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(plugin-tasks): respect Plan Mode and order completion evidence

Dash29f26c1dfa6f
diff --git a/apps/desktop/src/main/maker-ipc/__tests__/orcaLifecycleService.test.ts b/apps/desktop/src/main/maker-ipc/__tests__/orcaLifecycleService.test.ts
index 3a82d05e89..ae8741e360 100644
--- a/apps/desktop/src/main/maker-ipc/__tests__/orcaLifecycleService.test.ts
+++ b/apps/desktop/src/main/maker-ipc/__tests__/orcaLifecycleService.test.ts
@@ -1014,12 +1014,12 @@ describe('retained tasks after explicit plugin uninstall', () => {
const helper = source.slice(source.indexOf(' const assertPluginWorkerAutoAuthorized ='), source.indexOf(' const orcaWorkerCreationService ='));
const callback = source.slice(source.indexOf(' getWorkerPermissionModeOverride: async (leadSessionId) => {'), source.indexOf(' setWorkerPermissionMode: applyWorkerPermissionModePreference,'));
const js = ts.transpileModule(`${helper}\nreturn ({${callback}}).getWorkerPermissionModeOverride;`, { compilerOptions: { target: ts.ScriptTarget.ES2022 } }).outputText;
- it.each(['enableTeam', 'startTeam', 'createWorker'] as const)('requires an active plugin task for %s', async action => {
- for (const status of ['active', 'archived']) {
+ it.each(['enableTeam', 'startTeam', 'createWorker'] as const)('requires an active plugin task outside Plan Mode for %s', async action => {
+ for (const {status,planModeEnabled} of [{status:'active',planModeEnabled:false},{status:'archived',planModeEnabled:false},{status:'active',planModeEnabled:true}]) {
const epoch = { client: {} };
const callbacks = { getCurrentDbClientSnapshot: () => epoch, PluginTaskError,
createPluginTaskStore: () => ({ get: async () => ({ operation: 'create', pluginId: 'plugin', payload: '{}' }) }),
- pluginTaskServiceForCurrentOwner: () => ({ get: async () => ({ status, permissionMode: 'auto' }) }),
+ pluginTaskServiceForCurrentOwner: () => ({ get: async () => ({ status, permissionMode: 'auto', planModeEnabled }) }),
isPluginTaskAuthorized: () => true, readGhostErrandConfig: () => ({ permissionMode: 'auto' }),
};
const override = new Function(...Object.keys(callbacks), js)(...Object.values(callbacks));
@@ -1029,9 +1029,9 @@ describe('retained tasks after explicit plugin uninstall', () => {
const result = action === 'enableTeam' ? service.enableTeam({ leadSessionId: 'lead-1', workerAgent: 'codex', role: 'worker', label: 'sample' })
: action === 'startTeam' ? service.startTeam({ leadSessionId: 'lead-1' })
: service.createWorker({ leadSessionId: 'lead-1', agent: 'codex', role: 'worker', label: 'sample' });
- if (status === 'active') await expect(result).resolves.toMatchObject({ ok: true });
+ if (status === 'active' && !planModeEnabled) await expect(result).resolves.toMatchObject({ ok: true });
else {
- await expect(result).rejects.toMatchObject({ code: 'TASK_BUSY' });
+ await expect(result).rejects.toMatchObject({ code: planModeEnabled ? 'PERMISSION_DENIED' : 'TASK_BUSY' });
expect(deps.createWorkerInTeam).not.toHaveBeenCalled();
expect(deps.createActiveTeam).not.toHaveBeenCalled();
}
diff --git a/apps/desktop/src/main/maker-ipc/__tests__/orcaWorkerCreationService.test.ts b/apps/desktop/src/main/maker-ipc/__tests__/orcaWorkerCreationService.test.ts
index 71efff209b..28bd566fde 100644
--- a/apps/desktop/src/main/maker-ipc/__tests__/orcaWorkerCreationService.test.ts
+++ b/apps/desktop/src/main/maker-ipc/__tests__/orcaWorkerCreationService.test.ts
@@ -2791,7 +2791,7 @@ describe('production plugin Auto admission after reservation', () => {
});
it.each([
- ...[false, true].flatMap(planned => ['reservation', 'directory', 'receipt', 'final-task', 'task-mode', 'disabled', 'healthy', 'archive-first', 'archive-reservation', 'archive-final'].map(point => ({ planned, point }))),
+ ...[false, true].flatMap(planned => ['reservation', 'directory', 'receipt', 'final-task', 'task-mode', 'disabled', 'healthy', 'archive-first', 'archive-reservation', 'archive-final', 'plan-first', 'plan-reservation', 'plan-final'].map(point => ({ planned, point }))),
...['explicit-match', 'canonical-directory', 'different-model', 'different-directory', 'normalized-fast', 'changed-plan', 'normalized-label', 'settled-label'].map(point => ({ planned: true, point })),
...['queued-plan-excludes', 'queued-plan-route', 'queued-plan-matches'].map(point => ({ planned: false, point })),
])('checks $point with planned=$planned before bootstrap', async ({ planned, point }) => {
@@ -2799,12 +2799,13 @@ describe('production plugin Auto admission after reservation', () => {
let mode = 'auto';
let taskMode = 'auto';
let taskStatus = point === 'archive-first' ? 'archived' : 'active';
+ let planModeEnabled = point === 'plan-first';
let enabled = true;
let receiptReads = 0;
let reservedTaskReads = 0;
const epoch = { client: {} };
const revoke = () => { mode = 'acceptEdits'; };
- const task = () => ({ revision: 1, status: taskStatus, permissionMode: taskMode, workingDir: path.resolve('repo') });
+ const task = () => ({ revision: 1, status: taskStatus, permissionMode: taskMode, planModeEnabled, workingDir: path.resolve('repo') });
const planItem = { label: 'sample', workingDir: path.resolve(point === 'canonical-directory' ? 'alias' : point === 'different-directory' ? 'other' : 'repo'), route: { agentKind: 'codex', model: 'gpt-5.5', providerId: 'xd', effort: 'medium', fastMode: point === 'normalized-fast' } };
const payload = () => JSON.stringify(planned ? { teamPlan: { concurrency: 2, items: [planItem] }, settledLabels: point === 'settled-label' ? ['sample'] : [] } : {});
const receipt = { pluginId: 'plugin', operation: 'create', payload: payload() };
@@ -2816,6 +2817,7 @@ describe('production plugin Auto admission after reservation', () => {
if (reservedTaskReads === 3 && point === 'final-task') revoke();
if (reservedTaskReads === 3 && point === 'task-mode') taskMode = 'plan';
if (reservedTaskReads === 3 && point === 'archive-final') taskStatus = 'archived';
+ if (reservedTaskReads === 3 && point === 'plan-final') planModeEnabled = true;
// A registration already past its reservation check commits while the
// post-reservation service read drains the existing receipt queue.
if (reservedTaskReads === 2 && point.startsWith('queued-plan-')) {
@@ -2845,6 +2847,7 @@ describe('production plugin Auto admission after reservation', () => {
if (point === 'reservation') revoke();
if (point === 'disabled') enabled = false;
if (point === 'archive-reservation') taskStatus = 'archived';
+ if (point === 'plan-reservation') planModeEnabled = true;
if (point === 'changed-plan') {
planItem.route.model = 'gpt-5.4';
receipt.payload = payload();
@@ -2863,6 +2866,6 @@ describe('production plugin Auto admission after reservation', () => {
await expect(result).rejects.toMatchObject({ code: point.startsWith('archive-') ? 'TASK_BUSY' : ['different-model', 'different-directory', 'normalized-fast', 'changed-plan', 'queued-plan-excludes', 'queued-plan-route', 'settled-label'].includes(point) ? 'INVALID_REQUEST' : 'PERMISSION_DENIED' });
expect(deps.bootstrapSession).not.toHaveBeenCalled();
}
- expect(deps.releaseWorkerCreationReservation).toHaveBeenCalledTimes(['archive-first', 'settled-label'].includes(point) ? 0 : 1);
+ expect(deps.releaseWorkerCreationReservation).toHaveBeenCalledTimes(['archive-first', 'plan-first', 'settled-label'].includes(point) ? 0 : 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 644fd981de..8b08899b4e 100644
--- a/apps/desktop/src/main/maker-ipc/__tests__/pluginTaskService.test.ts
+++ b/apps/desktop/src/main/maker-ipc/__tests__/pluginTaskService.test.ts
@@ -620,6 +620,27 @@ it('a rejected operation does not poison subsequent drain', async () => {
describe('current plugin dispatch authority', () => {
+ it.each(['before', 'route', 'insert'])('blocks independent Plan Mode before dispatch at %s', async point => {
+ const f=fixture(), task=await f.create();
+ const enable=()=>Object.assign(f.tasks.get(task.taskId)!,{permissionMode:'auto',planModeEnabled:true});
+ if(point==='before') enable();
+ if(point==='route') f.deps.resolveRoute=async()=>{enable();return f.route;};
+ if(point==='insert') {const insert=f.deps.store.insert;f.deps.store.insert=async row=>{await insert(row);enable();};}
+ const send=f.service.send('p',{taskId:task.taskId,expectedRevision:task.revision,requestKey:'plan',text:'input'});
+ if(point==='insert') await expect(send).resolves.toMatchObject({status:'reconciling'});
+ else await expect(send).rejects.toMatchObject({code:'PERMISSION_DENIED'});
+ expect(f.deps.dispatch).not.toHaveBeenCalled();
+ });
+ it.each(['before', 'route', 'save'])('blocks queued acceptance after Plan Mode at %s but keeps inspection/cancel', async point => {
+ const f=fixture(), run=await f.send();
+ const enable=()=>Object.assign(f.tasks.get(run.taskId)!,{permissionMode:'acceptEdits',planModeEnabled:true});
+ if(point==='before') enable();
+ if(point==='route') f.deps.resolveRoute=async()=>{enable();return f.route;};
+ if(point==='save') {const save=f.deps.store.save;f.deps.store.save=async row=>{await save(row);enable();};}
+ await expect(f.service.accept(run.taskId,{clientId:run.inputMessageId},f.execution)).rejects.toMatchObject({code:'PERMISSION_DENIED'});
+ await expect(f.service.get('p',run.taskId)).resolves.toMatchObject({planModeEnabled:true});
+ await expect(f.service.cancel('p',run.runId)).resolves.toMatchObject({status:'cancelled'});
+ });
it.each(['plan', 'acceptEdits', 'auto'])('allows only authority within %s configuration', configured => {
const modes = ['plan', 'acceptEdits', 'auto'];
for (const mode of [...modes, 'bypassPermissions', 'unknown', undefined]) {
diff --git a/apps/desktop/src/main/maker-ipc/__tests__/pluginTaskSnapshot.test.ts b/apps/desktop/src/main/maker-ipc/__tests__/pluginTaskSnapshot.test.ts
index 6dc45eda87..fbd051f8eb 100644
--- a/apps/desktop/src/main/maker-ipc/__tests__/pluginTaskSnapshot.test.ts
+++ b/apps/desktop/src/main/maker-ipc/__tests__/pluginTaskSnapshot.test.ts
@@ -1,4 +1,5 @@
import { readFileSync } from 'node:fs';
+import { createHash } from 'node:crypto';
import { mkdtemp, mkdir, realpath, rm, symlink, unlink } from 'node:fs/promises';
import os from 'node:os';
import path from 'node:path';
@@ -19,6 +20,20 @@ function handler(kind: string, next: string, deps: Record<string, unknown>) {
return compile(`return async function(pluginId,request){switch(request.kind){${branch}}}`, deps);
}
+it.each(['auto', 'acceptEdits'])('exposes independent Plan Mode alongside stored %s permission', async permissionMode => {
+ const start = source.indexOf(' readSession: async taskId =>');
+ const property = source.slice(start, source.indexOf(' dispatch:', start)).trim().replace(/,$/, '');
+ const row = {id:'task',source:'plugin',agentKind:'codex',status:'active',permissionMode,planModeEnabled:true};
+ const query = {from:()=>query,where:()=>query,limit:async()=>[row]};
+ const read = compile(`return ({${property}}).readSession;`, {assertCurrent:()=>{},snapshot:{client:{drizzle:{select:()=>query}}},sessions:{},eq:()=>true,pluginTaskConfigHash:createHash});
+ const plan = await read('task');
+ expect(plan).toMatchObject({permissionMode,planModeEnabled:true});
+ row.planModeEnabled=false;
+ const normal = await read('task');
+ expect(normal).toMatchObject({permissionMode,planModeEnabled:false});
+ expect(normal.revision).not.toBe(plan.revision);
+});
+
it('freezes the directory returned by admission without mutating the caller plan', async () => {
const epoch = {};
const save = vi.fn();
diff --git a/apps/desktop/src/main/maker-ipc/__tests__/pluginWorkerCompletion.test.ts b/apps/desktop/src/main/maker-ipc/__tests__/pluginWorkerCompletion.test.ts
index 9835c5eb24..f53d21aebe 100644
--- a/apps/desktop/src/main/maker-ipc/__tests__/pluginWorkerCompletion.test.ts
+++ b/apps/desktop/src/main/maker-ipc/__tests__/pluginWorkerCompletion.test.ts
@@ -1,7 +1,36 @@
import {describe, it, expect} from 'vitest';
import {pluginWorkerCompletedAt} from '../pluginWorkerCompletion.js';
+import {readFileSync} from 'node:fs';
+import Database from 'better-sqlite3';
+import {drizzle} from 'drizzle-orm/better-sqlite3';
+import {and, desc, eq, inArray, isNull, sql} from 'drizzle-orm';
+import {integer, sqliteTable, text} from 'drizzle-orm/sqlite-core';
+import ts from 'typescript';
const final = {status:'idle',working:false,queued:0,paused:false,startedAt:100,endedAt:200,anchor:{role:'assistant',createdAt:190,agentMeta:'{"turnCompleted":true}'}};
describe('released Worker completion',()=>{
it('recovers a released final turn from host metadata',()=>expect(pluginWorkerCompletedAt(final)).toBe(200));
it.each([{working:true},{queued:1},{paused:true},{status:'error'},{startedAt:210},{clearedAt:195},{anchor:{...final.anchor,role:'user'}},{anchor:{...final.anchor,agentMeta:'{}'}},{anchor:{...final.anchor,agentMeta:'{"turnCompleted":false}'}},{anchor:{...final.anchor,agentMeta:'{"turnCompleted":true,"parentUuid":"child"}'}}])('does not infer completion from idle or old/report text: %j',patch=>expect(pluginWorkerCompletedAt({...final,...patch})).toBeNull());
});
+
+it.each(['assistant', 'user'])('uses insertion order for same-millisecond latest %s evidence', async latest => {
+ const sqlite = new Database(':memory:');
+ try {
+ sqlite.exec('CREATE TABLE sessions(id TEXT, active_turn_started_at INTEGER, last_turn_ended_at INTEGER, cleared_at INTEGER); CREATE TABLE messages(id TEXT PRIMARY KEY, session_id TEXT, role TEXT, created_at INTEGER, agent_meta TEXT, rewind_at INTEGER);');
+ const sessions = sqliteTable('sessions', {id:text('id'),activeTurnStartedAt:integer('active_turn_started_at'),lastTurnEndedAt:integer('last_turn_ended_at'),clearedAt:integer('cleared_at')});
+ const messages = sqliteTable('messages', {id:text('id'),sessionId:text('session_id'),role:text('role'),createdAt:integer('created_at'),agentMeta:text('agent_meta'),rewindAt:integer('rewind_at')});
+ sqlite.prepare('INSERT INTO sessions VALUES (?, 100, 200, NULL)').run('worker');
+ const insert = sqlite.prepare('INSERT INTO messages VALUES (?, ?, ?, 190, ?, ?)');
+ insert.run('z-old', 'worker', latest === 'user' ? 'assistant' : 'user', '{"turnCompleted":true}', null);
+ insert.run('a-new', 'worker', latest, '{"turnCompleted":true}', null);
+ insert.run('other', 'other-worker', 'user', '{}', null);
+ insert.run('child', 'worker', 'user', '{"parentUuid":"child"}', null);
+ insert.run('rewound', 'worker', 'user', '{}', 195);
+ const epoch = {client:{drizzle:drizzle(sqlite)}};
+ const source = readFileSync(new URL('../register.ts',import.meta.url),'utf8');
+ const start = source.indexOf(' const readPluginWorkerCompletion =');
+ const code = source.slice(start, source.indexOf(' const handlePluginTask =',start));
+ const deps = {sessions,messages,and,desc,eq,inArray,isNull,sql,pluginWorkerCompletedAt,getCurrentDbClientSnapshot:()=>epoch,createOrcaDiagnosticsDeps:()=>({getWorkerFlowStatus:async()=>({isWorking:false,queuedCount:0,queuePaused:false})})};
+ const read = new Function(...Object.keys(deps),ts.transpileModule(`${code}\nreturn readPluginWorkerCompletion;`,{compilerOptions:{target:ts.ScriptTarget.ES2022}}).outputText)(...Object.values(deps));
+ expect((await read(epoch,'worker','idle')).completedAt).toBe(latest === 'assistant' ? 200 : null);
+ } finally {sqlite.close();}
+});
diff --git a/apps/desktop/src/main/maker-ipc/__tests__/pluginWriteAccess.test.ts b/apps/desktop/src/main/maker-ipc/__tests__/pluginWriteAccess.test.ts
index b77c1f6498..eed926ad2e 100644
--- a/apps/desktop/src/main/maker-ipc/__tests__/pluginWriteAccess.test.ts
+++ b/apps/desktop/src/main/maker-ipc/__tests__/pluginWriteAccess.test.ts
@@ -31,6 +31,17 @@ function fixture() {
return { run: (mode = 'acceptEdits', explicit = false) => run('plugin', { kind: 'requestWriteAccess', taskId: 'task', mode }, explicit), queue, gate, identity: (next: string) => {identity=next;}, service, live, epoch, dialog, slots, write, history, drain, config: () => cfg, change: (next: Record<string, unknown>) => { cfg = next; } };
}
describe('plugin write confirmation interleavings', () => {
+ it.each(['auto','acceptEdits'].flatMap(mode=>['before','dialog','lastRead'].map(point=>({mode,point}))))('rejects independent Plan Mode at $point for $mode without reporting a grant',async ({point,mode})=>{
+ const f=fixture();f.change({permissionMode:mode});
+ const planTask={taskId:'task',revision:1,status:'active',permissionMode:mode,planModeEnabled:true};
+ if(point==='before') f.service.get.mockResolvedValue(planTask);
+ if(point==='dialog') f.dialog.showMessageBox.mockImplementationOnce(async()=>{f.service.get.mockResolvedValue(planTask);return {response:0};});
+ if(point==='lastRead') f.epoch.client.tx.mockImplementationOnce(async()=>{f.service.get.mockResolvedValue(planTask);return {updated:true};});
+ await expect(f.run(mode)).rejects.toMatchObject({code:'PERMISSION_DENIED'});
+ expect(f.write).not.toHaveBeenCalled();
+ if(point==='before') expect(f.dialog.showMessageBox).not.toHaveBeenCalled();
+ if(point!=='lastRead') {expect(f.live.setPermissionMode).not.toHaveBeenCalled();expect(f.epoch.client.tx).not.toHaveBeenCalled();}
+ });
it.each(['acceptEdits', 'auto'])('restores a cold durable queue before %s confirmation under the send lock', async mode => {
const f=fixture();
f.queue.ensureQueueRestored.mockImplementation(async()=>{
diff --git a/apps/desktop/src/main/maker-ipc/pluginTaskService.ts b/apps/desktop/src/main/maker-ipc/pluginTaskService.ts
index 64b7602ddc..c092afb5c3 100644
--- a/apps/desktop/src/main/maker-ipc/pluginTaskService.ts
+++ b/apps/desktop/src/main/maker-ipc/pluginTaskService.ts
@@ -61,10 +61,10 @@ export function assertPluginTaskResult(result: { ok: boolean; errorCode?: string
if (!result.ok) throw new PluginTaskError(result.errorCode || 'HOST_NOT_READY', message);
}
/** A live task cannot exercise more authority than the plugin's current setting. */
-export function isPluginTaskPermissionAllowed(taskMode: unknown, configuredMode: unknown): boolean {
+export function isPluginTaskPermissionAllowed(taskMode: unknown, configuredMode: unknown, planModeEnabled = false): boolean {
const rank = (mode: unknown) => mode === 'plan' ? 0 : mode === 'acceptEdits' ? 1 : mode === 'auto' ? 2 : -1;
const task = rank(taskMode);
- return task >= 0 && task <= Math.max(0, rank(configuredMode));
+ return !planModeEnabled && task >= 0 && task <= Math.max(0, rank(configuredMode));
}
const fail = (code: string, message: string): never => {
throw new PluginTaskError(code, message);
@@ -141,7 +141,7 @@ export function createPluginTaskService(deps: PluginTaskServiceDeps) {
const view = await ownTask(pluginId, taskId);
deps.assertAuthorized(pluginId);
if (view.status !== 'active') return fail('TASK_BUSY', 'Archived tasks cannot accept input');
- if (!isPluginTaskPermissionAllowed(view.permissionMode, deps.readPermissionMode(pluginId)))
+ if (!isPluginTaskPermissionAllowed(view.permissionMode, deps.readPermissionMode(pluginId), view.planModeEnabled))
return fail('PERMISSION_DENIED', 'Task permission exceeds plugin dispatch policy');
return view;
};
@@ -315,7 +315,7 @@ export function createPluginTaskService(deps: PluginTaskServiceDeps) {
);
if (previous)
return { run: JSON.parse(previous.payload) as PluginTaskRun, dispatch: false };
- if (!isPluginTaskPermissionAllowed(view.permissionMode, deps.readPermissionMode(pluginId))) return fail('PERMISSION_DENIED', 'Task permission exceeds plugin dispatch policy');
+ if (!isPluginTaskPermissionAllowed(view.permissionMode, deps.readPermissionMode(pluginId), view.planModeEnabled)) return fail('PERMISSION_DENIED', 'Task permission exceeds plugin dispatch policy');
if (view.status !== 'active')
return fail('TASK_BUSY', 'Archived tasks cannot accept input');
if (view.revision !== request.expectedRevision)
@@ -426,7 +426,7 @@ export function createPluginTaskService(deps: PluginTaskServiceDeps) {
}
const view = await ownTask(row.pluginId, taskId);
if (view.status !== 'active') return fail('TASK_BUSY', 'Archived tasks cannot accept input');
- if (!isPluginTaskPermissionAllowed(view.permissionMode, deps.readPermissionMode(row.pluginId))) return fail('PERMISSION_DENIED', 'Task permission exceeds plugin dispatch policy');
+ if (!isPluginTaskPermissionAllowed(view.permissionMode, deps.readPermissionMode(row.pluginId), view.planModeEnabled)) 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');
await deps.resolveRoute(row.pluginId, run.acceptedConfig);
diff --git a/apps/desktop/src/main/maker-ipc/register.ts b/apps/desktop/src/main/maker-ipc/register.ts
index d94948db49..bc14da6607 100644
--- a/apps/desktop/src/main/maker-ipc/register.ts
+++ b/apps/desktop/src/main/maker-ipc/register.ts
@@ -10544,7 +10544,7 @@ export function registerMakerIpc(maker: Maker, options: RegisterMakerIpcOptions)
if (!row || row.source !== 'plugin' || row.remoteHostId || (row.orcaRole && row.orcaRole !== 'lead') || !['cc', 'codex', 'pi'].includes(row.agentKind)) return null;
const resolvedConfig: PluginTaskRoute = { agentKind: row.agentKind as PluginTaskRoute['agentKind'], providerId: row.providerId ?? '', model: row.model, effort: row.effort, fastMode: row.fastMode };
const revision = Number.parseInt(pluginTaskConfigHash('sha256').update(JSON.stringify([resolvedConfig, row.permissionMode, row.planModeEnabled, row.workingDir, row.status, row.orcaRole])).digest('hex').slice(0, 12), 16);
- return { taskId, title: row.title, status: row.status, revision, resolvedConfig, workingDir: row.workingDir ?? undefined, permissionMode: row.permissionMode };
+ return { taskId, title: row.title, status: row.status, revision, resolvedConfig, workingDir: row.workingDir ?? undefined, permissionMode: row.permissionMode, planModeEnabled: !!row.planModeEnabled };
},
dispatch: async (pluginId, taskId, clientId, text) => {
assertPlugin(pluginId);
@@ -10638,7 +10638,7 @@ export function registerMakerIpc(maker: Maker, options: RegisterMakerIpcOptions)
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);
+ .orderBy(desc(messages.createdAt), desc(sql`rowid`)).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})};
@@ -10650,6 +10650,7 @@ export function registerMakerIpc(maker: Maker, options: RegisterMakerIpcOptions)
const snapshot = getCurrentDbClientSnapshot();
const task = await service.get(pluginId, request.taskId);
if (task.status !== 'active') throw new PluginTaskError('TASK_BUSY', 'Archived tasks cannot request write access');
+ if (task.planModeEnabled) throw new PluginTaskError('PERMISSION_DENIED', 'Exit Plan Mode before requesting write access');
const mode = request.mode ?? 'acceptEdits';
const cfg = readGhostErrandConfig(pluginId);
assertCallerCurrent();
@@ -10700,6 +10701,7 @@ export function registerMakerIpc(maker: Maker, options: RegisterMakerIpcOptions)
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.status !== 'active') throw new PluginTaskError('TASK_BUSY', 'Archived tasks cannot request write access');
+ if (fresh.planModeEnabled) throw new PluginTaskError('PERMISSION_DENIED', 'Exit Plan Mode before requesting write access');
if (fresh.revision !== task.revision) throw new PluginTaskError('TASK_BUSY', 'Task changed while awaiting permission');
await assertIdle();
assertRequestCurrent();
@@ -10714,6 +10716,7 @@ export function registerMakerIpc(maker: Maker, options: RegisterMakerIpcOptions)
if (!saved.updated) throw new PluginTaskError('TASK_NOT_FOUND', 'Task not found');
if (snapshot !== getCurrentDbClientSnapshot()) throw new PluginTaskError('PERMISSION_DENIED', 'Account changed');
const updatedTask = await service.get(pluginId, task.taskId);
+ if (updatedTask.planModeEnabled) throw new PluginTaskError('PERMISSION_DENIED', 'Plan Mode changed during permission confirmation');
assertRequestCurrent();
if (snapshot !== getCurrentDbClientSnapshot()) throw new PluginTaskError('PERMISSION_DENIED', 'Account changed');
const currentConfig = readGhostErrandConfig(pluginId);
@@ -10737,7 +10740,7 @@ export function registerMakerIpc(maker: Maker, options: RegisterMakerIpcOptions)
if (status !== 'active') throw new PluginTaskError('TASK_BUSY', 'Archived tasks cannot start a team');
};
assertActive(task.status);
- if (task.permissionMode === 'plan' || task.permissionMode === 'bypassPermissions') throw new PluginTaskError('PERMISSION_DENIED', 'Coordinator requires an allowed execution permission');
+ if (task.planModeEnabled || task.permissionMode === 'plan' || task.permissionMode === 'bypassPermissions') throw new PluginTaskError('PERMISSION_DENIED', 'Coordinator requires an allowed execution permission');
const result = await startOrcaTeamForCaller(task.taskId, undefined, async () => {
if (epoch !== getCurrentDbClientSnapshot()) throw new PluginTaskError('PERMISSION_DENIED', 'Account changed');
const fresh = await service.get(pluginId, task.taskId);
@@ -11856,11 +11859,11 @@ export function registerMakerIpc(maker: Maker, options: RegisterMakerIpcOptions)
getCatalog: getActiveCatalog,
});
- const assertPluginWorkerAutoAuthorized = (pluginId: string, task: { status: string; permissionMode?: string }) => {
+ const assertPluginWorkerAutoAuthorized = (pluginId: string, task: { status: string; permissionMode?: string; planModeEnabled?: boolean }) => {
if (task.status !== 'active') {
throw new PluginTaskError('TASK_BUSY', 'Archived tasks cannot create Workers');
}
- if (!isPluginTaskAuthorized(pluginId) || task.permissionMode !== 'auto' || readGhostErrandConfig(pluginId).permissionMode !== 'auto') {
+ if (!isPluginTaskAuthorized(pluginId) || task.planModeEnabled || task.permissionMode !== 'auto' || readGhostErrandConfig(pluginId).permissionMode !== 'auto') {
throw new PluginTaskError('PERMISSION_DENIED', 'Authorize Auto for the plugin coordinator before creating Workers');
}
};
diff --git a/apps/desktop/src/shared/pluginTasks.ts b/apps/desktop/src/shared/pluginTasks.ts
index 9f3236ad31..d9c773815a 100644
--- a/apps/desktop/src/shared/pluginTasks.ts
+++ b/apps/desktop/src/shared/pluginTasks.ts
@@ -23,6 +23,8 @@ export interface PluginTaskView {
resolvedConfig: PluginTaskRoute;
workingDir?: string;
permissionMode?: string;
+ /** Independent Plan Mode; the stored permission remains available after it ends. */
+ planModeEnabled?: boolean;
}
export interface PluginTaskRun {
runId: string;
diff --git a/docs/dev-rules/plugin-task-api-implementation.md b/docs/dev-rules/plugin-task-api-implementation.md
index 4e991960ee..1aacd6a630 100644
--- a/docs/dev-rules/plugin-task-api-implementation.md
+++ b/docs/dev-rules/plugin-task-api-implementation.md
@@ -55,11 +55,11 @@
协同启动要求任务仍为 active;进入启动流程前和权限确认后的原生启动回调均重新检查,已归档任务不能借此创建或复用团队。不宣称与跨进程归档形成事务。
-插件可读取自己任务在权限变化后的状态与执行停止,但新发送拒绝超出插件策略的 full access 任务。既有普通任务的所有权收据在成为 Lead 后继续有效;Worker 不是插件直接控制的普通任务。
+插件可读取自己任务在权限变化后的状态与执行停止,但新发送拒绝超出插件策略的 full access 任务。任务快照同时返回独立的 planModeEnabled 与原 permissionMode;独立 Plan Mode 开启时拒绝新发送、排队接受、写权限请求及 Worker/团队启动,不以原 Auto/AcceptEdits 作为执行授权。普通 permissionMode 为 plan 的既有流程保持不变。既有普通任务的所有权收据在成为 Lead 后继续有效;Worker 不是插件直接控制的普通任务。
评测客户端每批仅创建一个 Lead,答案目录逐份隔离,由 Lead 使用原生 Orca 调度。插件根据 Worker 成员、配置、目录、done 且无活动/队列的状态独立验收。该投影不是逐轮执行账本,不作为精确费用证据。重试先核对既有 Worker;未知归属不得重派或算零分。停止须确认 Lead 停止处理完成和团队不再活动。
-getTeam 的 completedAt 可由宿主落盘的 turnCompleted 终态恢复:仅接受当前轮最终顶层 assistant、启动/结束边界吻合、无后续用户输入、无活动/排队/暂停工作。空闲状态或 Worker 报告正文自身不是交卷凭据。投影同时返回实际 permissionMode,供插件诊断。
+getTeam 的 completedAt 可由宿主落盘的 turnCompleted 终态恢复:仅接受当前轮最终顶层 assistant、启动/结束边界吻合、无后续用户输入、无活动/排队/暂停工作。同毫秒消息按 SQLite rowid 插入顺序确定最后一条,不按随机消息 ID 排序;releaseWorker 共用该读取。空闲状态或 Worker 报告正文自身不是交卷凭据。投影同时返回实际 permissionMode,供插件诊断。
### 已登记协同计划与释放