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(plugins): 统一任务终态凭据与协同准入复核

Dash860b0809e7ab
diff --git a/apps/desktop/src/main/__tests__/makerOrcaRoleMarking.test.ts b/apps/desktop/src/main/__tests__/makerOrcaRoleMarking.test.ts
index c89e0306b7..705418d79e 100644
--- a/apps/desktop/src/main/__tests__/makerOrcaRoleMarking.test.ts
+++ b/apps/desktop/src/main/__tests__/makerOrcaRoleMarking.test.ts
@@ -66,12 +66,17 @@ describe('maker Orca role marking IPC boundary', () => {
);
expect(workerIpcSource).toContain('await assertLeadCollabProjectEnabled(b.leadSessionId);');
- expect(collabHolderSource).toContain('startTeam: async');
+ const sharedStart = registerSource.slice(
+ registerSource.indexOf('const startOrcaTeamForCaller ='),
+ registerSource.indexOf('const pluginPermissionRequests ='),
+ );
+ expectOrder(sharedStart, 'await assertLeadCollabProjectEnabled(leadSessionId);', 'return await startOrcaTeamWithPermissionGate(');
+ expect(collabHolderSource).toContain('startOrcaTeamForCaller(leadSessionId, workerPermissionMode)');
expect(collabHolderSource).toContain('createWorker: async');
expect(collabHolderSource).toContain('createWorkerFromTask: async');
expect(
collabHolderSource.match(/await assertLeadCollabProjectEnabled\(/g)?.length ?? 0,
- ).toBeGreaterThanOrEqual(3);
+ ).toBeGreaterThanOrEqual(2);
});
it('registers rehydrated worker sessions as known before Maker publishes them', () => {
diff --git a/apps/desktop/src/main/bootstrap-electron.ts b/apps/desktop/src/main/bootstrap-electron.ts
index 05a01d3e0e..cdea4b545f 100644
--- a/apps/desktop/src/main/bootstrap-electron.ts
+++ b/apps/desktop/src/main/bootstrap-electron.ts
@@ -758,6 +758,7 @@ import {
scheduleDeferredCodexRestart,
clearWorkingDirectoryRecoveryForOwnerBoundary,
collectAgentInputQueueScanTexts,
+ flushPluginTaskLifecycle,
createAutomationUserTurnGitBaselineHooks,
registerModelVisibilitySyncIpc,
registerMakerIpc as registerMakerCoreIpc,
@@ -2078,6 +2079,7 @@ async function teardownAuthAccountBoundary(reason: string): Promise<void> {
`[bootstrap-electron] release device-link ownership on ${reason} failed (non-fatal):`, err,
),
});
+ await flushPluginTaskLifecycle();
await lifecycleDbClientManager.dispose(reason);
} finally {
releaseEndedSuppression();
@@ -2103,6 +2105,7 @@ async function teardownAuthAccountBoundary(reason: string): Promise<void> {
),
});
try {
+ await flushPluginTaskLifecycle();
await lifecycleDbClientManager.dispose(reason);
} finally {
try {
@@ -10083,7 +10086,10 @@ onQuit('ios-simulator-host', disposeIOSSimulatorHost, 'async');
onQuit('ios-simulator-ownership-registry', flushIOSSimulatorOwnershipRegistry, 'async');
// Post-async 阶段: 串行跑, 确保依赖 async 阶段产物的清理 (WAL checkpoint by close)。
-onQuit('db-client', () => lifecycleDbClientManager.dispose('quit'), 'post-async');
+onQuit('db-client', async () => {
+ await flushPluginTaskLifecycle();
+ await lifecycleDbClientManager.dispose('quit');
+}, 'post-async');
onQuit('local-db-close', () => localDbCloseDb(), 'post-async');
// A display restore may join an in-flight native mode write (5s), restore the
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 40d78936d7..19aec08296 100644
--- a/apps/desktop/src/main/maker-ipc/__tests__/orcaWorkerCreationService.test.ts
+++ b/apps/desktop/src/main/maker-ipc/__tests__/orcaWorkerCreationService.test.ts
@@ -2726,3 +2726,15 @@ describe('SSH remote worker model/provider compatibility gate (R23 P2)', () => {
it('applies plan limit in atomic reservation',async()=>{const {deps,service}=createDeps({validateCreationPlan:vi.fn(async()=>2)});await service.createWorker({leadSessionId:'lead-1',role:'eval',agent:'codex',label:'sample'});expect(deps.reserveWorkerCreation).toHaveBeenCalledWith(expect.objectContaining({hardLimit:2}));});
it('rejects invalid plan before reservation',async()=>{const {deps,service}=createDeps({validateCreationPlan:vi.fn(async()=>{throw Error('not pending');})});await expect(service.createWorker({leadSessionId:'lead-1',role:'eval',agent:'codex',label:'sample'})).rejects.toThrow('not pending');expect(deps.reserveWorkerCreation).not.toHaveBeenCalled();expect(deps.bootstrapSession).not.toHaveBeenCalled();});
+it('revalidates a plan registered during creation preflight and releases the reservation on rejection', async () => {
+ let reserved = false;
+ const {deps, service} = createDeps({validateCreationPlan: vi.fn(async () => {
+ if (reserved) throw new Error('Worker not in newly registered plan');
+ return undefined;
+ })});
+ const reserve = deps.reserveWorkerCreation;
+ deps.reserveWorkerCreation = vi.fn(async input => { const result = await reserve(input); reserved = true; return result; });
+ await expect(service.createWorker({leadSessionId: 'lead-1', role: 'eval', agent: 'codex', label: 'sample'})).rejects.toThrow('newly registered plan');
+ expect(deps.bootstrapSession).not.toHaveBeenCalled();
+ expect(deps.releaseWorkerCreationReservation).toHaveBeenCalledTimes(1);
+});
diff --git a/apps/desktop/src/main/maker-ipc/__tests__/pluginTaskService.test.ts b/apps/desktop/src/main/maker-ipc/__tests__/pluginTaskService.test.ts
index cacb8176f9..0745f25fe0 100644
--- a/apps/desktop/src/main/maker-ipc/__tests__/pluginTaskService.test.ts
+++ b/apps/desktop/src/main/maker-ipc/__tests__/pluginTaskService.test.ts
@@ -224,6 +224,14 @@ describe('plugin ordinary task receipts', () => {
f.switchOwner();
await expect(f.service.list('p')).rejects.toThrow('Owner changed');
});
+ it('rejects queued input when the task was archived before vendor acceptance', async () => {
+ const f = fixture();
+ const run = await f.send();
+ f.tasks.get(run.taskId)!.status = 'archived';
+ await expect(f.service.accept(run.taskId, { clientId: run.inputMessageId }, f.execution))
+ .rejects.toMatchObject({ code: 'TASK_BUSY' });
+ expect(JSON.parse(f.rows.get(run.runId)!.payload).execution).toBeUndefined();
+ });
it('does not recreate a deleted task on request replay', async () => {
const f = fixture();
const task = await f.create();
@@ -306,3 +314,34 @@ it('rechecks permissions when queued input reaches native dispatch', async () =>
await expect(f.service.accept(run.taskId,{clientId:run.inputMessageId},f.execution)).rejects.toMatchObject({code:'PERMISSION_DENIED'});
expect(JSON.parse(f.rows.get(run.runId)!.payload).status).toBe('queued');
});
+
+it('registers plans only before input and preserves identical retries after dispatch', async () => {
+ const f = fixture(), task = await f.create();
+ const plan = {concurrency: 2, items: [{label: 'sample', workingDir: '/answer', route: f.route}]};
+ f.deps.assertTeamPlanUnstarted = vi.fn(async () => { throw new Error('Worker reservation exists'); });
+ await expect(f.service.setTeamPlan('p', task.taskId, plan)).rejects.toThrow('reservation');
+ f.deps.assertTeamPlanUnstarted = vi.fn(async () => undefined);
+ await f.service.setTeamPlan('p', task.taskId, plan);
+ await f.send();
+ await expect(f.service.setTeamPlan('p', task.taskId, plan)).resolves.toEqual({ok: true});
+ const late = fixture(), run = await late.send();
+ await expect(late.service.setTeamPlan('p', run.taskId, plan)).rejects.toMatchObject({code: 'TASK_BUSY'});
+});
+
+it('drains terminal receipt writes before the owner database closes', async () => {
+ const f = fixture(), run = await f.send();
+ await f.service.accept(run.taskId, {clientId: run.inputMessageId}, f.execution);
+ const save = f.deps.store.save;
+ let unblock!: () => void;
+ const barrier = new Promise<void>(resolve => { unblock = resolve; });
+ f.deps.store.save = async row => { await barrier; await save(row); };
+ const terminal = f.service.settle(run.taskId, f.execution, 'completed', 'answer');
+ let drained = false;
+ const drain = f.service.drain().then(() => { drained = true; });
+ await Promise.resolve();
+ expect(drained).toBe(false);
+ unblock();
+ await Promise.all([terminal, drain]);
+ f.switchOwner();
+ expect(JSON.parse(f.rows.get(run.runId)!.payload)).toMatchObject({status: 'completed', outputMessageId: 'answer'});
+});
diff --git a/apps/desktop/src/main/maker-ipc/orcaWorkerCreationService.ts b/apps/desktop/src/main/maker-ipc/orcaWorkerCreationService.ts
index 75bbfb21ba..52901d6a35 100644
--- a/apps/desktop/src/main/maker-ipc/orcaWorkerCreationService.ts
+++ b/apps/desktop/src/main/maker-ipc/orcaWorkerCreationService.ts
@@ -1024,6 +1024,12 @@ export function createOrcaWorkerCreationService(deps: OrcaWorkerCreationDeps): O
renewalTimer.unref?.();
try {
+ // Registration may race the preflight. Once a reservation exists, a new
+ // plan cannot be registered; reread any plan that won before reservation.
+ const reservedPlanLimit = await deps.validateCreationPlan?.(params);
+ if (reservedPlanLimit != null && reservation.occupiedSlotsBefore >= reservedPlanLimit) {
+ return { ok: false, errorCode: 'WORKER_LIMIT_HARD_EXCEEDED', message: 'Registered plan concurrency reached' };
+ }
const workerSessionId = deps.createSessionId();
const workerVendorOptions = {
orcaRole: 'worker' as const,
diff --git a/apps/desktop/src/main/maker-ipc/pluginTaskService.ts b/apps/desktop/src/main/maker-ipc/pluginTaskService.ts
index 9be1656dbe..7192a5517e 100644
--- a/apps/desktop/src/main/maker-ipc/pluginTaskService.ts
+++ b/apps/desktop/src/main/maker-ipc/pluginTaskService.ts
@@ -69,6 +69,7 @@ export interface PluginTaskServiceDeps {
isolatedWorkspace?: boolean,
): Promise<void>;
readSession(taskId: string): Promise<PluginTaskView | null>;
+ assertTeamPlanUnstarted?(taskId: string): Promise<void>;
dispatch(
pluginId: string,
taskId: string,
@@ -164,6 +165,11 @@ export function createPluginTaskService(deps: PluginTaskServiceDeps) {
return run;
};
return {
+ /** Account teardown awaits already accepted writes before closing this DB. */
+ drain: async () => {
+ let pending: Promise<unknown>;
+ do { pending = tail; await pending; } while (pending !== tail);
+ },
create: (
pluginId: string,
request: { requestKey: string; title: string; route?: PluginTaskRoute; isolatedWorkspace?: boolean },
@@ -201,6 +207,11 @@ export function createPluginTaskService(deps: PluginTaskServiceDeps) {
const row = (await deps.store.get(taskId))!;
const data = JSON.parse(row.payload);
if (data.teamPlan && hash(data.teamPlan) !== hash(plan)) return fail('IDEMPOTENCY_CONFLICT', 'Team plan is immutable');
+ if (data.teamPlan) return {ok:true};
+ if ((await deps.store.forSession(taskId)).length) return fail('TASK_BUSY', 'Register the team plan before sending input');
+ const observed = await deps.inspect(taskId);
+ if (observed.execution || observed.pending.length) return fail('TASK_BUSY', 'Register the team plan before starting work');
+ await deps.assertTeamPlanUnstarted?.(taskId);
deps.assertAuthorized(pluginId);
await save(row,{...data,teamPlan:plan});
return {ok:true};
@@ -345,6 +356,7 @@ export function createPluginTaskService(deps: PluginTaskServiceDeps) {
return fail('REQUEST_EXPIRED', 'Input was already settled');
}
const view = await ownTask(row.pluginId, taskId);
+ if (view.status !== 'active') return fail('TASK_BUSY', 'Archived tasks cannot accept input');
if (view.permissionMode === 'bypassPermissions') return fail('PERMISSION_DENIED', 'Task permission exceeds plugin dispatch policy');
if (hash(view.resolvedConfig) !== hash(run.acceptedConfig))
return fail('ROUTE_UNAVAILABLE', 'Accepted route changed before dispatch');
diff --git a/apps/desktop/src/main/maker-ipc/register.ts b/apps/desktop/src/main/maker-ipc/register.ts
index 10685d949c..76f4f1c647 100644
--- a/apps/desktop/src/main/maker-ipc/register.ts
+++ b/apps/desktop/src/main/maker-ipc/register.ts
@@ -4550,6 +4550,10 @@ const sessionBindings = createSessionBindingLifecycle<WiredSession, WiredSession
});
let pluginTaskServiceForCurrentOwner: (() => PluginTaskService) | null = null;
+let drainPluginTaskReceipts: (() => Promise<void>) | null = null;
+export async function flushPluginTaskLifecycle(): Promise<void> {
+ await drainPluginTaskReceipts?.();
+}
function notePluginTaskLifecycle(operation: (service: PluginTaskService) => Promise<unknown>): void {
if (!pluginTaskServiceForCurrentOwner) return;
try { void operation(pluginTaskServiceForCurrentOwner()).catch(() => log.warn('Plugin task receipt update failed')); }
@@ -4817,8 +4821,16 @@ export function wireSessionToIpc(session: ReturnType<Maker['getSession']>): void
// listeners never treat it as turn text; Desktop persist/broadcast still
// consumes the localized notice.
const emitWiredSessionEvent = (event: AgentEvent) => {
- handleSessionEvent(sessionEventDependencies, session, event);
+ handleSessionEvent(ownerEventDependencies, session, event);
};
+ const ownerDb = getCurrentDbClientSnapshot();
+ const ownerEventDependencies = Object.create(sessionEventDependencies) as SessionEventDependencies;
+ Object.defineProperty(ownerEventDependencies, 'onPluginTaskTerminal', {
+ value: (...args: Parameters<NonNullable<SessionEventDependencies['onPluginTaskTerminal']>>) => {
+ if (!ownerDb || getCurrentDbClientSnapshot() !== ownerDb) return;
+ sessionEventDependencies.onPluginTaskTerminal?.(...args);
+ },
+ });
registration.disposers.push(session.onEvent(emitWiredSessionEvent));
registration.disposers.push(session.onRuntimeRecovery(emitWiredSessionEvent));
sessionBindings.attachStatusListener(registration);
@@ -10109,6 +10121,7 @@ export function registerMakerIpc(maker: Maker, options: RegisterMakerIpcOptions)
// is retained by an asynchronous task request.
let pluginTaskEpoch: ReturnType<typeof getCurrentDbClientSnapshot> = null;
let pluginTasks: PluginTaskService | null = null;
+ drainPluginTaskReceipts = async () => { await pluginTasks?.drain(); };
pluginTaskServiceForCurrentOwner = () => {
const snapshot = getCurrentDbClientSnapshot();
if (!snapshot) throw new PluginTaskError('HOST_NOT_READY', 'Task storage is unavailable', true);
@@ -10147,6 +10160,13 @@ export function registerMakerIpc(maker: Maker, options: RegisterMakerIpcOptions)
pluginTaskEpoch = snapshot;
pluginTasks = createPluginTaskService({
store: createPluginTaskStore(snapshot.client), assertCurrent, assertAuthorized: assertPlugin, resolveRoute,
+ assertTeamPlanUnstarted: async taskId => {
+ assertCurrent();
+ const workers = await snapshot.client.drizzle.select({id:orcaWorkers.id}).from(orcaWorkers).innerJoin(orcaTeams,eq(orcaWorkers.teamId,orcaTeams.id)).where(eq(orcaTeams.leadSessionId,taskId)).limit(1);
+ const reservations = await snapshot.client.drizzle.select({id:orcaWorkerCreationReservations.id}).from(orcaWorkerCreationReservations).innerJoin(orcaTeams,eq(orcaWorkerCreationReservations.teamId,orcaTeams.id)).where(and(eq(orcaTeams.leadSessionId,taskId),gte(orcaWorkerCreationReservations.expiresAt,Date.now()))).limit(1);
+ assertCurrent();
+ if (workers.length || reservations.length) throw new PluginTaskError('TASK_BUSY', 'Register the team plan before creating Workers');
+ },
createSession: async (pluginId, taskId, title, route, isolatedWorkspace) => {
assertPlugin(pluginId);
const cfg = readGhostErrandConfig(pluginId);
@@ -10235,6 +10255,17 @@ export function registerMakerIpc(maker: Maker, options: RegisterMakerIpcOptions)
}
};
const pluginPermissionRequests = new Set<string>();
+ // Projection and release consume the same host-stamped completion evidence.
+ const readPluginWorkerCompletion = async (epoch: NonNullable<ReturnType<typeof getCurrentDbClientSnapshot>>, sessionId: string, status: string) => {
+ const [row] = await epoch.client.drizzle.select().from(sessions).where(eq(sessions.id, sessionId)).limit(1);
+ const safeMeta = sql`CASE WHEN json_valid(${messages.agentMeta}) THEN ${messages.agentMeta} ELSE '{}' END`;
+ const [anchor] = await epoch.client.drizzle.select({role:messages.role, createdAt:messages.createdAt, agentMeta:messages.agentMeta}).from(messages)
+ .where(and(eq(messages.sessionId, sessionId), isNull(messages.rewindAt), inArray(messages.role, ['user', 'assistant']), sql`json_extract(${safeMeta}, '$.parentUuid') IS NULL`))
+ .orderBy(desc(messages.createdAt), desc(messages.id)).limit(1);
+ const flow = await createOrcaDiagnosticsDeps().getWorkerFlowStatus(sessionId);
+ if (epoch !== getCurrentDbClientSnapshot()) throw new PluginTaskError('PERMISSION_DENIED', 'Account changed');
+ return {row, completedAt: pluginWorkerCompletedAt({status, working:flow.isWorking, queued:flow.queuedCount, paused:flow.queuePaused, startedAt:row?.activeTurnStartedAt ?? null, endedAt:row?.lastTurnEndedAt ?? null, clearedAt:row?.clearedAt, anchor})};
+ };
setPluginTaskHandler(async (pluginId, request) => {
const service = pluginTaskServiceForCurrentOwner!();
switch (request.kind) {
@@ -10304,22 +10335,25 @@ export function registerMakerIpc(maker: Maker, options: RegisterMakerIpcOptions)
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 () => {
if (epoch !== getCurrentDbClientSnapshot()) throw new PluginTaskError('PERMISSION_DENIED','Account changed');
await service.get(pluginId,request.taskId);
- const [fresh] = await epoch.client.drizzle.select().from(sessions).where(eq(sessions.id,record.sessionId)).limit(1);
- if (epoch !== getCurrentDbClientSnapshot()) throw new PluginTaskError('PERMISSION_DENIED','Account changed');
- if (!fresh || fresh.lastTurnEndedAt !== request.completedAt || (fresh.activeTurnStartedAt ?? 0) > request.completedAt) throw new PluginTaskError('STALE_REVISION','Worker execution changed');
+ 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();
- await service.settleWorkerLabel(pluginId,request.taskId,record.label!);
+ 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});
- if (result.ok) await service.settleWorkerLabel(pluginId,request.taskId,record.label!);
+ if (result.ok && plan) await service.settleWorkerLabel(pluginId,request.taskId,record.label!);
return result;
}
case 'getTeam': {
@@ -10328,17 +10362,10 @@ export function registerMakerIpc(maker: Maker, options: RegisterMakerIpcOptions)
await service.get(pluginId, request.taskId);
const team = await getOrcaWorkspaceInfoReadOnly(createOrcaDiagnosticsDeps(), request.taskId);
if (!team.ok) throw new PluginTaskError('HOST_NOT_READY', 'Collaboration state unavailable', true);
- const records = await listWorkersByLead(request.taskId);
const workers = await Promise.all(team.workers.map(async worker => {
- const [row] = await epoch!.client.drizzle.select().from(sessions).where(eq(sessions.id, worker.session_id)).limit(1);
- const safeMeta = sql`CASE WHEN json_valid(${messages.agentMeta}) THEN ${messages.agentMeta} ELSE '{}' END`;
- const [anchor] = await epoch.client.drizzle.select({role:messages.role, createdAt:messages.createdAt, agentMeta:messages.agentMeta}).from(messages)
- .where(and(eq(messages.sessionId, worker.session_id), isNull(messages.rewindAt), inArray(messages.role, ['user', 'assistant']), sql`json_extract(${safeMeta}, '$.parentUuid') IS NULL`))
- .orderBy(desc(messages.createdAt), desc(messages.id)).limit(1);
+ const {row, completedAt} = await readPluginWorkerCompletion(epoch, worker.session_id, worker.status);
const [firstInput] = await epoch.client.drizzle.select({at:messages.createdAt}).from(messages).where(and(eq(messages.sessionId,worker.session_id),eq(messages.role,'user'),isNull(messages.rewindAt))).orderBy(asc(messages.createdAt)).limit(1);
const [firstActivity] = await epoch.client.drizzle.select({at:messages.createdAt}).from(messages).where(and(eq(messages.sessionId,worker.session_id),inArray(messages.role,['assistant','thinking','tool_use']),gte(messages.createdAt,firstInput?.at??row?.createdAt??0),isNull(messages.rewindAt))).orderBy(asc(messages.createdAt)).limit(1);
- const restoredCompletion = pluginWorkerCompletedAt({status:worker.status, working:worker.is_working, queued:worker.queued_count, paused:worker.queue_paused, startedAt:row?.activeTurnStartedAt ?? null, endedAt:row?.lastTurnEndedAt ?? null, clearedAt:row?.clearedAt, anchor});
- const completedAt = restoredCompletion ?? (worker.status === 'done' && !worker.is_working && worker.queued_count === 0 && !worker.queue_paused ? records.find(r=>r.id===worker.worker_id)?.updatedAt : null);
return {...worker, acceptedAt:firstInput?.at, startedAt:firstActivity?.at, timingBasis:'host-message-window', createdAt:row?.createdAt, lastTurnStartedAt:row?.activeTurnStartedAt, lastTurnEndedAt:row?.lastTurnEndedAt, waitingForUser:!!maker.getSession(worker.session_id)?.getTurnControlSnapshot().pendingInteractionCount, usage: {scope:'session-total', tokens:row?.totalTokenUsage ?? null, costUSD:row?.totalCostCurrency === 'USD' && row.totalCostAmount > 0 ? row.totalCostAmount : null, approximate:row?.totalCostIsApproximate ?? false, reason:row?.totalCostCurrency === 'USD' && row.totalCostAmount > 0 ? null : 'No confirmed USD cost; subscription value and other currencies are not a bill'}, status:completedAt ? 'done' : worker.status, permissionMode:row?.permissionMode, providerId:row?.providerId, fastMode:row?.fastMode, completedAt};
}));
if (epoch !== getCurrentDbClientSnapshot()) throw new PluginTaskError('PERMISSION_DENIED', 'Account changed');
@@ -11359,7 +11386,10 @@ export function registerMakerIpc(maker: Maker, options: RegisterMakerIpcOptions)
if (!receipt || receipt.operation !== 'create') return undefined;
await pluginTaskServiceForCurrentOwner!().get(receipt.pluginId,params.leadSessionId);
if (epoch !== getCurrentDbClientSnapshot()) throw new PluginTaskError('PERMISSION_DENIED','Account changed');
- const data = JSON.parse(receipt.payload);
+ // get() waits behind plan registration in the existing receipt queue.
+ const currentReceipt = await createPluginTaskStore(epoch.client).get(params.leadSessionId);
+ if (!currentReceipt) throw new PluginTaskError('TASK_NOT_FOUND', 'Task not found');
+ const data = JSON.parse(currentReceipt.payload);
if (!data.teamPlan) return undefined; // Existing plugins retain their original behavior.
const item = data.teamPlan.items.find((x: {label:string})=>x.label===params.label);
if (!item || data.settledLabels?.includes(params.label)) throw new PluginTaskError('INVALID_REQUEST','Worker is not pending in the registered plan');
diff --git a/apps/desktop/src/renderer/i18n/locales/ja/common.json b/apps/desktop/src/renderer/i18n/locales/ja/common.json
index 372dafa053..8d9f2f15ae 100644
--- a/apps/desktop/src/renderer/i18n/locales/ja/common.json
+++ b/apps/desktop/src/renderer/i18n/locales/ja/common.json
@@ -13755,11 +13755,11 @@
"description": "このデバイスで {{host}} を開き、このタスクを実行するプラグインを認証します。認証情報は認証を開始したデバイスに保存されます。"
},
"pluginTaskWriteAccess": {
- "title": "Allow this plugin’s AI to edit files?",
- "message": "Allow the AI in “{{name}}” to edit files and continue?",
- "detail": "This sets the plugin’s AI permission to Allow edits for future tasks too. A separate working directory is not a system sandbox; commands still follow Cindy permission checks. You can switch back to read-only in the plugin’s AI settings.",
- "allow": "Allow and continue",
- "cancel": "Not now",
+ "title": "このプラグインの AI にファイルの編集を許可しますか?",
+ "message": "「{{name}}」の AI にファイルの編集を許可して続行しますか?",
+ "detail": "このプラグインの AI 権限を編集可能に変更します。今後のタスクにも適用されます。独立した作業ディレクトリはシステムのサンドボックスではなく、コマンドには引き続き Cindy の権限チェックが適用されます。プラグインの AI 設定でいつでも読み取り専用に戻せます。",
+ "allow": "許可して続行",
+ "cancel": "今は許可しない",
"autoTitle": "Auto 自動承認を有効化",
"autoMessage": "「{{name}}」で Auto 自動承認を使用しますか?",
"autoDetail": "主タスクと Worker の操作を Cindy が自動審査します。確認が必要な操作や拒否された操作は停止します。完全アクセスではありません。他のタスクの全体設定は変更しません。"
diff --git a/apps/desktop/src/renderer/i18n/locales/ko/common.json b/apps/desktop/src/renderer/i18n/locales/ko/common.json
index deb9ef408c..2141521b87 100644
--- a/apps/desktop/src/renderer/i18n/locales/ko/common.json
+++ b/apps/desktop/src/renderer/i18n/locales/ko/common.json
@@ -13755,11 +13755,11 @@
"description": "이 기기에서 {{host}}를 열어 이 작업을 실행하는 플러그인을 인증하세요. 인증 정보는 인증을 시작한 기기에 저장됩니다."
},
"pluginTaskWriteAccess": {
- "title": "Allow this plugin’s AI to edit files?",
- "message": "Allow the AI in “{{name}}” to edit files and continue?",
- "detail": "This sets the plugin’s AI permission to Allow edits for future tasks too. A separate working directory is not a system sandbox; commands still follow Cindy permission checks. You can switch back to read-only in the plugin’s AI settings.",
- "allow": "Allow and continue",
- "cancel": "Not now",
+ "title": "이 플러그인의 AI가 파일을 수정하도록 허용할까요?",
+ "message": "“{{name}}”의 AI가 파일을 수정하도록 허용하고 계속할까요?",
+ "detail": "이 플러그인의 AI 권한을 수정 가능으로 변경하며, 이후 작업에도 적용됩니다. 별도의 작업 디렉터리는 시스템 샌드박스가 아니며, 명령에는 계속 Cindy의 권한 검사가 적용됩니다. 플러그인 AI 설정에서 언제든지 읽기 전용으로 되돌릴 수 있습니다.",
+ "allow": "허용하고 계속",
+ "cancel": "지금은 허용 안 함",
"autoTitle": "Auto 자동 승인 사용",
"autoMessage": "“{{name}}”에 Auto 자동 승인을 허용할까요?",
"autoDetail": "Cindy가 주 작업과 Worker 동작을 자동 심사합니다. 확인이 필요하거나 거부된 동작은 일시 중지됩니다. 전체 접근 권한이 아니며 다른 작업의 전역 권한은 변경하지 않습니다."
diff --git a/docs/dev-rules/plugin-task-api-implementation.md b/docs/dev-rules/plugin-task-api-implementation.md
index f0350d5948..293ac3a1a3 100644
--- a/docs/dev-rules/plugin-task-api-implementation.md
+++ b/docs/dev-rules/plugin-task-api-implementation.md
@@ -52,9 +52,8 @@ getTeam 的 completedAt 可由宿主落盘的 turnCompleted 终态恢复:仅
### 已登记协同计划与释放
-`setTeamPlan({taskId,plan:{concurrency,items}})` 在本插件自己的创建收据中冻结计划。每项含唯一 label、workingDir 和精确 route;重复设置必须一致。未登记计划的存量插件沿用原行为。Worker 创建复用原子 reservation,计划上限只可收窄宿主硬上限。已结算 label 持久保留,不因归档再次变成可派发项。
+`setTeamPlan({taskId,plan:{concurrency,items}})` 在本插件自己的创建收据中冻结计划。首次登记必须早于输入派发和 Worker 创建(包括创建预留);同一计划的幂等重放不受此限制。每项含唯一 label、workingDir 和精确 route;重复设置必须一致。未登记计划的存量插件沿用原行为。Worker 创建复用原子 reservation,预留后再次核对计划,计划上限只可收窄宿主硬上限。已结算 label 持久保留,不因归档再次变成可派发项。
-`releaseWorker({taskId,workerId,completedAt})` 仅释放本插件 Lead 内、结束时间仍匹配、无活动/排队输入的 Worker。调用方应先保存交卷快照和评分。复用 Orca 的归档路径、transition 锁和发送锁;持锁后再次核对 completedAt 与归属。已有发送锁时直接拒绝释放,不等待而形成锁反转;只有归档成功才结算 label。拒绝正在发送或运行的 Worker,保留任务历史与作答文件。
+`releaseWorker({taskId,workerId,completedAt})` 仅释放本插件 Lead 内、结束时间仍匹配、无活动/排队输入的 Worker。它与 getTeam 共用宿主成功终态判据,不能以 Worker 更新时间或失败轮结束时间替代交卷凭据。调用方应先保存交卷快照和评分。复用 Orca 的归档路径、transition 锁和发送锁;持锁后再次核对 completedAt 与归属。有计划时必须在归档前确认标签归属;无计划的兼容调用不写标签结算。已有发送锁时直接拒绝释放,不等待而形成锁反转;只有归档成功才结算 label。拒绝正在发送或运行的 Worker,保留任务历史与作答文件。
`getTeam` 增加包含创建预留的 capacity 快照(advisory;准入仍由创建事务裁决)、逐 Worker 的等待确认状态、首条输入/首条执行消息时间、最近轮结束时间,以及 Worker/Lead 分列的 session-total 用量。`host-message-window` 是可观测作答窗口,不是精确模型计算时长。无确切 USD 金额时返回 null,不把订阅估值或其他币种直接当美元。
-