Skip to content

armgit / cindy

Public Imported from GitHub
0

Consider it done. The open-source AI agent that works out of the box · 想到,就能做到。开源、开箱即用的 AI Agent。

fix(orca): 将代理任务创建纳入远端关联事务

DavidShen70c49ef76f9a
diff --git a/apps/desktop/src/main/localDb/client/WorkerThreadTransport.ts b/apps/desktop/src/main/localDb/client/WorkerThreadTransport.ts
index 6f026c1f98..21974718dc 100644
--- a/apps/desktop/src/main/localDb/client/WorkerThreadTransport.ts
+++ b/apps/desktop/src/main/localDb/client/WorkerThreadTransport.ts
@@ -1456,6 +1456,19 @@ function orcaUpsertWorker(readyDb, args) {
if (!activeTeam) {
throw new Error('Orca team ' + teamId + ' is no longer active');
}
+ if (payload.remoteExecution !== undefined) {
+ const remote = asRecord(payload.remoteExecution, 'remoteExecution');
+ if (remote.proxySession !== undefined) {
+ const proxy = asRecord(remote.proxySession, 'remoteExecution.proxySession');
+ readyDb.prepare("INSERT INTO sessions (id, title, working_dir, workspace_kind, model, effort, permission_mode, fast_mode, status, agent_kind, orca_role, source, created_at, updated_at) VALUES (?, ?, NULL, 'project', ?, ?, ?, ?, 'active', ?, 'worker', 'desktop', ?, ?)").run(
+ sessionId, expectString(proxy.title, 'proxySession.title'),
+ expectString(proxy.model, 'proxySession.model'),
+ proxy.effort == null ? 'high' : expectString(proxy.effort, 'proxySession.effort'),
+ expectString(proxy.permissionMode, 'proxySession.permissionMode'), proxy.fastMode === true ? 1 : 0,
+ expectString(proxy.agentKind, 'proxySession.agentKind'), now, now,
+ );
+ }
+ }
if (payload.focused === true) {
readyDb.prepare('UPDATE orca_workers SET focused = 0, updated_at = ? WHERE team_id = ? AND focused = 1').run(now, teamId);
}
diff --git a/apps/desktop/src/main/localDb/client/__tests__/tx.test.ts b/apps/desktop/src/main/localDb/client/__tests__/tx.test.ts
index 83613ebbee..0f3eea3ceb 100644
--- a/apps/desktop/src/main/localDb/client/__tests__/tx.test.ts
+++ b/apps/desktop/src/main/localDb/client/__tests__/tx.test.ts
@@ -3356,26 +3356,47 @@ describe('db worker tx handlers', () => {
it.each([false, true])('commits remote Worker routing and the open receipt atomically (inline=%s)', async useInlineWorker => {
await withClient(async client => {
await seedSession(client, 'lead');
- await seedSession(client, 'proxy');
await client.exec("INSERT INTO orca_teams (id, lead_session_id, status, created_at, updated_at) VALUES ('t', 'lead', 'active', 1, 1)");
await client.exec("INSERT INTO orca_remote_opens VALUES ('remote', 'device', 1)");
const args = { id: 'w', teamId: 't', sessionId: 'proxy', label: 'dev', role: 'developer',
- remoteExecution: { deviceId: 'device', remoteSessionId: 'remote' }, now: 2 };
+ remoteExecution: { deviceId: 'device', remoteSessionId: 'remote',
+ proxySession: { title: 'Remote Worker', model: 'remote-model', agentKind: 'codex',
+ effort: null, permissionMode: 'auto', fastMode: true } }, now: 2 };
// Force a failure after the Worker and route writes. None of them may survive.
await client.exec("CREATE TRIGGER fail_receipt BEFORE DELETE ON orca_remote_opens BEGIN SELECT RAISE(ABORT, 'receipt failure'); END");
await expect(client.tx('orca.upsertWorker', args)).rejects.toThrow('receipt failure');
await expect(client.query('SELECT * FROM orca_workers')).resolves.toEqual([]);
- await expect(client.queryOne('SELECT orca_role FROM sessions WHERE id = ?', ['proxy'])).resolves.toEqual({ orca_role: null });
+ await expect(client.queryOne('SELECT id FROM sessions WHERE id = ?', ['proxy'])).resolves.toBeUndefined();
await expect(client.query('SELECT remote_session_id FROM orca_remote_opens')).resolves.toEqual([{ remote_session_id: 'remote' }]);
await client.exec('DROP TRIGGER fail_receipt');
await client.tx('orca.upsertWorker', args);
await expect(client.queryOne('SELECT execution_device_id, remote_session_id FROM orca_workers WHERE id = ?', ['w']))
.resolves.toEqual({ execution_device_id: 'device', remote_session_id: 'remote' });
- await expect(client.queryOne('SELECT orca_role FROM sessions WHERE id = ?', ['proxy'])).resolves.toEqual({ orca_role: 'worker' });
+ await expect(client.queryOne('SELECT title, working_dir, model, effort, permission_mode, fast_mode, status, agent_kind, orca_role FROM sessions WHERE id = ?', ['proxy']))
+ .resolves.toEqual({ title: 'Remote Worker', working_dir: null, model: 'remote-model', effort: 'high',
+ permission_mode: 'auto', fast_mode: 1, status: 'active', agent_kind: 'codex', orca_role: 'worker' });
await expect(client.query('SELECT * FROM orca_remote_opens')).resolves.toEqual([]);
}, { useInlineWorker });
});
+ it.each([false, true])('rejects a proxy id collision without changing the existing task (inline=%s)', async useInlineWorker => {
+ await withClient(async client => {
+ await seedSession(client, 'lead');
+ await seedSession(client, 'existing');
+ const before = await client.queryOne('SELECT * FROM sessions WHERE id = ?', ['existing']);
+ await client.exec("INSERT INTO orca_teams (id, lead_session_id, status, created_at, updated_at) VALUES ('t', 'lead', 'active', 1, 1)");
+ await client.exec("INSERT INTO orca_remote_opens VALUES ('remote', 'device', 1)");
+ await expect(client.tx('orca.upsertWorker', { id: 'w', teamId: 't', sessionId: 'existing', label: 'dev',
+ remoteExecution: { deviceId: 'device', remoteSessionId: 'remote',
+ proxySession: { title: 'Proxy', model: 'remote-model', agentKind: 'codex',
+ effort: null, permissionMode: 'auto', fastMode: true } }, now: 2 }))
+ .rejects.toThrow('UNIQUE');
+ await expect(client.queryOne('SELECT * FROM sessions WHERE id = ?', ['existing'])).resolves.toEqual(before);
+ await expect(client.query('SELECT * FROM orca_workers')).resolves.toEqual([]);
+ await expect(client.query('SELECT remote_session_id FROM orca_remote_opens')).resolves.toEqual([{ remote_session_id: 'remote' }]);
+ }, { useInlineWorker });
+ });
+
it.each([false, true])('retains rollback cleanup routing until remote release is confirmed (inline=%s)', async useInlineWorker => {
await withClient(async client => {
await seedSession(client, 'lead');
diff --git a/apps/desktop/src/main/localDb/client/tx/types.ts b/apps/desktop/src/main/localDb/client/tx/types.ts
index 7bca21fe5c..a345d373ef 100644
--- a/apps/desktop/src/main/localDb/client/tx/types.ts
+++ b/apps/desktop/src/main/localDb/client/tx/types.ts
@@ -261,6 +261,15 @@ export interface EmbeddingEnqueueArgs {
* orcaTeamStore.addOrUpdateWorker 原同步事务逻辑。可选字段值为 undefined 表示
* "保留 existing 行的当前值",与原 drizzle 写法语义一致。
*/
+export interface OrcaRemoteWorkerProxySessionSeed {
+ title: string;
+ agentKind: string;
+ model: string;
+ effort: string | null;
+ permissionMode: string;
+ fastMode: boolean;
+}
+
export interface OrcaUpsertWorkerArgs {
id: string;
teamId: string;
@@ -271,7 +280,12 @@ export interface OrcaUpsertWorkerArgs {
role?: string;
focused?: boolean;
idleSince?: number | null;
- remoteExecution?: { deviceId: string; remoteSessionId: string };
+ remoteExecution?: {
+ deviceId: string;
+ remoteSessionId: string;
+ /** 新建代理与 Worker 路由一起提交;已有代理的更新可省略。 */
+ proxySession?: OrcaRemoteWorkerProxySessionSeed;
+ };
now: number;
}
diff --git a/apps/desktop/src/main/localDb/orcaTeamStore.ts b/apps/desktop/src/main/localDb/orcaTeamStore.ts
index 91f853705b..c2b73194f4 100644
--- a/apps/desktop/src/main/localDb/orcaTeamStore.ts
+++ b/apps/desktop/src/main/localDb/orcaTeamStore.ts
@@ -4,6 +4,7 @@ import { createId } from '@paralleldrive/cuid2';
import type { OrcaRemotePendingReport } from '../../shared/orcaRemoteWorker.js';
import { getDbClient } from './client/current.js';
+import type { OrcaRemoteWorkerProxySessionSeed } from './client/tx/types.js';
import { orcaWorkers, orcaTeams, orcaWorkerCreationReservations, orcaRemoteOpens, sessions } from './schema.js';
import { createLogger } from '../logger.js';
import { throwIpcError } from '../utils/ipcValidate.js';
@@ -735,49 +736,16 @@ export interface RemoteWorkerRow {
remoteStopConfirmedAt: number | null;
}
-/**
- * 写入远端 Worker 的本机代理任务行:不跑 Agent,不绑定本机目录(working_dir 为空),
- * 只用来承接现有协同的计槽、归档与回报。真实任务在运行设备上。
- */
-export async function insertRemoteWorkerProxySession(input: {
- id: string;
- title: string;
- agentKind: MakerAgentKind;
- model: string;
- effort: string | null;
- permissionMode: string;
- fastMode: boolean;
-}): Promise<void> {
- const now = Date.now();
- await getDbClient()
- .drizzle.insert(sessions)
- .values({
- id: input.id,
- title: input.title,
- workingDir: null,
- workspaceKind: 'project',
- model: input.model,
- effort: (input.effort ?? 'high') as (typeof sessions.$inferInsert)['effort'],
- permissionMode: input.permissionMode as (typeof sessions.$inferInsert)['permissionMode'],
- fastMode: input.fastMode,
- status: 'active',
- agentKind: input.agentKind === 'claude-code' ? 'cc' : input.agentKind,
- orcaRole: 'worker',
- source: 'desktop',
- createdAt: now,
- updatedAt: now,
- });
-}
-
/** Worker、远端路由、代理身份和 open 收据在同一事务内提交。 */
export async function addRemoteWorker(input: {
workerId: string; teamId: string; proxySessionId: string;
deviceId: string; remoteSessionId: string; label: string; role: string;
+ proxySession?: OrcaRemoteWorkerProxySessionSeed;
}): Promise<void> {
await getDbClient().tx('orca.upsertWorker', {
id: input.workerId, teamId: input.teamId, sessionId: input.proxySessionId,
label: input.label, role: input.role, status: 'idle', focused: false,
- remoteExecution: { deviceId: input.deviceId, remoteSessionId: input.remoteSessionId },
+ remoteExecution: { deviceId: input.deviceId, remoteSessionId: input.remoteSessionId, proxySession: input.proxySession },
now: Date.now(),
});
}
diff --git a/apps/desktop/src/main/localDb/worker/opHandlers/tx.ts b/apps/desktop/src/main/localDb/worker/opHandlers/tx.ts
index 747b5607d1..72c165f280 100644
--- a/apps/desktop/src/main/localDb/worker/opHandlers/tx.ts
+++ b/apps/desktop/src/main/localDb/worker/opHandlers/tx.ts
@@ -3399,6 +3399,19 @@ function orcaUpsertWorker(db: Database.Database, args: unknown): void {
if (!activeTeam) {
throw new Error(`Orca team ${teamId} is no longer active`);
}
+ if (payload.remoteExecution !== undefined) {
+ const remote = asRecord(payload.remoteExecution, 'remoteExecution');
+ if (remote.proxySession !== undefined) {
+ const proxy = asRecord(remote.proxySession, 'remoteExecution.proxySession');
+ db.prepare("INSERT INTO sessions (id, title, working_dir, workspace_kind, model, effort, permission_mode, fast_mode, status, agent_kind, orca_role, source, created_at, updated_at) VALUES (?, ?, NULL, 'project', ?, ?, ?, ?, 'active', ?, 'worker', 'desktop', ?, ?)").run(
+ sessionId, expectString(proxy.title, 'proxySession.title'),
+ expectString(proxy.model, 'proxySession.model'),
+ proxy.effort == null ? 'high' : expectString(proxy.effort, 'proxySession.effort'),
+ expectString(proxy.permissionMode, 'proxySession.permissionMode'), proxy.fastMode === true ? 1 : 0,
+ expectString(proxy.agentKind, 'proxySession.agentKind'), now, now,
+ );
+ }
+ }
if (payload.focused === true) {
db.prepare('UPDATE orca_workers SET focused = 0, updated_at = ? WHERE team_id = ? AND focused = 1').run(now, teamId);
}
diff --git a/apps/desktop/src/main/maker-ipc/__tests__/orcaRemoteWorkers.test.ts b/apps/desktop/src/main/maker-ipc/__tests__/orcaRemoteWorkers.test.ts
index 56882b61ab..45b3e8de33 100644
--- a/apps/desktop/src/main/maker-ipc/__tests__/orcaRemoteWorkers.test.ts
+++ b/apps/desktop/src/main/maker-ipc/__tests__/orcaRemoteWorkers.test.ts
@@ -8,7 +8,6 @@ import { withSendToSessionLock } from '../sendToSessionLock.js';
const store = vi.hoisted(() => ({
archiveSingleWorkerSession: vi.fn(async () => undefined),
getRemoteWorkerByProxySession: vi.fn(async () => null),
- insertRemoteWorkerProxySession: vi.fn(async () => undefined),
listActiveRemoteWorkers: vi.fn(async () => []),
listUnreleasedEndedRemoteWorkers: vi.fn(async () => []),
markWorkerRemoteReleased: vi.fn(async () => undefined),
@@ -108,6 +107,9 @@ const openInput = {
title: 'transcriber',
};
+const proxySeed = { title: 'transcriber', agentKind: 'cc', model: 'claude-opus-5-5',
+ effort: null, permissionMode: 'auto', fastMode: false };
+
function baseDeps() {
return {
getLiveSession: vi.fn(() => null),
@@ -196,7 +198,7 @@ describe('execution devices', () => {
});
describe('openRemoteWorker', () => {
- it('opens the task on the device and writes a local proxy row without a directory', async () => {
+ it('opens the device task and defers the local proxy until Worker association', async () => {
const { workers, remoteInvoke } = setup();
const result = await workers.openRemoteWorker({ ...openInput, workingDir: '/Users/demo/Interviews' });
expect(result).toMatchObject({
@@ -212,9 +214,15 @@ describe('openRemoteWorker', () => {
workingDir: '/Users/demo/Interviews',
lead: { leadSessionId: 'lead-1', leadTitle: '访谈整理', workerLabel: 'transcriber' },
});
- expect(store.insertRemoteWorkerProxySession).toHaveBeenCalledWith(
- expect.objectContaining({ model: 'claude-opus-5-5', permissionMode: 'auto' }),
- );
+ expect(store.addRemoteWorker).not.toHaveBeenCalled();
+ if (!result.ok) throw Error('expected successful open');
+ await workers.recordRemoteWorker({ workerId: 'w-1', teamId: 'team-1', leadSessionId: 'lead-1',
+ proxySessionId: result.proxySessionId, proxySession: result.proxySession,
+ remoteSessionId: result.remoteSessionId, deviceId: 'mac-mini', label: 'transcriber', role: 'developer' });
+ expect(store.addRemoteWorker).toHaveBeenCalledWith(expect.objectContaining({
+ proxySessionId: result.proxySessionId, proxySession: proxySeed,
+ }));
+ workers.stop();
});
it('refuses an offline device without falling back to this computer', async () => {
@@ -224,7 +232,7 @@ describe('openRemoteWorker', () => {
errorCode: 'REMOTE_AGENT_DEVICE_UNREACHABLE',
});
expect(remoteInvoke).not.toHaveBeenCalled();
- expect(store.insertRemoteWorkerProxySession).not.toHaveBeenCalled();
+ expect(store.addRemoteWorker).not.toHaveBeenCalled();
});
it('reports an outdated device as unsupported', async () => {
@@ -417,6 +425,7 @@ describe('wrapTeamDeps', () => {
teamId: 'team-1',
leadSessionId: 'lead-1',
proxySessionId: 'proxy-1',
+ proxySession: proxySeed,
deviceId: 'mac-mini',
remoteSessionId: 'remote-1',
label: 'transcriber',
@@ -733,6 +742,46 @@ describe('wrapTeamDeps', () => {
});
describe('remote open recovery', () => {
+ it.each([false, true])('does not touch a colliding existing task after association fails (remote=%s)', async remote => {
+ const existing = { workerId: 'other-worker', teamId: 'other-team', leadSessionId: 'other-lead',
+ proxySessionId: 'proxy-1', deviceId: 'other-device', remoteSessionId: 'other-remote', lastBridgedMessageId: null };
+ const { workers, remoteInvoke } = setup();
+ if (remote) workers.runtime.track(existing);
+ store.addRemoteWorker.mockRejectedValueOnce(new Error('UNIQUE constraint failed: sessions.id'));
+ store.getRemoteWorkerByProxySession.mockResolvedValueOnce(remote ? existing as never : null);
+ const input = { ...openInput, proxySessionId: 'proxy-1', proxySession: proxySeed, remoteSessionId: 'new-remote' };
+ try {
+ await expect(workers.recordRemoteWorker(input)).rejects.toThrow('UNIQUE');
+ await workers.discardRemoteWorker(input);
+ expect(store.removeWorker).not.toHaveBeenCalled();
+ expect(store.archiveSingleWorkerSession).not.toHaveBeenCalled();
+ expect(workers.runtime.isRemote('proxy-1')).toBe(remote);
+ expect(remoteInvoke.mock.calls.map(([, channel]) => channel)).toEqual(['maker:orca:remote-worker:release']);
+ expect(remoteInvoke.mock.calls[0]![0]).toBe('mac-mini');
+ expect(store.removeRemoteWorkerOpen).toHaveBeenCalledWith('new-remote');
+ } finally { workers.stop(); }
+ });
+
+ it('recovers an open abandoned before association without creating a local proxy', async () => {
+ const first = setup();
+ const opened = await first.workers.openRemoteWorker(openInput);
+ if (!opened.ok) throw Error('expected successful open');
+ expect(store.addRemoteWorker).not.toHaveBeenCalled();
+ first.workers.stop();
+ const receipt = { deviceId: 'mac-mini', remoteSessionId: opened.remoteSessionId, createdAt: Date.now() };
+ store.listOrphanRemoteWorkerOpens.mockResolvedValueOnce([receipt] as never[]);
+ store.listOrphanRemoteWorkerOpens.mockResolvedValueOnce([receipt] as never[]);
+ const second = setup();
+ try {
+ await second.workers.releaseEnded([]);
+ expect(second.remoteInvoke.mock.calls.map(([, channel]) => channel))
+ .toEqual(['local-db:sessions:get', 'maker:orca:remote-worker:release']);
+ expect(store.removeRemoteWorkerOpen).toHaveBeenCalledWith(opened.remoteSessionId);
+ expect(store.addRemoteWorker).not.toHaveBeenCalled();
+ expect(store.archiveSingleWorkerSession).not.toHaveBeenCalled();
+ } finally { second.workers.stop(); }
+ });
+
it('rechecks an orphan snapshot after a Worker has become associated', async () => {
const { workers, remoteInvoke } = setup();
let deliver!: (rows: never[]) => void;
@@ -742,7 +791,7 @@ describe('remote open recovery', () => {
store.listOrphanRemoteWorkerOpens.mockImplementationOnce(async () => { entered(); return gate; });
const cleanup = workers.releaseEnded([]);
await reading;
- await workers.recordRemoteWorker({ ...openInput, proxySessionId: 'proxy-1', remoteSessionId: 'remote-1' });
+ await workers.recordRemoteWorker({ ...openInput, proxySessionId: 'proxy-1', proxySession: proxySeed, remoteSessionId: 'remote-1' });
store.listOrphanRemoteWorkerOpens.mockResolvedValueOnce([]);
deliver([{ deviceId: 'mac-mini', remoteSessionId: 'remote-1', createdAt: Date.now() }] as never[]);
await cleanup;
@@ -772,7 +821,7 @@ describe('remote open recovery', () => {
await workers.start();
finishList(); await rejected;
expect(store.saveRemoteWorkerOpen).not.toHaveBeenCalled();
- expect(store.insertRemoteWorkerProxySession).not.toHaveBeenCalled();
+ expect(store.addRemoteWorker).not.toHaveBeenCalled();
expect(invoke).not.toHaveBeenCalled();
workers.stop();
});
@@ -783,7 +832,7 @@ describe('remote open recovery', () => {
const opened = await workers.openRemoteWorker(openInput);
if (!opened.ok) throw Error('expected successful open');
workers.stop(); owner = {}; await workers.start();
- const record = { ...openInput, proxySessionId: opened.proxySessionId, remoteSessionId: opened.remoteSessionId };
+ const record = { ...openInput, proxySessionId: opened.proxySessionId, proxySession: opened.proxySession, remoteSessionId: opened.remoteSessionId };
await expect(workers.recordRemoteWorker(record)).rejects.toThrow('owner changed');
await workers.discardRemoteWorker(record);
expect(store.addRemoteWorker).not.toHaveBeenCalled();
diff --git a/apps/desktop/src/main/maker-ipc/__tests__/orcaWorkerCreationService.test.ts b/apps/desktop/src/main/maker-ipc/__tests__/orcaWorkerCreationService.test.ts
index 3fd8e1511b..dc0ef19c32 100644
--- a/apps/desktop/src/main/maker-ipc/__tests__/orcaWorkerCreationService.test.ts
+++ b/apps/desktop/src/main/maker-ipc/__tests__/orcaWorkerCreationService.test.ts
@@ -256,6 +256,11 @@ describe('Worker running on another device (execution device)', () => {
ok: true as const,
proxySessionId: 'proxy-1',
remoteSessionId: 'remote-1',
+ proxySession: {
+ title: input.title, agentKind: input.agent === 'claude-code' ? 'cc' : input.agent,
+ model: input.model ?? 'device-default-model', effort: input.effort ?? null,
+ permissionMode: input.permissionMode, fastMode: input.fast === true,
+ },
agent: input.agent,
model: input.model ?? 'device-default-model',
workingDir: input.workingDir ?? '/Users/demo/Cindy/dialogues/remote-1',
@@ -285,6 +290,7 @@ describe('Worker running on another device (execution device)', () => {
expect(deps.recordRemoteWorker).toHaveBeenCalledWith({
workerId: 'worker-1', teamId: 'team-1', leadSessionId: 'lead-1',
proxySessionId: 'proxy-1', deviceId: 'mac-mini', remoteSessionId: 'remote-1',
+ proxySession: expect.objectContaining({ model: 'only-on-device', agentKind: 'cc' }),
label: 'transcribe', role: '转写',
workingDir: '/Users/demo/Interviews',
});
diff --git a/apps/desktop/src/main/maker-ipc/orcaRemoteWorkers.ts b/apps/desktop/src/main/maker-ipc/orcaRemoteWorkers.ts
index 6a1b32d455..57f1790eb9 100644
--- a/apps/desktop/src/main/maker-ipc/orcaRemoteWorkers.ts
+++ b/apps/desktop/src/main/maker-ipc/orcaRemoteWorkers.ts
@@ -24,7 +24,6 @@ import type { DeviceLinkDeviceView } from '../../shared/deviceLinkIpc.js';
import {
archiveSingleWorkerSession,
getRemoteWorkerByProxySession,
- insertRemoteWorkerProxySession,
listActiveRemoteWorkers,
listUnreleasedEndedRemoteWorkers,
markWorkerRemoteReleased,
@@ -480,35 +479,21 @@ export function createOrcaRemoteWorkers(deps: OrcaRemoteWorkersDeps) {
}
const proxySessionId = createId();
const agent: AgentKind = opened.agentKind ?? input.agent;
- try {
- assertOwner(owner);
- await insertRemoteWorkerProxySession({
- id: proxySessionId,
- title: input.title,
- agentKind: agent,
- model: opened.model || input.model || '',
- effort: input.effort && EFFORTS.has(input.effort) ? input.effort : null,
- permissionMode: input.permissionMode,
- fastMode: input.fast === true,
- });
- assertOwner(owner);
- } catch (err) {
- opening.delete(remoteSessionId);
- if (
- owner === ownerToken() &&
- ownerCurrent() &&
- (await runtime.release({
- deviceId: input.deviceId,
- remoteSessionId,
- }))
- )
- await removeRemoteWorkerOpen(remoteSessionId);
- throw err;
- }
+ // open 与关联之间尚未创建本机代理,退出后只需按持久 open 身份解除远端标记。
+ assertOwner(owner);
+ const proxySession = {
+ title: input.title,
+ agentKind: agent === 'claude-code' ? 'cc' : agent,
+ model: opened.model || input.model || '',
+ effort: input.effort && EFFORTS.has(input.effort) ? input.effort : null,
+ permissionMode: input.permissionMode,
+ fastMode: input.fast === true,
+ };
creationOwners.set(proxySessionId, owner);
return {
ok: true,
proxySessionId,
+ proxySession,
remoteSessionId: opened.sessionId || remoteSessionId,
agent,
model: opened.model,
@@ -529,7 +514,7 @@ export function createOrcaRemoteWorkers(deps: OrcaRemoteWorkersDeps) {
await addRemoteWorker(input);
assertOwner(owner);
opening.delete(input.remoteSessionId);
- const { workingDir, label: _label, role: _role, ...ref } = input;
+ const { workingDir, proxySession: _proxySession, label: _label, role: _role, ...ref } = input;
runtime.track({ ...ref, lastBridgedMessageId: null }, { workingDir });
deps.broadcastOrcaWorkerChanged(input.leadSessionId);
creationOwners.delete(input.proxySessionId);
@@ -552,7 +537,7 @@ export function createOrcaRemoteWorkers(deps: OrcaRemoteWorkersDeps) {
opening.delete(input.remoteSessionId);
const row = await getRemoteWorkerByProxySession(input.proxySessionId);
assertOwner(owner);
- if (row) {
+ if (row && row.deviceId === input.deviceId && row.remoteSessionId === input.remoteSessionId) {
await removeWorker(row.workerId);
assertOwner(owner);
runtime.untrack(input.proxySessionId);
@@ -560,13 +545,12 @@ export function createOrcaRemoteWorkers(deps: OrcaRemoteWorkersDeps) {
creationOwners.delete(input.proxySessionId);
return;
}
- runtime.untrack(input.proxySessionId);
+ // 关联事务失败时没有新代理;ID 冲突也不能归档或取消已有任务的路由。
if (await runtime.release(input)) {
assertOwner(owner);
await removeRemoteWorkerOpen(input.remoteSessionId);
}
assertOwner(owner);
- await archiveSingleWorkerSession(input.proxySessionId).catch(() => undefined);
creationOwners.delete(input.proxySessionId);
});
},
diff --git a/apps/desktop/src/main/maker-ipc/orcaWorkerCreationService.ts b/apps/desktop/src/main/maker-ipc/orcaWorkerCreationService.ts
index a1d32b4e8f..28b6a3b2c9 100644
--- a/apps/desktop/src/main/maker-ipc/orcaWorkerCreationService.ts
+++ b/apps/desktop/src/main/maker-ipc/orcaWorkerCreationService.ts
@@ -6,6 +6,7 @@ import { isCredentialModeSwitchBusyError } from '../maker-host/codex-credential-
import { isSubscriptionDirectModel } from '../../shared/subscriptionModels.js';
import type { DispatchWorkerTaskResult, OrcaWorkerEffort, OrcaWorkerStatus } from './orcaTeamService.js';
import type { MakerSessionCreateOpts } from './sessionRequest.js';
+import type { OrcaRemoteWorkerProxySessionSeed } from '../localDb/client/tx/types.js';
import {
resolveOrcaWorkerPermissionMode,
type OrcaWorkerPermissionMode,
@@ -230,11 +231,12 @@ export interface OrcaWorkerCreateParams {
executionDeviceId?: string;
}
-/** 在运行设备上建好 Worker 任务、并在本机写好代理任务行之后的结果。 */
+/** 运行设备已建好任务;代理数据随后与 Worker 路由一起提交。 */
export type OrcaRemoteWorkerOpenResult =
| {
ok: true;
proxySessionId: string;
+ proxySession: OrcaRemoteWorkerProxySessionSeed;
remoteSessionId: string;
agent: AgentKind;
model: string;
@@ -358,6 +360,7 @@ export interface OrcaWorkerCreationDeps {
teamId: string;
leadSessionId: string;
proxySessionId: string;
+ proxySession: OrcaRemoteWorkerProxySessionSeed;
deviceId: string;
remoteSessionId: string;
label: string;
@@ -853,6 +856,7 @@ export function createOrcaWorkerCreationService(deps: OrcaWorkerCreationDeps): O
teamId: params.teamId,
leadSessionId: params.leadSessionId,
proxySessionId: opened.proxySessionId,
+ proxySession: opened.proxySession,
deviceId,
remoteSessionId: opened.remoteSessionId,
label,
diff --git a/docs/dev-rules/orca-team-architecture.md b/docs/dev-rules/orca-team-architecture.md
index 2a00c517ff..942d31805a 100644
--- a/docs/dev-rules/orca-team-architecture.md
+++ b/docs/dev-rules/orca-team-architecture.md
@@ -395,7 +395,9 @@ Worker turn 被 vendor 报终止型 error,但 interrupted-turn auto-resume 仍
清理单飞且读取最新阶段,后续只补未完成阶段。归档提交成功后才取消远端路由。
创建回执丢失时使用同一 sessionId 核对,未确认身份保存在 `orca_remote_opens`;孤儿清理与
Worker 关联共用任务锁,锁内复查后仅解除未关联标记,保留任务、文件及用户发起的工作。
-Worker、远端路由、代理身份与 open 收据在同一事务提交;恢复完成前派发和本机启动入口
+本机代理任务行在 Worker 关联时才创建,与 Worker、远端路由及 open 收据在同一事务提交;
+open 成功后未关联即退出时,本机没有半成品代理,仅按持久 open 身份解除远端标记。
+恢复完成前派发和本机启动入口
不得按缺失的运行期路由回退到本机,读取失败或 owner 改变时应拒绝继续。
创建回滚原子归档代理并释放名称与名额,未确认释放的 Worker 行保留供重启补发;正常
结束协同仍保留历史 link,回滚行只在 stop/release 已确认后删除。
diff --git a/docs/dev-rules/remote-and-mobile-adaptation.md b/docs/dev-rules/remote-and-mobile-adaptation.md
index d2e7b64688..953349c7ce 100644
--- a/docs/dev-rules/remote-and-mobile-adaptation.md
+++ b/docs/dev-rules/remote-and-mobile-adaptation.md
@@ -97,7 +97,8 @@ relay 以 close 1013 `inbound backpressure` 主动断连,此时任何「立即
清理共用单 Worker 入口并读最新阶段,不能因迟到快照重复停止用户后续的普通任务。
open 丢回执时用相同 sessionId 核对一次;无法确认的创建身份落盘,恢复后只解除未关联任务的标记。
清理与 Worker 关联共用任务锁,锁内复查归属;公开写操作和迟到回调均核对数据库 owner。
- Worker、运行设备路由、代理身份和 open 收据在同一数据库事务内提交,避免半关联状态。
+ 本机代理任务行只在关联时创建,与 Worker、运行设备路由和 open 收据同事务提交。
+ 未关联即退出时没有本机半成品代理,恢复只按 open 身份解除远端标记,不派活也不复制任务。
派发、恢复与本机启动检查等待当前 owner 的路由恢复;数据库读取失败不得回退到本机。
创建回滚归档代理并释放名称与名额,但保留未释放路由;重启后继续 stop/release,确认后清理。
3. **多 peer 与负载**:每台设备每轮只发一次 `maker:list-active`,有待回报时 2s 一轮,否则 15s 一轮;