Consider it done. The open-source AI agent that works out of the box · 想到,就能做到。开源、开箱即用的 AI Agent。
TypeScript agentai-agentai-assistantandroidclaude-codecodexelectroniosllmmacosreact-nativetypescriptwindows
fix(orca): 原子登记远端路由并保留回滚清理记录
DavidShenae19b29d8621
diff --git a/apps/desktop/src/main/localDb/__tests__/orcaTeamStore.test.ts b/apps/desktop/src/main/localDb/__tests__/orcaTeamStore.test.tsindex 6118f78639..c04fa4a953 100644--- a/apps/desktop/src/main/localDb/__tests__/orcaTeamStore.test.ts+++ b/apps/desktop/src/main/localDb/__tests__/orcaTeamStore.test.ts@@ -129,6 +129,29 @@ describe('orcaTeamStore', () => {expect(await store.listOrphanRemoteWorkerOpens()).toEqual([expect.objectContaining({ remoteSessionId: 'orphan-1' })]);});+ it('keeps a rolled-back remote Worker available for cleanup across database rereads', async () => {+ const store = await import('../orcaTeamStore.js');+ const client = createTestDbClient();+ setCurrentDbClient(client, 'test-user');+ await seedOrcaWorkers(client);+ await store.saveRemoteWorkerOpen('device-b', 'remote-1');+ await store.addRemoteWorker({ workerId: 'worker-1', teamId: 'team-1', proxySessionId: 'worker-session-1',+ deviceId: 'device-b', remoteSessionId: 'remote-1', label: 'dev', role: 'developer' });+ expect(await store.listOrphanRemoteWorkerOpens()).toEqual([]);+ await store.removeWorker('worker-1');+ expect(await store.listActiveRemoteWorkers()).toEqual([]);+ expect(await store.listWorkersByLead('lead-session-1')).toHaveLength(1);+ expect(await store.listUnreleasedEndedRemoteWorkers()).toEqual([+ expect.objectContaining({ workerId: 'worker-1', deviceId: 'device-b', remoteSessionId: 'remote-1' }),+ ]);+ expect(await store.getWorkerRemoteReleaseState('worker-1')).toMatchObject({ removeAfterRelease: true });+ await store.markWorkerRemoteStopConfirmed('worker-1');+ await store.markWorkerRemoteReleased('worker-1');+ await store.removeWorker('worker-1');+ expect(await store.getRemoteWorkerByProxySession('worker-session-1')).toBeNull();+ expect(await store.listUnreleasedEndedRemoteWorkers()).toEqual([]);+ });+it('notifies Agent Island when Orca archives worker sessions', async () => {const { archiveWorkersByTeam } = await import('../orcaTeamStore.js');const client = createTestDbClient();diff --git a/apps/desktop/src/main/localDb/client/WorkerThreadTransport.ts b/apps/desktop/src/main/localDb/client/WorkerThreadTransport.tsindex ac497cb019..6f026c1f98 100644--- a/apps/desktop/src/main/localDb/client/WorkerThreadTransport.ts+++ b/apps/desktop/src/main/localDb/client/WorkerThreadTransport.ts@@ -1373,13 +1373,18 @@ function orcaRemoveWorker(readyDb, args) {const payload = asRecord(args, 'orca.removeWorker args');const workerId = expectString(payload.workerId, 'workerId');const now = expectNumber(payload.now, 'now');- const selectWorker = readyDb.prepare('SELECT session_id AS sessionId FROM orca_workers WHERE id = ? LIMIT 1');+ const selectWorker = readyDb.prepare('SELECT session_id AS sessionId, execution_device_id AS deviceId, remote_released_at AS releasedAt FROM orca_workers WHERE id = ? LIMIT 1');const deleteWorker = readyDb.prepare('DELETE FROM orca_workers WHERE id = ?');const archiveSession = readyDb.prepare("UPDATE sessions SET status = 'archived', orca_role = NULL, updated_at = ? WHERE id = ? AND status != 'deleted'");return readyDb.transaction(() => {const row = selectWorker.get(workerId);if (!row) return null;- deleteWorker.run(workerId);+ // 回滚先隐藏代理并释放 label;远端 stop/release 未确认前必须保留持久重试路由。+ if (row.deviceId && row.releasedAt == null) {+ readyDb.prepare('UPDATE orca_workers SET label = NULL, updated_at = ? WHERE id = ?').run(now, workerId);+ } else {+ deleteWorker.run(workerId);+ }const archived = archiveSession.run(now, row.sessionId);return archived.changes > 0 ? row.sessionId : null;})();@@ -1454,6 +1459,15 @@ function orcaUpsertWorker(readyDb, args) {if (payload.focused === true) {readyDb.prepare('UPDATE orca_workers SET focused = 0, updated_at = ? WHERE team_id = ? AND focused = 1').run(now, teamId);}+ const persistRemoteExecution = () => {+ if (payload.remoteExecution === undefined) return;+ const remote = asRecord(payload.remoteExecution, 'remoteExecution');+ const deviceId = expectString(remote.deviceId, 'remoteExecution.deviceId');+ const remoteSessionId = expectString(remote.remoteSessionId, 'remoteExecution.remoteSessionId');+ readyDb.prepare('UPDATE orca_workers SET execution_device_id = ?, remote_session_id = ? WHERE session_id = ?').run(deviceId, remoteSessionId, sessionId);+ readyDb.prepare("UPDATE sessions SET orca_role = 'worker' WHERE id = ?").run(sessionId);+ readyDb.prepare('DELETE FROM orca_remote_opens WHERE device_id = ? AND remote_session_id = ?').run(deviceId, remoteSessionId);+ };const existing = readyDb.prepare('SELECT * FROM orca_workers WHERE id = ? LIMIT 1').get(id);if (existing) {readyDb.prepare('UPDATE orca_workers SET team_id = ?, session_id = ?, status = ?, label = ?, worktree_branch = ?, role = ?, focused = ?, idle_since = ?, updated_at = ? WHERE id = ?').run(@@ -1468,6 +1482,7 @@ function orcaUpsertWorker(readyDb, args) {now,id,);+ persistRemoteExecution();return;}const bySession = readyDb.prepare('SELECT * FROM orca_workers WHERE session_id = ? LIMIT 1').get(sessionId);@@ -1483,6 +1498,7 @@ function orcaUpsertWorker(readyDb, args) {now,sessionId,);+ persistRemoteExecution();return;}readyDb.prepare('INSERT INTO orca_workers (id, team_id, session_id, status, label, worktree_branch, role, focused, idle_since, created_at, updated_at) VALUES (?,?,?,?,?,?,?,?,?,?,?)').run(@@ -1498,6 +1514,7 @@ function orcaUpsertWorker(readyDb, args) {now,now,);+ persistRemoteExecution();})();}diff --git a/apps/desktop/src/main/localDb/client/__tests__/tx.test.ts b/apps/desktop/src/main/localDb/client/__tests__/tx.test.tsindex 0b492cff97..83613ebbee 100644--- a/apps/desktop/src/main/localDb/client/__tests__/tx.test.ts+++ b/apps/desktop/src/main/localDb/client/__tests__/tx.test.ts@@ -147,6 +147,11 @@ CREATE TABLE orca_workers (updated_at INTEGER NOT NULL);CREATE UNIQUE INDEX uniq_orca_workers_team_label ON orca_workers (team_id, lower(label));+CREATE TABLE orca_remote_opens (+ remote_session_id TEXT PRIMARY KEY,+ device_id TEXT NOT NULL,+ created_at INTEGER NOT NULL+);CREATE TABLE orca_worker_creation_reservations (id TEXT PRIMARY KEY,team_id TEXT NOT NULL,@@ -3347,6 +3352,52 @@ 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 };+ // 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.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.query('SELECT * FROM orca_remote_opens')).resolves.toEqual([]);+ }, { 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');+ 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.tx('orca.upsertWorker', { id: 'w', teamId: 't', sessionId: 'proxy', label: 'dev',+ remoteExecution: { deviceId: 'device', remoteSessionId: 'remote' }, now: 2 });+ await client.tx('orca.removeWorker', { workerId: 'w', now: 3 });+ await expect(client.queryOne('SELECT execution_device_id, remote_session_id, label FROM orca_workers WHERE id = ?', ['w']))+ .resolves.toEqual({ execution_device_id: 'device', remote_session_id: 'remote', label: null });+ await expect(client.queryOne('SELECT status, orca_role FROM sessions WHERE id = ?', ['proxy']))+ .resolves.toEqual({ status: 'archived', orca_role: null });+ // A failed create no longer consumes a label; its cleanup survives restarting the client.+ await seedSession(client, 'proxy2');+ await client.tx('orca.upsertWorker', { id: 'w2', teamId: 't', sessionId: 'proxy2', label: 'dev', now: 4 });+ await client.exec('UPDATE orca_workers SET remote_released_at = ? WHERE id = ?', [5, 'w']);+ await client.tx('orca.removeWorker', { workerId: 'w', now: 6 });+ await expect(client.queryOne('SELECT id FROM orca_workers WHERE id = ?', ['w'])).resolves.toBeUndefined();+ await expect(client.queryOne('SELECT label FROM orca_workers WHERE id = ?', ['w2'])).resolves.toEqual({ label: 'dev' });+ }, { useInlineWorker });+ });+it('orca.removeWorker deletes the worker and archives its session atomically', async () => {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.tsindex 517cda157d..7bca21fe5c 100644--- a/apps/desktop/src/main/localDb/client/tx/types.ts+++ b/apps/desktop/src/main/localDb/client/tx/types.ts@@ -271,6 +271,7 @@ export interface OrcaUpsertWorkerArgs {role?: string;focused?: boolean;idleSince?: number | null;+ remoteExecution?: { deviceId: string; remoteSessionId: string };now: number;}diff --git a/apps/desktop/src/main/localDb/orcaTeamStore.ts b/apps/desktop/src/main/localDb/orcaTeamStore.tsindex eb6445b4d0..91f853705b 100644--- a/apps/desktop/src/main/localDb/orcaTeamStore.ts+++ b/apps/desktop/src/main/localDb/orcaTeamStore.ts@@ -574,7 +574,8 @@ export async function restoreWorkerDoneIfIdle(workerId: string): Promise<boolean}/**- * create_worker 派发失败补偿:移除尚未成功 dispatch 的 worker link,并归档对应 session。+ * create_worker 派发失败补偿:归档代理并移除 worker link;未释放的远端路由留待补发,+ * 通过已归档 session 的空 orcaRole 区分回滚清理与正常保留历史的协同结束。* 这条路径只服务失败清理,不影响正常协同结束时保留历史 worker link 的语义。*/export async function removeWorker(workerId: string): Promise<void> {@@ -768,6 +769,19 @@ export async function insertRemoteWorkerProxySession(input: {});}+/** Worker、远端路由、代理身份和 open 收据在同一事务内提交。 */+export async function addRemoteWorker(input: {+ workerId: string; teamId: string; proxySessionId: string;+ deviceId: string; remoteSessionId: string; label: string; role: string;+}): 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 },+ now: Date.now(),+ });+}+export async function setWorkerRemoteExecution(workerId: string,input: { deviceId: string; remoteSessionId: string },@@ -819,8 +833,11 @@ export async function markWorkerRemoteStopConfirmed(workerId: string, at = Date.export async function getWorkerRemoteReleaseState(workerId: string) {const [row] = await getDbClient().drizzle.select({remoteStopConfirmedAt: orcaWorkers.remoteStopConfirmedAt, remoteReleasedAt: orcaWorkers.remoteReleasedAt,- }).from(orcaWorkers).where(eq(orcaWorkers.id, workerId)).limit(1);- return row ?? null;+ sessionStatus: sessions.status, orcaRole: sessions.orcaRole,+ }).from(orcaWorkers).innerJoin(sessions, eq(sessions.id, orcaWorkers.sessionId))+ .where(eq(orcaWorkers.id, workerId)).limit(1);+ return row ? { remoteStopConfirmedAt: row.remoteStopConfirmedAt, remoteReleasedAt: row.remoteReleasedAt,+ removeAfterRelease: row.sessionStatus !== 'active' && row.orcaRole === null } : null;}function parsePendingReport(raw: string | null): OrcaRemotePendingReport | null {diff --git a/apps/desktop/src/main/localDb/worker/opHandlers/tx.ts b/apps/desktop/src/main/localDb/worker/opHandlers/tx.tsindex fd168724b9..747b5607d1 100644--- a/apps/desktop/src/main/localDb/worker/opHandlers/tx.ts+++ b/apps/desktop/src/main/localDb/worker/opHandlers/tx.ts@@ -3288,13 +3288,18 @@ function orcaRemoveWorker(db: Database.Database, args: unknown): string | null {const payload = asRecord(args, 'orca.removeWorker args');const workerId = expectString(payload.workerId, 'workerId');const now = expectNumber(payload.now, 'now');- const selectWorker = db.prepare('SELECT session_id AS sessionId FROM orca_workers WHERE id = ? LIMIT 1');+ const selectWorker = db.prepare('SELECT session_id AS sessionId, execution_device_id AS deviceId, remote_released_at AS releasedAt FROM orca_workers WHERE id = ? LIMIT 1');const deleteWorker = db.prepare('DELETE FROM orca_workers WHERE id = ?');const archiveSession = db.prepare("UPDATE sessions SET status = 'archived', orca_role = NULL, updated_at = ? WHERE id = ? AND status != 'deleted'");const transaction = db.transaction(() => {- const row = selectWorker.get(workerId) as { sessionId: string } | undefined;+ const row = selectWorker.get(workerId) as { sessionId: string; deviceId: string | null; releasedAt: number | null } | undefined;if (!row) return null;- deleteWorker.run(workerId);+ // 回滚先隐藏代理并释放 label;远端 stop/release 未确认前必须保留持久重试路由。+ if (row.deviceId && row.releasedAt == null) {+ db.prepare('UPDATE orca_workers SET label = NULL, updated_at = ? WHERE id = ?').run(now, workerId);+ } else {+ deleteWorker.run(workerId);+ }const archived = archiveSession.run(now, row.sessionId);return archived.changes > 0 ? row.sessionId : null;});@@ -3397,6 +3402,15 @@ function orcaUpsertWorker(db: Database.Database, args: unknown): void {if (payload.focused === true) {db.prepare('UPDATE orca_workers SET focused = 0, updated_at = ? WHERE team_id = ? AND focused = 1').run(now, teamId);}+ const persistRemoteExecution = () => {+ if (payload.remoteExecution === undefined) return;+ const remote = asRecord(payload.remoteExecution, 'remoteExecution');+ const deviceId = expectString(remote.deviceId, 'remoteExecution.deviceId');+ const remoteSessionId = expectString(remote.remoteSessionId, 'remoteExecution.remoteSessionId');+ db.prepare('UPDATE orca_workers SET execution_device_id = ?, remote_session_id = ? WHERE session_id = ?').run(deviceId, remoteSessionId, sessionId);+ db.prepare("UPDATE sessions SET orca_role = 'worker' WHERE id = ?").run(sessionId);+ db.prepare('DELETE FROM orca_remote_opens WHERE device_id = ? AND remote_session_id = ?').run(deviceId, remoteSessionId);+ };const existing = db.prepare('SELECT * FROM orca_workers WHERE id = ? LIMIT 1').get(id) as Record<string, unknown> | undefined;if (existing) {db.prepare('UPDATE orca_workers SET team_id = ?, session_id = ?, status = ?, label = ?, worktree_branch = ?, role = ?, focused = ?, idle_since = ?, updated_at = ? WHERE id = ?').run(@@ -3411,6 +3425,7 @@ function orcaUpsertWorker(db: Database.Database, args: unknown): void {now,id,);+ persistRemoteExecution();return;}const bySession = db.prepare('SELECT * FROM orca_workers WHERE session_id = ? LIMIT 1').get(sessionId) as Record<string, unknown> | undefined;@@ -3426,6 +3441,7 @@ function orcaUpsertWorker(db: Database.Database, args: unknown): void {now,sessionId,);+ persistRemoteExecution();return;}db.prepare('INSERT INTO orca_workers (id, team_id, session_id, status, label, worktree_branch, role, focused, idle_since, created_at, updated_at) VALUES (?,?,?,?,?,?,?,?,?,?,?)').run(@@ -3441,6 +3457,7 @@ function orcaUpsertWorker(db: Database.Database, args: unknown): void {now,now,);+ persistRemoteExecution();})();}diff --git a/apps/desktop/src/main/maker-ipc/__tests__/orcaRemoteWorkers.test.ts b/apps/desktop/src/main/maker-ipc/__tests__/orcaRemoteWorkers.test.tsindex f7ec55b163..56882b61ab 100644--- a/apps/desktop/src/main/maker-ipc/__tests__/orcaRemoteWorkers.test.ts+++ b/apps/desktop/src/main/maker-ipc/__tests__/orcaRemoteWorkers.test.ts@@ -18,7 +18,8 @@ const store = vi.hoisted(() => ({saveRemoteWorkerOpen: vi.fn(async () => undefined),removeRemoteWorkerOpen: vi.fn(async () => undefined),listOrphanRemoteWorkerOpens: vi.fn(async (_sessionId?: string) => []),- setWorkerRemoteExecution: vi.fn(async () => undefined),+ addRemoteWorker: vi.fn(async () => undefined),+ removeWorker: vi.fn(async () => undefined),}));vi.mock('../../localDb/orcaTeamStore.js', () => store);vi.mock('../../logger.js', () => ({ createLogger: () => ({ info: vi.fn(), warn: vi.fn() }) }));@@ -257,6 +258,8 @@ describe('start', () => {proxySessionId: 'proxy-1',deviceId: 'mac-mini',remoteSessionId: 'remote-1',+ label: 'transcriber',+ role: 'developer',lastBridgedMessageId: null,};let owner = {};@@ -317,6 +320,96 @@ describe('start', () => {});describe('wrapTeamDeps', () => {+ const restoredRow = { workerId: 'w-1', teamId: 'team-1', leadSessionId: 'lead-1',+ proxySessionId: 'proxy-1', deviceId: 'mac-mini', remoteSessionId: 'remote-1', lastBridgedMessageId: null };++ it('blocks resume, dispatch and local bootstrap detection until routing has restored', async () => {+ let restoreRows!: (rows: never[]) => void;+ store.listActiveRemoteWorkers.mockImplementationOnce(() => new Promise(resolve => { restoreRows = resolve; }));+ const { workers, remoteInvoke } = setup();+ const base = baseDeps();+ base.resumeWorkerSession = vi.fn(async () => undefined);+ const wrapped = workers.wrapTeamDeps(base);+ const starting = workers.start();+ const detecting = workers.isRemoteWorker('proxy-1');+ const resuming = wrapped.resumeWorkerSession({ sessionId: 'proxy-1' } as never, {} as never);+ const sending = wrapped.dispatchWorkerMessage({ targetSessionId: 'proxy-1', message: 'work', workerId: 'w-1',+ dispatchMeta: { source: 'mcp', context: 'send_to_worker' } } as never);+ expect(base.resumeWorkerSession).not.toHaveBeenCalled();+ expect(base.dispatchWorkerMessage).not.toHaveBeenCalled();+ restoreRows([restoredRow] as never[]);+ try {+ await starting;+ await expect(detecting).resolves.toBe(true);+ await resuming;+ await expect(sending).resolves.toMatchObject({ ok: true });+ expect(base.resumeWorkerSession).not.toHaveBeenCalled();+ expect(base.dispatchWorkerMessage).not.toHaveBeenCalled();+ expect(remoteInvoke.mock.calls.some(([, channel]) => channel === 'maker:input:enqueue')).toBe(true);+ } finally { workers.stop(); }+ });++ it('does not fall back locally when restoring routes fails', async () => {+ store.listActiveRemoteWorkers.mockRejectedValueOnce(new Error('database unavailable'));+ const { workers } = setup();+ const base = baseDeps();+ try {+ await expect(workers.wrapTeamDeps(base).dispatchWorkerMessage({ targetSessionId: 'proxy-1' } as never))+ .rejects.toThrow('database unavailable');+ expect(base.dispatchWorkerMessage).not.toHaveBeenCalled();+ } finally { workers.stop(); }+ });++ it('rejects a pending dispatch when the database owner changes during restore', async () => {+ let owner = {};+ let restoreRows!: (rows: never[]) => void;+ store.listActiveRemoteWorkers.mockImplementationOnce(() => new Promise(resolve => { restoreRows = resolve; }));+ const { workers, remoteInvoke } = setup({ getOwnerToken: () => owner });+ const base = baseDeps();+ const sending = workers.wrapTeamDeps(base).dispatchWorkerMessage({ targetSessionId: 'proxy-1' } as never);+ const rejected = expect(sending).rejects.toThrow('owner changed');+ owner = {};+ restoreRows([restoredRow] as never[]);+ try {+ await rejected;+ expect(base.dispatchWorkerMessage).not.toHaveBeenCalled();+ expect(remoteInvoke).not.toHaveBeenCalled();+ } finally { workers.stop(); }+ });++ it('recognizes an archived durable route even though it is not polled', async () => {+ store.getRemoteWorkerByProxySession.mockResolvedValueOnce(restoredRow as never);+ const { workers } = setup();+ try {+ await expect(workers.isRemoteWorker('proxy-1')).resolves.toBe(true);+ expect(workers.runtime.isRemote('proxy-1')).toBe(false);+ } finally { workers.stop(); }+ });++ it('retries an offline rollback after restart and only then deletes the cleanup row', async () => {+ store.getRemoteWorkerByProxySession.mockResolvedValueOnce(restoredRow as never);+ store.getWorkerRemoteReleaseState.mockResolvedValueOnce({ remoteStopConfirmedAt: null, remoteReleasedAt: null,+ removeAfterRelease: true } as never);+ const first = setup({ handle: (_device, channel) => channel === 'maker:abort-session'+ ? fail('DEVICE_OFFLINE', 'offline') : undefined });+ await expect(first.workers.rollbackCreatedWorker('proxy-1')).resolves.toBe(true);+ expect(store.removeWorker).toHaveBeenCalledOnce();+ expect(store.markWorkerRemoteReleased).not.toHaveBeenCalled();+ first.workers.stop();+ store.listUnreleasedEndedRemoteWorkers.mockResolvedValueOnce([restoredRow] as never);+ store.getWorkerRemoteReleaseState.mockResolvedValueOnce({ remoteStopConfirmedAt: null, remoteReleasedAt: null,+ removeAfterRelease: true } as never);+ const second = setup();+ try {+ await second.workers.releaseEnded([]);+ expect(store.markWorkerRemoteStopConfirmed).toHaveBeenCalledOnce();+ expect(store.markWorkerRemoteReleased).toHaveBeenCalledOnce();+ expect(store.removeWorker).toHaveBeenCalledTimes(2);+ expect(second.remoteInvoke.mock.calls.map(([, channel]) => channel))+ .toEqual(['maker:abort-session', 'maker:orca:remote-worker:release']);+ } finally { second.workers.stop(); }+ });+async function trackedWorker(setupOpts?: Parameters<typeof setup>[0]) {const ctx = setup(setupOpts);await ctx.workers.recordRemoteWorker({@@ -326,6 +419,8 @@ describe('wrapTeamDeps', () => {proxySessionId: 'proxy-1',deviceId: 'mac-mini',remoteSessionId: 'remote-1',+ label: 'transcriber',+ role: 'developer',workingDir: '/Users/demo/Interviews',});return ctx;@@ -691,7 +786,7 @@ describe('remote open recovery', () => {const record = { ...openInput, proxySessionId: opened.proxySessionId, remoteSessionId: opened.remoteSessionId };await expect(workers.recordRemoteWorker(record)).rejects.toThrow('owner changed');await workers.discardRemoteWorker(record);- expect(store.setWorkerRemoteExecution).not.toHaveBeenCalled();+ expect(store.addRemoteWorker).not.toHaveBeenCalled();expect(remoteInvoke.mock.calls.some(([, channel]) => channel === 'maker:orca:remote-worker:release')).toBe(false);workers.stop();});diff --git a/apps/desktop/src/main/maker-ipc/__tests__/orcaWorkerCreationService.test.ts b/apps/desktop/src/main/maker-ipc/__tests__/orcaWorkerCreationService.test.tsindex 4051cbe7f7..3fd8e1511b 100644--- a/apps/desktop/src/main/maker-ipc/__tests__/orcaWorkerCreationService.test.ts+++ b/apps/desktop/src/main/maker-ipc/__tests__/orcaWorkerCreationService.test.ts@@ -281,12 +281,11 @@ describe('Worker running on another device (execution device)', () => {label: 'transcribe', role: '转写', agent: 'claude-code', model: 'only-on-device',permissionMode: 'auto', workingDir: '/Users/demo/Interviews', title: 'Worker · 转写 · transcribe',}));- expect(deps.addOrUpdateWorker).toHaveBeenCalledWith(expect.objectContaining({- id: 'worker-1', sessionId: 'proxy-1', status: 'idle',- }));+ expect(deps.addOrUpdateWorker).not.toHaveBeenCalled();expect(deps.recordRemoteWorker).toHaveBeenCalledWith({workerId: 'worker-1', teamId: 'team-1', leadSessionId: 'lead-1',proxySessionId: 'proxy-1', deviceId: 'mac-mini', remoteSessionId: 'remote-1',+ label: 'transcribe', role: '转写',workingDir: '/Users/demo/Interviews',});expect(deps.getProviderRoutingContext).not.toHaveBeenCalled();@@ -355,7 +354,7 @@ describe('Worker running on another device (execution device)', () => {it('discards the device task when persisting the worker fails', async () => {const { deps, service } = remoteDeps({- addOrUpdateWorker: vi.fn(async () => { throw new Error('disk full'); }),+ recordRemoteWorker: vi.fn(async () => { throw new Error('disk full'); }),});const result = await service.createWorker({leadSessionId: 'lead-1', role: 'dev', label: 'a', agent: 'codex', executionDeviceId: 'mac-mini',@@ -364,7 +363,9 @@ describe('Worker running on another device (execution device)', () => {expect(deps.discardRemoteWorker).toHaveBeenCalledWith({proxySessionId: 'proxy-1', deviceId: 'mac-mini', remoteSessionId: 'remote-1',});- expect(deps.recordRemoteWorker).not.toHaveBeenCalled();+ expect(deps.recordRemoteWorker).toHaveBeenCalledOnce();+ expect(deps.addOrUpdateWorker).not.toHaveBeenCalled();+ expect(deps.removeWorker).not.toHaveBeenCalled();});it('reports remote workers as unsupported when the host did not wire them', async () => {diff --git a/apps/desktop/src/main/maker-ipc/orcaRemoteWorkers.ts b/apps/desktop/src/main/maker-ipc/orcaRemoteWorkers.tsindex c0ac5cae53..6a1b32d455 100644--- a/apps/desktop/src/main/maker-ipc/orcaRemoteWorkers.ts+++ b/apps/desktop/src/main/maker-ipc/orcaRemoteWorkers.ts@@ -34,7 +34,8 @@ import {saveRemoteWorkerOpen,removeRemoteWorkerOpen,listOrphanRemoteWorkerOpens,- setWorkerRemoteExecution,+ addRemoteWorker,+ removeWorker,} from '../localDb/orcaTeamStore.js';import { createHostSendFailure } from '../maker-host/send-outcome.js';import type {@@ -231,7 +232,10 @@ export function createOrcaRemoteWorkers(deps: OrcaRemoteWorkersDeps) {}if (owner !== ownerToken()) return;if (await runtime.release(row)) {- if (owner === ownerToken()) await markWorkerRemoteReleased(row.workerId);+ if (owner === ownerToken()) {+ await markWorkerRemoteReleased(row.workerId);+ if (phase.removeAfterRelease && owner === ownerToken()) await removeWorker(row.workerId);+ }}})();releases.set(row.workerId, operation);@@ -294,7 +298,6 @@ export function createOrcaRemoteWorkers(deps: OrcaRemoteWorkersDeps) {runtime.reset();if (releaseRetryTimer) clearInterval(releaseRetryTimer);releaseRetryTimer = null;- await refreshDeviceNames().catch(() => undefined);const rows = await listActiveRemoteWorkers();if (owner !== ownerToken() || owner !== activeOwner) return;for (const row of rows) {@@ -302,6 +305,7 @@ export function createOrcaRemoteWorkers(deps: OrcaRemoteWorkersDeps) {deps.getTeamService()?.restoreWorkerPendingReport(row.proxySessionId, row);runtime.track(row);}+ void refreshDeviceNames().catch(() => undefined);void retryPendingReleases();// 结束通知在运行设备离线时发不出去;低频补发,送达即记账,不重复。releaseRetryTimer = setInterval(() => void retryPendingReleases(), RELEASE_RETRY_MS);@@ -314,18 +318,8 @@ export function createOrcaRemoteWorkers(deps: OrcaRemoteWorkersDeps) {/*** 按当前账号恢复待回报与结束通知;同一数据库 owner 重入不清除现有派活。*/- async start(): Promise<void> {- const owner = ownerToken();- if (startInFlight && startInFlight.owner === owner) return startInFlight.promise;- if (releaseRetryTimer && owner === activeOwner) return;- const promise = restore(owner);- startInFlight = { owner, promise };- try {- await promise;- } finally {- if (startInFlight?.promise === promise) startInFlight = null;- }- },+ start,+ isRemoteWorker,stop(): void {activeOwner = Symbol('stopped');@@ -532,16 +526,13 @@ export function createOrcaRemoteWorkers(deps: OrcaRemoteWorkersDeps) {: ownerToken();await withOpenLock(input.remoteSessionId, async () => {assertOwner(owner);- await setWorkerRemoteExecution(input.workerId, {- deviceId: input.deviceId,- remoteSessionId: input.remoteSessionId,- });+ await addRemoteWorker(input);assertOwner(owner);- creationOwners.delete(input.proxySessionId);opening.delete(input.remoteSessionId);- const { workingDir, ...ref } = input;+ const { workingDir, label: _label, role: _role, ...ref } = input;runtime.track({ ...ref, lastBridgedMessageId: null }, { workingDir });deps.broadcastOrcaWorkerChanged(input.leadSessionId);+ creationOwners.delete(input.proxySessionId);});},@@ -559,6 +550,16 @@ export function createOrcaRemoteWorkers(deps: OrcaRemoteWorkersDeps) {await withOpenLock(input.remoteSessionId, async () => {assertOwner(owner);opening.delete(input.remoteSessionId);+ const row = await getRemoteWorkerByProxySession(input.proxySessionId);+ assertOwner(owner);+ if (row) {+ await removeWorker(row.workerId);+ assertOwner(owner);+ runtime.untrack(input.proxySessionId);+ await releaseAndMark(row);+ creationOwners.delete(input.proxySessionId);+ return;+ }runtime.untrack(input.proxySessionId);if (await runtime.release(input)) {assertOwner(owner);@@ -572,6 +573,19 @@ export function createOrcaRemoteWorkers(deps: OrcaRemoteWorkersDeps) {archive,wrapTeamDeps,+ async rollbackCreatedWorker(proxySessionId: string): Promise<boolean> {+ const owner = ownerToken();+ assertOwner(owner);+ const row = await getRemoteWorkerByProxySession(proxySessionId);+ assertOwner(owner);+ if (!row) return false;+ // removeWorker 的事务保留未释放路由;重连补发成功后才删除回滚行。+ await removeWorker(row.workerId);+ assertOwner(owner);+ runtime.untrack(proxySessionId);+ await releaseAndMark(row);+ return true;+ },/** 团队结束后:停掉仍在跑的远端 Worker,并补发全部未送达的结束通知。 */async releaseEnded(proxySessionIds: readonly string[]): Promise<void> {@@ -581,6 +595,30 @@ export function createOrcaRemoteWorkers(deps: OrcaRemoteWorkersDeps) {},};+ async function start(): Promise<void> {+ const owner = ownerToken();+ if (startInFlight && startInFlight.owner === owner) return startInFlight.promise;+ if (releaseRetryTimer && owner === activeOwner) return;+ const promise = restore(owner);+ startInFlight = { owner, promise };+ try {+ await promise;+ } finally {+ if (startInFlight?.promise === promise) startInFlight = null;+ }+ }++ /** 恢复尚未完成或查询失败时不得把未知代理回退到本机。 */+ async function isRemoteWorker(sessionId: string): Promise<boolean> {+ const owner = ownerToken();+ if (!runtime.isRemote(sessionId) || !ownerCurrent()) await start();+ assertOwner(owner);+ if (runtime.isRemote(sessionId)) return true;+ const row = await getRemoteWorkerByProxySession(sessionId);+ assertOwner(owner);+ return row !== null;+ }+/** 归档或结束团队:通知运行设备结束协同(任务保留),本机归档代理行。 */async function archive(proxySessionId: string,@@ -616,31 +654,28 @@ export function createOrcaRemoteWorkers(deps: OrcaRemoteWorkersDeps) {: null: base.getLiveSession(sessionId),resumeWorkerSession: async (worker, link) => {- if (remote(worker.sessionId)) return;+ if (await isRemoteWorker(worker.sessionId)) return;await base.resumeWorkerSession(worker, link);},closeWorkerSession: async (sessionId, beforeClose) => {- if (!remote(sessionId)) return base.closeWorkerSession(sessionId, beforeClose);+ if (!(await isRemoteWorker(sessionId))) return base.closeWorkerSession(sessionId, beforeClose);await beforeClose?.();await runtime.abort(sessionId);},closeWorkerSessionIfIdle: async (sessionId, sendLockHeld) =>- remote(sessionId)+ (await isRemoteWorker(sessionId))? !runtime.isTurnRunning(sessionId): base.closeWorkerSessionIfIdle(sessionId, sendLockHeld),hasPendingWorkerInput: async (sessionId) =>- remote(sessionId)+ (await isRemoteWorker(sessionId))? runtime.hasPendingReport(sessionId): base.hasPendingWorkerInput(sessionId),archiveWorkerSession: async (sessionId, beforeMutation) => {- if (!remote(sessionId)) {- const row = await getRemoteWorkerByProxySession(sessionId).catch(() => null);- if (!row) return base.archiveWorkerSession(sessionId, beforeMutation);- }+ if (!(await isRemoteWorker(sessionId))) return base.archiveWorkerSession(sessionId, beforeMutation);await archive(sessionId, beforeMutation);},dispatchWorkerMessage: async (params) => {- if (!remote(params.targetSessionId)) return base.dispatchWorkerMessage(params);+ if (!(await isRemoteWorker(params.targetSessionId))) return base.dispatchWorkerMessage(params);// 与本机派发复用同一会话锁,保持 enqueue 与 accepted/commit 身份的顺序一致。return base.withSessionSendLock(params.targetSessionId, async () => {const clientId = createId();@@ -693,7 +728,7 @@ export function createOrcaRemoteWorkers(deps: OrcaRemoteWorkersDeps) {});},reserveWorkerMessage: async (params) => {- if (!remote(params.targetSessionId)) return base.reserveWorkerMessage(params);+ if (!(await isRemoteWorker(params.targetSessionId))) return base.reserveWorkerMessage(params);// 打断改派:先停远端当前一轮,再把新指令作为下一条派过去。await params.beforeReserve?.();params.onReserved?.();@@ -709,14 +744,14 @@ export function createOrcaRemoteWorkers(deps: OrcaRemoteWorkersDeps) {});},requestWorkerInterrupt: async (sessionId) => {- if (!remote(sessionId)) return base.requestWorkerInterrupt(sessionId);+ if (!(await isRemoteWorker(sessionId))) return base.requestWorkerInterrupt(sessionId);const requested = await runtime.abort(sessionId);return { stopOutcome: requested ? 'requested' : 'unconfirmed', queuePaused: false };},getWorkerQueuePaused: (sessionId) =>remote(sessionId) ? false : base.getWorkerQueuePaused(sessionId),getSessionQueueSnapshot: async (sessionId) =>- remote(sessionId)+ (await isRemoteWorker(sessionId))? {pendingQueue: [],steeringClientIds: [],@@ -728,13 +763,13 @@ export function createOrcaRemoteWorkers(deps: OrcaRemoteWorkersDeps) {}: base.getSessionQueueSnapshot(sessionId),ensureWorkerQueueRestored: async (sessionId) =>- remote(sessionId) ? false : base.ensureWorkerQueueRestored(sessionId),+ (await isRemoteWorker(sessionId)) ? false : base.ensureWorkerQueueRestored(sessionId),removeQueuedMessage: (sessionId, clientId, expected) =>remote(sessionId) ? false : base.removeQueuedMessage(sessionId, clientId, expected),replaceQueuedMessage: (sessionId, clientId, next, expected) =>remote(sessionId) ? false : base.replaceQueuedMessage(sessionId, clientId, next, expected),steerStoredQueuedMessage: async (sessionId, clientId) =>- remote(sessionId)+ (await isRemoteWorker(sessionId))? { kind: 'queued', reason: 'STEER_UNSUPPORTED' }: base.steerStoredQueuedMessage(sessionId, clientId),moveQueuedMessage: (sessionId, clientId, position) =>diff --git a/apps/desktop/src/main/maker-ipc/orcaWorkerCreationService.ts b/apps/desktop/src/main/maker-ipc/orcaWorkerCreationService.tsindex 394136a076..a1d32b4e8f 100644--- a/apps/desktop/src/main/maker-ipc/orcaWorkerCreationService.ts+++ b/apps/desktop/src/main/maker-ipc/orcaWorkerCreationService.ts@@ -352,7 +352,7 @@ export interface OrcaWorkerCreationDeps {workingDir?: string;title: string;}): Promise<OrcaRemoteWorkerOpenResult>;- /** 写入 Worker 记录后登记运行设备,开始轮询。 */+ /** 原子写入 Worker 与运行设备路由,再开始轮询。 */recordRemoteWorker?(input: {workerId: string;teamId: string;@@ -360,6 +360,8 @@ export interface OrcaWorkerCreationDeps {proxySessionId: string;deviceId: string;remoteSessionId: string;+ label: string;+ role: string;/** 运行设备上实际使用的工作目录,只做展示。 */workingDir?: string;}): Promise<void>;@@ -846,15 +848,6 @@ export function createOrcaWorkerCreationService(deps: OrcaWorkerCreationDeps): Oawait discard();return { ok: false, errorCode: 'WORKER_LIMIT_HARD_EXCEEDED', message: 'Registered plan concurrency reached' };}- await deps.addOrUpdateWorker({- id: workerId,- teamId: params.teamId,- sessionId: opened.proxySessionId,- status: 'idle',- label,- role,- focused: false,- });await deps.recordRemoteWorker({workerId,teamId: params.teamId,@@ -862,11 +855,12 @@ export function createOrcaWorkerCreationService(deps: OrcaWorkerCreationDeps): OproxySessionId: opened.proxySessionId,deviceId,remoteSessionId: opened.remoteSessionId,+ label,+ role,...(opened.workingDir ? { workingDir: opened.workingDir } : {}),});} catch (err) {await discard();- await deps.removeWorker(workerId).catch(() => undefined);if (isWorkerLabelConstraintError(err)) {return { ok: false, errorCode: 'DUPLICATE_LABEL', message: `label "${label}" already used in this team` };}diff --git a/apps/desktop/src/main/maker-ipc/register.ts b/apps/desktop/src/main/maker-ipc/register.tsindex cf69537c5b..4574d2c62f 100644--- a/apps/desktop/src/main/maker-ipc/register.ts+++ b/apps/desktop/src/main/maker-ipc/register.ts@@ -7427,9 +7427,10 @@ export function registerMakerIpc(maker: Maker, options: RegisterMakerIpcOptions)}> {assertAccess?.();// 协同远端 Worker 的代理任务行只承接计槽与回报,真实任务在运行设备上,绝不在本机起 Agent。- if (o.id && orcaRemoteWorkersForHost?.runtime.isRemote(o.id)) {+ if (o.id && await orcaRemoteWorkersForHost?.isRemoteWorker(o.id)) {throw new Error('[PRECONDITION_FAILED] this Worker runs on another device and cannot start locally');}+ assertAccess?.();// Agent 在另一台电脑上运行的任务:恢复时调用方可能没带设备,以任务记录为准。if (o.id && o.agentDeviceId === undefined && !o.remoteHostId) {const agentDeviceId = await readSessionAgentDeviceId(o.id);@@ -13181,11 +13182,7 @@ export function registerMakerIpc(maker: Maker, options: RegisterMakerIpcOptions)});},rollbackCreatedWorker: async ({ workerId, workerSessionId }) => {- if (orcaRemoteWorkers.runtime.isRemote(workerSessionId)) {- await orcaRemoteWorkers.archive(workerSessionId).catch(() => undefined);- await removeWorker(workerId);- return;- }+ if (await orcaRemoteWorkers.rollbackCreatedWorker(workerSessionId)) return;const workerSession = maker.getSession(workerSessionId);if (workerSession) {await maker.closeSession(workerSessionId).catch(() => undefined);diff --git a/docs/dev-rules/orca-team-architecture.md b/docs/dev-rules/orca-team-architecture.mdindex 827fd54ff5..2a00c517ff 100644--- a/docs/dev-rules/orca-team-architecture.md+++ b/docs/dev-rules/orca-team-architecture.md@@ -395,6 +395,10 @@ Worker turn 被 vendor 报终止型 error,但 interrupted-turn auto-resume 仍清理单飞且读取最新阶段,后续只补未完成阶段。归档提交成功后才取消远端路由。创建回执丢失时使用同一 sessionId 核对,未确认身份保存在 `orca_remote_opens`;孤儿清理与Worker 关联共用任务锁,锁内复查后仅解除未关联标记,保留任务、文件及用户发起的工作。+Worker、远端路由、代理身份与 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.mdindex 3b28ab1d09..d2e7b64688 100644--- a/docs/dev-rules/remote-and-mobile-adaptation.md+++ b/docs/dev-rules/remote-and-mobile-adaptation.md@@ -97,6 +97,9 @@ relay 以 close 1013 `inbound backpressure` 主动断连,此时任何「立即清理共用单 Worker 入口并读最新阶段,不能因迟到快照重复停止用户后续的普通任务。open 丢回执时用相同 sessionId 核对一次;无法确认的创建身份落盘,恢复后只解除未关联任务的标记。清理与 Worker 关联共用任务锁,锁内复查归属;公开写操作和迟到回调均核对数据库 owner。+ Worker、运行设备路由、代理身份和 open 收据在同一数据库事务内提交,避免半关联状态。+ 派发、恢复与本机启动检查等待当前 owner 的路由恢复;数据库读取失败不得回退到本机。+ 创建回滚归档代理并释放名称与名额,但保留未释放路由;重启后继续 stop/release,确认后清理。3. **多 peer 与负载**:每台设备每轮只发一次 `maker:list-active`,有待回报时 2s 一轮,否则 15s 一轮;按派活输入 clientId 读取对应回复(user / assistant 历史分页)与投递回执,只针对仍在等待回报的 Worker;每轮最多扫描 2000 行,预算用尽保留游标下轮续读,不累计“缺少回复”次数。后续插话的回复与 terminal