Consider it done. The open-source AI agent that works out of the box · 想到,就能做到。开源、开箱即用的 AI Agent。
TypeScript agentai-agentai-assistantandroidclaude-codecodexelectroniosllmmacosreact-nativetypescriptwindows
fix(orca): 原子创建运行设备任务与来源标记
DavidShen3d61607ec00d
diff --git a/apps/desktop/src/main/localDb/__tests__/sessionOpening.test.ts b/apps/desktop/src/main/localDb/__tests__/sessionOpening.test.tsindex ccbda58b6f..3f6e0c7192 100644--- a/apps/desktop/src/main/localDb/__tests__/sessionOpening.test.ts+++ b/apps/desktop/src/main/localDb/__tests__/sessionOpening.test.ts@@ -9,6 +9,28 @@ vi.mock('../../git-snapshot/projectGitBootstrap', () => ({ ensureProjectGitInitivi.mock('../../maker-host/git-safety-settings-store', () => ({ readGitSafetySettings: () => ({ autoSnapshotEnabled: false, autoInitProjectGit: false }) }));import { openSession, setSessionOpeningModelAdmission, type OpenedSessionRow } from '../sessionOpening';import { resolveSessionExecutionSelection } from '../../maker-ipc/sessionExecutionSelection';+import { createOrcaRemoteWorkerHost, createOrcaRemoteWorkerSessionOpener } from '../../maker-ipc/orcaRemoteWorkerHost';+import { parseOrcaRemoteLead } from '../../../shared/orcaRemoteWorker';++const remoteLead = {+ leadDeviceId: 'lead-device', leadDeviceName: 'Lead computer', leadSessionId: 'lead-1',+ leadTitle: 'Lead task', workerLabel: 'tester',+};+const remoteRequest = {+ sessionId: 'remote-worker', agentKind: 'codex' as const, model: 'model', providerId: 'connected',+ permissionMode: 'auto' as const, title: 'Worker task',+ lead: { leadSessionId: 'lead-1', leadTitle: 'Lead task', workerLabel: 'tester' },+};+function remoteOpener() {+ const bootstrapSession = vi.fn(async (_row: OpenedSessionRow, _assertCurrent: () => void) => undefined);+ const broadcastSessionCreated = vi.fn();+ const open = createOrcaRemoteWorkerSessionOpener({+ openSession,+ insertSession: async row => { await h.values(row).run(); },+ bootstrapSession, broadcastSessionCreated,+ });+ return { open, bootstrapSession, broadcastSessionCreated };+}const body = { agentKind: 'codex' as const, model: 'model', providerId: 'connected', effort: '', fastMode: false,workspaceKind: 'dialogue' as const, permissionMode: 'ask', title: 'Normal task' };@@ -74,3 +96,60 @@ it('still admits the model here for a blank agent computer', async () => {await expect(openSession({ body: { ...body, providerId: 'disconnected', agentDeviceId: ' ' } })).rejects.toThrow('供应商');expect(h.values).not.toHaveBeenCalled();});++it.each([undefined, '/execution/project'])('inserts the remote Worker identity atomically before Agent startup (directory=%s)', async workingDir => {+ const { open, bootstrapSession, broadcastSessionCreated } = remoteOpener();+ const result = await open({ ...remoteRequest, workingDir }, remoteLead);+ const persisted = h.values.mock.calls[0]![0] as OpenedSessionRow;+ expect(parseOrcaRemoteLead(persisted.orcaRemoteLead)).toEqual(remoteLead);+ expect(persisted).toMatchObject({ id: 'remote-worker', permissionMode: 'auto',+ workspaceKind: workingDir ? 'project' : 'dialogue', workingDir: workingDir ?? '/dialogue/remote-worker' });+ expect(bootstrapSession).toHaveBeenCalledWith(persisted, expect.any(Function));+ expect(h.run.mock.invocationCallOrder[0]).toBeLessThan(bootstrapSession.mock.invocationCallOrder[0]!);+ expect(bootstrapSession.mock.invocationCallOrder[0]).toBeLessThan(broadcastSessionCreated.mock.invocationCallOrder[0]!);+ expect(h.values).toHaveBeenCalledOnce();+ expect(result).toEqual({ agentKind: 'codex', model: 'model', workingDir: persisted.workingDir });+});++it('does not start or broadcast a remote Worker when its identity INSERT fails', async () => {+ h.run.mockRejectedValueOnce(new Error('INSERT failed'));+ const { open, bootstrapSession, broadcastSessionCreated } = remoteOpener();+ await expect(open(remoteRequest, remoteLead)).rejects.toThrow('INSERT failed');+ expect(bootstrapSession).not.toHaveBeenCalled();+ expect(broadcastSessionCreated).not.toHaveBeenCalled();+});++it('keeps a persisted remote Worker recognizable after startup fails or the host restarts', async () => {+ const { open, bootstrapSession, broadcastSessionCreated } = remoteOpener();+ bootstrapSession.mockRejectedValueOnce(new Error('startup interrupted'));+ const start = vi.fn(open);+ const deps = {+ getCaller: () => ({ controllerDeviceId: 'lead-device', controllerName: 'Lead computer' }),+ readSession: async () => {+ const row = h.values.mock.calls[0]?.[0] as OpenedSessionRow | undefined;+ return row ? { orcaRemoteLead: parseOrcaRemoteLead(row.orcaRemoteLead),+ workingDir: row.workingDir ?? null, model: row.model, agentKind: 'codex' as const } : null;+ },+ openSession: start,+ writeRemoteLead: vi.fn(),+ withSessionLock: async <T,>(_id: string, task: () => Promise<T>) => task(),+ now: () => 1000,+ };+ await expect(createOrcaRemoteWorkerHost(deps).open(remoteRequest)).rejects.toThrow('startup interrupted');+ expect(broadcastSessionCreated).not.toHaveBeenCalled();+ // 重建 Host,仅使用已 INSERT 的任务身份;同 ID 重试可对账,无 ALREADY_EXISTS。+ await expect(createOrcaRemoteWorkerHost(deps).open(remoteRequest)).resolves.toMatchObject({ sessionId: 'remote-worker', model: 'model' });+ expect(h.run).toHaveBeenCalledOnce();+ expect(start).toHaveBeenCalledOnce();+ const foreign = createOrcaRemoteWorkerHost({ ...deps, getCaller: () => ({ controllerDeviceId: 'other-device' }) });+ await expect(foreign.open(remoteRequest)).rejects.toThrow('ALREADY_EXISTS');+});++it('does not start a persisted remote Worker in a replacement account', async () => {+ h.run.mockImplementationOnce(async () => { h.owner = {}; });+ const { open, bootstrapSession, broadcastSessionCreated } = remoteOpener();+ await expect(open(remoteRequest, remoteLead)).rejects.toThrow('账号已变化');+ expect(parseOrcaRemoteLead(h.values.mock.calls[0]![0].orcaRemoteLead)).toEqual(remoteLead);+ expect(bootstrapSession).not.toHaveBeenCalled();+ expect(broadcastSessionCreated).not.toHaveBeenCalled();+});diff --git a/apps/desktop/src/main/maker-ipc/orcaRemoteWorkerHost.ts b/apps/desktop/src/main/maker-ipc/orcaRemoteWorkerHost.tsindex b9a7204c2e..d6584cbeb2 100644--- a/apps/desktop/src/main/maker-ipc/orcaRemoteWorkerHost.ts+++ b/apps/desktop/src/main/maker-ipc/orcaRemoteWorkerHost.ts@@ -20,6 +20,41 @@ import {import type { OrcaRemoteLead } from '../../shared/orcaRemoteWorker.js';import type { IpcHandlerRegistry } from './ipcHandlerRegistry.js';+import type { OpenedSessionRow, openSession } from '../localDb/sessionOpening.js';++/** 先以同一 INSERT 保存任务和来源,再启动 Agent;启动失败也保留可幂等核对的身份。 */+export function createOrcaRemoteWorkerSessionOpener(deps: {+ openSession: typeof openSession;+ insertSession(row: OpenedSessionRow): Promise<void>;+ bootstrapSession(row: OpenedSessionRow, assertCurrent: () => void): Promise<unknown>;+ broadcastSessionCreated(sessionId: string): void;+}): OrcaRemoteWorkerHostDeps['openSession'] {+ return async (request, lead) => {+ const { row } = await deps.openSession({+ id: request.sessionId,+ body: {+ title: request.title,+ agentKind: request.agentKind === 'claude-code' ? 'cc' : request.agentKind,+ model: request.model,+ providerId: request.providerId,+ effort: request.effort,+ fastMode: request.fastMode,+ permissionMode: request.permissionMode,+ workspaceKind: request.workingDir ? 'project' : 'dialogue',+ workingDir: request.workingDir,+ orcaRemoteLead: lead,+ },+ }, async (opened, assertCurrent) => {+ assertCurrent();+ await deps.insertSession(opened);+ assertCurrent();+ await deps.bootstrapSession(opened, assertCurrent);+ });+ deps.broadcastSessionCreated(row.id);+ const agentKind = row.agentKind === 'cc' ? 'claude-code' : (row.agentKind as 'codex' | 'pi');+ return { workingDir: row.workingDir ?? '', model: row.model, agentKind };+ };+}export interface OrcaRemoteWorkerCaller {controllerDeviceId: string;@@ -39,7 +74,7 @@ export interface OrcaRemoteWorkerHostDeps {getCaller(): OrcaRemoteWorkerCaller | null;readSession(sessionId: string): Promise<OrcaRemoteWorkerExistingSession | null>;/**- * 新建任务并启动 Agent(复用普通开任务事务与模型准入),随后写入远端 Worker 标记并广播。+ * 任务与远端 Worker 标记一起落库,再启动 Agent(复用普通开任务与模型准入)并广播。* 未给 workingDir 时由本机按自身设置分配任务目录。*/openSession(diff --git a/apps/desktop/src/main/maker-ipc/register.ts b/apps/desktop/src/main/maker-ipc/register.tsindex 4574d2c62f..c3f01747f7 100644--- a/apps/desktop/src/main/maker-ipc/register.ts+++ b/apps/desktop/src/main/maker-ipc/register.ts@@ -876,6 +876,7 @@ import { tryInjectProjectContext } from './projectContextInject.js';import { registerMakerSessionCreateHandler } from './sessionCreateHandler.js';import {createOrcaRemoteWorkerHost,+ createOrcaRemoteWorkerSessionOpener,registerOrcaRemoteWorkerHandlers,} from './orcaRemoteWorkerHost.js';import { createOrcaRemoteWorkers, type OrcaRemoteWorkers } from './orcaRemoteWorkers.js';@@ -8393,23 +8394,12 @@ export function registerMakerIpc(maker: Maker, options: RegisterMakerIpcOptions)agentKind: row.agentKind === 'cc' ? 'claude-code' : (row.agentKind as 'codex' | 'pi'),};},- openSession: async (request, lead) => {- const workspaceKind = request.workingDir ? 'project' : 'dialogue';- const { row } = await openSession({- id: request.sessionId,- body: {- title: request.title,- agentKind: request.agentKind === 'claude-code' ? 'cc' : request.agentKind,- model: request.model,- providerId: request.providerId,- effort: request.effort,- fastMode: request.fastMode,- permissionMode: request.permissionMode,- workspaceKind,- workingDir: request.workingDir,- orcaRemoteLead: lead,- },- }, async (opened, assertCurrent) => {+ openSession: createOrcaRemoteWorkerSessionOpener({+ openSession,+ insertSession: async (row) => {+ await getDbClient().drizzle.insert(sessions).values(row).run();+ },+ bootstrapSession: async (opened, assertCurrent) => {const agentKind = opened.agentKind === 'codex' || opened.agentKind === 'pi'? opened.agentKind: 'claude-code';@@ -8426,16 +8416,9 @@ export function registerMakerIpc(maker: Maker, options: RegisterMakerIpcOptions)permissionMode: opened.permissionMode as CreateOpts['permissionMode'],title: opened.title,}), assertCurrent);- // maker.createSession 只写通用列;来源标记在广播 created 之前补上。- await getDbClient()- .drizzle.update(sessions)- .set({ orcaRemoteLead: serializeOrcaRemoteLead(lead) })- .where(eq(sessions.id, opened.id));- });- broadcastSessionCreated(row.id);- const agentKind = row.agentKind === 'cc' ? 'claude-code' : (row.agentKind as 'codex' | 'pi');- return { workingDir: row.workingDir ?? '', model: row.model, agentKind };- },+ },+ broadcastSessionCreated,+ }),writeRemoteLead: writeOrcaRemoteLead,withSessionLock: withSendToSessionLock,now: Date.now,diff --git a/docs/dev-rules/orca-team-architecture.md b/docs/dev-rules/orca-team-architecture.mdindex 6323d10f5f..ac25cb6ff4 100644--- a/docs/dev-rules/orca-team-architecture.md+++ b/docs/dev-rules/orca-team-architecture.md@@ -397,6 +397,10 @@ Worker turn 被 vendor 报终止型 error,但 interrupted-turn auto-resume 仍Worker 关联共用任务锁,锁内复查后仅解除未关联标记,保留任务、文件及用户发起的工作。本机代理任务行在 Worker 关联时才创建,与 Worker、远端路由及 open 收据在同一事务提交;open 成功后未关联即退出时,本机没有半成品代理,仅按持久 open 身份解除远端标记。+运行设备的真实任务与 `orcaRemoteLead` 在同一 INSERT 写入,再启动 Agent;启动失败或+进程在两者之间退出时,同一来源与 Lead 仍能按任务 ID 对账,不留下无来源标记的普通任务。+实现见 `orcaRemoteWorkerHost.ts` 的 `createOrcaRemoteWorkerSessionOpener`,回归见+`apps/desktop/src/main/localDb/__tests__/sessionOpening.test.ts`。恢复完成前派发和本机启动入口不得按缺失的运行期路由回退到本机,读取失败或 owner 改变时应拒绝继续。创建回滚原子归档代理并释放名称与名额,未确认释放的 Worker 行保留供重启补发;正常@@ -406,6 +410,12 @@ Desktop 和 Mobile 均隐藏协同入口,保留 `releasedAt` 的历史来源Mobile 的入口读取和残留表单提交都检查该身份,元数据补齐标记后返回主面板;回归见 `apps/mobile/src/__tests__/orcaTeam.test.ts` 与 `useOrcaWorkerForm.test.tsx`。+当前停止补偿的已知限制:`maker:abort-session` 只接受任务 ID,没有目标轮次与持久请求+身份;若运行设备已停止但回执丢失,后续补偿可能停止用户新发起的轮次。现有传输去重+不能覆盖新的请求或运行设备重启。不能把超时当成功、取消所有补偿,或用先查空闲再停止+代替解决;后续应在 Orca 专用边界设计持久幂等停止、目标轮次条件与旧端能力协商,覆盖+丢回执后新轮次、重启、并发重试及账号切换。当前实现尚未消除此风险。+当前文档要求保留以下回归方向:- Service 边界:`orcaLifecycleService`、`orcaWorkerCreationService`、`orcaTeamService` 的单测覆盖 start/enable/create/dispatch/idle/archive/auto-bridge 关键路径。