Consider it done. The open-source AI agent that works out of the box · 想到,就能做到。开源、开箱即用的 AI Agent。
TypeScript agentai-agentai-assistantandroidclaude-codecodexelectroniosllmmacosreact-nativetypescriptwindows
fix(plugins): reject model preferences changed during route resolution
Chrisb722bcf858ed
diff --git a/apps/desktop/src/main/cindy-brain/__tests__/ghostUserDataRelocation.test.ts b/apps/desktop/src/main/cindy-brain/__tests__/ghostUserDataRelocation.test.tsindex 62b44e7f47..053195125f 100644--- a/apps/desktop/src/main/cindy-brain/__tests__/ghostUserDataRelocation.test.ts+++ b/apps/desktop/src/main/cindy-brain/__tests__/ghostUserDataRelocation.test.ts@@ -192,7 +192,7 @@ it('completes source replacement and another plugin uninstall without reversingconst archive = '_ns__cindy-archive-00000000-0000-4000-8000-000000000002__helper';const service = createPluginTaskService({store: tasks, assertCurrent: () => {}, assertAuthorized: vi.fn(), readPermissionMode: vi.fn(),- resolveRoute: vi.fn(), createSession: vi.fn(), readSession: vi.fn(),+ readModelPreference: vi.fn(), resolveRoute: vi.fn(), createSession: vi.fn(), readSession: vi.fn(),dispatch: vi.fn(), inspect: vi.fn(), cancel: vi.fn(),});let entered!: () => void, finish!: () => void;diff --git a/apps/desktop/src/main/maker-ipc/__tests__/pluginTaskService.test.ts b/apps/desktop/src/main/maker-ipc/__tests__/pluginTaskService.test.tsindex c7e0b43ff0..28b00e71a3 100644--- a/apps/desktop/src/main/maker-ipc/__tests__/pluginTaskService.test.ts+++ b/apps/desktop/src/main/maker-ipc/__tests__/pluginTaskService.test.ts@@ -117,6 +117,7 @@ function fixture() {const deps: PluginTaskServiceDeps = {store,readPermissionMode: () => 'auto',+ readModelPreference: () => route,assertAuthorized: () => {if (!current) throw new Error('Owner changed');},@@ -951,6 +952,7 @@ it('does not apply a model after the task changes while route admission is pendiit('rechecks plugin defaults for the same task on every request without resetting unchanged tasks', async () => {const f = fixture();let preference = { ...f.route, model: 'grok' };+ f.deps.readModelPreference = () => preference;f.deps.resolveRoute = vi.fn(async (_plugin, requested) => requested ?? { ...preference });// First install: creation already respects the saved preference.let task = await f.create();@@ -985,6 +987,60 @@ it('rechecks plugin defaults for the same task on every request without resettinexpect(f.deps.setModel).toHaveBeenCalledTimes(3);});+it.each([+ { model: 'new-model' }, { providerId: 'new-provider' },+ { agentKind: 'pi' as const }, { effort: 'low' }, { fastMode: true },+])('rejects preferences changed during async route admission: %j', async patch => {+ const f = fixture(), task = await f.create();+ const preference = { ...f.route };+ f.deps.readModelPreference = () => preference;+ let entered!: () => void, finish!: () => void;+ const started = new Promise<void>(resolve => { entered = resolve; });+ const gate = new Promise<void>(resolve => { finish = resolve; });+ f.deps.resolveRoute = async () => { const captured = { ...preference }; entered(); await gate; return captured; };+ f.deps.setModel = vi.fn(async (id, route, assertCurrent) => {+ await assertCurrent();+ const stored = f.tasks.get(id)!;+ f.tasks.set(id, { ...stored, revision: stored.revision + 1, resolvedConfig: route });+ return { status: 'applied' };+ });+ const request = { taskId: task.taskId, expectedRevision: task.revision, route: 'plugin-default' as const };+ const pending = f.service.setModel('p', request);+ await started;+ Object.assign(preference, patch);+ const rejected = expect(pending).rejects.toMatchObject({ code: 'STALE_REVISION' });+ finish(); await rejected;+ expect(f.deps.setModel).not.toHaveBeenCalled();+ expect((await f.service.get('p', task.taskId)).revision).toBe(task.revision);+ // No stale input was accepted; retry resolves and applies the newly saved choice.+ f.deps.resolveRoute = async () => ({ ...preference });+ const next = await f.service.setModel('p', request);+ expect(next.task.resolvedConfig).toEqual(preference);+});++it('rechecks saved preferences at the runtime mutation boundary', async () => {+ const f = fixture(), task = await f.create();+ let preference = { ...f.route, model: 'chosen' };+ f.deps.readModelPreference = () => preference;+ f.deps.resolveRoute = async () => ({ ...preference });+ const apply = vi.fn();+ f.deps.setModel = async (_id, _route, assertCurrent) => {+ preference = { ...preference, model: 'newer' };+ await assertCurrent(); apply(); return { status: 'applied' };+ };+ await expect(f.service.setModel('p', { taskId: task.taskId, expectedRevision: task.revision, route: 'plugin-default' }))+ .rejects.toMatchObject({ code: 'STALE_REVISION' });+ expect(apply).not.toHaveBeenCalled();+});++it('does not reject explicit routes when unrelated plugin preferences change', async () => {+ const f = fixture(), task = await f.create();+ f.deps.readModelPreference = () => { throw Error('Explicit route must not read preferences'); };+ f.deps.setModel = vi.fn(async (_id, _route, assertCurrent) => { await assertCurrent(); return { status: 'applied' }; });+ await expect(f.service.setModel('p', { taskId: task.taskId, expectedRevision: task.revision, route: f.route }))+ .resolves.toMatchObject({ status: 'applied' });+});+it('keeps taskless plans immutable instead of retroactively granting scope', async () => {const f=fixture(),task=await f.create();const old={concurrency:2,items:[{label:'sample',workingDir:'/answer',route:f.route}]};diff --git a/apps/desktop/src/main/maker-ipc/__tests__/pluginTaskStorePagination.test.ts b/apps/desktop/src/main/maker-ipc/__tests__/pluginTaskStorePagination.test.tsindex b1f8d2f30a..8bae5bebe0 100644--- a/apps/desktop/src/main/maker-ipc/__tests__/pluginTaskStorePagination.test.ts+++ b/apps/desktop/src/main/maker-ipc/__tests__/pluginTaskStorePagination.test.ts@@ -45,7 +45,7 @@ it('durably revokes only create ownership while retaining plans, run results andconst unused=async():Promise<never>=>{throw Error('unexpected dispatch/control');};const service=createPluginTaskService({store,assertCurrent(){},assertAuthorized(){},readSession:async taskId=>({taskId,title:'kept',revision:1,status:'active',resolvedConfig:route,permissionMode:'plan'}),- readPermissionMode:()=> 'plan',resolveRoute:unused,createSession:unused,dispatch:unused,inspect:unused,cancel:unused,+ readModelPreference:()=>route,readPermissionMode:()=> 'plan',resolveRoute:unused,createSession:unused,dispatch:unused,inspect:unused,cancel:unused,});expect((await service.list('p')).items.map(row=>row.taskId)).toEqual(['task']);await store.revokePlugin('p');diff --git a/apps/desktop/src/main/maker-ipc/pluginTaskService.ts b/apps/desktop/src/main/maker-ipc/pluginTaskService.tsindex 7c0b97a0a0..3b6a55b529 100644--- a/apps/desktop/src/main/maker-ipc/pluginTaskService.ts+++ b/apps/desktop/src/main/maker-ipc/pluginTaskService.ts@@ -98,6 +98,7 @@ export interface PluginTaskServiceDeps {assertCurrent(): void;assertAuthorized(pluginId: string): void;readPermissionMode(pluginId: string): unknown;+ readModelPreference(pluginId: string): Partial<PluginTaskRoute>;resolveRoute(pluginId: string, route?: PluginTaskRoute, callId?: string): Promise<PluginTaskRoute>;createSession(pluginId: string,@@ -322,20 +323,29 @@ export function createPluginTaskService(deps: PluginTaskServiceDeps) {}),assertDispatch,setModel: (pluginId: string, request: { taskId: string; expectedRevision: number; route: PluginTaskRoute | 'plugin-default' }) => exclusive(async () => {+ const modelFields = ['agentKind', 'providerId', 'model', 'effort', 'fastMode'] as const;+ const followDefault = request.route === 'plugin-default';+ const preference = followDefault ? { ...deps.readModelPreference(pluginId) } : undefined;const assertUnchanged = async () => {const task = await ownTask(pluginId, request.taskId);if (task.status !== 'active') return fail('TASK_BUSY', '任务已归档,请先恢复任务');if (task.revision !== request.expectedRevision) return fail('STALE_REVISION', '任务配置已变化,请刷新后重试');+ // Saving plugin preferences does not change the task revision. Check+ // them after admission and again at the runtime's mutation boundary.+ if (preference) {+ const current = deps.readModelPreference(pluginId);+ if (modelFields.some(key => preference[key] !== current[key]))+ return fail('STALE_REVISION', '插件模型设置已变化,请重试以使用当前设置');+ }return task;};await assertUnchanged();// Opt-in: persistent plugin workflows can re-read the user's current// plugin selection before each new input, using the same resolver as create.// Ordinary tasks and explicit routes retain their existing semantics.- const followDefault = request.route === 'plugin-default';const route = await deps.resolveRoute(pluginId, request.route === 'plugin-default' ? undefined : request.route);const task = await assertUnchanged();- if (followDefault && (['agentKind', 'providerId', 'model', 'effort', 'fastMode'] as const)+ if (followDefault && modelFields.every(key => task.resolvedConfig[key] === route[key])) return { status: 'unchanged', task };if (!deps.setModel) return fail('HOST_NOT_READY', '任务模型服务尚未就绪');const result = await deps.setModel(request.taskId, route, async () => { await assertUnchanged(); });diff --git a/apps/desktop/src/main/maker-ipc/register.ts b/apps/desktop/src/main/maker-ipc/register.tsindex 33f6588fc9..0b6ad7ee8b 100644--- a/apps/desktop/src/main/maker-ipc/register.ts+++ b/apps/desktop/src/main/maker-ipc/register.ts@@ -12291,6 +12291,7 @@ export function registerMakerIpc(maker: Maker, options: RegisterMakerIpcOptions)pluginTaskEpoch = snapshot;pluginTasks = createPluginTaskService({store: createPluginTaskStore(snapshot.client), assertCurrent, assertAuthorized: assertPlugin, resolveRoute,+ readModelPreference: readPluginTaskConfig,readPermissionMode: pluginId => clampPluginTaskPermissionMode(readPluginTaskConfig(pluginId).permissionMode),setModel: async (taskId, route, assertUnchanged) => {const current = await sessionControlService.getSessionRuntime({ targetSessionId: taskId });