Consider it done. The open-source AI agent that works out of the box · 想到,就能做到。开源、开箱即用的 AI Agent。
TypeScript agentai-agentai-assistantandroidclaude-codecodexelectroniosllmmacosreact-nativetypescriptwindows
fix(plugins): drain native task lifecycle operations before account teardown
Dashea368d4ad9e2
diff --git a/apps/desktop/src/main/maker-ipc/__tests__/pluginTaskService.test.ts b/apps/desktop/src/main/maker-ipc/__tests__/pluginTaskService.test.tsindex a167ba9b62..9279c6c1f4 100644--- a/apps/desktop/src/main/maker-ipc/__tests__/pluginTaskService.test.ts+++ b/apps/desktop/src/main/maker-ipc/__tests__/pluginTaskService.test.ts@@ -1,7 +1,11 @@import { describe, expect, it, vi } from 'vitest';+import { readFileSync } from 'node:fs';+import ts from 'typescript';import {createPluginTaskService,isPluginTaskPermissionAllowed,+ PluginTaskError,+ assertPluginTaskResult,type PluginTaskReceipt,type PluginTaskStore,type PluginTaskServiceDeps,@@ -370,6 +374,75 @@ it.each(['send', 'cancel'] as const)('drain waits for the full %s operation inclf.switchOwner();expect(JSON.parse(f.rows.get(run.runId)!.payload).status).toBe(kind === 'send' ? 'running' : 'cancelled');});+it.each(['validation', 'archive', 'settlement', 'alreadyArchived', 'failure'] as const)('drains the real releaseWorker branch through %s', async phase => {+ const f = fixture();+ let release!: () => void, entered!: () => void;+ const barrier = new Promise<void>(resolve => { release = resolve; });+ const started = new Promise<void>(resolve => { entered = resolve; });+ const pause = async () => { entered(); await barrier; };+ const service = {...f.service,+ get: vi.fn(async () => { if (phase === 'validation') await pause(); return {taskId:'lead'}; }),+ settleWorkerLabel: vi.fn(async () => {+ if (phase === 'settlement' || phase === 'alreadyArchived') await pause();+ // Native completion enqueues work on the real receipt tail. Holding that+ // tail across archive would deadlock this callback.+ await f.create();+ }),+ };+ const archiveWorker = vi.fn(async ({beforeArchive}: {beforeArchive: () => Promise<void>}) => {+ await beforeArchive();+ if (phase === 'archive' || phase === 'failure') await pause();+ if (phase === 'failure') throw new Error('archive failed');+ await f.create();+ return {ok:true};+ });+ const record = {id:'worker',sessionId:'child',label:'one',status:phase === 'alreadyArchived' ? 'archived' : 'done'};+ const query = {from:()=>query,innerJoin:()=>query,where:()=>query,limit:async()=>[record]};+ const epoch = {client:{drizzle:{select:()=>query}}};+ const deps = {service, getCurrentDbClientSnapshot:()=>epoch,PluginTaskError,assertPluginTaskResult,+ orcaWorkers:{},orcaTeams:{},sessions:{},eq:()=>true,and:()=>true,+ createPluginTaskStore:()=>({get:async()=>({payload:JSON.stringify({teamPlan:{items:[{label:'one'}]}})})}),+ readPluginWorkerCompletion:async()=>({row:record,completedAt:1}),orcaTeamService:{archiveWorker}};+ const source = readFileSync(new URL('../register.ts',import.meta.url),'utf8');+ const branch = source.slice(source.indexOf(" case 'releaseWorker': {"),source.indexOf(" case 'getTeam': {"));+ const js = ts.transpileModule(`return async function(pluginId, request) { switch(request.kind) { ${branch} } }`,{compilerOptions:{target:ts.ScriptTarget.ES2022}}).outputText;+ const run = new Function(...Object.keys(deps),js)(...Object.values(deps));+ const operation = run('p',{kind:'releaseWorker',taskId:'lead',workerId:'worker',completedAt:1});+ const result = phase === 'failure' ? expect(operation).rejects.toThrow('archive failed') : expect(operation).resolves.toMatchObject({ok:true});+ await started;+ let drained = false;+ const drain = f.service.drain().then(()=>{drained=true;});+ await new Promise(resolve=>setTimeout(resolve,0));+ expect(drained).toBe(false);+ release(); await Promise.all([result,drain]);+ expect(service.settleWorkerLabel).toHaveBeenCalledTimes(phase === 'failure' ? 0 : 1);+ expect(archiveWorker).toHaveBeenCalledTimes(phase === 'alreadyArchived' ? 0 : 1);+ await f.service.drain();+ f.switchOwner();+});++it.each([false, true])('team start drain excludes confirmation and includes native completion (failure=%s)', async fails => {+ const f = fixture();+ let confirm!: () => void, finish!: () => void, entered!: () => void;+ const dialog = new Promise<void>(resolve=>{confirm=resolve;});+ const native = new Promise<void>(resolve=>{finish=resolve;});+ const started = new Promise<void>(resolve=>{entered=resolve;});+ const source = readFileSync(new URL('../register.ts',import.meta.url),'utf8');+ const helper = source.slice(source.indexOf(' const startOrcaTeamForCaller ='),source.indexOf(' const pluginPermissionRequests ='));+ const deps = {assertLeadCollabProjectEnabled:async()=>{},getWorkerPermissionModeFromCreationPrefs:()=> 'auto',+ t:(key:string)=>key,orcaWorkerPermissionConfirmBridge:{request:()=>dialog},+ startOrcaTeamWithPermissionGate:async (params:unknown, handlers:{startTeam:(params:unknown)=>Promise<unknown>})=>{await dialog;return handlers.startTeam(params);},+ orcaLifecycleService:{startTeam:async()=>{entered();await native;await f.create();if(fails)throw new Error('failed');return {ok:true};}}};+ const js = ts.transpileModule(`${helper}\nreturn startOrcaTeamForCaller;`,{compilerOptions:{target:ts.ScriptTarget.ES2022}}).outputText;+ const run = new Function(...Object.keys(deps),js)(...Object.values(deps));+ const operation = run('lead',undefined,async()=>{},f.service.completeOperation);+ await f.service.drain(); // An unanswered dialog must not block logout.+ confirm();await started;+ let drained=false;const drain=f.service.drain().then(()=>{drained=true;});+ await new Promise(resolve=>setTimeout(resolve,0));expect(drained).toBe(false);+ finish();expect(await operation).toMatchObject({ok:!fails});await drain;+});+it('a rejected operation does not poison subsequent drain', async () => {const f = fixture(), run = await f.send();f.deps.cancel = async () => { throw new Error('native stop failed'); };diff --git a/apps/desktop/src/main/maker-ipc/__tests__/pluginWriteAccess.test.ts b/apps/desktop/src/main/maker-ipc/__tests__/pluginWriteAccess.test.tsindex 176de88da5..d4e1bffbff 100644--- a/apps/desktop/src/main/maker-ipc/__tests__/pluginWriteAccess.test.ts+++ b/apps/desktop/src/main/maker-ipc/__tests__/pluginWriteAccess.test.ts@@ -16,7 +16,7 @@ function fixture() {const drain = vi.fn(async()=>{});const epoch = { client: { tx: vi.fn(async () => ({ updated: true })), drizzle: {select} } };const task = { taskId: 'task', revision: 1, permissionMode: 'plan' };- const service = { get: vi.fn(async () => task), listRuns: vi.fn(async () => ({ items: [] })) };+ const service = { get: vi.fn(async () => task), listRuns: vi.fn(async () => ({ items: [] })), completeOperation: vi.fn(async <T>(operation: () => Promise<T>) => operation()) };const live = { isTurnRunning: () => false, getTurnControlSnapshot: () => ({ pendingInteractionCount: 0 }), setPermissionMode: vi.fn(async () => {}) };const slots = new Set<string>();const dialog = { showMessageBox: vi.fn(async () => ({ response: 0 })) };@@ -26,6 +26,21 @@ function fixture() {return { run: (mode = 'acceptEdits') => run('plugin', { kind: 'requestWriteAccess', taskId: 'task', mode }), service, live, epoch, dialog, slots, write, history, drain, config: () => cfg, change: (next: Record<string, unknown>) => { cfg = next; } };}describe('plugin write confirmation interleavings', () => {+ it('tracks the permission commit only after confirmation and includes rollback', async () => {+ const f=fixture();let answer!:()=>void;+ f.dialog.showMessageBox.mockImplementationOnce(()=>new Promise(resolve=>{answer=()=>resolve({response:0});}));+ const operation=f.run();const rejected=expect(operation).rejects.toThrow('write failed');+ await vi.waitFor(()=>expect(f.dialog.showMessageBox).toHaveBeenCalledOnce());+ expect(f.service.completeOperation).not.toHaveBeenCalled();+ let release!:()=>void;const rollback=new Promise<void>(resolve=>{release=resolve;});+ f.epoch.client.tx.mockRejectedValueOnce(new Error('write failed'));+ f.live.setPermissionMode.mockImplementationOnce(async()=>{}).mockImplementationOnce(()=>rollback);+ answer();await vi.waitFor(()=>expect(f.live.setPermissionMode).toHaveBeenCalledTimes(2));+ expect(f.service.completeOperation).toHaveBeenCalledOnce();+ let finished=false;const tracked=f.service.completeOperation.mock.results[0]!.value.then(()=>{finished=true;},()=>{finished=true;});+ await Promise.resolve();expect(finished).toBe(false);+ release();await Promise.all([rejected,tracked]);expect(finished).toBe(true);+ });it('owns the existing slot across idle checks and releases it on failure', async () => {const f = fixture(); let reject!: (e: Error) => void;f.service.listRuns.mockImplementationOnce(() => new Promise((_, r) => { reject = r; }));diff --git a/apps/desktop/src/main/maker-ipc/pluginTaskService.ts b/apps/desktop/src/main/maker-ipc/pluginTaskService.tsindex 4c2324efbe..e8412d4d2f 100644--- a/apps/desktop/src/main/maker-ipc/pluginTaskService.ts+++ b/apps/desktop/src/main/maker-ipc/pluginTaskService.ts@@ -192,6 +192,9 @@ export function createPluginTaskService(deps: PluginTaskServiceDeps) {return run;};return {+ // Host-only native lifecycle work shares send/cancel's drain. Do not use+ // exclusive here: native close callbacks may enqueue receipt writes.+ completeOperation,/** Account teardown awaits already accepted writes before closing this DB. */drain: async () => {let pending: Promise<unknown>, active: Promise<unknown>;diff --git a/apps/desktop/src/main/maker-ipc/register.ts b/apps/desktop/src/main/maker-ipc/register.tsindex 7bfad15587..d027261210 100644--- a/apps/desktop/src/main/maker-ipc/register.ts+++ b/apps/desktop/src/main/maker-ipc/register.ts@@ -10230,7 +10230,7 @@ export function registerMakerIpc(maker: Maker, options: RegisterMakerIpcOptions)});return pluginTasks;};- const startOrcaTeamForCaller = async (leadSessionId: string, workerPermissionMode?: OrcaWorkerPermissionMode, assertCurrent?: () => Promise<void>) => {+ const startOrcaTeamForCaller = async (leadSessionId: string, workerPermissionMode?: OrcaWorkerPermissionMode, assertCurrent?: () => Promise<void>, completeOperation?: PluginTaskService['completeOperation']) => {try {await assertLeadCollabProjectEnabled(leadSessionId);return await startOrcaTeamWithPermissionGate(@@ -10242,7 +10242,11 @@ export function registerMakerIpc(maker: Maker, options: RegisterMakerIpcOptions)title: t('newChat.chatInput.fullAccessConfirmation.title'),description: `${t('newChat.chatInput.fullAccessConfirmation.description')} ${t('newChat.chatInput.fullAccessConfirmation.note')}`,}),- startTeam: async (params) => { await assertCurrent?.(); return orcaLifecycleService.startTeam(params); },+ startTeam: async (params) => {+ const start = async () => { await assertCurrent?.(); return orcaLifecycleService.startTeam(params); };+ // Track only admitted native work, never the permission dialog.+ return completeOperation ? completeOperation(start) : start();+ },},);} catch (err) {@@ -10307,7 +10311,7 @@ export function registerMakerIpc(maker: Maker, options: RegisterMakerIpcOptions)});if (result.response !== 0) return { granted: false };// Reuse the existing non-bailing runtime mutation fence; do not hold it over the dialog.- return await withSessionRestartLock(task.taskId, async () => {+ return await service.completeOperation(() => withSessionRestartLock(task.taskId, async () => {if (snapshot !== getCurrentDbClientSnapshot() || before !== JSON.stringify(readGhostErrandConfig(pluginId))) throw new PluginTaskError('PERMISSION_DENIED', 'Account or permission settings changed');const fresh = await service.get(pluginId, task.taskId);if (fresh.revision !== task.revision) throw new PluginTaskError('TASK_BUSY', 'Task changed while awaiting permission');@@ -10333,7 +10337,7 @@ export function registerMakerIpc(maker: Maker, options: RegisterMakerIpcOptions)if (persisted) await snapshot!.client.tx('bots.persistSessionPermission', {sessionId: task.taskId, mode: task.permissionMode});throw error;}- });+ }));} finally { pluginPermissionRequests.delete(pluginId); }}case 'startTeam': {@@ -10349,7 +10353,7 @@ export function registerMakerIpc(maker: Maker, options: RegisterMakerIpcOptions)const fresh = await service.get(pluginId, task.taskId);assertActive(fresh.status);if (fresh.revision !== task.revision) throw new PluginTaskError('STALE_REVISION', 'Task changed during confirmation');- });+ }, service.completeOperation);if (epoch !== getCurrentDbClientSnapshot()) throw new PluginTaskError('PERMISSION_DENIED', 'Account changed');await service.get(pluginId, task.taskId);assertPluginTaskResult(result, 'Collaboration could not be started');@@ -10369,34 +10373,36 @@ export function registerMakerIpc(maker: Maker, options: RegisterMakerIpcOptions)return service.setTeamPlan(pluginId, request.taskId, request.plan);}case 'releaseWorker': {- const epoch = getCurrentDbClientSnapshot();- await service.get(pluginId,request.taskId);- if (!epoch) throw new PluginTaskError('HOST_NOT_READY','Task storage unavailable',true);- const [record] = await epoch.client.drizzle.select({id:orcaWorkers.id,sessionId:orcaWorkers.sessionId,label:orcaWorkers.label}).from(orcaWorkers).innerJoin(orcaTeams,eq(orcaWorkers.teamId,orcaTeams.id)).where(and(eq(orcaWorkers.id,request.workerId),eq(orcaTeams.leadSessionId,request.taskId))).limit(1);- if (epoch !== getCurrentDbClientSnapshot()) throw new PluginTaskError('PERMISSION_DENIED','Account changed');- await service.get(pluginId,request.taskId);- if (!record) throw new PluginTaskError('TASK_NOT_FOUND','Worker not found');- const planReceipt = await createPluginTaskStore(epoch.client).get(request.taskId);- const plan = planReceipt ? JSON.parse(planReceipt.payload).teamPlan : undefined;- if (plan && !plan.items.some((item: {label: string}) => item.label === record.label)) throw new PluginTaskError('INVALID_REQUEST', 'Worker is not in team plan');- const [row] = await epoch.client.drizzle.select().from(sessions).where(eq(sessions.id,record.sessionId)).limit(1);- if (!row || row.status === 'deleted') throw new PluginTaskError('TASK_NOT_FOUND','Worker not found');- const validate = async () => {+ return service.completeOperation(async () => {+ const epoch = getCurrentDbClientSnapshot();+ await service.get(pluginId,request.taskId);+ if (!epoch) throw new PluginTaskError('HOST_NOT_READY','Task storage unavailable',true);+ const [record] = await epoch.client.drizzle.select({id:orcaWorkers.id,sessionId:orcaWorkers.sessionId,label:orcaWorkers.label}).from(orcaWorkers).innerJoin(orcaTeams,eq(orcaWorkers.teamId,orcaTeams.id)).where(and(eq(orcaWorkers.id,request.workerId),eq(orcaTeams.leadSessionId,request.taskId))).limit(1);if (epoch !== getCurrentDbClientSnapshot()) throw new PluginTaskError('PERMISSION_DENIED','Account changed');await service.get(pluginId,request.taskId);- const [worker] = await epoch.client.drizzle.select({status:orcaWorkers.status}).from(orcaWorkers).where(eq(orcaWorkers.id,record.id)).limit(1);- const {row: fresh, completedAt} = await readPluginWorkerCompletion(epoch, record.sessionId, worker?.status ?? 'unknown');- if (!fresh || fresh.status === 'deleted' || completedAt === null || completedAt !== request.completedAt) throw new PluginTaskError('STALE_REVISION','Worker has no matching successful completion');- };- if (row.status === 'archived') {- await validate();- if (plan) await service.settleWorkerLabel(pluginId,request.taskId,record.label!);- return {ok:true,workerId:record.id};- }- const result = await orcaTeamService.archiveWorker({callerLeadSessionId:request.taskId,workerId:record.id,onlyIfIdle:true,beforeArchive:validate});- assertPluginTaskResult(result, 'Worker could not be released');- if (result.ok && plan) await service.settleWorkerLabel(pluginId,request.taskId,record.label!);- return result;+ if (!record) throw new PluginTaskError('TASK_NOT_FOUND','Worker not found');+ const planReceipt = await createPluginTaskStore(epoch.client).get(request.taskId);+ const plan = planReceipt ? JSON.parse(planReceipt.payload).teamPlan : undefined;+ if (plan && !plan.items.some((item: {label: string}) => item.label === record.label)) throw new PluginTaskError('INVALID_REQUEST', 'Worker is not in team plan');+ const [row] = await epoch.client.drizzle.select().from(sessions).where(eq(sessions.id,record.sessionId)).limit(1);+ if (!row || row.status === 'deleted') throw new PluginTaskError('TASK_NOT_FOUND','Worker not found');+ const validate = async () => {+ if (epoch !== getCurrentDbClientSnapshot()) throw new PluginTaskError('PERMISSION_DENIED','Account changed');+ await service.get(pluginId,request.taskId);+ const [worker] = await epoch.client.drizzle.select({status:orcaWorkers.status}).from(orcaWorkers).where(eq(orcaWorkers.id,record.id)).limit(1);+ const {row: fresh, completedAt} = await readPluginWorkerCompletion(epoch, record.sessionId, worker?.status ?? 'unknown');+ if (!fresh || fresh.status === 'deleted' || completedAt === null || completedAt !== request.completedAt) throw new PluginTaskError('STALE_REVISION','Worker has no matching successful completion');+ };+ if (row.status === 'archived') {+ await validate();+ if (plan) await service.settleWorkerLabel(pluginId,request.taskId,record.label!);+ return {ok:true,workerId:record.id};+ }+ const result = await orcaTeamService.archiveWorker({callerLeadSessionId:request.taskId,workerId:record.id,onlyIfIdle:true,beforeArchive:validate});+ assertPluginTaskResult(result, 'Worker could not be released');+ if (result.ok && plan) await service.settleWorkerLabel(pluginId,request.taskId,record.label!);+ return result;+ });}case 'getTeam': {const epoch = getCurrentDbClientSnapshot();