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): guard inherited default model selection

Chris405a97b8236f
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 28b00e71a3..48937cad02 100644
--- a/apps/desktop/src/main/maker-ipc/__tests__/pluginTaskService.test.ts
+++ b/apps/desktop/src/main/maker-ipc/__tests__/pluginTaskService.test.ts
@@ -2,6 +2,7 @@ import { describe, expect, it, vi } from 'vitest';
import { readFileSync } from 'node:fs';
import { createHash } from 'node:crypto';
import ts from 'typescript';
+import { createSessionExecutionResolver } from '../sessionExecutionSelection.js';
import {
createPluginTaskService,
isPluginTaskPermissionAllowed,
@@ -1033,6 +1034,77 @@ it('rechecks saved preferences at the runtime mutation boundary', async () => {
expect(apply).not.toHaveBeenCalled();
});
+it.each([
+ ['provider', 'reset'], ['provider', 'partial'],
+ ['mutation', 'reset'], ['mutation', 'partial'],
+ ['provider', 'explicit'],
+] as const)('checks inherited defaults through production adapters during %s (%s)', async (phase, mode) => {
+ const f = fixture(), task = await f.create();
+ const config = mode === 'explicit' ? { ...f.route, model: 'next' }
+ : mode === 'partial' ? { effort: 'high' } : {};
+ const selected = { harness: 'codex' as const, model: 'next', providerId: f.route.providerId,
+ effort: 'high' as const, fastMode: false };
+ let entered!: () => void, finish!: () => void;
+ const started = new Promise<void>(resolve => { entered = resolve; });
+ const gate = new Promise<void>(resolve => { finish = resolve; });
+ let waited = false;
+ const wait = async (point: string) => {
+ if (phase === point && !waited) { waited = true; entered(); await gate; }
+ };
+ const resolver = createSessionExecutionResolver({
+ captureOwner: () => () => {}, readCaller: async () => { throw Error('unexpected caller'); },
+ readDefault: () => ({ agentKind: selected.harness, model: selected.model,
+ providerId: selected.providerId, effort: selected.effort, fastMode: selected.fastMode }),
+ availableAgents: () => ['codex'],
+ availableModels: () => ['model', 'next', 'latest'].map(id => ({ id, efforts: ['high'] })),
+ hasCindyAiApiKey: () => true,
+ readProviderRouting: async () => {
+ await wait('provider');
+ return { availability: { 'claude-code': [], pi: [],
+ codex: [{ id: f.route.providerId, name: 'provider', models: ['model', 'next', 'latest'] }] },
+ resolveDefaultProviderIdForModel: () => f.route.providerId };
+ },
+ });
+ const source = readFileSync(new URL('../register.ts', import.meta.url), 'utf8');
+ const preferenceStart = source.indexOf(' readModelPreference:');
+ const preference = source.slice(preferenceStart, source.indexOf(' readPermissionMode:', preferenceStart));
+ const resolveStart = source.indexOf(' const resolveRoute = async');
+ const resolve = source.slice(resolveStart, source.indexOf(' const readExecution', resolveStart));
+ const deps = { readPluginTaskConfig: () => config, getSelectedNewMakerRoute: () => selected,
+ activeOwnerScopeKey: () => 'owner', assertPlugin: () => {}, getPluginTaskSourceSessionId: () => undefined,
+ resolveSessionExecution: resolver, PluginTaskError, routeUnavailable: () => { throw Error('unavailable'); } };
+ const js = ts.transpileModule(`${resolve}\nreturn {${preference} resolveRoute};`, {
+ compilerOptions: { target: ts.ScriptTarget.ES2022 },
+ }).outputText;
+ const adapter = new Function(...Object.keys(deps), js)(...Object.values(deps));
+ f.deps.readModelPreference = adapter.readModelPreference;
+ f.deps.resolveRoute = adapter.resolveRoute;
+ const write = vi.fn();
+ f.deps.setModel = async (id, route, assertCurrent) => {
+ await wait('mutation');
+ await assertCurrent();
+ write(route);
+ f.tasks.set(id, { ...f.tasks.get(id)!, revision: task.revision + 1, resolvedConfig: route });
+ return { status: 'applied' };
+ };
+ const request = { taskId: task.taskId, expectedRevision: task.revision, route: 'plugin-default' as const };
+ const result = f.service.setModel('p', request);
+ const assertion = mode === 'explicit'
+ ? expect(result).resolves.toMatchObject({ status: 'applied', task: { resolvedConfig: { model: 'next' } } })
+ : expect(result).rejects.toMatchObject({ code: 'STALE_REVISION' });
+ await started;
+ selected.model = 'latest';
+ finish();
+ await assertion;
+ if (mode !== 'explicit') {
+ expect(write).not.toHaveBeenCalled();
+ expect((await f.service.get('p', task.taskId)).revision).toBe(task.revision);
+ const retry = await f.service.setModel('p', request);
+ expect(retry.task.resolvedConfig.model).toBe('latest');
+ expect(write).toHaveBeenCalledOnce();
+ }
+});
+
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'); };
diff --git a/apps/desktop/src/main/maker-ipc/pluginTaskService.ts b/apps/desktop/src/main/maker-ipc/pluginTaskService.ts
index 3b6a55b529..1df4a3714b 100644
--- a/apps/desktop/src/main/maker-ipc/pluginTaskService.ts
+++ b/apps/desktop/src/main/maker-ipc/pluginTaskService.ts
@@ -98,7 +98,8 @@ export interface PluginTaskServiceDeps {
assertCurrent(): void;
assertAuthorized(pluginId: string): void;
readPermissionMode(pluginId: string): unknown;
- readModelPreference(pluginId: string): Partial<PluginTaskRoute>;
+ /** Include the inherited new-task selection when the resolver can use it. */
+ readModelPreference(pluginId: string): Partial<PluginTaskRoute> & { inheritedDefault?: string };
resolveRoute(pluginId: string, route?: PluginTaskRoute, callId?: string): Promise<PluginTaskRoute>;
createSession(
pluginId: string,
@@ -330,11 +331,12 @@ export function createPluginTaskService(deps: PluginTaskServiceDeps) {
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.
+ // Plugin preferences and inherited defaults do not change the task
+ // revision. Recheck both after admission and at the mutation boundary.
if (preference) {
const current = deps.readModelPreference(pluginId);
- if (modelFields.some(key => preference[key] !== current[key]))
+ if (modelFields.some(key => preference[key] !== current[key])
+ || preference.inheritedDefault !== current.inheritedDefault)
return fail('STALE_REVISION', '插件模型设置已变化,请重试以使用当前设置');
}
return task;
diff --git a/apps/desktop/src/main/maker-ipc/register.ts b/apps/desktop/src/main/maker-ipc/register.ts
index aed0cab785..16243993cd 100644
--- a/apps/desktop/src/main/maker-ipc/register.ts
+++ b/apps/desktop/src/main/maker-ipc/register.ts
@@ -12291,7 +12291,16 @@ export function registerMakerIpc(maker: Maker, options: RegisterMakerIpcOptions)
pluginTaskEpoch = snapshot;
pluginTasks = createPluginTaskService({
store: createPluginTaskStore(snapshot.client), assertCurrent, assertAuthorized: assertPlugin, resolveRoute,
- readModelPreference: readPluginTaskConfig,
+ readModelPreference: pluginId => {
+ const config = readPluginTaskConfig(pluginId);
+ // Match the shared resolver: a complete explicit identity does not
+ // inherit the new-task selection; partial/reset settings can do so.
+ const fallback = config.agentKind && config.model && config.providerId
+ ? undefined : getSelectedNewMakerRoute(activeOwnerScopeKey());
+ return { ...config, inheritedDefault: fallback ? JSON.stringify([
+ fallback.harness, fallback.model, fallback.providerId, fallback.effort, fallback.fastMode,
+ ]) : undefined };
+ },
readPermissionMode: pluginId => clampPluginTaskPermissionMode(readPluginTaskConfig(pluginId).permissionMode),
setModel: async (taskId, route, assertUnchanged) => {
const current = await sessionControlService.getSessionRuntime({ targetSessionId: taskId });