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): refresh saved model selection for persistent tasks

Chrisc7120fa3163b
diff --git a/apps/desktop/src/main/cindy-brain/__tests__/taskSlot.test.ts b/apps/desktop/src/main/cindy-brain/__tests__/taskSlot.test.ts
index 20facc1d4f..bae77f33d7 100644
--- a/apps/desktop/src/main/cindy-brain/__tests__/taskSlot.test.ts
+++ b/apps/desktop/src/main/cindy-brain/__tests__/taskSlot.test.ts
@@ -108,6 +108,10 @@ it('exposes catalog and guarded model changes without accepting permission overr
const request = { type: 'tasks-request', kind: 'setModel', taskId: 'own', expectedRevision: 1,
route: { agentKind: 'codex', model: 'm', providerId: 'p', effort: '', fastMode: false } };
expect(validPluginTaskRequest(request)).toBe(true);
+ expect(validPluginTaskRequest({ ...request, route: 'plugin-default' })).toBe(true);
+ expect(validPluginTaskRequest({ ...request, route: 'plugin-default', expectedRevision: undefined })).toBe(false);
+ expect(validPluginTaskRequest({ ...request, route: 'plugin-default', ghostId: 'other' })).toBe(false);
+ expect(validPluginTaskRequest({ type: 'tasks-request', kind: 'create', requestKey: 'one', title: 'Work', route: 'plugin-default' })).toBe(false);
expect(validPluginTaskRequest({ ...request, expectedRevision: undefined })).toBe(false);
expect(validPluginTaskRequest({ ...request, permissionMode: 'bypassPermissions' })).toBe(false);
});
diff --git a/apps/desktop/src/main/cindy-brain/forge.ts b/apps/desktop/src/main/cindy-brain/forge.ts
index d878d4f075..538fda4f57 100644
--- a/apps/desktop/src/main/cindy-brain/forge.ts
+++ b/apps/desktop/src/main/cindy-brain/forge.ts
@@ -4005,6 +4005,12 @@ const r = await cindy.agent.requestSchedule({
这描述准入检查,不是持续的 OS 目录隔离保证。首版用于可信本地工作区;同权限进程在检查后恶意置换目录对象仍可能改变实际 cwd,不提供此类对抗性沙箱。
\`models()\` 返回统一目录可选项的完整 route、efforts 和 supportsFastMode。用户明确选择后将 route 原样传给 create,或用 \`setModel({taskId, expectedRevision, route})\` 修改已有自有任务。运行中按普通任务的安全边界切换,不修改应用默认。两方法使用前检查 capabilities.operations。
+当 \`capabilities().pluginDefaultModel === true\` 时,持续复用任务的插件可在每次新输入前调用
+\`setModel({taskId, expectedRevision, route:'plugin-default'})\`。Host 当次读取本插件的任务模型设置,
+复用 create 的模型解析规则(未指定时采用当前新任务选择),只同步模型、来源、引擎、强度和 Fast,
+不改权限、目录或其它任务。返回 \`{status,task}\`;配置相同返回 unchanged,不反复切换。
+后续 send 使用返回 task.revision。须先处理已接受/结果不确定的旧请求,再同步下一次输入,
+不得修改旧请求的回执或为模型变化重发。旧 Host 未声明此能力时保留原任务行为,不传入该 route。
暂不支持接管任意现有任务、远程/伙伴任务、其它配置修改、归档、队列暂停或事件订阅。
旧 \`agent.errand\` 接口不变。
diff --git a/apps/desktop/src/main/cindy-brain/taskSlot.ts b/apps/desktop/src/main/cindy-brain/taskSlot.ts
index ac6afe98b9..b66d96c9fa 100644
--- a/apps/desktop/src/main/cindy-brain/taskSlot.ts
+++ b/apps/desktop/src/main/cindy-brain/taskSlot.ts
@@ -57,7 +57,8 @@ export function validPluginTaskRequest(value: unknown): value is PluginTaskReque
if (['get', 'setModel', 'send', 'listRuns', 'readMessages', 'requestWriteAccess', 'startTeam', 'getTeam', 'setTeamPlan', 'releaseWorker'].includes(value.kind) && !requires('taskId'))
return false;
if (['getRun', 'cancel'].includes(value.kind) && !requires('runId')) return false;
- if (kind === 'setModel' && (!object(value.route) || !Number.isSafeInteger(value.expectedRevision) || (value.expectedRevision as number) < 0)) return false;
+ const pluginDefault = kind === 'setModel' && value.route === 'plugin-default';
+ if (kind === 'setModel' && ((!pluginDefault && !object(value.route)) || !Number.isSafeInteger(value.expectedRevision) || (value.expectedRevision as number) < 0)) return false;
if (value.callId !== undefined && !text(value.callId, 128)) return false;
if (value.isolatedWorkspace !== undefined && typeof value.isolatedWorkspace !== 'boolean') return false;
if (value.kind === 'create' && !text(value.title, 100)) return false;
@@ -91,7 +92,7 @@ export function validPluginTaskRequest(value: unknown): value is PluginTaskReque
labels.add(String(item.label));
}
}
- if (value.route !== undefined) {
+ if (value.route !== undefined && !pluginDefault) {
const r = value.route;
if (
!object(r) ||
@@ -145,6 +146,7 @@ export async function handlePluginTaskRequest(
targets: ['own-plugin-local-session'],
maxPageSize: 100,
exactRoute: true,
+ pluginDefaultModel: true,
sourceCallContext: true,
},
};
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 38e0b0a4f7..c7e0b43ff0 100644
--- a/apps/desktop/src/main/maker-ipc/__tests__/pluginTaskService.test.ts
+++ b/apps/desktop/src/main/maker-ipc/__tests__/pluginTaskService.test.ts
@@ -948,6 +948,43 @@ it('does not apply a model after the task changes while route admission is pendi
expect(f.deps.setModel).not.toHaveBeenCalled();
});
+it('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.resolveRoute = vi.fn(async (_plugin, requested) => requested ?? { ...preference });
+ // First install: creation already respects the saved preference.
+ let task = await f.create();
+ expect(task.resolvedConfig.model).toBe('grok');
+ 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 sync = async () => {
+ const result = await f.service.setModel('p', {taskId: task.taskId, expectedRevision: task.revision, route: 'plugin-default'});
+ task = result.task;
+ return result.status;
+ };
+ expect(await sync()).toBe('unchanged');
+ expect(f.deps.setModel).not.toHaveBeenCalled();
+ for (const model of ['astra', 'grok']) {
+ preference = {...preference, model};
+ expect(await sync()).toBe('applied');
+ const run = await f.service.send('p', {taskId:task.taskId, expectedRevision:task.revision, requestKey:model, text:'translate'});
+ expect(run.acceptedConfig.model).toBe(model);
+ }
+ expect(f.tasks.size).toBe(1);
+ expect(f.deps.setModel).toHaveBeenCalledTimes(2);
+ expect(await sync()).toBe('unchanged');
+ preference = {...preference, effort:'low', fastMode:true, providerId:'other-source'};
+ expect(await sync()).toBe('applied');
+ expect(task.resolvedConfig).toEqual(preference);
+ f.deps.resolveRoute = async () => {throw new PluginTaskError('ROUTE_UNAVAILABLE', 'Unavailable selection');};
+ await expect(sync()).rejects.toMatchObject({code:'ROUTE_UNAVAILABLE'});
+ expect(f.deps.setModel).toHaveBeenCalledTimes(3);
+});
+
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/pluginTaskService.ts b/apps/desktop/src/main/maker-ipc/pluginTaskService.ts
index 75d1a30384..7c0b97a0a0 100644
--- a/apps/desktop/src/main/maker-ipc/pluginTaskService.ts
+++ b/apps/desktop/src/main/maker-ipc/pluginTaskService.ts
@@ -321,17 +321,24 @@ export function createPluginTaskService(deps: PluginTaskServiceDeps) {
await save(row,{...data,settledLabels:[...new Set([...(data.settledLabels||[]),label])]});
}),
assertDispatch,
- setModel: (pluginId: string, request: { taskId: string; expectedRevision: number; route: PluginTaskRoute }) => exclusive(async () => {
+ setModel: (pluginId: string, request: { taskId: string; expectedRevision: number; route: PluginTaskRoute | 'plugin-default' }) => exclusive(async () => {
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', '任务配置已变化,请刷新后重试');
+ return task;
};
await assertUnchanged();
- const route = await deps.resolveRoute(pluginId, request.route);
- 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)
+ .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, assertUnchanged);
+ const result = await deps.setModel(request.taskId, route, async () => { await assertUnchanged(); });
return { ...result, task: await ownTask(pluginId, request.taskId) };
}),
get: (pluginId: string, taskId: string) => exclusive(() => ownTask(pluginId, taskId)),
diff --git a/apps/desktop/src/shared/pluginTasks.ts b/apps/desktop/src/shared/pluginTasks.ts
index f3e5e3db7f..ae3d22fa03 100644
--- a/apps/desktop/src/shared/pluginTasks.ts
+++ b/apps/desktop/src/shared/pluginTasks.ts
@@ -58,7 +58,7 @@ export function isPluginTeamPlanWithinBudget(plan: unknown): boolean {
}
export type PluginTaskRequest = (
| { type: 'tasks-request'; kind: 'capabilities' | 'models' }
- | { type: 'tasks-request'; kind: 'setModel'; taskId: string; expectedRevision: number; route: PluginTaskRoute }
+ | { type: 'tasks-request'; kind: 'setModel'; taskId: string; expectedRevision: number; route: PluginTaskRoute | 'plugin-default' }
| {
type: 'tasks-request';
kind: 'create';