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(desktop): 任务内只换模型不再把新建默认搬到任务的来源 (#6555)

Dash63898f32a72f
diff --git a/apps/desktop/src/main/maker-ipc/register.ts b/apps/desktop/src/main/maker-ipc/register.ts
index 2778180e14..60daa876a7 100644
--- a/apps/desktop/src/main/maker-ipc/register.ts
+++ b/apps/desktop/src/main/maker-ipc/register.ts
@@ -6699,6 +6699,7 @@ export function registerMakerIpc(maker: Maker, options: RegisterMakerIpcOptions)
thinking?: unknown;
active?: unknown;
markModelChoice?: unknown;
+ taskProviderId?: unknown;
};
if (p.agent !== 'claude-code' && p.agent !== 'codex' && p.agent !== 'pi') {
throwIpcError('INVALID_PARAMS', 'agent must be claude-code|codex|pi');
@@ -6724,12 +6725,20 @@ export function registerMakerIpc(maker: Maker, options: RegisterMakerIpcOptions)
if (p.markModelChoice !== undefined && typeof p.markModelChoice !== 'boolean') {
throwIpcError('INVALID_PARAMS', 'markModelChoice must be boolean');
}
+ if (
+ p.taskProviderId !== undefined &&
+ (typeof p.taskProviderId !== 'string' || p.taskProviderId.length > 256)
+ ) {
+ throwIpcError('INVALID_PARAMS', 'taskProviderId must be a string of at most 256 chars');
+ }
broadcastToAllWindows(MAKER_PUSH.DRAFT_PREF_APPLY, {
agent: p.agent,
providerId: p.providerId ?? '',
modelId: p.modelId,
active: p.active === true,
...(p.markModelChoice === false ? { markModelChoice: false } : {}),
+ // 已有任务里只换模型:来源沿用任务的,被控端据此判断是否改写自己的新建默认。
+ ...(p.taskProviderId ? { taskProviderId: p.taskProviderId } : {}),
...(p.effort !== undefined ? { effort: p.effort } : {}),
...(p.fast !== undefined ? { fast: p.fast } : {}),
...(p.thinking !== undefined ? { thinking: p.thinking } : {}),
diff --git a/apps/desktop/src/renderer/App.tsx b/apps/desktop/src/renderer/App.tsx
index 4f7ae75743..def4475852 100644
--- a/apps/desktop/src/renderer/App.tsx
+++ b/apps/desktop/src/renderer/App.tsx
@@ -53,6 +53,7 @@ import {
} from '@/lib/localCatalogSnapshot';
import { useResyncAgentIslandSettingsAfterLogin } from '@/hooks/useAgentIslandSettings';
import {
+ getDraft,
getDraftForOwnerPreferenceSync,
applyAppDefaultModelSelection,
subscribeDraft,
@@ -60,8 +61,12 @@ import {
setFastModeForModel,
setWorktreePreference,
patchVendorPrefs,
+ patchVendorPrefsFromTaskModelSwitch,
patchVendorPrefsPreservingModelChoice,
} from '@/state/newMakerDraft';
+import { getCachedProvidersSnapshot } from '@/lib/providersSnapshotStore';
+import { resolveDraftEffectiveProviderId } from '@/lib/draftModelCalibration';
+import { isModelEnabled } from '@/state/modelVisibilityPrefs';
import {
snapshotForSeed,
setProviderModelChoice,
@@ -292,6 +297,7 @@ export function App() {
fast,
thinking,
markModelChoice,
+ taskProviderId,
appDefaultSelection,
}) => {
if (appDefaultSelection) {
@@ -309,7 +315,27 @@ export function App() {
return;
}
const vendor = agentKindToVendor(agent);
- if (active) {
+ if (active && taskProviderId && markModelChoice !== false) {
+ // 控制端在本机任务里只换了模型:按本机自己的新建默认判断是否写回(同本机换模)。
+ patchVendorPrefsFromTaskModelSwitch(
+ vendor,
+ {
+ model: modelId,
+ providerId: providerId || null,
+ ...(effort !== undefined ? { effort: effort as Effort } : {}),
+ },
+ taskProviderId,
+ (prefs) =>
+ resolveDraftEffectiveProviderId({
+ providers: getCachedProvidersSnapshot()?.providers ?? [],
+ agent,
+ model: prefs.model,
+ providerId: prefs.providerId,
+ chosenByUser: getDraft().modelChosenByVendor[vendor] === true,
+ isModelEnabled,
+ }),
+ );
+ } else if (active) {
const patch =
markModelChoice === false ? patchVendorPrefsPreservingModelChoice : patchVendorPrefs;
const shouldPatchActiveModel = markModelChoice !== false || effort !== undefined;
diff --git a/apps/desktop/src/renderer/__tests__/draftModelCalibration.test.ts b/apps/desktop/src/renderer/__tests__/draftModelCalibration.test.ts
index 3ac46560d6..d41cf84d84 100644
--- a/apps/desktop/src/renderer/__tests__/draftModelCalibration.test.ts
+++ b/apps/desktop/src/renderer/__tests__/draftModelCalibration.test.ts
@@ -16,6 +16,7 @@ import {
calibrateDraftModel,
pickConnectedModelForAgent,
pickFirstConnectedModelForAgent,
+ resolveDraftEffectiveProviderId,
resolveDraftSessionProviderId,
resolveNewTaskDefaultRoute,
type DraftModelCalibrationInput,
@@ -1283,3 +1284,61 @@ describe('模型组 Auto:服务端决定默认与来源', () => {
).toBe('custom-litellm');
});
});
+
+describe('resolveDraftEffectiveProviderId', () => {
+ const sonnet = model('claude-sonnet-5-5');
+ const anthropic = provider('anthropic', true, { 'claude-code': [sonnet] }, 'subscription');
+ const xd = provider('xd', true, { 'claude-code': [sonnet] }, 'managed');
+
+ it('草稿没存来源时按校准结果(订阅优先)解析,而不是按模型 id 直接取原生默认的 XD', () => {
+ const args = {
+ providers: [xd, anthropic],
+ agent: 'claude-code' as AgentKind,
+ model: 'claude-sonnet-5-5',
+ providerId: null,
+ chosenByUser: false,
+ };
+ expect(resolveDraftEffectiveProviderId(args)).toBe('anthropic');
+ });
+
+ it('草稿存了仍然可用的来源时原样返回', () => {
+ expect(
+ resolveDraftEffectiveProviderId({
+ providers: [xd, anthropic],
+ agent: 'claude-code',
+ model: 'claude-sonnet-5-5',
+ providerId: 'xd',
+ chosenByUser: true,
+ }),
+ ).toBe('xd');
+ });
+
+ it('用户隐藏了出厂推荐模型时跟随新建页的可见性谓词,落到下一个可用来源', () => {
+ const base = {
+ providers: [
+ provider('anthropic', true, { 'claude-code': [model('claude-opus-5-5')] }, 'subscription'),
+ provider('xai', true, { 'claude-code': [model('grok-4.6')] }, 'subscription'),
+ ],
+ agent: 'claude-code' as AgentKind,
+ model: 'claude-opus-5-5',
+ providerId: null,
+ chosenByUser: false,
+ };
+ const hideOpus = (_agent: AgentKind, _providerId: string, m: { id: string }) =>
+ m.id !== 'claude-opus-5-5';
+ expect(resolveDraftEffectiveProviderId(base)).toBe('anthropic');
+ expect(resolveDraftEffectiveProviderId({ ...base, isModelEnabled: hideOpus })).toBe('xai');
+ });
+
+ it('没有任何来源提供该模型时返回 null', () => {
+ expect(
+ resolveDraftEffectiveProviderId({
+ providers: [],
+ agent: 'claude-code',
+ model: 'claude-sonnet-5-5',
+ providerId: null,
+ chosenByUser: false,
+ }),
+ ).toBeNull();
+ });
+});
diff --git a/apps/desktop/src/renderer/__tests__/newMakerDraft.test.ts b/apps/desktop/src/renderer/__tests__/newMakerDraft.test.ts
index 584736bba5..3c735a5bc8 100644
--- a/apps/desktop/src/renderer/__tests__/newMakerDraft.test.ts
+++ b/apps/desktop/src/renderer/__tests__/newMakerDraft.test.ts
@@ -811,6 +811,219 @@ describe('newMakerDraft store', () => {
expect(m2.getPersistedVendorModel('cc')).toBe('claude-opus-4-8');
});
+ it('patchVendorPrefsFromTaskModelSwitch:新建默认在另一个来源上时,任务内只换模型不改写', async () => {
+ const m1 = await loadModule();
+ m1.patchVendorPrefs('cc', { model: 'claude-opus-5-5', providerId: 'anthropic', effort: 'high' });
+
+ const written = m1.patchVendorPrefsFromTaskModelSwitch(
+ 'cc',
+ { model: 'anthropic/claude-sonnet-5-5', providerId: 'xd', effort: 'medium' },
+ 'xd',
+ );
+
+ expect(written).toBe(false);
+ expect(m1.getDraft().lastByVendor.cc).toMatchObject({
+ model: 'claude-opus-5-5',
+ providerId: 'anthropic',
+ effort: 'high',
+ });
+ });
+
+ it('patchVendorPrefsFromTaskModelSwitch:来源一致时照常写回并打标', async () => {
+ const m1 = await loadModule();
+ m1.patchVendorPrefs('cc', { model: 'claude-opus-5-5', providerId: 'anthropic' });
+
+ const written = m1.patchVendorPrefsFromTaskModelSwitch(
+ 'cc',
+ { model: 'claude-sonnet-5-5', providerId: 'anthropic', effort: 'xhigh' },
+ 'anthropic',
+ );
+
+ expect(written).toBe(true);
+ expect(m1.getDraft().lastByVendor.cc).toMatchObject({
+ model: 'claude-sonnet-5-5',
+ providerId: 'anthropic',
+ effort: 'xhigh',
+ });
+ expect(m1.getDraft().modelChosenByVendor).toEqual({ cc: true });
+ });
+
+ it('patchVendorPrefsFromTaskModelSwitch:存着的来源已被搬走时按实际路由比较', async () => {
+ const m1 = await loadModule();
+ m1.patchVendorPrefs('cc', { model: 'auto/pool', providerId: 'org-pool' });
+ // 服务端把该 Auto 搬到了 xd:实际来源是 xd,不是存着的 org-pool。
+ const moved = () => 'xd';
+
+ expect(
+ m1.patchVendorPrefsFromTaskModelSwitch(
+ 'cc',
+ { model: 'auto/pool', providerId: 'org-pool' },
+ 'org-pool',
+ moved,
+ ),
+ ).toBe(false);
+ expect(m1.getDraft().lastByVendor.cc.providerId).toBe('org-pool');
+ // 解析不出来时回退用存着的来源比较。
+ expect(
+ m1.patchVendorPrefsFromTaskModelSwitch(
+ 'cc',
+ { model: 'auto/pool', providerId: 'org-pool' },
+ 'org-pool',
+ () => null,
+ ),
+ ).toBe(true);
+ });
+
+ it('patchVendorPrefsFromTaskModelSwitch:保留的草稿来源对新模型已失效时改写入任务实际来源', async () => {
+ const m1 = await loadModule();
+ m1.patchVendorPrefs('cc', { model: 'auto/pool', providerId: 'org-pool' });
+ // Auto 已搬到 xd:旧 org-pool 对任何模型都解析不到,实际落点是 xd。
+ const resolve = (prefs: { model: string; providerId?: string | null }) =>
+ prefs.model === 'auto/pool'
+ ? 'xd'
+ : prefs.providerId === 'org-pool'
+ ? null
+ : (prefs.providerId ?? null);
+
+ const written = m1.patchVendorPrefsFromTaskModelSwitch(
+ 'cc',
+ { model: 'plain-model', providerId: null },
+ 'xd',
+ resolve,
+ );
+
+ expect(written).toBe(true);
+ expect(m1.getDraft().lastByVendor.cc).toMatchObject({
+ model: 'plain-model',
+ providerId: 'xd',
+ });
+ });
+
+ it('patchVendorPrefsFromTaskModelSwitch:旧来源搬走后即使仍能提供新模型也不复活', async () => {
+ const m1 = await loadModule();
+ m1.patchVendorPrefs('cc', { model: 'auto/pool', providerId: 'org-pool' });
+ // Auto 已搬到 xd:存着的 org-pool 实际落点是 xd;org-pool 对普通模型仍然能提供。
+ const resolve = (prefs: { model: string; providerId?: string | null }) =>
+ prefs.model === 'auto/pool' ? 'xd' : (prefs.providerId ?? null);
+
+ expect(
+ m1.patchVendorPrefsFromTaskModelSwitch(
+ 'cc',
+ { model: 'plain-model', providerId: null },
+ 'xd',
+ resolve,
+ ),
+ ).toBe(true);
+ expect(m1.getDraft().lastByVendor.cc).toMatchObject({
+ model: 'plain-model',
+ providerId: 'xd',
+ });
+ });
+
+ it('patchVendorPrefsFromTaskModelSwitch:patch 里带着过期来源时仍写入已确认的任务来源', async () => {
+ const m1 = await loadModule();
+ m1.patchVendorPrefs('cc', { model: 'auto/pool', providerId: 'org-pool' });
+ const resolve = (prefs: { model: string; providerId?: string | null }) =>
+ prefs.model === 'auto/pool' ? 'xd' : (prefs.providerId ?? null);
+
+ expect(
+ m1.patchVendorPrefsFromTaskModelSwitch(
+ 'cc',
+ { model: 'plain-model', providerId: 'org-pool' },
+ 'xd',
+ resolve,
+ ),
+ ).toBe(true);
+ expect(m1.getDraft().lastByVendor.cc.providerId).toBe('xd');
+ });
+
+ it('patchVendorPrefsFromTaskModelSwitch:草稿本来跟随默认路由时保持跟随', async () => {
+ const m1 = await loadModule();
+ m1.patchVendorPrefs('cc', { model: 'claude-opus-5-5', providerId: null });
+
+ expect(
+ m1.patchVendorPrefsFromTaskModelSwitch(
+ 'cc',
+ { model: 'claude-sonnet-5-5', providerId: 'anthropic' },
+ 'anthropic',
+ () => 'anthropic',
+ ),
+ ).toBe(true);
+ expect(m1.getDraft().lastByVendor.cc).toMatchObject({
+ model: 'claude-sonnet-5-5',
+ providerId: null,
+ });
+ });
+
+ it('patchVendorPrefsFromTaskModelSwitch:任务跟随默认路由时保留草稿显式选过的同一来源', async () => {
+ const m1 = await loadModule();
+ m1.patchVendorPrefs('cc', { model: 'claude-opus-5-5', providerId: 'anthropic' });
+
+ const written = m1.patchVendorPrefsFromTaskModelSwitch(
+ 'cc',
+ { model: 'claude-sonnet-5-5', providerId: null },
+ 'anthropic',
+ );
+
+ expect(written).toBe(true);
+ expect(m1.getDraft().lastByVendor.cc).toMatchObject({
+ model: 'claude-sonnet-5-5',
+ providerId: 'anthropic',
+ });
+ });
+
+ it('patchVendorPrefsFromTaskModelSwitch:跟随默认路由的新建默认按解析出的来源比较', async () => {
+ const m1 = await loadModule();
+ m1.patchVendorPrefs('cc', { model: 'claude-opus-5-5', providerId: null });
+ const resolve = (prefs: { model: string }) =>
+ prefs.model === 'claude-opus-5-5' ? 'anthropic' : null;
+
+ expect(
+ m1.patchVendorPrefsFromTaskModelSwitch(
+ 'cc',
+ { model: 'anthropic/claude-opus-5-5', providerId: 'xd' },
+ 'xd',
+ resolve,
+ ),
+ ).toBe(false);
+ expect(m1.getDraft().lastByVendor.cc).toMatchObject({ model: 'claude-opus-5-5', providerId: null });
+
+ // 新建默认的来源解析不出来(目录未就绪等)时不能放行,否则会绕过保护把默认搬到任务的来源。
+ expect(
+ m1.patchVendorPrefsFromTaskModelSwitch(
+ 'cc',
+ { model: 'anthropic/claude-opus-5-5', providerId: 'xd' },
+ 'xd',
+ () => null,
+ ),
+ ).toBe(false);
+ expect(m1.patchVendorPrefsFromTaskModelSwitch('cc', { model: 'x', providerId: 'xd' }, 'xd')).toBe(
+ false,
+ );
+ expect(m1.getDraft().lastByVendor.cc).toMatchObject({ model: 'claude-opus-5-5', providerId: null });
+ });
+
+ it('patchVendorPrefsFromTaskModelSwitch:先吸收另一窗口刚保存的默认再比较来源', async () => {
+ const m1 = await loadModule();
+ m1.patchVendorPrefs('cc', { model: 'claude-opus-5-5', providerId: 'xd' });
+ // 另一窗口把新建默认改成 anthropic,本窗口的 storage 事件还没送达。
+ const stored = JSON.parse(memStorage.getItem([...(memStorage as any).store.keys()][0]) as string);
+ stored.lastByVendor.cc = { ...stored.lastByVendor.cc, model: 'claude-opus-5-5', providerId: 'anthropic' };
+ stored.modelChosenByVendor = { cc: true };
+ stored.defaultTupleCustomized = true;
+ stored.defaultTupleSelectionCustomized = true;
+ memStorage.setItem([...(memStorage as any).store.keys()][0], JSON.stringify(stored));
+
+ const written = m1.patchVendorPrefsFromTaskModelSwitch(
+ 'cc',
+ { model: 'anthropic/claude-sonnet-5-5', providerId: 'xd' },
+ 'xd',
+ );
+
+ expect(written).toBe(false);
+ expect(m1.getDraft().lastByVendor.cc.providerId).toBe('anthropic');
+ });
+
it('patchVendorPrefsPreservingModelChoice:只改思考档不打显式选择标记', async () => {
const m1 = await loadModule();
m1.patchVendorPrefsPreservingModelChoice('cc', {
diff --git a/apps/desktop/src/renderer/__tests__/taskModelSwitchDraft.test.ts b/apps/desktop/src/renderer/__tests__/taskModelSwitchDraft.test.ts
new file mode 100644
index 0000000000..b521bdcccd
--- /dev/null
+++ b/apps/desktop/src/renderer/__tests__/taskModelSwitchDraft.test.ts
@@ -0,0 +1,85 @@
+import { describe, expect, it } from 'vitest';
+
+import { resolveTaskModelSwitchDraftWrite } from '../lib/taskModelSwitchDraft';
+
+const base = {
+ requestedMarkModelChoice: true,
+ agentKind: 'claude-code' as const,
+ currentAgentKind: 'claude-code' as const,
+ activeProviderId: null as string | null,
+ memoryProviderId: null as string | null,
+ effectiveSourceId: null as string | null,
+ initialProviderId: null as string | null,
+};
+
+describe('resolveTaskModelSwitchDraftWrite', () => {
+ it('同引擎、写回来源就是任务来源 = 只换模型', () => {
+ expect(
+ resolveTaskModelSwitchDraftWrite({
+ ...base,
+ activeProviderId: 'xd',
+ memoryProviderId: 'xd',
+ effectiveSourceId: 'xd',
+ }),
+ ).toMatchObject({ modelOnly: true, markModelChoice: true, sourceUnknown: false, taskProviderId: 'xd' });
+ });
+
+ it('持久化的显式来源已因 Auto 搬迁过期时,用生效来源识别并写回它', () => {
+ expect(
+ resolveTaskModelSwitchDraftWrite({
+ ...base,
+ activeProviderId: 'org-pool',
+ initialProviderId: 'org-pool',
+ memoryProviderId: 'xd',
+ effectiveSourceId: 'xd',
+ }),
+ ).toMatchObject({ modelOnly: true, taskProviderId: 'xd', draftProviderId: 'xd' });
+ });
+
+ it('这次选了别的来源 = 显式换来源,不是只换模型', () => {
+ expect(
+ resolveTaskModelSwitchDraftWrite({
+ ...base,
+ activeProviderId: 'anthropic',
+ memoryProviderId: 'anthropic',
+ effectiveSourceId: 'xd',
+ }),
+ ).toMatchObject({ modelOnly: false, markModelChoice: true, draftProviderId: 'anthropic' });
+ });
+
+ it('跨引擎不算只换模型', () => {
+ expect(
+ resolveTaskModelSwitchDraftWrite({
+ ...base,
+ agentKind: 'codex',
+ activeProviderId: 'xd',
+ memoryProviderId: 'xd',
+ effectiveSourceId: 'xd',
+ }),
+ ).toMatchObject({ modelOnly: false, markModelChoice: true });
+ });
+
+ it('任务当前模型被停用(effectiveSourceId 为空)时回退用任务显式来源识别', () => {
+ expect(
+ resolveTaskModelSwitchDraftWrite({
+ ...base,
+ activeProviderId: 'xd',
+ initialProviderId: 'xd',
+ }),
+ ).toMatchObject({ modelOnly: true, markModelChoice: true, sourceUnknown: false });
+ });
+
+ it('任务来源确认不了且没带显式来源:不打显式选择标记', () => {
+ expect(resolveTaskModelSwitchDraftWrite(base)).toMatchObject({
+ sourceUnknown: true,
+ markModelChoice: false,
+ modelOnly: false,
+ });
+ });
+
+ it('本来就不要求打标的写回(只改档位)保持原样', () => {
+ expect(
+ resolveTaskModelSwitchDraftWrite({ ...base, requestedMarkModelChoice: false }),
+ ).toMatchObject({ markModelChoice: false, modelOnly: false, sourceUnknown: false });
+ });
+});
diff --git a/apps/desktop/src/renderer/components/new-chat/ChatInput.tsx b/apps/desktop/src/renderer/components/new-chat/ChatInput.tsx
index 4be4dec6ad..efad4870b0 100644
--- a/apps/desktop/src/renderer/components/new-chat/ChatInput.tsx
+++ b/apps/desktop/src/renderer/components/new-chat/ChatInput.tsx
@@ -346,6 +346,9 @@ import { useProviders } from '@/hooks/useProviders';
import { useSshCodexProviders } from '@/hooks/useSshCodexProviders';
import { useDeviceProviders } from '@/hooks/useDeviceProviders';
import { chatEligibleSourcesForModel, effectiveSourceIdForModel } from '@cindy/model-providers';
+import { resolveDraftEffectiveProviderId } from '@/lib/draftModelCalibration';
+import { resolveTaskModelSwitchDraftWrite } from '@/lib/taskModelSwitchDraft';
+import { isModelEnabled } from '@/state/modelVisibilityPrefs';
import {
deriveModelsFromProviders,
filterChatBridgedCodexProviders,
@@ -379,6 +382,7 @@ import {
import {
getDraft,
patchVendorPrefs,
+ patchVendorPrefsFromTaskModelSwitch,
patchVendorPrefsPreservingModelChoice,
setEffortForModel,
setFastModeForModel,
@@ -6471,18 +6475,52 @@ export function ChatInput({
}
const remoteDeviceId =
opts.remoteDeviceId ?? getSessionDeviceId(sessionId) ?? deviceLinkDeviceId;
- const markModelChoice = opts.markModelChoice === true;
+ const { markModelChoice, modelOnly, sourceUnknown, taskProviderId, draftProviderId } =
+ resolveTaskModelSwitchDraftWrite({
+ requestedMarkModelChoice: opts.markModelChoice === true,
+ agentKind,
+ currentAgentKind: currentModelAgentKind,
+ activeProviderId,
+ memoryProviderId,
+ effectiveSourceId,
+ initialProviderId,
+ });
if (!remoteDeviceId) {
const vendor = agentKind === 'codex' ? 'codex' : agentKind === 'pi' ? 'pi' : 'cc';
- const persistPrefs = markModelChoice
- ? patchVendorPrefs
- : patchVendorPrefsPreservingModelChoice;
- persistPrefs(vendor, {
- // 换模才带配对并打标记。本机只改思考档 / Fast 不写回活动模型,
- // 避免未打标用户把区域默认改成当前任务模型。
- ...(markModelChoice ? { model: modelId, providerId: activeProviderId ?? null } : {}),
- ...(patch.effort !== undefined ? { effort: patch.effort } : {}),
- });
+ if (modelOnly) {
+ // 只保护新建默认的模型 / 来源 / 其思考档;按 (引擎, 模型) 跨来源共享的档位与 Fast 预设
+ // 是独立的既有行为,下面照常记录。
+ patchVendorPrefsFromTaskModelSwitch(
+ vendor,
+ {
+ model: modelId,
+ providerId: draftProviderId,
+ ...(patch.effort !== undefined ? { effort: patch.effort } : {}),
+ },
+ taskProviderId,
+ (prefs) =>
+ resolveDraftEffectiveProviderId({
+ providers: localProviders.providers,
+ agent: agentKind,
+ model: prefs.model,
+ providerId: prefs.providerId,
+ chosenByUser: getDraft().modelChosenByVendor[vendor] === true,
+ isModelEnabled,
+ }),
+ );
+ } else if (!sourceUnknown) {
+ // 来源不明时与远程分支一致:整次不写新建默认(连思考档也不写,payload 没有 model 时它会被
+ // 当成草稿已存模型的档位)。
+ const persistPrefs = markModelChoice
+ ? patchVendorPrefs
+ : patchVendorPrefsPreservingModelChoice;
+ persistPrefs(vendor, {
+ // 换模才带配对并打标记。本机只改思考档 / Fast 不写回活动模型,
+ // 避免未打标用户把区域默认改成当前任务模型。
+ ...(markModelChoice ? { model: modelId, providerId: activeProviderId ?? null } : {}),
+ ...(patch.effort !== undefined ? { effort: patch.effort } : {}),
+ });
+ }
if (memoryProviderId) {
if (patch.effort !== undefined) {
setProviderModelChoice(agentKind, memoryProviderId, modelId, patch.effort);
@@ -6495,14 +6533,20 @@ export function ChatInput({
if (patch.fast !== undefined) setFastModeForModel(modelId, patch.fast);
return;
}
+ // 任务来源确认不了:被控端无从判断新建默认是否在同一来源,且迁移前的旧草稿没有选择标记可保护,
+ // 这次活动写穿整个不下发。
+ if (sourceUnknown) return;
window.electronAPI.deviceLink
.invoke(remoteDeviceId, 'maker:apply-new-maker-draft-pref', [
{
agent: agentKind,
+ // 保持原来的隐式值:旧被控端按它直接写草稿,新被控端用 taskProviderId 自己决定写哪个来源。
providerId: activeProviderId ?? '',
modelId,
active: true,
markModelChoice,
+ // 被控端按自己的新建默认判断是否写回;旧被控端忽略该字段,行为不变。
+ ...(modelOnly && taskProviderId ? { taskProviderId } : {}),
...(patch.effort !== undefined ? { effort: patch.effort } : {}),
...(patch.fast !== undefined ? { fast: patch.fast } : {}),
},
@@ -6511,7 +6555,7 @@ export function ChatInput({
log.warn('session draft model preference sync failed:', err);
});
},
- [sessionId, deviceLinkDeviceId, agentDeviceId, taskComputerModelMemory, currentModelAgentKind, selectedProviderId, effectiveSourceId, sshCodexHostId],
+ [sessionId, deviceLinkDeviceId, agentDeviceId, taskComputerModelMemory, currentModelAgentKind, selectedProviderId, effectiveSourceId, initialProviderId, sshCodexHostId, localProviders.providers],
);
const persistFastModeChange = useCallback(
diff --git a/apps/desktop/src/renderer/lib/taskModelSwitchDraft.ts b/apps/desktop/src/renderer/lib/taskModelSwitchDraft.ts
new file mode 100644
index 0000000000..40c9cd35e0
--- /dev/null
+++ b/apps/desktop/src/renderer/lib/taskModelSwitchDraft.ts
@@ -0,0 +1,40 @@
+import type { AgentKind } from '@cindy/model-providers';
+
+/**
+ * 已有任务里换模后,怎么写回新建任务默认的判定(纯函数,ChatInput 的写回入口只执行结果)。
+ *
+ * - `modelOnly`:同引擎,且写回的来源就是任务换模前的来源 = 只换了模型,来源是沿用任务的
+ * 而不是这次选的。交给 patchVendorPrefsFromTaskModelSwitch 判断新建默认是否在同一来源。
+ * - `sourceUnknown`:任务来源确认不了(跟随默认路由且模型 / 来源被停用)、这次写回又没带显式
+ * 来源,无法确认新建默认是否在同一来源,保守地不打显式选择标记(走只同步路径)。
+ *
+ * 任务当前模型被停用时 `effectiveSourceId` 会是 null,任务自己记着的显式来源
+ * (`initialProviderId`)仍然有效,用它识别同来源换模。
+ */
+export function resolveTaskModelSwitchDraftWrite(input: {
+ requestedMarkModelChoice: boolean;
+ agentKind: AgentKind;
+ currentAgentKind: AgentKind | null | undefined;
+ activeProviderId: string | null | undefined;
+ memoryProviderId: string | null | undefined;
+ effectiveSourceId: string | null | undefined;
+ initialProviderId: string | null | undefined;
+}): {
+ markModelChoice: boolean;
+ modelOnly: boolean;
+ sourceUnknown: boolean;
+ taskProviderId: string | null;
+ /** 写回草稿用的来源:只换模型时是已确认的任务来源,否则是这次显式选的来源。 */
+ draftProviderId: string | null;
+} {
+ const sameEngine = input.agentKind === input.currentAgentKind;
+ // 记忆 / 生效来源优先于持久化的显式来源:Auto 被服务端搬走后,后者可能已过期。
+ const taskProviderId = input.memoryProviderId ?? input.activeProviderId ?? null;
+ const taskSourceId = input.effectiveSourceId ?? input.initialProviderId ?? null;
+ const sourceUnknown =
+ input.requestedMarkModelChoice && sameEngine && !taskSourceId && !input.activeProviderId;
+ const markModelChoice = input.requestedMarkModelChoice && !sourceUnknown;
+ const modelOnly = markModelChoice && sameEngine && !!taskSourceId && taskProviderId === taskSourceId;
+ const draftProviderId = modelOnly ? taskProviderId : (input.activeProviderId ?? null);
+ return { markModelChoice, modelOnly, sourceUnknown, taskProviderId, draftProviderId };
+}
diff --git a/apps/desktop/src/renderer/state/newMakerDraft.ts b/apps/desktop/src/renderer/state/newMakerDraft.ts
index ea852f9790..7fbafb5594 100644
--- a/apps/desktop/src/renderer/state/newMakerDraft.ts
+++ b/apps/desktop/src/renderer/state/newMakerDraft.ts
@@ -1174,6 +1174,44 @@ export function patchVendorPrefsPreservingModelChoice(
patchVendorPrefsInternal(vendor, patch, { markModelChoice: false });
}
+/**
+ * 已有任务里只换模型(来源沿用任务自己的)时写回新建默认。
+ *
+ * 任务的来源不是这次选择的一部分:新建默认落在另一个来源上时整次不写,否则以后的新建
+ * 任务会被悄悄搬到这个任务的来源(例:在 Cindy AI 任务里换个模型,新建默认就从 Anthropic
+ * 变成 Cindy AI)。只有确认来源一致才照常写回并打标;来源无法确定时不写。换来源、跨引擎等
+ * 显式选择仍走 patchVendorPrefs。
+ *
+ * `taskProviderId` 是任务实际生效的来源(null = 任务来源未知,照常写回),只用于比较;`resolveDraftProviderId` 给跟随默认
+ * 路由(providerId=null)的新建默认解析生效来源。返回是否写入。
+ */
+export function patchVendorPrefsFromTaskModelSwitch(
+ vendor: MakerVendor,
+ patch: Pick<VendorPrefs, 'model' | 'providerId'> & { effort?: Effort },
+ taskProviderId: string | null,
+ resolveDraftProviderId?: (prefs: VendorPrefs) => string | null,
+): boolean {
+ // 先吸收另一窗口刚保存的默认,再比较来源,避免用过期的内存值放行后覆盖它。
+ rebaseStoredDefaultTuplePreference();
+ const saved = currentDraft.lastByVendor[vendor];
+ if (taskProviderId) {
+ // 存着的来源可能已被服务端搬走(例如企业号池 Auto 搬到 XD),先按实际路由解析,
+ // 解析不出再用存的值。
+ const draftProviderId = resolveDraftProviderId?.(saved) ?? saved.providerId ?? null;
+ // 只有确认新建默认就在任务的来源上才写回;来源不明(目录未就绪、账号切换中、没有来源提供该
+ // 模型)按保守处理,宁可这次不写,也不把默认搬到任务的来源。
+ if (draftProviderId !== taskProviderId) return false;
+ }
+ // 走到这里说明新建默认的实际来源已确认等于任务来源(或任务来源未知的旧行为)。草稿本来跟随默认
+ // 路由(providerId=null)就保持跟随,不因为任务显式用了某来源就把它固化成 override;草稿显式存着
+ // 来源时写入已确认的任务来源(不信任 patch 里可能过期的值)——存着的旧来源可能已被搬走,不能复活。
+ patchVendorPrefs(vendor, {
+ ...patch,
+ providerId: saved.providerId ? (taskProviderId ?? patch.providerId ?? saved.providerId) : null,
+ });
+ return true;
+}
+
/** 单字段写入当前 vendor 的某个 pref(用户在 ChatInput 改 model 等时同步落地)。 */
export function patchCurrentVendorPrefs(patch: Partial<VendorPrefs>): void {
patchVendorPrefs(currentDraft.vendor, patch);
diff --git a/apps/desktop/src/renderer/vite-env.d.ts b/apps/desktop/src/renderer/vite-env.d.ts
index 91df11950c..f3188c9865 100644
--- a/apps/desktop/src/renderer/vite-env.d.ts
+++ b/apps/desktop/src/renderer/vite-env.d.ts
@@ -2549,6 +2549,8 @@ interface ElectronAPI {
modelId: string;
active: boolean;
markModelChoice?: boolean;
+ /** 已有任务里只换模型时,任务沿用的来源(见 patchVendorPrefsFromTaskModelSwitch)。 */
+ taskProviderId?: string;
effort?: string;
fast?: boolean;
thinking?: boolean;
diff --git a/apps/desktop/src/shared/draftModelCalibration.ts b/apps/desktop/src/shared/draftModelCalibration.ts
index c96b0cb8d4..168890d1a2 100644
--- a/apps/desktop/src/shared/draftModelCalibration.ts
+++ b/apps/desktop/src/shared/draftModelCalibration.ts
@@ -413,3 +413,40 @@ export function resolveDraftSessionProviderId({
? null
: effectiveProviderId;
}
+
+/**
+ * 新建任务草稿此刻实际会落在哪个来源:与新建页同口径(显式来源 > 校准挑中的来源 > 原生默认)。
+ * 草稿没存来源(跟随默认路由)时不能直接按模型 id 取原生默认——校准可能把它指向订阅来源。
+ * 用于任务内换模时判断「新建默认是否已在别的来源上」;未选过模型时剔除清单发现失败的来源,
+ * 与新建页自动校准一致。解析不出来返回 null。
+ */
+export function resolveDraftEffectiveProviderId(args: {
+ providers: readonly ProviderView[];
+ agent: AgentKind;
+ model: string;
+ providerId: string | null | undefined;
+ chosenByUser: boolean;
+ /** 与新建页同源的模型可见性谓词:用户隐藏的推荐模型不参与校准。 */
+ isModelEnabled?: ModelEnabledPredicate;
+}): string | null {
+ const { providers, agent, model, chosenByUser } = args;
+ const providerId = args.providerId ?? null;
+ const healthy =
+ chosenByUser || providerId ? providers : providers.filter((p) => !p.modelDiscoveryFailure);
+ const candidates = healthy.length > 0 ? healthy : providers;
+ const calibration = calibrateDraftModel({
+ providers: candidates,
+ agent,
+ model,
+ chosenByUser,
+ preferredProviderId: providerId,
+ providersLoading: false,
+ isModelEnabled: args.isModelEnabled,
+ });
+ return effectiveSourceIdForModel(
+ [...candidates],
+ providerId ?? calibration.providerId,
+ calibration.model,
+ agent,
+ );
+}