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(bots): 将伙伴默认模型与新任务选择分开

Dash26f5079d73ed
diff --git a/apps/desktop/src/main/localDb/ipc/__tests__/botCanonicalSession.test.ts b/apps/desktop/src/main/localDb/ipc/__tests__/botCanonicalSession.test.ts
index bffcb93b12..d2194a78fd 100644
--- a/apps/desktop/src/main/localDb/ipc/__tests__/botCanonicalSession.test.ts
+++ b/apps/desktop/src/main/localDb/ipc/__tests__/botCanonicalSession.test.ts
@@ -521,9 +521,10 @@ beforeEach(async () => {
h.nextSession = 0;
h.providers = [{
id: 'xd', connected: true, source: 'builtin', agents: ['pi'], access: { kind: 'managed' },
+ auth: { method: 'managed' },
routing: { pi: { upstream: 'https://example.invalid', authStrategy: 'gateway-key' } },
- models: { pi: [{ id: 'z-ai/glm-5.3-flash', efforts: ['high'], defaultEffort: 'high',
- newSessionDefault: ['pi'], supportsImageInput: true }] },
+ models: { pi: ['z-ai/glm-5.3-flash', 'auto'].map(id => ({ id, efforts: ['high'], defaultEffort: 'high',
+ newSessionDefault: ['pi'], supportsImageInput: true })) },
}] as ProviderView[];
h.worktrees = [];
h.isSessionAlive.mockReturnValue(false);
@@ -686,6 +687,7 @@ describe('Bot canonical Session lifecycle', () => {
it('creates the first canonical task on Codex when only its subscription is connected', async () => {
h.providers = [{
id: 'openai', source: 'builtin', connected: true, agents: ['codex'],
+ auth: { method: 'oauth' },
access: { kind: 'subscription', product: 'ChatGPT' },
routing: { codex: { upstream: 'https://example.invalid', authStrategy: 'oauth-passthrough' } },
models: { codex: [{ id: 'gpt-5.6-sol', mode: 'chat', status: 'active', efforts: ['medium'], defaultEffort: 'medium' }] },
@@ -719,7 +721,7 @@ describe('Bot canonical Session lifecycle', () => {
expect(capabilities.modelChain?.[0]).toMatchObject({
harness: 'pi',
- model: 'z-ai/glm-5.3-flash',
+ model: 'auto',
providerId: 'xd',
effort: 'high',
});
@@ -9634,12 +9636,15 @@ describe('Teammate model selection shares profile persistence and route reconcil
id: JSON.stringify(['pi', 'xd', model.id]), model };
}
- it('saves only its own explicit model chain, applies it through the send resolver, and resets to the live default', async () => {
+ // DB regression: a per-teammate reset follows the teammate default even if
+ // the new-task composer changes later; previously the two were coupled.
+ it('saves its own model chain, applies it through the send resolver, and resets independently of new tasks', async () => {
const { service, sessionId, id } = await setupModelControl();
await invoke('local-db:bots:create', { id: 'bot-2', name: 'Other teammate', avatar: '🐈' });
const before = await invoke('local-db:bots:get', 'bot-1');
const other = await invoke('local-db:bots:get', 'bot-2');
const appDefault = getSelectedNewMakerRoute(h.ownerScopeKey);
+ const botDefault = await modelSettings.readEffectiveBotModelChain({ modelChainOverride: null });
expect(await service.updateProfile({ callerSessionId: sessionId, expectedVersion: 1,
modelChain: [{ id, effort: 'low', fastMode: false }] })).toMatchObject({ ok: true, effective: 'next-turn' });
const after = await invoke('local-db:bots:get', 'bot-1');
@@ -9661,10 +9666,10 @@ describe('Teammate model selection shares profile persistence and route reconcil
expect(await service.updateProfile({ callerSessionId: sessionId, expectedVersion: 2, modelChain: null })).toMatchObject({ ok: true });
const restored = await invoke('local-db:bots:get', 'bot-1');
expect(restored.capabilities.modelChainOverride).toBeNull();
- expect(await modelSettings.readEffectiveBotModelChain(restored.capabilities)).toEqual([appDefault]);
+ expect(await modelSettings.readEffectiveBotModelChain(restored.capabilities)).toEqual(botDefault);
const nextDefault = { ...appDefault!, effort: 'low' };
setNewMakerDraftCache({ selectedRoute: nextDefault, lastByVendor: {}, effortByModel: {}, fastModeByModel: {} }, h.ownerScopeKey);
- expect(await modelSettings.readEffectiveBotModelChain(restored.capabilities)).toEqual([nextDefault]);
+ expect(await modelSettings.readEffectiveBotModelChain(restored.capabilities)).toEqual(botDefault);
});
it.each(['disabled', 'disconnected', 'effort', 'fast', 'duplicate', 'unknown', 'owner', 'foreign'] as const)(
diff --git a/apps/desktop/src/main/maker-host/__tests__/botModelChainSettingsStore.test.ts b/apps/desktop/src/main/maker-host/__tests__/botModelChainSettingsStore.test.ts
index 4962bd1504..e4dba429d2 100644
--- a/apps/desktop/src/main/maker-host/__tests__/botModelChainSettingsStore.test.ts
+++ b/apps/desktop/src/main/maker-host/__tests__/botModelChainSettingsStore.test.ts
@@ -52,6 +52,32 @@ afterEach(async () => {
});
describe('bot model chain settings store', () => {
+ // unit regression: a new-task draft change used to switch existing teammates,
+ // including unattended routine sends. Exercise the actual default resolver
+ // and reset with a different harness/source/model/tuning in the draft.
+ it('keeps teammate defaults independent of new-task selections, including after reset', async () => {
+ const rootPath = await testRoot();
+ const providers = [{
+ id: 'openai', source: 'builtin', connected: true, agents: ['codex'],
+ auth: { method: 'oauth' },
+ access: { kind: 'subscription', product: 'ChatGPT' },
+ routing: { codex: { upstream: 'https://example.invalid', authStrategy: 'oauth-passthrough' } },
+ models: { codex: [{ id: 'gpt-5.6-sol', mode: 'chat', status: 'active', efforts: ['medium'], defaultEffort: 'medium' }] },
+ }] as ProviderView[];
+ const before = await readEffectiveBotModelChain({ modelChainOverride: null }, { rootPath, providers });
+ expect(before).toHaveLength(1);
+ providers.push({
+ id: 'anthropic', source: 'builtin', connected: true, agents: ['claude-code'],
+ auth: { method: 'oauth' }, access: { kind: 'subscription', product: 'Claude' },
+ routing: { 'claude-code': { upstream: 'https://example.invalid', authStrategy: 'oauth-passthrough' } },
+ models: { 'claude-code': [{ id: 'other-model', mode: 'chat', status: 'active', efforts: ['high'], defaultEffort: 'high' }] },
+ } as ProviderView);
+ setNewMakerDraftCache({ selectedRoute: { harness: 'claude', providerId: 'anthropic', model: 'other-model', effort: 'high', fastMode: true }, lastByVendor: {}, effortByModel: {}, fastModeByModel: {} }, owner.key);
+ expect(await readEffectiveBotModelChain({ modelChainOverride: null }, { rootPath, providers })).toEqual(before);
+ await writeBotModelChainSettings([{ harness: 'pi', model: 'custom-model' }], { rootPath });
+ expect((await resetBotModelChainSettings({ rootPath, providers })).value.modelChain).toEqual(before);
+ });
+
it('keeps unconfigured defaults empty without writing a Gateway placeholder', async () => {
const rootPath = await testRoot();
expect(await readBotModelChainSettingsState({ rootPath, providers: [] })).toMatchObject({
@@ -63,14 +89,13 @@ describe('bot model chain settings store', () => {
const rootPath = await testRoot();
const providers = [{
id: 'openai', source: 'builtin', connected: true, agents: ['codex'],
+ auth: { method: 'oauth' },
access: { kind: 'subscription', product: 'ChatGPT' },
routing: { codex: { upstream: 'https://example.invalid', authStrategy: 'oauth-passthrough' } },
models: { codex: [{ id: 'gpt-5.6-sol', mode: 'chat', status: 'active', efforts: ['medium'], defaultEffort: 'medium' }] },
}] as ProviderView[];
- // Connected catalog alone cannot select a model while the default mirror is absent.
+ // Teammates can resolve defaults before any new-task draft has synchronized.
setNewMakerDraftCache({ lastByVendor: {}, effortByModel: {}, fastModeByModel: {} }, owner.key);
- expect((await readBotModelChainSettingsState({ rootPath, providers })).value.modelChain).toEqual([]);
- setNewMakerDraftCache({ selectedRoute: { harness: 'codex', providerId: 'openai', model: 'gpt-5.6-sol', effort: 'medium', fastMode: false }, lastByVendor: {}, effortByModel: {}, fastModeByModel: {} }, owner.key);
const state = await readBotModelChainSettingsState({ rootPath, providers });
expect(state.isCustomized).toBe(false);
expect(state.value.modelChain[0]).toMatchObject({
@@ -84,10 +109,11 @@ describe('bot model chain settings store', () => {
.toEqual(state.value);
});
- it('uses only enabled Luna with Cindy tuning for new and existing default-following partners', async () => {
+ it('uses only enabled Luna with catalog tuning for new and existing default-following partners', async () => {
const rootPath = await testRoot();
const providers = [{
id: 'openai', source: 'builtin', connected: true, agents: ['codex'],
+ auth: { method: 'oauth' },
access: { kind: 'subscription', product: 'ChatGPT' },
routing: { codex: { upstream: 'https://example.invalid', authStrategy: 'oauth-passthrough' } },
models: { codex: ['gpt-5.6-sol', 'gpt-5.6-luna'].map(id => ({
@@ -95,16 +121,15 @@ describe('bot model chain settings store', () => {
})) },
}] as ProviderView[];
const selectedRoute = { harness: 'codex' as const, providerId: 'openai', model: 'gpt-5.6-luna', effort: 'medium', fastMode: false };
+ const expected = [{ ...selectedRoute, effort: 'low' }];
setModelVisibilityMirror({ 'codex:openai:gpt-5.6-luna': true }, { fallback: false, followCatalogKeys: [] });
setNewMakerDraftCache({ selectedRoute, lastByVendor: {}, effortByModel: {}, fastModeByModel: {} }, owner.key);
- expect((await readBotModelChainSettingsState({ rootPath, providers })).value.modelChain).toEqual([selectedRoute]);
- expect(await readEffectiveBotModelChain({ modelChainOverride: null, model: 'gpt-5.6-sol', effort: 'low' }, { rootPath, providers })).toEqual([selectedRoute]);
+ expect((await readBotModelChainSettingsState({ rootPath, providers })).value.modelChain).toEqual(expected);
+ expect(await readEffectiveBotModelChain({ modelChainOverride: null, model: 'gpt-5.6-sol', effort: 'low' }, { rootPath, providers })).toEqual(expected);
setNewMakerDraftCache({ selectedRoute: { ...selectedRoute, providerId: null }, lastByVendor: {}, effortByModel: {}, fastModeByModel: {} }, owner.key);
- expect(await readEffectiveBotModelChain({ modelChainOverride: null }, { rootPath, providers })).toEqual([selectedRoute]);
+ expect(await readEffectiveBotModelChain({ modelChainOverride: null }, { rootPath, providers })).toEqual(expected);
expect(await fs.readdir(rootPath)).toEqual([]);
- setModelVisibilityMirror({}, { fallback: true });
- expect((await readBotModelChainSettingsState({ rootPath, providers })).value.modelChain).toEqual([selectedRoute]);
- setModelVisibilityMirror({ 'codex:openai:gpt-5.6-luna': false }, { fallback: true });
+ setModelVisibilityMirror({}, { fallback: false, followCatalogKeys: [] });
expect(await readEffectiveBotModelChain({ modelChainOverride: null }, { rootPath, providers })).toEqual([]);
});
@@ -165,6 +190,7 @@ describe('bot model chain settings store', () => {
const otherRoot = await testRoot();
const providers = [{
id: 'openai', source: 'builtin', connected: true, agents: ['codex'],
+ auth: { method: 'oauth' },
access: { kind: 'subscription', product: 'ChatGPT' },
routing: { codex: { upstream: 'https://example.invalid', authStrategy: 'oauth-passthrough' } },
models: { codex: [{ id: 'gpt-5.6-sol', mode: 'chat', status: 'active', efforts: ['medium'], defaultEffort: 'medium' }] },
diff --git a/apps/desktop/src/main/maker-host/bot-model-chain-settings-store.ts b/apps/desktop/src/main/maker-host/bot-model-chain-settings-store.ts
index e6c456cc0c..aa86630d0a 100644
--- a/apps/desktop/src/main/maker-host/bot-model-chain-settings-store.ts
+++ b/apps/desktop/src/main/maker-host/bot-model-chain-settings-store.ts
@@ -22,7 +22,6 @@ import {
} from './override-settings-file.js';
import { getModelVisibilityOverride, waitForModelVisibilityMirror } from './model-visibility-mirror.js';
-import { getSelectedNewMakerRoute } from './newMakerDefaultsCache.js';
const log = desktopMakerLogger.child('bot-model-chain-settings-store');
@@ -98,17 +97,6 @@ export async function readBotModelChainSettingsState(
// Capture the owner before reading live connections; never persist derived defaults.
const owner = activeOwnerScopeKey();
await waitForModelVisibilityMirror();
- const preferredRoute = getSelectedNewMakerRoute(owner);
- if (preferredRoute?.agentDeviceId) {
- const { resolveAvailableTaskModels } = await import('../maker-ipc/appDefaultModelControl.js');
- const [route] = await resolveAvailableTaskModels([preferredRoute]).catch(() => [null]);
- if (activeOwnerScopeKey() !== owner) throw new Error('Bot model defaults owner changed');
- store.invalidateIfChanged();
- const confirmed = store.readState();
- if (confirmed.isCustomized) return confirmed;
- const value = { modelChain: route ? [route] : [] };
- return { ...confirmed, value, defaults: value };
- }
const providers = options?.providers ?? await readConnectedProviders(owner);
if (activeOwnerScopeKey() !== owner) throw new Error('Bot model defaults owner changed');
store.invalidateIfChanged();
@@ -119,7 +107,6 @@ export async function readBotModelChainSettingsState(
);
const value = { modelChain: defaultBotModelChain({ providers, providersLoading: false,
availableAgents, availableAgentsLoaded: true,
- preferredRoute: getSelectedNewMakerRoute(owner),
isModelEnabled: (agent, providerId, model) => isModelVisible(
getModelVisibilityOverride(agent, providerId, model.id), model.defaultEnabled),
}) };
@@ -214,7 +201,7 @@ export async function readEffectiveBotModelSelection(
};
}
const state = await readBotModelChainSettingsState(options);
- // 跟随 Cindy 默认时链路由实时目录推导,已经是当前位置;只有用户自定义的设置是存下来的。
+ // 未自定义的伙伴默认由实时目录推导,已经是当前位置;只有用户自定义的设置是存下来的。
const chain = state.isCustomized
? await followMovedCindyAuto(state.value.modelChain, options?.providers)
: state.value.modelChain;
diff --git a/apps/desktop/src/main/maker-ipc/appDefaultModelControl.ts b/apps/desktop/src/main/maker-ipc/appDefaultModelControl.ts
index 9c94970fdc..b5fb56044a 100644
--- a/apps/desktop/src/main/maker-ipc/appDefaultModelControl.ts
+++ b/apps/desktop/src/main/maker-ipc/appDefaultModelControl.ts
@@ -1,6 +1,6 @@
import { randomUUID } from 'node:crypto';
-import { isModelVisible, type ProviderView } from '@cindy/model-providers';
-import { defaultBotModelChain } from '../../shared/botDefaultModelChain.js';
+import { effectiveSourceIdForModel, isModelVisible, type ProviderView } from '@cindy/model-providers';
+import type { resolveNewMakerDefaultTuple } from '../../shared/newMakerDefaultTuple.js';
import type { BotModelRoute } from '../../shared/botModelChain.js';
import { sameModelRoute, type AppDefaultModelSelection } from '../../shared/appDefaultModelSelection.js';
import { activeOwnerScopeKey, getActiveDataOwnerPushStamp, isAppSessionBoundaryPending } from '../appSessionState.js';
@@ -15,16 +15,33 @@ export function configureAppDefaultModelSelection(dispatch: typeof dispatchSelec
dispatchSelection = dispatch;
}
+/** Validate exactly the requested model; recommendations belong to default
+ * selection, never to admission of an explicit task or teammate route. */
+function resolveAvailableLocalRoute(
+ args: Parameters<typeof resolveNewMakerDefaultTuple>[0] & { preferredRoute?: BotModelRoute | null },
+): BotModelRoute | null {
+ const preferred = args.preferredRoute;
+ // Remote routes are validated against their own authorized catalog below.
+ if (!preferred || preferred.agentDeviceId || args.providersLoading || !args.availableAgentsLoaded) return null;
+ const agent = preferred.harness === 'claude' ? 'claude-code' : preferred.harness;
+ if (!args.availableAgents.has(agent === 'claude-code' ? 'cc' : agent)) return null;
+ const providers = args.providers.filter(p => p.connected && !p.suspended && !p.modelDiscoveryFailure)
+ .map(p => ({ ...p, models: { ...p.models, [agent]: (p.models[agent] ?? []).filter(m =>
+ args.isModelEnabled?.(agent, p.id, m) ?? m.defaultEnabled !== false) } }));
+ const providerId = effectiveSourceIdForModel(providers, preferred.providerId, preferred.model, agent);
+ return providerId ? { ...preferred, providerId } : null;
+}
+
export function availableAppDefaultModels(input: {
providers: readonly ProviderView[];
currentRoute?: BotModelRoute | null;
tuning?: (agent: 'claude-code' | 'codex' | 'pi', providerId: string, model: string) => { effort?: string; fastMode?: boolean | 'ultrafast' };
availableAgents: ReadonlySet<'cc' | 'codex' | 'pi'>;
- enabled: NonNullable<Parameters<typeof defaultBotModelChain>[0]['isModelEnabled']>;
+ enabled: NonNullable<Parameters<typeof resolveAvailableLocalRoute>[0]['isModelEnabled']>;
}) {
- const current = defaultBotModelChain({ providers: input.providers, providersLoading: false,
+ const current = resolveAvailableLocalRoute({ providers: input.providers, providersLoading: false,
availableAgents: input.availableAgents, availableAgentsLoaded: true,
- preferredRoute: input.currentRoute ?? undefined, isModelEnabled: input.enabled })[0];
+ preferredRoute: input.currentRoute ?? undefined, isModelEnabled: input.enabled });
return input.providers.flatMap(provider => (['claude-code', 'codex', 'pi'] as const).flatMap(agent =>
(provider.models[agent] ?? []).flatMap(model => {
const remembered = input.tuning?.(agent, provider.id, model.id);
@@ -41,10 +58,10 @@ export function availableAppDefaultModels(input: {
if (remembered?.effort !== undefined) route.effort = model.efforts.some(effort => effort === remembered.effort)
? remembered.effort : (model.defaultEffort && model.efforts.includes(model.defaultEffort) ? model.defaultEffort : '');
if (remembered?.fastMode !== undefined) route.fastMode = model.supportsFastMode === true && remembered.fastMode;
- const valid = defaultBotModelChain({ providers: input.providers, providersLoading: false,
+ const valid = resolveAvailableLocalRoute({ providers: input.providers, providersLoading: false,
availableAgents: input.availableAgents, availableAgentsLoaded: true,
preferredRoute: route, isModelEnabled: input.enabled });
- return valid.length ? [{ id: JSON.stringify([route.harness, route.providerId, route.model]),
+ return valid ? [{ id: JSON.stringify([route.harness, route.providerId, route.model]),
route, efforts: model.efforts, supportsFastMode: model.supportsFastMode === true,
supportsUltrafastMode: agent === 'codex' && model.supportsUltrafastMode === true }] : [];
}),
@@ -123,9 +140,9 @@ export async function resolveAvailableTaskModels(routes: readonly BotModelRoute[
}
if (!local) return null;
const { available, inputs } = local;
- const resolved = defaultBotModelChain({ providers: inputs.providers, providersLoading: false,
+ const resolved = resolveAvailableLocalRoute({ providers: inputs.providers, providersLoading: false,
availableAgents: inputs.availableAgents, availableAgentsLoaded: true,
- preferredRoute: route, isModelEnabled: inputs.enabled })[0];
+ preferredRoute: route, isModelEnabled: inputs.enabled });
if (!resolved) return null;
const entry = available.find(item => item.route.harness === resolved.harness
&& item.route.model === resolved.model && item.route.providerId === resolved.providerId);
diff --git a/apps/desktop/src/renderer/features/bots/__tests__/botModelChainDefaults.test.tsx b/apps/desktop/src/renderer/features/bots/__tests__/botModelChainDefaults.test.tsx
index 10cb8d23e8..b9f0028d3c 100644
--- a/apps/desktop/src/renderer/features/bots/__tests__/botModelChainDefaults.test.tsx
+++ b/apps/desktop/src/renderer/features/bots/__tests__/botModelChainDefaults.test.tsx
@@ -4,6 +4,8 @@ import { act, cleanup, fireEvent, render, screen, waitFor } from '@testing-libra
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
import type { ProviderView } from '@cindy/model-providers';
import type { BotModelRoute } from '../../../../shared/botModelChain';
+import { getDataOwnerGeneration, setDataOwnerGeneration } from '@/contexts/dataOwnerGeneration';
+import { __resetAvailableAgentsCacheForTest } from '@/hooks/useAvailableAgents';
vi.mock('react-i18next', () => ({ useTranslation: () => ({ t: (key: string) => key }) }));
vi.mock('@/lib/localCatalogSnapshot', () => ({ refreshLocalCatalogSnapshot: vi.fn() }));
@@ -42,7 +44,7 @@ vi.mock('../BotModelChainEditor', () => ({
}));
const gateway: BotModelRoute = {
- harness: 'pi', providerId: 'xd', model: 'z-ai/glm-5.3-flash', effort: 'medium', fastMode: false,
+ harness: 'pi', providerId: 'xd', model: 'auto', effort: 'medium', fastMode: false,
};
const openai: BotModelRoute = {
harness: 'codex', providerId: 'openai', model: 'gpt-5.6-sol', effort: 'medium', fastMode: false,
@@ -53,6 +55,7 @@ function providers(gatewayConnected: boolean, openaiConnected: boolean): Provide
id: route.providerId,
name: route.providerId,
source: 'builtin',
+ auth: { method: index === 0 ? 'managed' : 'oauth' },
connected: index === 0 ? gatewayConnected : openaiConnected,
agents: [route.harness],
routing: { [route.harness]: { upstream: 'https://example.invalid', authStrategy: 'oauth-passthrough' } },
@@ -69,8 +72,8 @@ function shownChain(): BotModelRoute[] {
return JSON.parse(screen.getByTestId('chain').textContent ?? '[]');
}
+const listeners = new Set<() => void>();
async function setup(options: { customized?: boolean; empty?: boolean; pending?: boolean } = {}) {
- const listeners = new Set<() => void>();
const initial = options.empty ? [] : [gateway];
let resolveSettings!: (state: { modelChain: BotModelRoute[]; isCustomized: boolean }) => void;
const getModelChainSettings = vi.fn(() => options.pending
@@ -97,11 +100,12 @@ async function setup(options: { customized?: boolean; empty?: boolean; pending?:
const snapshots = await import('@/lib/providersSnapshotStore');
const publish = (next: ProviderView[]) => act(() => {
snapshots.commitProvidersSnapshot(snapshots.beginProvidersRefresh(), {
- dataOwnerId: null, ownerGeneration: 0, providers: next, providerOrder: next.map((item) => item.id),
+ dataOwnerId: null, ownerGeneration: getDataOwnerGeneration().generation, providers: next, providerOrder: next.map((item) => item.id),
});
});
publish(providers(!options.empty, false));
const store = await import('../botStore');
+ void store.ensureBotProfilesLoaded();
await waitFor(() => expect(getModelChainSettings).toHaveBeenCalledOnce());
if (!options.pending) await waitFor(() => expect(list).toHaveBeenCalledOnce());
const { BotsGlobalSettingsSection } = await import('../BotsGlobalSettingsSection');
@@ -119,16 +123,27 @@ async function setup(options: { customized?: boolean; empty?: boolean; pending?:
};
}
-beforeEach(() => { vi.resetModules(); window.localStorage.clear(); });
+beforeEach(() => {
+ window.localStorage.clear();
+ setDataOwnerGeneration(null);
+ __resetAvailableAgentsCacheForTest();
+});
afterEach(() => cleanup());
describe('live derived Bot defaults', () => {
beforeEach(() => { visibility.enabled = true; visibility.version = 0; Object.assign(selection, gateway); });
- it('does not replace Cindy selection when another connection becomes available', async () => {
+ // unit regression: changing only the new-task selection must leave both
+ // the settings editor and newly created teammate model/tuning unchanged.
+ it('ignores new-task selections in the global editor and new teammate creation', async () => {
const api = await setup();
- api.publish(providers(false, true));
- expect(shownChain()).toEqual([]);
- expect(api.store.getEffectiveBotModelChain()).toEqual([]);
+ Object.assign(selection, { ...openai, effort: 'high', fastMode: true });
+ api.publish(providers(true, false));
+ expect(shownChain()).toEqual([gateway]);
+ let bot!: Awaited<ReturnType<typeof api.store.addBotProfileAndWait>>;
+ await act(async () => { bot = await api.store.addBotProfileAndWait({ name: 'Independent', description: '' }); });
+ expect(bot.capabilities.modelChain).toEqual([gateway]);
+ expect(bot.capabilities).toMatchObject({ effort: 'medium', fastMode: false, providerId: 'xd' });
+ expect(api.setModelChainSettings).not.toHaveBeenCalled();
});
it('expires a hydrated default after model toggles change without a catalog change', async () => {
@@ -142,7 +157,6 @@ describe('live derived Bot defaults', () => {
it('updates the mounted global editor after a connection change and saves effort on the new route', async () => {
const api = await setup();
expect(shownChain()).toEqual([gateway]);
- Object.assign(selection, openai); // Cindy selected this route; connection changes alone must not select it.
api.publish(providers(false, true));
expect(shownChain()).toEqual([openai]);
expect(api.store.getEffectiveBotModelChain()).toEqual([openai]); // Restore-default consumer.
@@ -158,7 +172,6 @@ describe('live derived Bot defaults', () => {
it('recovers a hydrated empty chain after connecting and returns to empty after disconnecting', async () => {
const api = await setup({ empty: true });
expect(shownChain()).toEqual([]);
- Object.assign(selection, openai); // Cindy selected this route; connection changes alone must not select it.
api.publish(providers(false, true));
expect(shownChain()).toEqual([openai]);
api.publish(providers(false, false));
@@ -168,18 +181,18 @@ describe('live derived Bot defaults', () => {
it('recomputes defaults when engines are removed or installed without a provider update', async () => {
const api = await setup();
api.publish(providers(true, true));
- expect(shownChain()).toEqual([gateway]);
+ expect(shownChain()).toEqual([openai]);
await api.changeAgents(['codex']);
- expect(shownChain()).toEqual([]);
+ expect(shownChain()).toEqual([openai]);
await api.changeAgents([]);
expect(shownChain()).toEqual([]);
await api.changeAgents(['pi', 'codex']);
- expect(shownChain()).toEqual([gateway]);
+ expect(shownChain()).toEqual([openai]);
});
it('preserves a hydrated explicit global override across provider and engine changes', async () => {
const api = await setup({ customized: true });
- Object.assign(selection, openai); // Cindy selected this route; connection changes alone must not select it.
+ Object.assign(selection, openai);
api.publish(providers(false, true));
await api.changeAgents(['codex']);
expect(shownChain()).toEqual([gateway]);
@@ -189,7 +202,6 @@ describe('live derived Bot defaults', () => {
it('does not revive an obsolete default when its hydration response arrives after a source change', async () => {
const api = await setup({ pending: true });
- Object.assign(selection, openai); // Cindy selected this route; connection changes alone must not select it.
api.publish(providers(false, true));
await act(async () => api.resolveSettings({ modelChain: [gateway], isCustomized: false }));
expect(shownChain()).toEqual([openai]);
@@ -203,7 +215,6 @@ describe('live derived Bot defaults', () => {
let reset!: Promise<void>;
await act(async () => { reset = api.store.resetBotGlobalModelChain(); });
expect(api.resetModelChainSettings).toHaveBeenCalledOnce();
- Object.assign(selection, openai); // Cindy selected this route; connection changes alone must not select it.
api.publish(providers(false, true));
await act(async () => {
finishReset({ modelChain: [gateway], isCustomized: false });
@@ -220,7 +231,6 @@ describe('live derived Bot defaults', () => {
const api = await setup();
await act(async () => { await api.store.addBotProfileAndWait({ name: 'Helper', description: '' }); });
expect(api.getModelChainSettings).toHaveBeenCalledTimes(2);
- Object.assign(selection, openai); // Cindy selected this route; connection changes alone must not select it.
api.publish(providers(false, true));
expect(api.store.getEffectiveBotModelChain()).toEqual([openai]);
expect(shownChain()).toEqual([openai]);
diff --git a/apps/desktop/src/renderer/features/bots/__tests__/botStore.test.ts b/apps/desktop/src/renderer/features/bots/__tests__/botStore.test.ts
index 33c7d693e6..c343998cf0 100644
--- a/apps/desktop/src/renderer/features/bots/__tests__/botStore.test.ts
+++ b/apps/desktop/src/renderer/features/bots/__tests__/botStore.test.ts
@@ -112,7 +112,7 @@ describe('bot profile store', () => {
vendorKey: 'pi',
});
setProviders([
- piProvider('xd', true, [piModel('z-ai/glm-5.3-flash')]),
+ piProvider('xd', true, [piModel('auto')]),
]);
});
@@ -143,25 +143,25 @@ describe('bot profile store', () => {
expect(bot.capabilities).toMatchObject({
harness: 'pi',
- model: 'z-ai/glm-5.3-flash',
+ model: 'auto',
providerId: 'xd',
effort: 'high',
});
});
- it('uses Cindy selected default when it is selectable', () => {
+ it('uses the teammate recommendation independently of the new-task draft', () => {
const bot = addBotProfile({ name: 'Pi Bot', description: '' });
createdIds.push(bot.id);
expect(bot.capabilities).toMatchObject({
harness: 'pi',
- model: 'z-ai/glm-5.3-flash',
+ model: 'auto',
providerId: 'xd',
effort: 'high',
});
});
- it('does not replace an unavailable Cindy default with another connected model', async () => {
+ it('does not recommend a subscription on an unsupported default harness', async () => {
setProviders([
piProvider(
'openai',
diff --git a/apps/desktop/src/renderer/features/bots/botStore.ts b/apps/desktop/src/renderer/features/bots/botStore.ts
index 881624f741..f300d1bc44 100644
--- a/apps/desktop/src/renderer/features/bots/botStore.ts
+++ b/apps/desktop/src/renderer/features/bots/botStore.ts
@@ -6,7 +6,6 @@ import { botInvitationProgress, type BotInvitationProgress } from '../../../shar
import { useSyncExternalStore } from 'react';
import { getDataOwnerGeneration, isDataOwnerGenerationCurrent } from '@/contexts/dataOwnerGeneration';
import { getModel } from '@cindy/model-providers';
-import { getDraft, getDraftForPreferenceSync, getPersistedVendorModel } from '@/state/newMakerDraft';
import { getDefaultModelForVendor } from '@/lib/modelDefinitions';
import { pickConnectedModelForAgent } from '@/lib/draftModelCalibration';
import { refreshLocalCatalogSnapshot } from '@/lib/localCatalogSnapshot';
@@ -242,8 +241,7 @@ function defaultBotModelSettings(vendor: ReturnType<typeof vendorForHarness>): B
}
export function defaultBotModel(vendor: ReturnType<typeof vendorForHarness>): string {
- // `||` 不是 `??`:「没选过」在 getPersistedVendorModel 里是空串,不是 null。
- return getPersistedVendorModel(vendor) || defaultBotModelSettings(vendor).model;
+ return defaultBotModelSettings(vendor).model;
}
const BOT_GLOBAL_MODEL_KEY = 'cindy.bots.global-model-overrides.v1';
@@ -251,10 +249,8 @@ const BOT_GLOBAL_MODEL_CHAIN_KEY = 'cindy.bots.global-model-chain.v2';
type BotModelVendor = ReturnType<typeof vendorForHarness>;
const botModelListeners = new Set<() => void>();
function getDefaultModelInputs() {
- const draft = getDraftForPreferenceSync();
return {
visibilityVersion: getModelVisibilityVersion(),
- preference: JSON.stringify([draft.vendor, draft.lastByVendor[draft.vendor], draft.fastModeByModel, draft.agentDeviceId]),
providers: getCachedProvidersSnapshot(),
availableAgents: getCachedAvailableVendors(),
};
@@ -349,7 +345,7 @@ export function getBotGlobalModelChain(): BotModelRoute[] | null {
if (inputs) {
const current = getDefaultModelInputs();
if (inputs.providers !== current.providers || inputs.availableAgents !== current.availableAgents
- || inputs.visibilityVersion !== current.visibilityVersion || inputs.preference !== current.preference)
+ || inputs.visibilityVersion !== current.visibilityVersion)
return null;
}
return globalModelChainCache.modelChain;
@@ -374,16 +370,8 @@ export function getEffectiveBotModelChain(
if (stored) return stored;
const providers = getCachedProvidersSnapshot();
const availableAgents = getCachedAvailableVendors();
- const draft = getDraftForPreferenceSync();
- const selected = draft.lastByVendor[draft.vendor];
return defaultBotModelChain({ providers: providers?.providers ?? [],
isModelEnabled,
- preferredRoute: {
- ...(draft.agentDeviceId ? { agentDeviceId: draft.agentDeviceId } : {}),
- harness: draft.vendor === 'cc' || draft.vendor === 'orca' ? 'claude' : draft.vendor,
- providerId: selected.providerId ?? null, model: selected.model,
- effort: selected.effort ?? '', fastMode: (draft.fastModeByModel[selected.model] ?? false),
- },
providersLoading: !providers, availableAgents: availableAgents ?? new Set(),
availableAgentsLoaded: availableAgents !== null });
}
@@ -459,18 +447,14 @@ export function resetBotGlobalModelChain(): Promise<void> {
function defaultCapabilities(
harness: BotCapabilities['harness'] = NEW_BOT_DEFAULT_HARNESS,
): BotCapabilities {
- const vendor = vendorForHarness(harness);
- const prefs = getDraft().lastByVendor[vendor];
const globalChain = getEffectiveBotModelChain(harness);
const primary = globalChain[0] ?? { harness, model: '', providerId: null, effort: '', fastMode: false };
const model = primary.model;
return {
model,
modelOverride: null,
- // 模型没沿用 lastByVendor 时,来源也不能沿用 —— providerId 与 model 必须同源,
- // 否则会拿一个来源去解析另一个来源的模型 id。
- providerId: primary.providerId ?? (model === prefs.model ? (prefs.providerId ?? null) : null),
- effort: model ? primary.effort || prefs.effort : '',
+ providerId: primary.providerId,
+ effort: primary.effort,
fastMode: model ? primary.fastMode : false,
harness: primary.harness,
modelChain: globalChain,
diff --git a/apps/desktop/src/renderer/i18n/locales/en/common.json b/apps/desktop/src/renderer/i18n/locales/en/common.json
index 64898334dd..92455b3df9 100644
--- a/apps/desktop/src/renderer/i18n/locales/en/common.json
+++ b/apps/desktop/src/renderer/i18n/locales/en/common.json
@@ -9248,10 +9248,10 @@
"composerPlaceholderLatin": "Say something to {{name}}…"
},
"globalSettings": {
- "restoreHint": "Restoring defaults follows the client’s default model settings. Individual teammates’ custom models stay unchanged.",
+ "restoreHint": "Restore the recommended teammate model. Individual teammates’ custom models stay unchanged.",
"restoreFailed": "Could not restore defaults. Try again.",
"defaultModel": "Default model",
- "defaultModelHint": "Teammates use this model by default. Each teammate can pick a different one in their own settings.",
+ "defaultModelHint": "For teammates, independently of new-task model choices. Each teammate can choose another model.",
"title": "Teammates",
"description": "Settings shared by all teammates. Anything about one teammate lives on their own page.",
"rosterNote": "The shipped roster grows with each release."
diff --git a/apps/desktop/src/renderer/i18n/locales/ja/common.json b/apps/desktop/src/renderer/i18n/locales/ja/common.json
index c962b2f18c..c169bad090 100644
--- a/apps/desktop/src/renderer/i18n/locales/ja/common.json
+++ b/apps/desktop/src/renderer/i18n/locales/ja/common.json
@@ -9209,10 +9209,10 @@
"composerPlaceholderLatin": "{{name}} に話しかける…"
},
"globalSettings": {
- "restoreHint": "復元後はクライアントの既定のモデル設定に従います。各パートナーのカスタムモデルは変更されません。",
+ "restoreHint": "パートナーの推奨モデルに戻します。各パートナーのカスタムモデルは変更されません。",
"restoreFailed": "既定値を復元できませんでした。もう一度お試しください。",
"defaultModel": "デフォルトのモデル",
- "defaultModelHint": "パートナーが標準で使うモデルです。個々のパートナーは自分の設定で別のモデルを選べます。",
+ "defaultModelHint": "新規タスクとは独立した、パートナー用のモデルです。各パートナーで別のモデルも選べます。",
"title": "パートナー",
"description": "パートナー全体に共通する設定です。個々のパートナーの設定は、その子のページにあります。",
"rosterNote": "あらかじめ用意された顔ぶれは、バージョンごとに増えていきます。"
diff --git a/apps/desktop/src/renderer/i18n/locales/ko/common.json b/apps/desktop/src/renderer/i18n/locales/ko/common.json
index 42693fc0ad..baac9f60ca 100644
--- a/apps/desktop/src/renderer/i18n/locales/ko/common.json
+++ b/apps/desktop/src/renderer/i18n/locales/ko/common.json
@@ -9209,10 +9209,10 @@
"composerPlaceholderLatin": "{{name}} 에게 말 걸기…"
},
"globalSettings": {
- "restoreHint": "기본값으로 복원하면 클라이언트의 기본 모델 설정을 따릅니다. 개별 파트너의 사용자 지정 모델은 유지됩니다.",
+ "restoreHint": "파트너 추천 모델로 복원합니다. 개별 파트너의 사용자 지정 모델은 유지됩니다.",
"restoreFailed": "기본값을 복원하지 못했습니다. 다시 시도해 주세요.",
"defaultModel": "기본 사용 모델",
- "defaultModelHint": "파트너가 기본으로 사용하는 모델입니다. 개별 파트너는 각자의 설정에서 다른 모델을 선택할 수 있어요.",
+ "defaultModelHint": "새 작업의 모델 선택과 별개인 파트너용 모델입니다. 개별 파트너는 다른 모델을 선택할 수 있어요.",
"title": "파트너",
"description": "파트너 전체에 적용되는 설정입니다. 개별 파트너 설정은 각자의 페이지에 있어요.",
"rosterNote": "기본 제공되는 구성원은 버전마다 늘어납니다."
diff --git a/apps/desktop/src/renderer/i18n/locales/zh-CN/common.json b/apps/desktop/src/renderer/i18n/locales/zh-CN/common.json
index 8081c40602..558991c9bf 100644
--- a/apps/desktop/src/renderer/i18n/locales/zh-CN/common.json
+++ b/apps/desktop/src/renderer/i18n/locales/zh-CN/common.json
@@ -9209,10 +9209,10 @@
"composerPlaceholderLatin": "跟 {{name}} 说点什么…"
},
"globalSettings": {
- "restoreHint": "恢复默认后将跟随客户端默认模型设置,单个伙伴的自定义模型保持不变。",
+ "restoreHint": "恢复伙伴推荐模型,单个伙伴的自定义模型保持不变。",
"restoreFailed": "恢复默认失败,请重试。",
"defaultModel": "默认模型",
- "defaultModelHint": "伙伴默认使用的模型,单个伙伴可以在自己的设置里另选。",
+ "defaultModelHint": "仅用于伙伴,与新任务的模型选择独立。单个伙伴可以另选。",
"title": "伙伴",
"description": "和伙伴有关的通用设置。单个伙伴的设置在{{pronoun}}自己的页面里。",
"rosterNote": "预置阵容会随版本更新。"
diff --git a/apps/desktop/src/renderer/i18n/locales/zh-TW/common.json b/apps/desktop/src/renderer/i18n/locales/zh-TW/common.json
index 901f8bab4d..6666a25e3b 100644
--- a/apps/desktop/src/renderer/i18n/locales/zh-TW/common.json
+++ b/apps/desktop/src/renderer/i18n/locales/zh-TW/common.json
@@ -9209,10 +9209,10 @@
"composerPlaceholderLatin": "跟 {{name}} 說點什麼…"
},
"globalSettings": {
- "restoreHint": "恢復預設後將跟隨用戶端預設模型設定,個別夥伴的自訂模型保持不變。",
+ "restoreHint": "恢復夥伴推薦模型,個別夥伴的自訂模型保持不變。",
"restoreFailed": "恢復預設失敗,請重試。",
"defaultModel": "預設模型",
- "defaultModelHint": "夥伴預設使用的模型,單個夥伴可以在自己的設定裡另選。",
+ "defaultModelHint": "僅用於夥伴,與新任務的模型選擇獨立。個別夥伴可以另選。",
"title": "伙伴",
"description": "和伙伴有關的通用設定。單個伙伴的設定在{{pronoun}}自己的頁面裡。",
"rosterNote": "預置陣容會隨版本更新。"
diff --git a/apps/desktop/src/shared/__tests__/botDefaultModelChain.test.ts b/apps/desktop/src/shared/__tests__/botDefaultModelChain.test.ts
index ea651cc7ef..ef67cc05c6 100644
--- a/apps/desktop/src/shared/__tests__/botDefaultModelChain.test.ts
+++ b/apps/desktop/src/shared/__tests__/botDefaultModelChain.test.ts
@@ -1,49 +1,35 @@
import { describe, expect, it } from 'vitest';
-import { effectiveSourceIdForModel, type ProviderView } from '@cindy/model-providers';
+import type { ProviderView } from '@cindy/model-providers';
import { defaultBotModelChain } from '../botDefaultModelChain';
-const selected = { harness: 'codex' as const, providerId: 'my-connection', model: 'user-chosen-model', effort: 'high', fastMode: false };
-const providers = [{ id: 'my-connection', source: 'user', connected: true, agents: ['codex'], routing: { codex: { upstream: 'https://example.invalid', authStrategy: 'oauth-passthrough' } },
- models: { codex: ['gpt-5.6-sol', selected.model].map(id => ({ id, mode: 'chat', status: 'active' })) },
+const providers = [{ id: 'openai', source: 'builtin', connected: true, agents: ['codex'],
+ auth: { method: 'oauth' },
+ access: { kind: 'subscription', product: 'ChatGPT' },
+ routing: { codex: { upstream: 'https://example.invalid', authStrategy: 'oauth-passthrough' } },
+ models: { codex: ['gpt-6.1-sol', 'enabled-model'].map(id => ({ id, mode: 'chat', status: 'active', efforts: ['medium', 'high'], defaultEffort: 'high' })) },
}] as unknown as ProviderView[];
const args = { providers, providersLoading: false, availableAgents: new Set(['codex'] as const), availableAgentsLoaded: true };
-describe('Bot strictly follows the available Cindy default', () => {
- it('uses the exact selected route and tuning without adding catalog recommendations', () => {
- expect(defaultBotModelChain({ ...args, preferredRoute: selected })).toEqual([selected]);
+// unit: defaults must resolve without a new-task draft. The old contract
+// required the draft and copied its model and tuning into teammate defaults.
+describe('independent teammate defaults', () => {
+ it('uses one product recommendation with catalog tuning and no fallback chain', () => {
+ expect(defaultBotModelChain(args)).toEqual([{
+ harness: 'codex', providerId: 'openai', model: 'gpt-6.1-sol', effort: 'high', fastMode: false,
+ }]);
});
- it('resolves a legacy implicit source exactly like ordinary new tasks, without changing the model', () => {
- const preferredRoute = { ...selected, providerId: null };
- const providerId = effectiveSourceIdForModel(providers, null, selected.model, 'codex');
- expect(defaultBotModelChain({ ...args, preferredRoute })).toEqual([{ ...selected, providerId }]);
- expect(defaultBotModelChain({ ...args, preferredRoute, isModelEnabled: () => false })).toEqual([]);
- expect(defaultBotModelChain({ ...args, preferredRoute: { ...preferredRoute, model: 'removed' } })).toEqual([]);
+ it('respects enabled models and does not manufacture a choice when none remain', () => {
+ expect(defaultBotModelChain({ ...args, isModelEnabled: (_a, _p, m) => m.id === 'enabled-model' })[0]?.model).toBe('enabled-model');
+ expect(defaultBotModelChain({ ...args, isModelEnabled: () => false })).toEqual([]);
});
- it('resolves implicit sources only among enabled connections offering the selected model', () => {
- const sameModel = [
- { ...providers[0], id: 'openai' },
- { ...providers[0], id: 'other-connection' },
- ] as ProviderView[];
- expect(defaultBotModelChain({ ...args, providers: sameModel, preferredRoute: { ...selected, providerId: null },
- isModelEnabled: (_agent, providerId) => providerId !== 'openai' }))
- .toEqual([{ ...selected, providerId: 'other-connection' }]);
- expect(defaultBotModelChain({ ...args, providers: sameModel, preferredRoute: { ...selected, providerId: 'openai' },
- isModelEnabled: (_agent, providerId) => providerId !== 'openai' })).toEqual([]);
+ it('waits for catalog and engine readiness', () => {
+ expect(defaultBotModelChain({ ...args, providersLoading: true })).toEqual([]);
+ expect(defaultBotModelChain({ ...args, availableAgentsLoaded: false })).toEqual([]);
});
- it('returns empty before preferences or catalog/runtime readiness arrive', () => {
- expect(defaultBotModelChain(args)).toEqual([]);
- expect(defaultBotModelChain({ ...args, preferredRoute: selected, providersLoading: true })).toEqual([]);
- expect(defaultBotModelChain({ ...args, preferredRoute: selected, availableAgentsLoaded: false })).toEqual([]);
- });
- it('never substitutes another enabled model when the selected model is disabled or removed', () => {
- expect(defaultBotModelChain({ ...args, preferredRoute: selected, isModelEnabled: (_a, _p, m) => m.id !== selected.model })).toEqual([]);
- expect(defaultBotModelChain({ ...args, preferredRoute: { ...selected, model: 'removed-model' } })).toEqual([]);
- });
- it('requires the selected connection and engine to remain available', () => {
+ it('requires an available connection and engine', () => {
for (const patch of [{ connected: false }, { suspended: true }, { modelDiscoveryFailure: 'offline' }]) {
- expect(defaultBotModelChain({ ...args, preferredRoute: selected, providers: [{ ...providers[0]!, ...patch } as ProviderView] })).toEqual([]);
+ expect(defaultBotModelChain({ ...args, providers: [{ ...providers[0]!, ...patch } as ProviderView] })).toEqual([]);
}
- expect(defaultBotModelChain({ ...args, preferredRoute: selected, availableAgents: new Set() })).toEqual([]);
- expect(defaultBotModelChain({ ...args, preferredRoute: { ...selected, providerId: 'other-account' } })).toEqual([]);
+ expect(defaultBotModelChain({ ...args, availableAgents: new Set() })).toEqual([]);
});
});
diff --git a/apps/desktop/src/shared/botDefaultModelChain.ts b/apps/desktop/src/shared/botDefaultModelChain.ts
index b04bf887fa..da17a3203e 100644
--- a/apps/desktop/src/shared/botDefaultModelChain.ts
+++ b/apps/desktop/src/shared/botDefaultModelChain.ts
@@ -1,29 +1,19 @@
-import { effectiveSourceIdForModel } from '@cindy/model-providers';
-import type { resolveNewMakerDefaultTuples } from './newMakerDefaultTuple.js';
+import { resolveNewMakerDefaultTuple } from './newMakerDefaultTuple.js';
import type { BotModelRoute } from './botModelChain.js';
-/** Adapt the client's ordered defaults to Bot routes without another selection policy. */
+/** Use the product recommendation, independently of the new-task composer.
+ * Explicit global/per-teammate choices are resolved by the caller. Never add
+ * automatic fallback candidates to an uncustomized teammate default.
+ */
export function defaultBotModelChain(
- args: Parameters<typeof resolveNewMakerDefaultTuples>[0] & { preferredRoute?: BotModelRoute | null },
+ args: Parameters<typeof resolveNewMakerDefaultTuple>[0],
): BotModelRoute[] {
- const preferred = args.preferredRoute;
- // Remote selections are validated against their own authorized catalog in Main.
- if (preferred?.agentDeviceId) return [];
- if (preferred && !args.providersLoading && args.availableAgentsLoaded) {
- const agent = preferred.harness === 'claude' ? 'claude-code' : preferred.harness;
- const vendor = agent === 'claude-code' ? 'cc' : agent;
- if (!args.availableAgents.has(vendor)) return [];
- // Legacy drafts may leave the source implicit. Resolve only the selected
- // model through the ordinary task resolver, after applying user availability.
- const providers = args.providers.filter(p => p.connected && !p.suspended && !p.modelDiscoveryFailure)
- .map(p => ({ ...p, models: { ...p.models, [agent]: (p.models[agent] ?? []).filter(m =>
- args.isModelEnabled?.(agent, p.id, m) ?? m.defaultEnabled !== false) } }));
- const providerId = effectiveSourceIdForModel(providers, preferred.providerId, preferred.model, agent);
- if (providerId) {
- // A selected app default is not consent to add factory fallback models.
- return [{ ...preferred, providerId }];
- }
- }
- // Missing, stale or unavailable Cindy defaults are not permission to choose a replacement.
- return [];
+ const primary = resolveNewMakerDefaultTuple(args);
+ return primary ? [{
+ harness: primary.vendor === 'cc' ? 'claude' : primary.vendor,
+ providerId: primary.providerId,
+ model: primary.model,
+ effort: primary.effort ?? '',
+ fastMode: false,
+ }] : [];
}
diff --git a/docs/product-rules/cindy-bots-runtime.md b/docs/product-rules/cindy-bots-runtime.md
index 877774ea4d..442ef7e095 100644
--- a/docs/product-rules/cindy-bots-runtime.md
+++ b/docs/product-rules/cindy-bots-runtime.md
@@ -290,11 +290,14 @@ harness + provider + model + effort + fastMode
- fallback 只改变当前任务的有效路由,不暗改 Profile 顺序。下一次确定性重建仍从首选开始。
- 存量单模型配置归一成一项候选链,不能在升级时改变用户已有选择。
-未自定义伙伴候选链时,优先采用 Cindy 当前有效的模型选择、思考档位与 Fast 偏好,
-只返回这一条,不自动追加出厂 fallback。当前选择尚未同步、失效或不可用时返回空链,
-等待 Cindy 默认配置就绪,不由伙伴另选型号。用户显式设置的伙伴候选链优先;
-派生默认值不写成用户 override。旧默认配置的来源 ID 为空时,复用普通新任务的有效来源解析,
-只解析已选型号可用的连接,不换型号;显式来源失效时不改用其它连接。
+伙伴默认模型与新任务选择独立(2026-10-21 用户裁决)。保留「设置 → 通用 → 伙伴 → 默认模型」
+入口;新任务输入框的引擎、来源、模型、思考档位、Fast 与远程电脑选择都不得改变伙伴默认。
+未自定义伙伴默认时,复用产品推荐顺序,从已连接且可用的目录选出第一条推荐路由,
+思考档位取模型推荐值,Fast 默认关闭;只返回一条,不自动追加备用链。
+目录或引擎尚未就绪、没有可用推荐时返回空链,沿用连接与选模引导。
+「恢复默认」只删除全局伙伴 override,重新解析推荐值,不重新跟随新任务草稿。
+已有显式全局设置、单个伙伴的显式模型及历史单模型兼容配置保持不变;
+新用户与此前未自定义的老用户都采用独立推荐规则,不迁移新任务草稿或把派生值写成 override。
可用性同时检查实际连接、引擎和型号。用户显式开关优先;未单独设置的型号遵循当前
目录的默认可见性,不能把供应商目录中的每个型号都直接当作可用。只启用 Luna 时不得加入 Sol。
启用清单尚未同步时等待或报未就绪;旧资料生成入口也在实际派发前核对。
@@ -314,7 +317,7 @@ Mobile 使用电脑端已连接的模型目录;目录为空时保持创建禁
该伙伴保存自己的链。全局链由主进程按当前数据 owner 持久化,并由所有 Session 创建与 fallback
入口直接读取;不得只存在 renderer localStorage。
-发送前按持久 Profile 协调长期主任务的路由,复用普通任务的模型控制与跨引擎交接。显式候选链未变时保留运行期 fallback;跟随 Cindy 默认时每次核对当前唯一可用默认,不沿用自动切出的其它型号。用户改变候选链后按新选择执行。后台任务默认继承发起时的实际路由,不读取可能过时的主任务创建模型。
+发送前按持久 Profile 协调长期主任务的路由,复用普通任务的模型控制与跨引擎交接。显式候选链未变时保留运行期 fallback;未自定义伙伴默认时核对独立的推荐路由,不沿用自动切出的其它型号。普通消息、例行任务和自动唤醒遵守同一规则,都不读取新任务输入框。用户改变候选链后按新选择执行。后台任务默认继承发起时的实际路由,不读取可能过时的主任务创建模型。
伙伴的创建、全局默认、主模型、任务模型和备用模型都使用普通任务的模型目录与来源选择;
共享账号和另一台电脑的可用来源不受本机引擎安装情况限制。业务仅维护有序备用链,
diff --git a/scripts/test-hygiene-baseline.json b/scripts/test-hygiene-baseline.json
index 19ac795b37..3703c702e9 100644
--- a/scripts/test-hygiene-baseline.json
+++ b/scripts/test-hygiene-baseline.json
@@ -837,9 +837,6 @@
"apps/desktop/src/renderer/features/bots/__tests__/botGroupListRemoval.test.ts": {
"resetModules": 1
},
- "apps/desktop/src/renderer/features/bots/__tests__/botModelChainDefaults.test.tsx": {
- "resetModules": 1
- },
"apps/desktop/src/renderer/features/bots/__tests__/botNavigation.test.ts": {
"sourceReads": 5
},