Consider it done. The open-source AI agent that works out of the box · 想到,就能做到。开源、开箱即用的 AI Agent。
TypeScript agentai-agentai-assistantandroidclaude-codecodexelectroniosllmmacosreact-nativetypescriptwindows
fix(desktop): 校准模型推理档位后再创建任务 (#5998)
Lizia7aaaee1021d
diff --git a/apps/desktop/src/main/localDb/__tests__/sessionCreateToRow.providerId.test.ts b/apps/desktop/src/main/localDb/__tests__/sessionCreateToRow.providerId.test.tsindex 392d6e5b06..16821b54d2 100644--- a/apps/desktop/src/main/localDb/__tests__/sessionCreateToRow.providerId.test.ts+++ b/apps/desktop/src/main/localDb/__tests__/sessionCreateToRow.providerId.test.ts@@ -34,6 +34,24 @@ describe('sessionCreateToRow providerId', () => {});});+describe('sessionCreateToRow effort', () => {+ const now = 1_700_000_000_000;++ it('keeps the explicit empty effort for a remote session instead of applying high', () => {+ expect(+ sessionCreateToRow(+ 'remote-no-effort',+ { workingDir: '/remote/repo', remoteHostId: 'remote-mac', effort: '' },+ now,+ ).effort,+ ).toBe('');+ });++ it('still uses the historical high default when the effort field is omitted', () => {+ expect(sessionCreateToRow('legacy', { workingDir: '/repo' }, now).effort).toBe('high');+ });+});+describe('sessionCreateToRow source', () => {const now = 1_700_000_000_000;diff --git a/apps/desktop/src/main/localDb/__tests__/sessionOpening.test.ts b/apps/desktop/src/main/localDb/__tests__/sessionOpening.test.tsindex 4cc19ed1e4..96b1ec7055 100644--- a/apps/desktop/src/main/localDb/__tests__/sessionOpening.test.ts+++ b/apps/desktop/src/main/localDb/__tests__/sessionOpening.test.ts@@ -92,6 +92,23 @@ it("leaves model admission to the computer running the agent when the task's ageexpect(h.run).toHaveBeenCalledOnce();});+it('passes an explicitly empty SSH effort through persistence and first startup', async () => {+ const bootstrap = vi.fn(async (row: OpenedSessionRow) => row.effort);+ const opened = await openSession(+ {+ id: 'ssh-no-effort',+ body: { ...body, remoteHostId: 'remote-mac', effort: '' },+ },+ bootstrap,+ );+ expect(opened.row).toMatchObject({ remoteHostId: 'remote-mac', effort: '' });+ expect(bootstrap).toHaveBeenCalledWith(+ expect.objectContaining({ remoteHostId: 'remote-mac', effort: '' }),+ expect.any(Function),+ );+ expect(opened.value).toBe('');+});+it('still admits the model here for a blank agent computer', async () => {await expect(openSession({ body: { ...body, providerId: 'disconnected', agentDeviceId: ' ' } })).rejects.toThrow('供应商');expect(h.values).not.toHaveBeenCalled();diff --git a/apps/desktop/src/main/maker-host/__tests__/catalogDerivedModels.test.ts b/apps/desktop/src/main/maker-host/__tests__/catalogDerivedModels.test.tsindex 7436ef6f96..64268e5996 100644--- a/apps/desktop/src/main/maker-host/__tests__/catalogDerivedModels.test.ts+++ b/apps/desktop/src/main/maker-host/__tests__/catalogDerivedModels.test.ts@@ -204,12 +204,14 @@ describe('deriveAvailableModels — dynamic-first catalog contract', () => {expect(deriveAvailableModels(catalog, 'pi').find((m) => m.id === 'reasoner')).toMatchObject({efforts: ['low', 'high'],defaultEffort: 'high',+ effortsUnknown: false,});expect(resolvePiRuntimeModelDescriptor(catalog, 'explicit-reasoning', 'reasoner'),).toMatchObject({efforts: ['low', 'high'],defaultEffort: 'high',+ effortsUnknown: false,});});@@ -247,6 +249,7 @@ describe('deriveAvailableModels — dynamic-first catalog contract', () => {expect(flat[0]).toMatchObject({efforts: ['low'],defaultEffort: 'low',+ effortsUnknown: false,});expect(resolvePiRuntimeModelDescriptor(catalog, 'colliding-reasoning', 'grok-4.3'),@@ -281,6 +284,7 @@ describe('deriveAvailableModels — dynamic-first catalog contract', () => {expect(deriveAvailableModels(catalog, 'pi').find((m) => m.id === 'grok-4.5')).toMatchObject({efforts: [],defaultEffort: null,+ effortsUnknown: false,});expect(resolvePiRuntimeModelDescriptor(catalog, 'colliding-non-reasoning', 'grok-4.5'),@@ -400,9 +404,31 @@ describe('deriveAvailableModels — dynamic-first catalog contract', () => {expect(codex.find((m) => m.id === 'xai/grok-code-fast')).toMatchObject({efforts: [],defaultEffort: null,+ effortsUnknown: false,});});+ it('explicitly distinguishes declared effort capabilities from unknown placeholders', () => {+ const catalog = injectedCatalog();+ const openai = catalog.providers.find((provider) => provider.id === 'openai')!;+ openai.models.codex = [+ model('known-empty'),+ model('known-efforts', { efforts: ['low', 'high'], defaultEffort: 'high' }),+ model('known-explicit', { effortsUnknown: false }),+ model('unknown-placeholder', { effortsUnknown: true }),+ ];++ const descriptors = deriveAvailableModels(catalog, 'codex');+ for (const declaration of openai.models.codex) {+ expect(descriptors.find((descriptor) => descriptor.id === declaration.id)).toMatchObject({+ efforts: declaration.efforts,+ defaultEffort: declaration.defaultEffort,+ effortsUnknown: declaration.effortsUnknown === true,+ });+ }+ expect(openai.models.codex[0]).not.toHaveProperty('effortsUnknown');+ });+// availableModels 是跨 provider 去重后的扁平表 —— provenance 刻意**不**进这份 descriptor:// 归属已丢,按 id 回查可能命中另一条路由。收敛改走 resolveVerifiedContextWindow。it('toDescriptor 不透传 contextWindowVerified(provenance 只留在 host 侧)', () => {diff --git a/apps/desktop/src/main/maker-host/catalog-to-descriptors.ts b/apps/desktop/src/main/maker-host/catalog-to-descriptors.tsindex 5c0e730a55..d957f82fa3 100644--- a/apps/desktop/src/main/maker-host/catalog-to-descriptors.ts+++ b/apps/desktop/src/main/maker-host/catalog-to-descriptors.ts@@ -59,7 +59,7 @@ function toDescriptor(m: CatalogModel): ModelDescriptor {// 不进这份跨端 descriptor)。if (m.description !== undefined) d.description = m.description;// 「未声明档位」要跟着走到准入:否则 sendToSession/新建任务会把占位的 [] 当成明确无档位(#5535)。- if (m.effortsUnknown === true) d.effortsUnknown = true;+ d.effortsUnknown = m.effortsUnknown === true;if (m.effortDisplayNames !== undefined) d.effortDisplayNames = m.effortDisplayNames;if (m.supportsFastMode !== undefined) d.supportsFastMode = m.supportsFastMode;if (m.group !== undefined) d.group = m.group;@@ -99,8 +99,7 @@ function intersectPiEffortCapabilities(}const merged: ModelDescriptor = { ...first, efforts, defaultEffort };// 只要有一条路由声明过档位,交集就是已声明的结论;两条都未声明才保留「未知」。- if (first.effortsUnknown === true && next.effortsUnknown === true) merged.effortsUnknown = true;- else delete merged.effortsUnknown;+ merged.effortsUnknown = first.effortsUnknown === true && next.effortsUnknown === true;return merged;}diff --git a/apps/desktop/src/main/maker-ipc/__tests__/providerHandlers.test.ts b/apps/desktop/src/main/maker-ipc/__tests__/providerHandlers.test.tsindex 7fdd86b8bc..3e459df325 100644--- a/apps/desktop/src/main/maker-ipc/__tests__/providerHandlers.test.ts+++ b/apps/desktop/src/main/maker-ipc/__tests__/providerHandlers.test.ts@@ -186,6 +186,44 @@ afterEach(() => {});describe('provider:list IPC handler', () => {+ it('projects explicit effort capability markers without mutating the catalog or exposing credentials', async () => {+ const harness = new IpcHarness();+ const models: ProviderView['models'] = {+ codex: [+ { id: 'known-empty', name: 'Known empty', contextWindow: 200_000, efforts: [], defaultEffort: null },+ { id: 'known-efforts', name: 'Known efforts', contextWindow: 200_000, efforts: ['low', 'high'], defaultEffort: 'high' },+ { id: 'unknown', name: 'Unknown', contextWindow: 200_000, efforts: [], defaultEffort: null, effortsUnknown: true },+ ],+ };+ const provider = {+ ...fakeView('custom', true),+ models,+ routing: {+ codex: {+ upstream: 'https://custom.example/v1',+ authStrategy: 'api-key-header',+ headerOverride: { Authorization: 'Bearer secret' },+ headerOverrideState: 'configured',+ },+ },+ } as ProviderView;+ const original = structuredClone(provider);+ registerProviderHandlers(harness, makeDeps({+ listProviders: async () => [provider],+ getRemoteProviderInvocationEnabled: () => false,+ }));++ const result = await harness.invoke(MAKER_INVOKE.PROVIDER_LIST) as { providers: ProviderView[] };+ expect(result.providers[0].models.codex).toEqual(models.codex!.map((model) => ({+ ...model,+ effortsUnknown: model.effortsUnknown === true,+ })));+ expect(result.providers[0].remoteInvocationEnabled).toBe(false);+ expect(result.providers[0].routing.codex?.headerOverride).toBeUndefined();+ expect(result.providers[0].routing.codex?.headerOverrideState).toBe('configured');+ expect(provider).toEqual(original);+ });+it('keeps providers in catalog order and returns display order as owner-scoped metadata', async () => {const harness = new IpcHarness();const views = [fakeView('xd', true), fakeView('anthropic', false)];diff --git a/apps/desktop/src/main/maker-ipc/providerHandlers.ts b/apps/desktop/src/main/maker-ipc/providerHandlers.tsindex 71c5ff6997..98d308c78f 100644--- a/apps/desktop/src/main/maker-ipc/providerHandlers.ts+++ b/apps/desktop/src/main/maker-ipc/providerHandlers.ts@@ -1103,9 +1103,20 @@ export function registerProviderHandlers(ownerGeneration: ownerAtIngress?.generation ?? 0,providers: providers.map((provider) => {const safe = withoutProviderHeaderCredentials(provider);+ const view = {+ ...safe,+ ...(safe.models ? {+ models: Object.fromEntries(+ Object.entries(safe.models).map(([agent, models]) => [+ agent,+ models?.map((model) => ({ ...model, effortsUnknown: model.effortsUnknown === true })),+ ]),+ ),+ } : {}),+ };return remoteAccess- ? { ...safe, remoteInvocationEnabled: remoteAccess(provider.id) }- : safe;+ ? { ...view, remoteInvocationEnabled: remoteAccess(provider.id) }+ : view;}),providerOrder,modelVisibilityOverrides,diff --git a/apps/desktop/src/renderer/__tests__/agentCapabilitiesDeviceCache.test.ts b/apps/desktop/src/renderer/__tests__/agentCapabilitiesDeviceCache.test.tsindex 32ecd7b0f2..38347a6ca6 100644--- a/apps/desktop/src/renderer/__tests__/agentCapabilitiesDeviceCache.test.ts+++ b/apps/desktop/src/renderer/__tests__/agentCapabilitiesDeviceCache.test.ts@@ -17,6 +17,7 @@ interface Caps {contextWindow: number;efforts: string[];defaultEffort: string | null;+ effortsUnknown?: boolean;}>;hasFastMode: boolean;effortLevels: unknown[];@@ -313,6 +314,28 @@ describe('useAgentCapabilities deviceId-aware cache', () => {).toBe(false);});+ it.each([undefined, true, false])('preserves remote effort capability marker %s without inferring legacy emptiness', async (effortsUnknown) => {+ const snapshot: Caps = {+ ...caps('dev-1:codex'),+ availableModels: [{+ id: 'empty-efforts',+ displayName: 'Empty efforts',+ contextWindow: 200_000,+ efforts: [],+ defaultEffort: null,+ ...(effortsUnknown === undefined ? {} : { effortsUnknown }),+ }],+ };+ const invoke = vi.fn(async () => snapshot);+ const getCapabilities = vi.fn(async (agent: string) => caps(`local:${agent}`));+ vi.stubGlobal('window', { electronAPI: { maker: { getCapabilities }, deviceLink: { invoke } } });+ const mod = await import('@/hooks/useAgentCapabilities');++ await mod.prefetchDeviceCapabilities('dev-1');++ expect(mod.getCachedCapabilities('codex', 'dev-1')?.availableModels[0]?.effortsUnknown).toBe(effortsUnknown);+ });+it('远程 Pi capabilities 原样保留 BYOM 显式 effort 子集', async () => {const explicitPiCaps: Caps = {...caps('dev-1:pi'),diff --git a/apps/desktop/src/renderer/__tests__/chatInputGhostSnapshot.test.ts b/apps/desktop/src/renderer/__tests__/chatInputGhostSnapshot.test.tsindex 7615644183..8ccedb1d29 100644--- a/apps/desktop/src/renderer/__tests__/chatInputGhostSnapshot.test.ts+++ b/apps/desktop/src/renderer/__tests__/chatInputGhostSnapshot.test.ts@@ -43,4 +43,10 @@ describe('ChatInput Ghost snapshot contract', () => {/isPlanModeComposerCommandText\(\s*editorText,?/,);});++ it('persists the explicit no-effort sentinel for Cindy Make creation', () => {+ expect(source).toContain("const selectedEffort = composerSelection.display.effort ?? initialEffort ?? '';");+ expect(source).toContain('effort: selectedEffort,');+ expect(source).not.toContain('...(initialEffort === null ? {} : { effort: activeEffort })');+ });});diff --git a/apps/desktop/src/renderer/__tests__/deviceLinkCreateArgs.test.ts b/apps/desktop/src/renderer/__tests__/deviceLinkCreateArgs.test.tsindex b9f265970c..247a7c1e82 100644--- a/apps/desktop/src/renderer/__tests__/deviceLinkCreateArgs.test.ts+++ b/apps/desktop/src/renderer/__tests__/deviceLinkCreateArgs.test.ts@@ -19,7 +19,10 @@ import {resolveDeviceLinkSubmission,} from '@/features/cc-agent/deviceLinkCreateArgs';-function catalogModel(id: string): CatalogModel {+function catalogModel(+ id: string,+ capabilities: Partial<CatalogModel> = {},+): CatalogModel {return {id,name: id,@@ -30,19 +33,26 @@ function catalogModel(id: string): CatalogModel {defaultEffort: null,supportsFastMode: false,status: 'active',+ ...capabilities,} as CatalogModel;}/** 被控端供应商目录的最小形态(与 draftModelCalibration.test.ts 同款构造)。 */-function deviceProvider(id: string, connected: boolean, modelIds: string[]): ProviderView {+function deviceProvider(+ id: string,+ connected: boolean,+ modelIds: string[],+ agent: 'claude-code' | 'pi' = 'claude-code',+ capabilities: Partial<CatalogModel> = {},+): ProviderView {return {id,name: id,source: 'builtin',- agents: ['claude-code'],- models: { 'claude-code': modelIds.map(catalogModel) },+ agents: [agent],+ models: { [agent]: modelIds.map((modelId) => catalogModel(modelId, capabilities)) },routing: {- 'claude-code': { upstream: 'https://provider.test', authStrategy: 'none' },+ [agent]: { upstream: 'https://provider.test', authStrategy: 'none' },},auth: { method: 'oauth' },connected,@@ -100,6 +110,18 @@ describe('buildDeviceLinkCreateArgs', () => {});});+ it('无 effort 模型用空串交给被控端准入层', () => {+ const args = buildDeviceLinkCreateArgs({+ agentKind: 'pi',+ workingDir: '/host/repo',+ model: 'qwen3:14b',+ effort: null,+ permissionMode: 'auto',+ fastMode: false,+ });+ expect(args.effort).toBe('');+ });+// [12] 远程 create 透传 extraDirs:被控端 bootstrapSession 再按 set-extra-dirs 同款校验,// 这里只锁「控制端是否把草稿 extraDirs 带进 create args」这一接线。it('非空 extraDirs 透传进 args', () => {@@ -459,6 +481,134 @@ describe('resolveDeviceLinkSubmission', () => {expect(args.providerId).toBe('anything');});+ it('提交前按选中来源清掉已知无 effort 模型的旧档位', () => {+ const args = resolveDeviceLinkSubmission({+ agentKind: 'pi',+ candidate: { ...candidate, model: 'qwen3:14b', effort: 'medium', providerId: 'ollama' },+ deviceProviders: [deviceProvider('ollama', true, ['qwen3:14b'], 'pi', { effortsUnknown: false })],+ capabilityAgentKind: 'pi',+ });+ expect(args.effort).toBe('');+ });++ it('提交前把选中来源已失效的 effort 校准到该来源默认档位', () => {+ const args = resolveDeviceLinkSubmission({+ agentKind: 'pi',+ candidate: { ...candidate, model: 'qwen3:14b', effort: 'medium', providerId: 'ollama' },+ deviceProviders: [deviceProvider('ollama', true, ['qwen3:14b'], 'pi', {+ efforts: ['low', 'high'], defaultEffort: 'high',+ })],+ capabilityAgentKind: 'pi',+ });+ expect(args.effort).toBe('high');+ });++ it('提交前无默认档位时回落到选中来源当前档位列表首项', () => {+ const args = resolveDeviceLinkSubmission({+ agentKind: 'pi',+ candidate: { ...candidate, model: 'qwen3:14b', effort: 'medium', providerId: 'ollama' },+ deviceProviders: [deviceProvider('ollama', true, ['qwen3:14b'], 'pi', { efforts: ['low', 'high'] })],+ capabilityAgentKind: 'pi',+ });+ expect(args.effort).toBe('low');+ });++ it('提交前失效的默认档位也回落到当前列表首项', () => {+ const args = resolveDeviceLinkSubmission({+ agentKind: 'pi',+ candidate: { ...candidate, model: 'qwen3:14b', effort: 'medium', providerId: 'ollama' },+ deviceProviders: [deviceProvider('ollama', true, ['qwen3:14b'], 'pi', {+ efforts: ['low', 'high'], defaultEffort: 'medium',+ })],+ capabilityAgentKind: 'pi',+ });+ expect(args.effort).toBe('low');+ });++ it('提交前保留选中来源合法档位,不受同名无档位来源或默认值影响', () => {+ const args = resolveDeviceLinkSubmission({+ agentKind: 'pi',+ candidate: { ...candidate, model: 'qwen3:14b', effort: 'medium', providerId: 'reasoning' },+ deviceProviders: [+ deviceProvider('plain', true, ['qwen3:14b'], 'pi'),+ deviceProvider('reasoning', true, ['qwen3:14b'], 'pi', {+ efforts: ['medium', 'high'], defaultEffort: 'high',+ }),+ ],+ capabilityAgentKind: 'pi',+ });+ expect(args.providerId).toBe('reasoning');+ expect(args.effort).toBe('medium');+ });++ it('提交前只按选中来源的当前能力校准,不使用其他同名来源支持的旧档位', () => {+ const args = resolveDeviceLinkSubmission({+ agentKind: 'pi',+ candidate: { ...candidate, model: 'qwen3:14b', effort: 'medium', providerId: 'updated' },+ deviceProviders: [+ deviceProvider('other', true, ['qwen3:14b'], 'pi', { efforts: ['medium', 'high'] }),+ deviceProvider('updated', true, ['qwen3:14b'], 'pi', {+ efforts: ['low', 'high'], defaultEffort: 'high',+ }),+ ],+ capabilityAgentKind: 'pi',+ });+ expect(args.providerId).toBe('updated');+ expect(args.effort).toBe('high');+ });++ it('未指定来源时按解析出的默认来源校准失效档位', () => {+ const args = resolveDeviceLinkSubmission({+ agentKind: 'pi',+ candidate: { ...candidate, model: 'qwen3:14b', effort: 'medium', providerId: null },+ deviceProviders: [deviceProvider('ollama', true, ['qwen3:14b'], 'pi', {+ efforts: ['low', 'high'], defaultEffort: 'high',+ })],+ capabilityAgentKind: 'pi',+ });+ expect(args.providerId).toBe('ollama');+ expect(args.effort).toBe('high');+ });++ it.each<{ efforts: CatalogModel['efforts'] }>([+ { efforts: [] },+ { efforts: ['low', 'high'] },+ ])('档位能力未知时保留候选档位 (%j)', ({ efforts }) => {+ const args = resolveDeviceLinkSubmission({+ agentKind: 'pi',+ candidate: { ...candidate, model: 'qwen3:14b', effort: 'medium', providerId: 'ollama' },+ deviceProviders: [deviceProvider('ollama', true, ['qwen3:14b'], 'pi', {+ efforts, defaultEffort: 'high', effortsUnknown: true,+ })],+ capabilityAgentKind: 'pi',+ });+ expect(args.effort).toBe('medium');+ });++ it.each(['medium', 'high'])('旧主机空档位表缺少能力标记时保留候选档位 (%s)', (effort) => {+ const args = resolveDeviceLinkSubmission({+ agentKind: 'pi',+ candidate: { ...candidate, model: 'qwen3:14b', effort, providerId: 'ollama' },+ deviceProviders: [deviceProvider('ollama', true, ['qwen3:14b'], 'pi')],+ capabilityAgentKind: 'pi',+ });+ expect(args.effort).toBe(effort);+ });++ it.each(['missing-provider', 'missing-model'])('缺少选中来源或模型时不使用其他来源校准 (%s)', (providerId) => {+ const args = resolveDeviceLinkSubmission({+ agentKind: 'pi',+ candidate: { ...candidate, model: 'qwen3:14b', effort: 'medium', providerId },+ deviceProviders: [+ deviceProvider('missing-model', true, ['different-model'], 'pi'),+ deviceProvider('other', true, ['qwen3:14b'], 'pi', { efforts: ['low', 'high'] }),+ ],+ capabilityAgentKind: 'pi',+ });+ expect(args.providerId).toBe(providerId);+ expect(args.effort).toBe('medium');+ });+it('无项目目录 → dialogue,且不把 workingDir 塞进 payload(转调派生未被绕过)', () => {const args = resolveDeviceLinkSubmission({agentKind: 'codex',diff --git a/apps/desktop/src/renderer/__tests__/deviceProvidersCache.test.ts b/apps/desktop/src/renderer/__tests__/deviceProvidersCache.test.tsindex 8125c91c5c..400cda16c6 100644--- a/apps/desktop/src/renderer/__tests__/deviceProvidersCache.test.ts+++ b/apps/desktop/src/renderer/__tests__/deviceProvidersCache.test.ts@@ -224,6 +224,22 @@ describe('useDeviceProviders deviceId-aware cache', () => {expect(mod.getCachedDeviceProviders('dev-luna')?.providers[0]?.models['claude-code']?.[0]?.defaultEffort).toBe('medium');});+ it.each([undefined, true, false])('preserves provider effort capability marker %s without inferring legacy emptiness', async (effortsUnknown) => {+ const mod = await import('@/hooks/useDeviceProviders');+ const base = providerWithModel('remote');+ const model = {+ ...base.models['claude-code'][0],+ efforts: [],+ defaultEffort: null,+ ...(effortsUnknown === undefined ? {} : { effortsUnknown }),+ };+ const result = mod.parseDeviceProvidersPayload({ providers: [{+ ...base, models: { 'claude-code': [model] },+ }] });++ expect(result.providers[0]?.models['claude-code']?.[0]?.effortsUnknown).toBe(effortsUnknown);+ });+it('preserves explicit no-thinking and rejects malformed remote defaults', async () => {const mod = await import('@/hooks/useDeviceProviders');const base = providerWithModel('remote');diff --git a/apps/desktop/src/renderer/__tests__/newMakerProjectPicker.test.ts b/apps/desktop/src/renderer/__tests__/newMakerProjectPicker.test.tsindex 15fec03aae..368a73f369 100644--- a/apps/desktop/src/renderer/__tests__/newMakerProjectPicker.test.ts+++ b/apps/desktop/src/renderer/__tests__/newMakerProjectPicker.test.ts@@ -1630,6 +1630,35 @@ describe('Shared create project picker', () => {expect((body.match(/resolveDeviceLinkDraftDefaults\(/g) ?? []).length).toBeGreaterThanOrEqual(3,);+ expect((body.match(/freshProviders,/g) ?? []).length).toBeGreaterThanOrEqual(3);+ expect(body).not.toContain('agentCatalogProviders');+ });++ it('uses the selected provider catalog for remote effort recalculation', () => {+ const pushStart = newMakerDraftRouteSource.indexOf(+ 'const re = resolveDeviceLinkDraftDefaults(',+ );+ const pushBlock = newMakerDraftRouteSource.slice(+ pushStart,+ newMakerDraftRouteSource.indexOf('return { ...prev', pushStart),+ );+ const modelSwitchStart = newMakerDraftRouteSource.indexOf(+ 'const resolved = resolveDeviceLinkDraftDefaults(',+ );+ const modelSwitchBlock = newMakerDraftRouteSource.slice(+ modelSwitchStart,+ newMakerDraftRouteSource.indexOf('setDlSel((prev) =>', modelSwitchStart),+ );+ const unifiedStart = newMakerDraftRouteSource.indexOf('const baseline = capabilities');+ const unifiedBlock = newMakerDraftRouteSource.slice(+ unifiedStart,+ newMakerDraftRouteSource.indexOf('// 能力与镜像都还没到', unifiedStart),+ );++ for (const block of [pushBlock, modelSwitchBlock, unifiedBlock]) {+ expect(block).toContain('agentCatalogProviders,');+ }+ expect(unifiedBlock).toContain('providerId: selection.providerId,');});it('reapplies refreshed regional defaults only while the remote runtime is untouched', () => {@@ -1639,7 +1668,10 @@ describe('Shared create project picker', () => {);expect(seed).toContain('shouldReseedDeviceLinkDraftDefaults({');expect(seed).toContain('capabilitiesChanged,');- expect(seed).toContain('if (!capabilities || capabilitiesLoading');+ expect(seed).toContain('!capabilities');+ expect(seed).toContain('capabilitiesLoading');+ expect(seed).toContain('!deviceDraftDefaultsReady');+ expect(seed).toContain('!deviceProviderCatalogReady');expect(seed).toContain('controllerTouched: dlRuntimeTouchedRef.current,');expect(seed).toContain('remoteModelChosenByUser: deviceDraftDefaults?.modelChosenByUser,');expect(seed).toContain('modelChosenByUser: true,');diff --git a/apps/desktop/src/renderer/__tests__/remoteCodexCreation.test.tsx b/apps/desktop/src/renderer/__tests__/remoteCodexCreation.test.tsxindex 4cbdf3bd65..67b1b3b087 100644--- a/apps/desktop/src/renderer/__tests__/remoteCodexCreation.test.tsx+++ b/apps/desktop/src/renderer/__tests__/remoteCodexCreation.test.tsx@@ -156,6 +156,17 @@ describe('settings remote Codex creation', () => {});});+ it('persists an explicit empty effort for SSH models without effort levels', async () => {+ publish([sshModel('plain', { efforts: [], defaultEffort: null })]);+ start();+ await waitFor(() => expect(mocks.create).toHaveBeenCalled());+ expect(mocks.create.mock.calls[0][0]).toMatchObject({+ model: 'plain',+ providerId: 'openai',+ effort: '',+ });+ });+it('uses remote defaults even when the local native preference is available remotely', async () => {publish([sshModel('first', { supportsFastMode: true }), sshModel('chosen', { supportsFastMode: true })]);mocks.prefs.mockReturnValue({ model: 'chosen', providerId: 'openai', effort: 'low' });diff --git a/apps/desktop/src/renderer/__tests__/remoteWorkerCreationContext.test.ts b/apps/desktop/src/renderer/__tests__/remoteWorkerCreationContext.test.tsindex 17d73a7a2d..c3311b8345 100644--- a/apps/desktop/src/renderer/__tests__/remoteWorkerCreationContext.test.ts+++ b/apps/desktop/src/renderer/__tests__/remoteWorkerCreationContext.test.ts@@ -20,6 +20,15 @@ describe('remote Orca Worker creation context', () => {expect(selection).toContain('target.hostId');expect(read('components/settings/RemoteHostDetail.tsx')).toContain('loadSshSessionModelSelection(hostId)');});++ it('writes the SSH no-effort sentinel instead of omitting the session field', () => {+ const draft = read('features/cc-agent/NewMakerDraftRoute.tsx');+ const start = draft.indexOf('const newSession = await createSession(');+ const end = draft.indexOf('if (!newSession)', start);+ expect(start).toBeGreaterThan(-1);+ expect(end).toBeGreaterThan(start);+ expect(draft.slice(start, end)).toContain("effort: sshEffort ?? '',");+ });it('scopes capabilities, providers, and the nested model selector to the controlled device', () => {const popover = read('features/cc-agent/CreateWorkerPopover.tsx');diff --git a/apps/desktop/src/renderer/components/chat/UpgradeBanner.tsx b/apps/desktop/src/renderer/components/chat/UpgradeBanner.tsxindex 3c41cb6a85..71bcb017ee 100644--- a/apps/desktop/src/renderer/components/chat/UpgradeBanner.tsx+++ b/apps/desktop/src/renderer/components/chat/UpgradeBanner.tsx@@ -112,7 +112,7 @@ function fallbackFilesFromMessage(message: ChatMessage): AttachedFile[] | undefi* (ChatMessage 只有 role/content/clientId/persistedContent, 不带 agent prefs).* Returns null if no user message present or DB session row missing critical* fields. */-async function snapshotRetryCandidate(sessionId: string): Promise<RetryCandidate | null> {+export async function snapshotRetryCandidate(sessionId: string): Promise<RetryCandidate | null> {const snap = makerChatStore.getSnapshot(sessionId);// Critical gate: 只有该 session **正在 streaming / agent 正在 running** 时, 才// 把 last user message 当成"被升级中断的 in-flight turn"来 retry。空闲会话点@@ -154,7 +154,10 @@ async function snapshotRetryCandidate(sessionId: string): Promise<RetryCandidate// banner click 路径不在乎几毫秒。失败返 null, handleUpgrade 捕获后不重发。try {const row = await sessionService.get(sessionId);- if (!row.workingDir || !row.model || !row.effort || !row.permissionMode) {+ // An empty effort is the persisted sentinel for a model that has no+ // reasoning tiers. It is a valid retry preference; only a missing value+ // means the session row is incomplete.+ if (!row.workingDir || !row.model || row.effort == null || !row.permissionMode) {return null;}return {diff --git a/apps/desktop/src/renderer/components/chat/__tests__/UpgradeBanner.test.tsx b/apps/desktop/src/renderer/components/chat/__tests__/UpgradeBanner.test.tsxnew file mode 100644index 0000000000..fe7ba03050--- /dev/null+++ b/apps/desktop/src/renderer/components/chat/__tests__/UpgradeBanner.test.tsx@@ -0,0 +1,73 @@+// @vitest-environment jsdom++import { beforeEach, describe, expect, it, vi } from 'vitest';++const mocks = vi.hoisted(() => ({+ getSnapshot: vi.fn(),+ getSession: vi.fn(),+}));++vi.mock('@/lib/makerChatStore', () => ({+ makerChatStore: {+ getSnapshot: mocks.getSnapshot,+ sendMessage: vi.fn(),+ },+}));++vi.mock('@/lib/sessionService', () => ({+ get: mocks.getSession,+}));++vi.mock('@/state/ccMgrUpgradeStore', () => ({+ subscribeCcMgrUpgradeStore: vi.fn(),+ getCcMgrUpgradeSnapshot: vi.fn(() => null),+ forceUpgradeCcMgr: vi.fn(),+ dismissCcMgrUpgrade: vi.fn(),+}));++vi.mock('react-i18next', () => ({+ useTranslation: () => ({ t: (key: string) => key }),+}));++vi.mock('@/lib/toast', () => ({+ toast: { error: vi.fn() },+}));++import { snapshotRetryCandidate } from '../UpgradeBanner';++describe('UpgradeBanner retry snapshot', () => {+ beforeEach(() => {+ vi.clearAllMocks();+ mocks.getSnapshot.mockReturnValue({+ isStreaming: true,+ agentStatus: { isRunning: true },+ messages: [{ role: 'user', content: 'continue this task' }],+ });+ });++ it('keeps an explicit empty effort for a no-tier SSH session', async () => {+ mocks.getSession.mockResolvedValue({+ workingDir: '/workspace',+ model: 'claude-sonnet-4-5',+ effort: '',+ permissionMode: 'default',+ });++ await expect(snapshotRetryCandidate('ssh-no-effort')).resolves.toMatchObject({+ sessionId: 'ssh-no-effort',+ text: 'continue this task',+ effort: '',+ });+ });++ it.each([null, undefined])('rejects a session row with missing effort (%j)', async (effort) => {+ mocks.getSession.mockResolvedValue({+ workingDir: '/workspace',+ model: 'claude-sonnet-4-5',+ effort,+ permissionMode: 'default',+ });++ await expect(snapshotRetryCandidate('missing-effort')).resolves.toBeNull();+ });+});diff --git a/apps/desktop/src/renderer/components/new-chat/ChatInput.tsx b/apps/desktop/src/renderer/components/new-chat/ChatInput.tsxindex 2319f2fdbb..d48b1c1515 100644--- a/apps/desktop/src/renderer/components/new-chat/ChatInput.tsx+++ b/apps/desktop/src/renderer/components/new-chat/ChatInput.tsx@@ -569,8 +569,8 @@ interface ChatInputProps {modelMemoryOverride?: ModelMemoryAccessors;/** Initial model from session data. When provided, overrides activeModel. */initialModel?: string;- /** Initial effort from session data. When provided, overrides activeEffort. */- initialEffort?: Effort;+ /** Initial effort from session data. null explicitly means the model has no effort selector. */+ initialEffort?: Effort | null;/*** per-session 来源(供应商)初值。来自 session.providerId(null = 跟随默认路由)。* 决定 ModelSelector 来源栏高亮哪家;不传 = 跟随默认(显示列表首项为默认命中)。@@ -1762,7 +1762,7 @@ export function ChatInput({agentKind: runtimeAgentKind ?? vendorKeyToAgentKind(vendorKey) ?? 'claude-code',model: initialModel ?? (sessionId ? '' : localVendorDefaults.model),providerId: initialProviderId ?? null,- effort: initialEffort ?? localVendorDefaults.effort,+ effort: initialEffort === null || initialEffort === '' ? null : initialEffort ?? localVendorDefaults.effort,fastMode: fastMode === true,},effective: sessionId ? runtimeEffective : undefined,@@ -1771,9 +1771,10 @@ export function ChatInput({optimistic: pendingRemoteSwitch,});const activeModel = composerSelection.display.model;- // null = 投影未知/不可调档:回落到会话已持久化的档位(与运行实况一致),不能兜底成- // 字面量 'low'——该值会随下一条发送作为用户选择下发,把假档位写成真档位。- const activeEffort = composerSelection.display.effort ?? initialEffort ?? 'low';+ // A missing runtime projection keeps the persisted choice; null/empty session+ // effort remains unspecified instead of sending the display-only fallback.+ const selectedEffort = composerSelection.display.effort ?? initialEffort ?? '';+ const activeEffort = selectedEffort || 'low';const activePermissionMode: PermissionMode =initialPermissionMode ?? localVendorDefaults.permissionMode;@@ -5379,7 +5380,7 @@ export function ChatInput({workspaceKind: 'dialogue',agentKind: currentModelAgentKind === 'claude-code' ? 'cc' : currentModelAgentKind ?? undefined,model: activeModel,- effort: activeEffort,+ effort: selectedEffort,permissionMode: activePermissionMode,providerId: sendProviderId,fastMode,@@ -5927,7 +5928,7 @@ export function ChatInput({}}let result: boolean | void;- let effortForSend = activeEffort;+ let effortForSend = selectedEffort;try {if (sessionId) {const coordinator = effortChangeCoordinatorRef.current;@@ -5965,7 +5966,7 @@ export function ChatInput({}// 等待 commit 后,闭包里的 activeEffort 可能仍是旧 props;以该 session 已提交的// 选择发送,保证本 turn 与 UI/SQLite 的 effort 相同。- effortForSend = coordinator.getCommittedEffort(sessionId) ?? activeEffort;+ effortForSend = coordinator.getCommittedEffort(sessionId) ?? selectedEffort;}result = await onSend(routedText,@@ -6016,7 +6017,7 @@ export function ChatInput({sessionId,onSend,activeModel,- activeEffort,+ selectedEffort,activePermissionMode,sendProviderId,selectedSourceDisconnected,@@ -6199,7 +6200,7 @@ export function ChatInput({// cache,并使先前本机发布的旧 runtime attempt 失效,避免迟到完成覆盖外部终态。effortChangeCoordinatorRef.current.adoptExternalEffort(sessionId,- initialEffort,+ initialEffort ?? '',(targetSessionId, effort) => window.electronAPI.maker.setEffort(targetSessionId, effort),);}, [deviceLinkDeviceId, initialEffort, sessionId]);diff --git a/apps/desktop/src/renderer/components/new-chat/__tests__/chatInputModelLoading.test.tsx b/apps/desktop/src/renderer/components/new-chat/__tests__/chatInputModelLoading.test.tsxindex b44b713778..b195ed8e70 100644--- a/apps/desktop/src/renderer/components/new-chat/__tests__/chatInputModelLoading.test.tsx+++ b/apps/desktop/src/renderer/components/new-chat/__tests__/chatInputModelLoading.test.tsx@@ -9,9 +9,11 @@ import { sshNativeCodexProvider, sshModel } from '@/features/cc-agent/__tests__/import { ChatInput } from '../ChatInput';import * as providerMemory from '@/state/providerModelMemory';import * as draftMemory from '@/state/newMakerDraft';+import { getEffortChangeCoordinator } from '../effortChangeQueue';const h = vi.hoisted(() => ({ t: (key: string) => key, confirm: vi.fn(), editor: null as Editor | null, listening: false, stop: vi.fn().mockResolvedValue(undefined),setModel: vi.fn(), selectModel: undefined as undefined | ((id: string) => Promise<void | boolean>), selectEffort: undefined as string | null | undefined, remoteProviders: [] as ProviderView[],+ localProviders: [] as ProviderView[],remoteStatus: 'ready' as 'ready' | 'loading' | 'error',}));vi.mock('react-i18next', async (original) => ({ ...await original<typeof import('react-i18next')>(), useTranslation: () => ({ t: h.t }) }));@@ -56,7 +58,7 @@ vi.mock('@/voice-input/useVoiceInput', () => ({ useVoiceInput: (editor: Editor |h.editor = editor;return { state: h.listening ? 'listening' : 'idle', isListening: h.listening, isBusy: h.listening, draftText: '', start: vi.fn(), stop: h.stop, cancel: vi.fn() };} }));-vi.mock('@/hooks/useProviders', () => ({ useProviders: () => ({ providers: [], loading: false }) }));+vi.mock('@/hooks/useProviders', () => ({ useProviders: () => ({ providers: h.localProviders, loading: false }) }));vi.mock('@/hooks/useDeviceProviders', () => ({ useDeviceProviders: () => ({ providers: [], loading: false, unsupported: false }) }));vi.mock('@/hooks/useConnectedSource', () => ({ useConnectedSource: () => ({ hasConnectedSource: true, loading: false }) }));vi.mock('@/hooks/useAvailableAgents', () => ({ useAvailableAgents: () => ({ agents: [], loading: false }) }));@@ -90,7 +92,7 @@ const attachments: ComponentProps<typeof ChatInput>['attachmentState'] = {removeFile: noOp, updateFile: noOp, discardFiles: noOp, clearFiles: noOp, restoreFiles: (files) => [...files],};beforeEach(() => { h.listening = false; h.stop.mockClear(); h.selectEffort = undefined; window.electronAPI = api; vi.stubGlobal('ResizeObserver', class { observe() {} unobserve() {} disconnect() {} }); });-afterEach(() => { cleanup(); h.remoteProviders = []; h.remoteStatus = 'ready'; h.setModel.mockReset(); h.confirm.mockReset(); vi.unstubAllGlobals(); vi.restoreAllMocks(); });+afterEach(() => { cleanup(); h.remoteProviders = []; h.localProviders = []; h.remoteStatus = 'ready'; h.setModel.mockReset(); h.confirm.mockReset(); vi.unstubAllGlobals(); vi.restoreAllMocks(); });const props = {sessionId: 'loading-test', initialWorkingDir: '/workspace', runtimeAgentKind: 'codex' as const,@@ -98,6 +100,41 @@ const props = {hideRuntimeControls: true, showFolderPicker: false, disableAutofocus: true,};+it.each([null, 'test-host'])('preserves no-effort after creation when sending the second message (%s)', async (deviceLinkDeviceId) => {+ h.localProviders = [sshNativeCodexProvider([sshModel('qwen3:14b', { efforts: [], defaultEffort: null })])];+ const onSend = vi.fn().mockResolvedValue(true);+ const view = render(<ChatInput {...props} sessionId={undefined} deviceLinkDeviceId={null}+ initialModel="qwen3:14b" initialEffort={null} onSend={onSend} />);+ await waitFor(() => expect(view.container.querySelector('[contenteditable]')).not.toBeNull());+ await act(async () => { h.editor!.commands.setContent('<p>First message</p>'); });+ await act(async () => { fireEvent.click(screen.getByRole('button', { name: 'newChat.sendButton.send' })); });+ await waitFor(() => expect(onSend).toHaveBeenCalledTimes(1));+ expect(onSend.mock.calls[0][2]).toBe('');++ view.rerender(<ChatInput {...props} sessionId={`no-effort-created-${deviceLinkDeviceId}`} deviceLinkDeviceId={deviceLinkDeviceId}+ initialModel="qwen3:14b" initialEffort={onSend.mock.calls[0][2]} onSend={onSend} />);+ await waitFor(() => expect(view.container.querySelector('[contenteditable]')).not.toBeNull());+ await act(async () => { h.editor!.commands.setContent('<p>Second message</p>'); });+ await act(async () => { fireEvent.click(screen.getByRole('button', { name: 'newChat.sendButton.send' })); });+ await waitFor(() => expect(onSend).toHaveBeenCalledTimes(2));+ expect(onSend.mock.calls[1][0]).toBe('Second message');+ expect(onSend.mock.calls[1][2]).toBe('');+});++it.each([null, ''])('adopts an explicit no-effort session snapshot without reusing a stale committed tier (%j)', async (initialEffort) => {+ h.localProviders = [sshNativeCodexProvider([sshModel('qwen3:14b', { efforts: [], defaultEffort: null })])];+ const sessionId = `no-effort-existing-${initialEffort === null ? 'null' : 'empty'}`;+ getEffortChangeCoordinator().setCommittedEffort(sessionId, 'high');+ const onSend = vi.fn().mockResolvedValue(true);+ const view = render(<ChatInput {...props} sessionId={sessionId} deviceLinkDeviceId={null}+ initialModel="qwen3:14b" initialEffort={initialEffort} onSend={onSend} />);+ await waitFor(() => expect(view.container.querySelector('[contenteditable]')).not.toBeNull());+ await act(async () => { h.editor!.commands.setContent('<p>Continue without effort</p>'); });+ await act(async () => { fireEvent.click(screen.getByRole('button', { name: 'newChat.sendButton.send' })); });+ await waitFor(() => expect(onSend).toHaveBeenCalledTimes(1));+ expect(onSend.mock.calls[0][2]).toBe('');+});+it('keeps the shared guest model visible but locks selection without locking message input', async () => {const onSend = vi.fn().mockResolvedValue(undefined);const inputProps = { ...props, hideRuntimeControls: false, initialModel: 'gpt-6-sol', onSend };diff --git a/apps/desktop/src/renderer/components/settings/RemoteHostDetail.tsx b/apps/desktop/src/renderer/components/settings/RemoteHostDetail.tsxindex cabfd08abf..d91a970777 100644--- a/apps/desktop/src/renderer/components/settings/RemoteHostDetail.tsx+++ b/apps/desktop/src/renderer/components/settings/RemoteHostDetail.tsx@@ -442,7 +442,7 @@ export function StartRemoteSessionPanel({ hostId }: StartRemoteSessionPanelPropspermissionMode: 'auto',model: selection.model,providerId: selection.providerId,- effort: selection.effort,+ effort: selection.effort ?? '',fastMode: selection.fastMode,remoteHostId: hostId,});diff --git a/apps/desktop/src/renderer/features/cc-agent/NewMakerDraftRoute.tsx b/apps/desktop/src/renderer/features/cc-agent/NewMakerDraftRoute.tsxindex 95f40b828f..e43d288fad 100644--- a/apps/desktop/src/renderer/features/cc-agent/NewMakerDraftRoute.tsx+++ b/apps/desktop/src/renderer/features/cc-agent/NewMakerDraftRoute.tsx@@ -258,6 +258,7 @@ import { useAvailableAgents } from '@/hooks/useAvailableAgents';import {useDeviceProviders,evictDeviceProviders,+ parseDeviceProvidersPayload,prefetchDeviceProviders,} from '@/hooks/useDeviceProviders';import {@@ -678,12 +679,14 @@ interface DraftTargetRequest {workingDir: string | null;/*** 已经 inline 拉到的被控端快照。只有「添加远程项目」那条路径有 —— 它为了验证设备可达,本来就- * 直接 invoke 过 capabilities / defaults,于是能立刻 seed,不必等 effect 再跑一轮隧道往返。+ * 直接 invoke 过 capabilities / providers / defaults,于是能立刻 seed,不必等 effect 再跑一轮隧道往返。* 不给就把远程运行配置打回未加载,交给 seed effect 自己拉。*/remoteSnapshot?: {capabilities: AgentCapabilities;defaults: RemoteDraftDefaults | null;+ /** The target device's provider catalog, fetched alongside capabilities. */+ providers: ProviderView[];};}@@ -1440,7 +1443,7 @@ export function NewMakerDraftRoute() {// 首页是“下一次创建会话”的配置草稿,没有正在运行的当前模型需要保护。其它对话更新同一模型// 的全局预设后,即使该模型正显示在首页 trigger 上,也应立即采用新 effort / fast。真实会话仍// 由 CCAgentSessionView 的 live DB/runtime props 保护,不会走这里。- const localDraftEffort = useMemo<Effort>(() => {+ const localDraftEffort = useMemo<Effort | null>(() => {if (usesDeviceCatalog || !effectiveSourceId) return chatPrefs.effort;const provider = providers.find((item) => item.id === effectiveSourceId);// 按**校准后**的模型推导:effort 必须和最终提交的模型属于同一个能力集合。@@ -1456,6 +1459,9 @@ export function NewMakerDraftRoute() {),efforts: model?.efforts ?? [],defaultEffort: model?.defaultEffort ?? null,+ // An absent model entry means the catalog is still loading; an existing Pi/Ollama+ // entry with [] is a known no-effort model and must omit the stale draft value.+ effortsUnknown: model ? model.effortsUnknown === true : true,});}, [usesDeviceCatalog,@@ -1595,7 +1601,15 @@ export function NewMakerDraftRoute() {}// provider revision 驱逐时 hook 会保留旧快照但标 loading;必须等新代际 ready,不能用 stale// capabilities 把 inline handoff 或用户当前选择校准回旧目录。- if (!capabilities || capabilitiesLoading || !deviceDraftDefaultsReady) return;+ // 现代被控端还要等 provider:list;否则 flat capabilities 先播种后不会因目录到达而重校准。+ // 明确不支持该 channel 的旧端继续使用 capabilities fallback。+ const deviceProviderCatalogReady = deviceProvidersUnsupported || !deviceProvidersLoading;+ if (+ !capabilities ||+ capabilitiesLoading ||+ !deviceDraftDefaultsReady ||+ !deviceProviderCatalogReady+ ) return;const key = `${catalogDeviceId}:${capabilityAgentKind}`;const newTarget = dlSeedKeyRef.current !== key;const capabilitiesChanged = dlSeedCapabilitiesRef.current !== capabilities;@@ -1625,6 +1639,8 @@ export function NewMakerDraftRoute() {providerId: current.providerId,},current.model,+ capabilityAgentKind,+ agentCatalogProviders,): current,);@@ -1640,14 +1656,18 @@ export function NewMakerDraftRoute() {deviceDraftDefaults,undefined,capabilityAgentKind,+ agentCatalogProviders,),);}, [usesDeviceCatalog,catalogDeviceId,capabilityAgentKind,+ agentCatalogProviders,capabilities,capabilitiesLoading,+ deviceProvidersLoading,+ deviceProvidersUnsupported,deviceDraftDefaultsReady,deviceDraftDefaults,]);@@ -1665,10 +1685,22 @@ export function NewMakerDraftRoute() {if (!usesDeviceCatalog) return null;if (dlSel) return dlSel;if (capabilities) {- return resolveDeviceLinkDraftDefaults(capabilities, null, undefined, capabilityAgentKind);+ return resolveDeviceLinkDraftDefaults(+ capabilities,+ null,+ undefined,+ capabilityAgentKind,+ agentCatalogProviders,+ );}return null;- }, [usesDeviceCatalog, dlSel, capabilities, capabilityAgentKind]);+ }, [+ usesDeviceCatalog,+ dlSel,+ capabilities,+ capabilityAgentKind,+ agentCatalogProviders,+ ]);// ── device-link 草稿列表「纯显示镜像」(非选中行的 effort/fast) ──────────────────// scopeKey 按设备隔离。镜像 = 被控端 providerModelMemory 全量快照(草稿列表行的真实读源),@@ -1717,6 +1749,7 @@ export function NewMakerDraftRoute() {next,prev.model,capabilityAgentKind,+ agentCatalogProviders,);return { ...prev, effort: re.effort, fastMode: re.fastMode };});@@ -1728,6 +1761,7 @@ export function NewMakerDraftRoute() {effectiveAgentDeviceId,capabilityAgentKind,capabilities,+ agentCatalogProviders,]);// ── worktree 勾选 = 工作端记忆的镜像(2026-07-29 用户裁决:状态只属于用户) ────@@ -2276,7 +2310,14 @@ export function NewMakerDraftRoute() {// 的能力快照校准不了它(store 也不会清掉那台的选择)。只刷新被控电脑的草稿值。setRemoteDraftState({ status: 'ready', value: req.remoteSnapshot.defaults });} else if (req.remoteSnapshot) {- const { capabilities: freshCaps, defaults: freshDefaults } = req.remoteSnapshot;+ const {+ capabilities: freshCaps,+ defaults: freshDefaults,+ providers: freshProviders,+ } = req.remoteSnapshot;+ // Use the target device's inline catalog, not the previous render's providers.+ // Switching task devices also clears the previous separate-Agent selection;+ // same-device refreshes that retain a separate Agent are handled above.dlSeedKeyRef.current = req.deviceId ? `${req.deviceId}:${capabilityAgentKind}` : null;dlSeedCapabilitiesRef.current = freshCaps;if (deviceChanged) {@@ -2286,6 +2327,7 @@ export function NewMakerDraftRoute() {freshDefaults,undefined,capabilityAgentKind,+ freshProviders,),);dlRuntimeTouchedRef.current = false;@@ -2310,12 +2352,14 @@ export function NewMakerDraftRoute() {},undefined,capabilityAgentKind,+ freshProviders,): resolveDeviceLinkDraftDefaults(freshCaps,freshDefaults,undefined,capabilityAgentKind,+ freshProviders,),);}@@ -2429,12 +2473,13 @@ export function NewMakerDraftRoute() {// useEffect 不会因 deps 不变重跑 fetch,只有 subscriber 通知路径能送达新数据。// 验证设备可达:直接 invoke 能力 + 供应商(不走 swallow 的 prefetch)。// 失败 throw → dialog 留 open,不破坏当前草稿状态。- const [freshCaps] = await Promise.all([+ const [freshCaps, freshProviderPayload] = await Promise.all([window.electronAPI.deviceLink.invoke(target.deviceId, 'maker:get-capabilities', [capabilityAgentKind,]) as Promise<AgentCapabilities>,window.electronAPI.deviceLink.invoke(target.deviceId, 'maker:provider:list', []),]);+ const freshProviders = parseDeviceProvidersPayload(freshProviderPayload).providers;// 只有旧版被控端明确不支持 defaults channel 时才回落 capabilities 默认;网络失败// 仍然是连接失败,必须让 dialog 保持打开,不能把 null 当成权威空配置。const freshDefaults = await window.electronAPI.deviceLink@@ -2453,9 +2498,13 @@ export function NewMakerDraftRoute() {deviceId: target.deviceId,deviceName: target.deviceName,workingDir: target.path,- // 上面为验证可达已经 inline 拉过 capabilities 与 defaults,直接交给转移动作当场 seed /+ // 上面为验证可达已经 inline 拉过 capabilities / providers / defaults,直接交给转移动作当场 seed /// 重校,省掉一次隧道往返;它同时会置 skip flag,避免 effect 再拉一次把值覆盖回去。- remoteSnapshot: { capabilities: freshCaps, defaults: freshDefaults },+ remoteSnapshot: {+ capabilities: freshCaps,+ defaults: freshDefaults,+ providers: freshProviders,+ },});// prefetch 补回 hook 缓存:选的是**同一** deviceId 时 hook 的 effect 不会因 deps 变化重跑,// 只有 subscriber 通知路径能送达新数据。即使 prefetch 内部 swallow error,send / goal 的@@ -2490,7 +2539,7 @@ export function NewMakerDraftRoute() {preferred: {model: draftInitialModel,providerId: chatInitialProviderId,- effort: draftInitialEffort,+ ...(draftInitialEffort !== null ? { effort: draftInitialEffort } : {}),fastMode: effectiveFastMode,},getPresetEffort: getProviderModelEffort,@@ -2509,7 +2558,7 @@ export function NewMakerDraftRoute() {workspaceKind: 'project',permissionMode: chatInitialPermissionMode,model: sshModel,- effort: sshEffort,+ effort: sshEffort ?? '',fastMode: sshFastMode,planModeEnabled: effectivePlanMode,remoteHostId: target.hostId,@@ -2665,6 +2714,7 @@ export function NewMakerDraftRoute() {deviceDraftDefaults,newModelId,capabilityAgentKind,+ agentCatalogProviders,);setDlSel((prev) => ({...resolved,@@ -2684,6 +2734,7 @@ export function NewMakerDraftRoute() {deviceDraftDefaults,patchActiveTuplePrefs,capabilityAgentKind,+ agentCatalogProviders,],);const handleFastModeChange = useCallback(@@ -2925,9 +2976,13 @@ export function NewMakerDraftRoute() {const baseline = capabilities? resolveDeviceLinkDraftDefaults(capabilities,- deviceDraftDefaults ?? previous,+ {+ ...(deviceDraftDefaults ?? previous ?? {}),+ providerId: selection.providerId,+ },selection.modelId,capabilityAgentKind,+ agentCatalogProviders,): previous;// 能力与镜像都还没到:推不出任何一档,保持原状而不是编一个默认值。@@ -3003,6 +3058,7 @@ export function NewMakerDraftRoute() {capabilities,deviceDraftDefaults,capabilityAgentKind,+ agentCatalogProviders,pushActiveDraftPref,],);@@ -3557,6 +3613,9 @@ export function NewMakerDraftRoute() {// (未选 / 已断开 → null = 跟随默认路由)。透传给 createSession 落盘 sessions.provider_id,// 让新会话首个请求就走对来源,与"会话内切来源"行为一致。device-link 远程会话不支持(下方分支跳过)。const providerId = opts?.providerId ?? null;+ // 已知无 effort 的模型(例如 Pi/Ollama qwen3:14b)不能接收 ChatInput 的+ // UI fallback 档位;空串会在 main 的准入层归一化为“未指定”。+ const submittedEffort = draftInitialEffort === null ? '' : effort;// 本地导航命令(/jump-session)在进入 createSession 前同步短路:命中即直接// 跳转,新建界面不会先创建 session。这正是它和 /issue 的关键区别。@@ -3822,7 +3881,7 @@ export function NewMakerDraftRoute() {// 路径各自推导曾长出过只在其中一条上复现的缺陷(见该函数注释)。candidate: {model,- effort,+ effort: draftInitialEffort === null ? null : effort,permissionMode,fastMode: effectiveFastMode,planModeEnabled: effectivePlanMode,@@ -4123,7 +4182,7 @@ export function NewMakerDraftRoute() {id: sessionId,agentKind: persistedAgentKind,model,- effort,+ effort: submittedEffort,permissionMode,fastMode: effectiveFastMode,planModeEnabled: effectivePlanMode,@@ -4328,7 +4387,7 @@ export function NewMakerDraftRoute() {newSession.id,dispatchedMessage,model,- effort,+ submittedEffort,permissionMode,newDir,rehomedFiles,@@ -4380,7 +4439,7 @@ export function NewMakerDraftRoute() {id: sessionId,agentKind: persistedAgentKind,model,- effort,+ effort: submittedEffort,permissionMode,fastMode: effectiveFastMode,planModeEnabled: effectivePlanMode,@@ -4556,7 +4615,7 @@ export function NewMakerDraftRoute() {newSession.id,dispatchedMessage,model,- effort,+ submittedEffort,permissionMode,sendWorkingDir,rehydratedFiles,@@ -5131,7 +5190,7 @@ export function NewMakerDraftRoute() {id: goalSessionId,agentKind: persistedAgentKind,model: draftInitialModel,- effort: draftInitialEffort,+ effort: draftInitialEffort ?? '',permissionMode: chatInitialPermissionMode,fastMode: effectiveFastMode,workingDir: goalWorkingDir,diff --git a/apps/desktop/src/renderer/features/cc-agent/__tests__/deviceLinkDraftDefaults.test.ts b/apps/desktop/src/renderer/features/cc-agent/__tests__/deviceLinkDraftDefaults.test.tsindex e12ce5d0d7..9f7a85c9a7 100644--- a/apps/desktop/src/renderer/features/cc-agent/__tests__/deviceLinkDraftDefaults.test.ts+++ b/apps/desktop/src/renderer/features/cc-agent/__tests__/deviceLinkDraftDefaults.test.ts@@ -5,6 +5,36 @@ import {shouldReseedDeviceLinkDraftDefaults,} from '../deviceLinkDraftDefaults';import type { AgentCapabilities } from '@/hooks/useAgentCapabilities';+import type { CatalogModel, ProviderView } from '@cindy/model-providers';++function providerModel(+ id: string,+ efforts: CatalogModel['efforts'],+ defaultEffort: CatalogModel['defaultEffort'],+): CatalogModel {+ return {+ id,+ name: id,+ contextWindow: 200_000,+ efforts,+ defaultEffort,+ effortsUnknown: false,+ supportsFastMode: false,+ } as CatalogModel;+}++function provider(id: string, model: CatalogModel): ProviderView {+ return {+ id,+ name: id,+ source: 'user',+ agents: ['pi'],+ models: { pi: [model] },+ routing: { pi: { upstream: 'https://provider.test', authStrategy: 'none' } },+ auth: { method: 'api-key' },+ connected: true,+ } as unknown as ProviderView;+}// 最小被控端 capabilities:两模型(Opus 支持 fast + 多 effort 档;Haiku 无 effort/fast)。function caps(overrides: Partial<AgentCapabilities> = {}): AgentCapabilities {@@ -24,6 +54,7 @@ function caps(overrides: Partial<AgentCapabilities> = {}): AgentCapabilities {contextWindow: 200_000,efforts: [],defaultEffort: null,+ effortsUnknown: false,supportsFastMode: false,sortOrder: 10,newSessionDefault: ['claude-code'],@@ -165,6 +196,95 @@ describe('resolveDeviceLinkDraftDefaults', () => {expect(sel.effort).toBe('high');});+ it('已知无 effort 模型清掉远端草稿里的旧档位', () => {+ const sel = resolveDeviceLinkDraftDefaults(caps(), {+ model: 'claude-haiku-4-5',+ effort: 'high',+ fastMode: true,+ });+ expect(sel.effort).toBeNull();+ });++ it('按选中的供应商校准 effort,不被同名其他来源的空档位清掉', () => {+ const model = 'qwen3:14b';+ const capabilities = caps({+ availableModels: [+ {+ id: model,+ displayName: model,+ contextWindow: 200_000,+ efforts: [],+ defaultEffort: null,+ },+ ],+ });+ const sel = resolveDeviceLinkDraftDefaults(+ capabilities,+ { model, providerId: 'ollama', effort: 'medium' },+ undefined,+ 'pi',+ [+ provider('ollama', providerModel(model, ['medium', 'high'], 'high')),+ provider('other', providerModel(model, [], null)),+ ],+ );+ expect(sel.effort).toBe('medium');+ });++ it('选中的供应商明确无 effort 时才清掉旧档位', () => {+ const model = 'qwen3:14b';+ const sel = resolveDeviceLinkDraftDefaults(+ caps({+ availableModels: [+ {+ id: model,+ displayName: model,+ contextWindow: 200_000,+ efforts: ['medium', 'high'],+ defaultEffort: 'high',+ },+ ],+ }),+ { model, providerId: 'ollama', effort: 'medium' },+ undefined,+ 'pi',+ [+ provider('ollama', providerModel(model, [], null)),+ provider('other', providerModel(model, ['medium', 'high'], 'high')),+ ],+ );+ expect(sel.effort).toBeNull();+ });++ it('档位能力尚未声明时保留远端草稿档位', () => {+ const capabilities = caps();+ capabilities.availableModels[1]!.effortsUnknown = true;+ const sel = resolveDeviceLinkDraftDefaults(capabilities, {+ model: 'claude-haiku-4-5',+ effort: 'high',+ });+ expect(sel.effort).toBe('high');+ });++ it.each(['medium', 'high'])('旧主机缺少能力标记时保留远端草稿档位 (%s)', (effort) => {+ const capabilities = caps();+ delete capabilities.availableModels[1]!.effortsUnknown;+ const sel = resolveDeviceLinkDraftDefaults(capabilities, {+ model: 'claude-haiku-4-5', effort,+ });+ expect(sel.effort).toBe(effort);+ });++ it.each(['medium', 'high'])('旧主机来源条目缺少能力标记时不借用扁平目录清空档位 (%s)', (effort) => {+ const model = providerModel('claude-haiku-4-5', [], null);+ delete model.effortsUnknown;+ const sel = resolveDeviceLinkDraftDefaults(+ caps(), { model: model.id, providerId: 'legacy', effort }, undefined, 'pi',+ [provider('legacy', model)],+ );+ expect(sel.effort).toBe(effort);+ });+it('模型不支持 fast(或被控端 agent 无 fast 能力)→ fastMode 强制 false', () => {// 选中无 fast 的 Haikuconst a = resolveDeviceLinkDraftDefaults(caps(), {diff --git a/apps/desktop/src/renderer/features/cc-agent/__tests__/newMakerDraftModelPrefs.test.ts b/apps/desktop/src/renderer/features/cc-agent/__tests__/newMakerDraftModelPrefs.test.tsindex 18d1386236..e931efab6e 100644--- a/apps/desktop/src/renderer/features/cc-agent/__tests__/newMakerDraftModelPrefs.test.ts+++ b/apps/desktop/src/renderer/features/cc-agent/__tests__/newMakerDraftModelPrefs.test.ts@@ -42,10 +42,22 @@ describe('resolveNewMakerDraftEffort', () => {presetEffort: 'high',efforts: [],defaultEffort: null,+ effortsUnknown: true,}),).toBe('medium');});+ it('已知无推理档位的模型清掉旧草稿档位', () => {+ expect(+ resolveNewMakerDraftEffort({+ currentEffort: 'medium',+ efforts: [],+ defaultEffort: null,+ effortsUnknown: false,+ }),+ ).toBeNull();+ });+/*** 2026-08-12 登录态沙盒实证:服务端把 DeepSeek V4 Pro 下发为新用户默认种子* (目录 newSessionDefault 标记),它的档位表只有 ['high','max']、defaultEffort='high';@@ -134,6 +146,7 @@ describe('NewMakerDraftRoute 的档位校准接线', () => {);expect(routeSource).toContain('efforts: model?.efforts ?? [],');expect(routeSource).toContain('defaultEffort: model?.defaultEffort ?? null,');+ expect(routeSource).toContain('effortsUnknown: model ? model.effortsUnknown === true : true,');// 种子档与全局预设都作为输入交给规则,由它裁决 —— 调用方不自己短路。expect(routeSource).toContain('currentEffort: chatPrefs.effort,');});@@ -141,7 +154,16 @@ describe('NewMakerDraftRoute 的档位校准接线', () => {it('校准后的档同时喂 composer 显示与 createSession 提交', () => {// 显示:draftInitialEffort → ChatInput.initialEffort → pill。expect(routeSource).toContain('return { model: calibratedDraftModel, effort: localDraftEffort };');- // 提交:两条 createSession 组装都用同一个值,不得回退 chatPrefs.effort。- expect(routeSource.match(/effort: draftInitialEffort,/g)?.length).toBeGreaterThanOrEqual(2);+ // Goal 提交也必须把「明确无档位」写成空串,否则 sessionCreateToRow 会回填 high。+ const goalCreateStart = routeSource.lastIndexOf('const newSession = await createSession({');+ const goalCreateEnd = routeSource.indexOf('if (!newSession)', goalCreateStart);+ expect(goalCreateStart).toBeGreaterThan(-1);+ expect(goalCreateEnd).toBeGreaterThan(goalCreateStart);+ expect(routeSource.slice(goalCreateStart, goalCreateEnd)).toContain(+ "effort: draftInitialEffort ?? '',",+ );+ expect(routeSource.slice(goalCreateStart, goalCreateEnd)).not.toContain(+ 'draftInitialEffort !== null',+ );});});diff --git a/apps/desktop/src/renderer/features/cc-agent/__tests__/newMakerDraftTargetCatalog.test.ts b/apps/desktop/src/renderer/features/cc-agent/__tests__/newMakerDraftTargetCatalog.test.tsnew file mode 100644index 0000000000..cb6556e2c0--- /dev/null+++ b/apps/desktop/src/renderer/features/cc-agent/__tests__/newMakerDraftTargetCatalog.test.ts@@ -0,0 +1,179 @@+import { readFileSync } from 'node:fs';+import { resolve } from 'node:path';+import ts from 'typescript';+import { describe, expect, it, vi } from 'vitest';++import type { Effort, ProviderView } from '@cindy/model-providers';+import type { RemoteProjectTarget } from '@/components/new-chat/AddRemoteProjectDialog';+import type { AgentCapabilities } from '@/hooks/useAgentCapabilities';+import { parseDeviceProvidersPayload } from '@/hooks/useDeviceProviders';+import { extractIpcError } from '@/utils/ipcError';+import { normalizeDbAgentKind } from '../../../../shared/agentKindConversion';+import {+ resolveDeviceLinkDraftDefaults,+ type DeviceLinkDraftSelection,+ type RemoteDraftDefaults,+} from '../deviceLinkDraftDefaults';+import { isSameNewMakerDevice } from '../lib/newMakerRouteState';++// Run the real async project-selection and target-transition callbacks. Only their+// React setters and IPC are replaced; catalog parsing and effort resolution stay real.+const source = ts.createSourceFile(+ 'NewMakerDraftRoute.tsx',+ readFileSync(resolve(__dirname, '..', 'NewMakerDraftRoute.tsx'), 'utf8'),+ ts.ScriptTarget.Latest,+ true,+ ts.ScriptKind.TSX,+);+const factories = new Map<string, (...args: unknown[]) => unknown>();+function callback<T>(name: string, bindings: Record<string, unknown>): T {+ const keys = Object.keys(bindings);+ let factory = factories.get(name);+ if (!factory) {+ let expression: ts.Node | undefined;+ const visit = (node: ts.Node) => {+ if (ts.isVariableDeclaration(node) && node.name.getText(source) === name+ && node.initializer && ts.isCallExpression(node.initializer)) {+ expression = node.initializer.arguments[0];+ }+ ts.forEachChild(node, visit);+ };+ visit(source);+ if (!expression) throw new Error(`Missing draft callback: ${name}`);+ const code = ts.transpileModule(`const callback = ${expression.getText(source)};`, {+ compilerOptions: { target: ts.ScriptTarget.ES2022 },+ }).outputText;+ factory = new Function(...keys, code + ';return callback;') as (...args: unknown[]) => unknown;+ factories.set(name, factory);+ }+ return factory(...Object.values(bindings)) as T;+}++function provider(id: string, efforts: Effort[]): ProviderView {+ return {+ id, name: id, source: 'user', connected: true,+ agents: ['pi'], auth: { method: 'none' },+ routing: { pi: { upstream: 'https://provider.invalid', authStrategy: 'none' } },+ models: { pi: [{+ id: 'shared-model', name: 'Shared model', contextWindow: 200_000,+ efforts, defaultEffort: efforts.at(-1) ?? null, effortsUnknown: false,+ }] },+ };+}++function selection(effort: Effort | null): DeviceLinkDraftSelection {+ return { model: 'shared-model', providerId: 'source', effort, fastMode: false, permissionMode: 'default' };+}++function harness(options: {+ sameDevice?: boolean;+ separateAgent?: boolean;+ previous?: DeviceLinkDraftSelection | null;+ targetEfforts?: Effort[];+} = {}) {+ let current = options.previous ?? null;+ const defaults: RemoteDraftDefaults = { ...selection('medium'), modelChosenByUser: true };+ // A second source makes the flat Pi effort intersection empty even though the+ // selected target source supports medium/high. It cannot replace source-level data.+ const capabilities: AgentCapabilities = {+ availableModels: [{+ id: 'shared-model', displayName: 'Shared model', contextWindow: 200_000,+ efforts: [], defaultEffort: null, effortsUnknown: false,+ }],+ hasFastMode: false, effortLevels: [],+ permissionModes: [{ id: 'default', displayName: 'Default' }],+ };+ const targetProviders = [provider('source', options.targetEfforts ?? ['medium', 'high']), provider('other', [])];+ const invoke = vi.fn(async (deviceId: string, channel: string): Promise<unknown> => {+ if (deviceId !== 'target-device') throw new Error('Unexpected device');+ switch (channel) {+ case 'maker:get-capabilities': return capabilities;+ case 'maker:provider:list': return { providers: targetProviders };+ case 'maker:get-new-maker-defaults': return defaults;+ default: throw new Error(`Unexpected channel: ${channel}`);+ }+ });+ const patchDraft = vi.fn();+ const setRemoteDraftState = vi.fn();+ const dlSeedKeyRef = { current: null as string | null };+ const bindings = {+ // These are target-machine POSIX paths, not local filesystem paths.+ draft: { vendor: 'pi', workingDir: '/remote/project' },+ effectiveDeviceLinkDeviceId: options.sameDevice ? 'target-device' : 'old-device',+ effectiveRemoteHostId: null,+ effectiveAgentDeviceId: options.separateAgent ? 'agent-device' : undefined,+ capabilityAgentKind: 'pi',+ agentCatalogProviders: [provider('source', ['low'])],+ isSameNewMakerDevice, normalizeDbAgentKind, resolveDeviceLinkDraftDefaults,+ parseDeviceProvidersPayload, extractIpcError, patchDraft, setRemoteDraftState,+ window: { electronAPI: { deviceLink: { invoke } } },+ setDlSel: (next: DeviceLinkDraftSelection | null | ((prev: DeviceLinkDraftSelection | null) => DeviceLinkDraftSelection | null)) => {+ current = typeof next === 'function' ? next(current) : next;+ },+ dlSeedKeyRef, dlSeedCapabilitiesRef: { current: null },+ dlRuntimeTouchedRef: { current: true }, skipDefaultsRefetchRef: { current: false },+ wtBranchReadSeqRef: { current: 0 }, wtBranchWriteSeqRef: { current: 0 },+ wtBranchPreferenceSavingRef: { current: false }, wtBranchTargetRef: { current: null },+ wtBranchSyncRef: { current: null }, wtBranchPreferenceErrorRef: { current: false },+ wtPreferenceWriteSeqRef: { current: 0 }, wtPreferenceSavingRef: { current: false },+ stripProjectRelativeMentions: vi.fn(),+ evictDeviceCapabilities: vi.fn(), evictDeviceProviders: vi.fn(), evictDeviceGitSafetySettings: vi.fn(),+ prefetchDeviceCapabilities: vi.fn(), prefetchDeviceProviders: vi.fn(), prefetchDeviceGitSafetySettings: vi.fn(),+ setWtBranchPreferenceSaving: vi.fn(), setWtBranchSync: vi.fn(), setWtBranchPreferenceError: vi.fn(),+ setWtBaseRepo: vi.fn(), setWtSourceBranch: vi.fn(), setWtSupportsRecoveryKeyDiscard: vi.fn(),+ setWtConfirmedIneligible: vi.fn(), setWtPreferenceSaving: vi.fn(),+ };+ const applyDraftTarget = callback<(request: unknown) => void>('applyDraftTarget', bindings);+ const add = callback<(target: RemoteProjectTarget) => Promise<void>>('handleRemoteProjectAdded', { ...bindings, applyDraftTarget });+ return {+ invoke, patchDraft, setRemoteDraftState, defaults, dlSeedKeyRef,+ current: () => current,+ add: () => add({ kind: 'device-link', deviceId: 'target-device', deviceName: 'Target', path: '/remote/project' }),+ };+}++describe('remote project draft catalog ownership', () => {+ it.each([false, true])('seeds the new task device using its source-level efforts (previous separate Agent: %s)', async (separateAgent) => {+ const h = harness({ separateAgent, previous: selection('low') });+ await h.add();+ expect(h.current()).toEqual(selection('medium'));+ expect(h.dlSeedKeyRef.current).toBe('target-device:pi');+ expect(h.patchDraft).toHaveBeenCalledWith(expect.objectContaining({ deviceLinkDeviceId: 'target-device' }));+ });++ it.each([false, true])('clears effort when the target source explicitly has no efforts (same device: %s)', async (sameDevice) => {+ const h = harness({ sameDevice, previous: selection('low'), targetEfforts: [] });+ await h.add();+ expect(h.current()).toEqual(selection(null));+ });++ it('recalibrates a preserved empty selection when the same source gains effort levels', async () => {+ const h = harness({ sameDevice: true, previous: selection(null) });+ await h.add();+ expect(h.current()).toEqual(selection('high'));+ });++ it('seeds from the fresh catalog when the same device has no prior selection', async () => {+ const h = harness({ sameDevice: true });+ await h.add();+ expect(h.current()).toEqual(selection('medium'));+ });++ it('does not overwrite a separate Agent selection when refreshing the same task device', async () => {+ const previous = selection('low');+ const h = harness({ sameDevice: true, separateAgent: true, previous });+ await h.add();+ expect(h.current()).toBe(previous);+ expect(h.setRemoteDraftState).toHaveBeenCalledWith({ status: 'ready', value: h.defaults });+ });++ it('leaves the current draft intact if the target provider response is malformed', async () => {+ const previous = selection('low');+ const h = harness({ previous });+ h.invoke.mockImplementation(async (_device, channel) => channel === 'maker:provider:list' ? null : {});+ await expect(h.add()).rejects.toThrow('Invalid provider list response');+ expect(h.current()).toBe(previous);+ expect(h.patchDraft).not.toHaveBeenCalled();+ expect(h.setRemoteDraftState).not.toHaveBeenCalled();+ });+});diff --git a/apps/desktop/src/renderer/features/cc-agent/__tests__/sshSessionModelSelection.test.ts b/apps/desktop/src/renderer/features/cc-agent/__tests__/sshSessionModelSelection.test.tsindex 7ec0f8377b..a5ed270007 100644--- a/apps/desktop/src/renderer/features/cc-agent/__tests__/sshSessionModelSelection.test.ts+++ b/apps/desktop/src/renderer/features/cc-agent/__tests__/sshSessionModelSelection.test.ts@@ -144,9 +144,23 @@ describe('SSH creation model selection', () => {expect(getPresetFast).toHaveBeenCalledWith('codex', 'openai', 'available-model');});- it('retains the ordinary draft policy when the catalog has no effort levels', () => {+ it('omits effort when the catalog explicitly declares no effort levels', () => {expect(resolve([sshNativeCodexProvider([sshModel('plain', { efforts: [], defaultEffort: null })])]),+ ).toMatchObject({+ ok: true,+ effort: null,+ fastMode: false,+ });+ });++ it('retains the draft effort when the catalog has not declared effort capabilities', () => {+ expect(+ resolve([+ sshNativeCodexProvider([+ sshModel('unknown', { efforts: [], defaultEffort: null, effortsUnknown: true }),+ ]),+ ]),).toMatchObject({ok: true,effort: 'medium',diff --git a/apps/desktop/src/renderer/features/cc-agent/deviceLinkCreateArgs.ts b/apps/desktop/src/renderer/features/cc-agent/deviceLinkCreateArgs.tsindex d1c904a127..156f93c557 100644--- a/apps/desktop/src/renderer/features/cc-agent/deviceLinkCreateArgs.ts+++ b/apps/desktop/src/renderer/features/cc-agent/deviceLinkCreateArgs.ts@@ -16,7 +16,7 @@* agentKind 归一到 maker-core 形态('cc' → 'claude-code');其余字段原样透传。*/-import { effectiveSourceIdForModel, type ProviderView } from '@cindy/model-providers';+import { effectiveSourceIdForModel, getModel, reconcileInvocationEffort, type ProviderView } from '@cindy/model-providers';import type { Session, WorkspaceKind } from '@/lib/ccAgent.types';import type { AgentKind } from '@/hooks/useAgentCapabilities';@@ -38,7 +38,7 @@ export interface DeviceLinkCreateParams {*/id?: string;model: string;- effort: Effort;+ effort: Effort | null;permissionMode: PermissionMode;fastMode: boolean;planModeEnabled?: boolean;@@ -71,7 +71,7 @@ export interface DeviceLinkCreateArgs {/** 由 workingDir 派生 —— 有目录 'project',无目录 'dialogue'。归属一致的关键。 */workspaceKind: WorkspaceKind;model: string;- effort: Effort;+ effort: Effort | '';permissionMode: PermissionMode;fastMode: boolean;planMode?: boolean;@@ -96,7 +96,9 @@ export function buildDeviceLinkCreateArgs(p: DeviceLinkCreateParams): DeviceLink...(dir ? { workingDir: dir } : {}),workspaceKind: dir ? 'project' : 'dialogue',model: p.model,- effort: p.effort,+ // Empty string is the wire representation for a model without an effort selector;+ // the remote host's admission layer treats it as unspecified.+ effort: p.effort ?? '',permissionMode: p.permissionMode,fastMode: p.fastMode,...(p.planModeEnabled ? { planMode: true } : {}),@@ -117,7 +119,7 @@ export function buildDeviceLinkCreateArgs(p: DeviceLinkCreateParams): DeviceLink*/export interface DeviceLinkSubmissionCandidate {model: string;- effort: Effort;+ effort: Effort | null;permissionMode: PermissionMode;fastMode: boolean;planModeEnabled?: boolean;@@ -169,12 +171,27 @@ export function resolveDeviceLinkSubmission(p: DeviceLinkSubmissionParams): Devip.candidate.model,p.capabilityAgentKind,);+ const routeProvider = providerId+ ? p.deviceProviders.find((provider) => provider.id === providerId)+ : undefined;+ const routeModel = routeProvider+ ? getModel(routeProvider, p.candidate.model, p.capabilityAgentKind)+ : undefined;+ const effort =+ !routeModel || routeModel.effortsUnknown === true ||+ (routeModel.efforts.length === 0 && routeModel.effortsUnknown !== false)+ ? p.candidate.effort+ : reconcileInvocationEffort({+ requested: p.candidate.effort,+ model: routeModel,+ noEffortFallback: null,+ });return buildDeviceLinkCreateArgs({agentKind: p.agentKind,id: p.id,workingDir: p.workingDir,model: p.candidate.model,- effort: p.candidate.effort,+ effort,permissionMode: p.candidate.permissionMode,fastMode: p.candidate.fastMode,planModeEnabled: p.candidate.planModeEnabled,diff --git a/apps/desktop/src/renderer/features/cc-agent/deviceLinkDraftDefaults.ts b/apps/desktop/src/renderer/features/cc-agent/deviceLinkDraftDefaults.tsindex 57850f6d05..80de96f83d 100644--- a/apps/desktop/src/renderer/features/cc-agent/deviceLinkDraftDefaults.ts+++ b/apps/desktop/src/renderer/features/cc-agent/deviceLinkDraftDefaults.ts@@ -15,6 +15,11 @@* 与「会话内切来源」同一口径,不在本函数重复一套。*/+import {+ effectiveSourceIdForModel,+ getModel,+ type ProviderView,+} from '@cindy/model-providers';import type { AgentCapabilities, AgentKind } from '@/hooks/useAgentCapabilities';import type { Effort, PermissionMode } from '@/lib/userPreferences.types';@@ -23,7 +28,7 @@ export interface RemoteDraftDefaults {model?: string;/** false = 被控端明确未在 New Maker picker 选过模型;undefined = 旧端未知。 */modelChosenByUser?: boolean;- effort?: string;+ effort?: string | null;fastMode?: boolean;permissionMode?: string;providerId?: string | null;@@ -53,7 +58,7 @@ export interface RemoteDraftDefaults {/** 校准后可直接 seed 控制端草稿 holder 的一组值。 */export interface DeviceLinkDraftSelection {model: string;- effort: Effort;+ effort: Effort | null;fastMode: boolean;/** 仍是被控端支持的权限档则带上;否则 undefined(由 ChatInput 回落自身默认)。 */permissionMode?: PermissionMode;@@ -97,6 +102,7 @@ export function resolveDeviceLinkDraftDefaults(remoteDraft: RemoteDraftDefaults | null,targetModel?: string,agentKind?: AgentKind,+ providers?: ProviderView[],): DeviceLinkDraftSelection {const models = capabilities.availableModels;const providerId = remoteDraft?.providerId ?? null;@@ -128,7 +134,7 @@ export function resolveDeviceLinkDraftDefaults(if (models.length === 0) {return {model: wantedModelId ?? '',- effort: (remoteDraft?.effort as Effort) ?? 'high',+ effort: (remoteDraft?.effort as Effort | null | undefined) ?? 'high',fastMode: false,permissionMode,providerId,@@ -136,6 +142,21 @@ export function resolveDeviceLinkDraftDefaults(}const chosen = models.find((m) => m.id === wantedModelId) ?? models[0];+ const selectedProviderId =+ agentKind && providers?.length+ ? remoteDraft?.providerId ??+ effectiveSourceIdForModel(providers, null, chosen.id, agentKind)+ : null;+ const selectedProvider = selectedProviderId+ ? providers?.find((provider) => provider.id === selectedProviderId)+ : undefined;+ const providerModel = selectedProvider && agentKind+ ? getModel(selectedProvider, chosen.id, agentKind)+ : undefined;+ // capabilities.availableModels is a cross-provider union. If the selected source has+ // its own entry, its effort table is authoritative; otherwise keep the flat snapshot+ // for old hosts that do not expose provider catalogs.+ const effortModel = providerModel ?? chosen;const globalPreset = agentKind ? remoteDraft?.providerModelMemory?.[`${agentKind}:*`] : undefined;const providerPreset =agentKind && providerId@@ -158,11 +179,16 @@ export function resolveDeviceLinkDraftDefaults((isActiveModel? remoteDraft?.fastMode === true: remoteDraft?.fastModeByModel?.[chosen.id] === true);+ const supportedEfforts = effortModel.efforts as readonly string[];- const effort: Effort =- wantedEffort && chosen.efforts.includes(wantedEffort)- ? wantedEffort- : (chosen.defaultEffort ?? chosen.efforts[0] ?? wantedEffort ?? 'high');+ const effort: Effort | null =+ supportedEfforts.length === 0+ ? effortModel.effortsUnknown === false+ ? null+ : wantedEffort ?? effortModel.defaultEffort ?? 'high'+ : wantedEffort && supportedEfforts.includes(wantedEffort)+ ? wantedEffort+ : (effortModel.defaultEffort ?? supportedEfforts[0] ?? wantedEffort ?? 'high');const fastMode = Boolean(capabilities.hasFastMode && chosen.supportsFastMode && wantedFast);return { model: chosen.id, effort, fastMode, permissionMode, providerId };diff --git a/apps/desktop/src/renderer/features/cc-agent/newMakerDraftModelPrefs.ts b/apps/desktop/src/renderer/features/cc-agent/newMakerDraftModelPrefs.tsindex 5b1b95a49e..e899ccf7d4 100644--- a/apps/desktop/src/renderer/features/cc-agent/newMakerDraftModelPrefs.ts+++ b/apps/desktop/src/renderer/features/cc-agent/newMakerDraftModelPrefs.ts@@ -55,11 +55,13 @@ export function resolveNewMakerDraftEffort(args: {presetEffort?: Effort;efforts: readonly Effort[];defaultEffort: Effort | null;-}): Effort {- const { currentEffort, presetEffort, efforts, defaultEffort } = args;- // 目录尚未就绪(档位表为空)= **还不知道**,不是「不支持」:保留草稿原值,避免首帧跳变。- // 这也是唯一一条允许放行未经校验档位的路径。- if (efforts.length === 0) return currentEffort;+ /** true = [] 只是未声明能力的占位;false/缺省 = 目录明确没有档位。 */+ effortsUnknown?: boolean;+}): Effort | null {+ const { currentEffort, presetEffort, efforts, defaultEffort, effortsUnknown = false } = args;+ // 目录尚未就绪(调用方没有模型条目)时保留草稿原值,避免首帧跳变;已知模型的空表+ // 则表示它不接受 reasoning effort,必须让提交层省略该字段,不能把旧档位带进准入校验。+ if (efforts.length === 0) return effortsUnknown ? currentEffort : null;// 优先级:全局预设 > 草稿当前值。两者都必须过档位表这一关(旧实现在没有预设时直接// 交出 currentEffort,种子 'medium' 就是这样漏到 DeepSeek 这类 high/max-only 模型上的)。const preferred = presetEffort ?? currentEffort;diff --git a/apps/desktop/src/renderer/features/cc-agent/sshSessionModelSelection.ts b/apps/desktop/src/renderer/features/cc-agent/sshSessionModelSelection.tsindex fbcfa52a8f..17cb8f2ff5 100644--- a/apps/desktop/src/renderer/features/cc-agent/sshSessionModelSelection.ts+++ b/apps/desktop/src/renderer/features/cc-agent/sshSessionModelSelection.ts@@ -56,12 +56,12 @@ export function resolveSshSessionModelSelection(args: {loading: boolean;loadFailed: boolean;agentKind: AgentKind;- preferred?: { model: string; providerId?: string | null; effort: Effort; fastMode: boolean };+ preferred?: { model: string; providerId?: string | null; effort?: Effort; fastMode: boolean };getPresetEffort?: (agent: AgentKind, providerId: string, model: string) => Effort | undefined;getPresetFast?: (agent: AgentKind, providerId: string, model: string) => boolean | undefined;}):| { ok: false; reason: keyof typeof sshModelSelectionErrorKeys }- | { ok: true; model: string; providerId: string; effort: Effort; fastMode: boolean } {+ | { ok: true; model: string; providerId: string; effort: Effort | null; fastMode: boolean } {if (args.loadFailed) return { ok: false, reason: 'catalog-error' };if (args.loading) return { ok: false, reason: 'catalog-loading' };const { agentKind, preferred } = args;@@ -108,6 +108,7 @@ export function resolveSshSessionModelSelection(args: {presetEffort: args.getPresetEffort?.(agentKind, providerId, model),efforts: descriptor.efforts,defaultEffort: descriptor.defaultEffort,+ effortsUnknown: descriptor.effortsUnknown === true,}),fastMode:descriptor.supportsFastMode === true &&diff --git a/apps/desktop/src/renderer/hooks/useAgentCapabilities.ts b/apps/desktop/src/renderer/hooks/useAgentCapabilities.tsindex 3866d14cb6..c3cbd1f303 100644--- a/apps/desktop/src/renderer/hooks/useAgentCapabilities.ts+++ b/apps/desktop/src/renderer/hooks/useAgentCapabilities.ts@@ -40,6 +40,8 @@ export interface ModelDescriptor {description?: string;contextWindow: number;efforts: readonly Effort[];+ /** true = the catalog has not declared this model's effort capability yet. */+ effortsUnknown?: boolean;effortDisplayNames?: Partial<Record<Effort, string>>;defaultEffort: Effort | null;supportsFastMode?: boolean;@@ -249,6 +251,7 @@ function isModelDescriptor(value: unknown): value is ModelDescriptor {isStringArray(efforts) &&(defaultEffort === null ||(typeof defaultEffort === 'string' && efforts.includes(defaultEffort))) &&+ isOptionalBoolean(value.effortsUnknown) &&isOptionalString(value.group) &&isOptionalString(value.mode) &&isOptionalString(value.description) &&diff --git a/docs/dev-rules/model-catalog-maintenance.md b/docs/dev-rules/model-catalog-maintenance.mdindex 7b7986f16b..f012ab2f9b 100644--- a/docs/dev-rules/model-catalog-maintenance.md+++ b/docs/dev-rules/model-catalog-maintenance.md@@ -85,6 +85,19 @@ notes 仅按纯文本呈现,未知单位不猜换算。列表不新增价格`defaultEffort` 的已配置默认优先于供应商实报的推荐档,再适配实际支持能力,force / 用户覆盖仍优先。详细字段及成员空值规则以 [模型资料优先级](../product-rules/model-metadata-precedence.md) 为唯一正本。+### 远程推理档位快照兼容++Desktop 主机向能力清单和 `maker:provider:list` 的模型条目显式投影既有的+`effortsUnknown` 布尔值:`false` 表示能力已知,`true` 表示未声明。控制端收到旧主机+缺少该字段的空档位表时保留已有选择,只有显式 `false` 的空表才清空;非空表照常校准。+草稿播种与最终提交使用同一兼容口径,不在控制端给缺失字段补 `false`。+无档位选择落库使用既有空串哨兵,任务后续发送也保留“未指定”,不提交输入框显示兜底档位。+Codex 在实际 `turn/start` 请求中省略该档位字段,计划模式的 `reasoning_effort` 使用协议允许的+`null`;运行时切换与恢复重试同样不发送空串,服务端默认档位快照不覆盖明确的无档位选择。+回归见 `packages/maker-core/src/agents/codex/index.test.ts` 的 no-effort 用例。+实现与回归见 `catalog-to-descriptors.ts`、`providerHandlers.ts`、+`deviceLinkDraftDefaults.test.ts`、`deviceLinkCreateArgs.test.ts` 与 `chatInputModelLoading.test.tsx`。+<a id="ordering"></a>## 模型排序与成员:以账号为准diff --git a/packages/maker-core/src/agents/codex/index.test.ts b/packages/maker-core/src/agents/codex/index.test.tsindex 6344207a03..1646132c96 100644--- a/packages/maker-core/src/agents/codex/index.test.ts+++ b/packages/maker-core/src/agents/codex/index.test.ts@@ -12,7 +12,8 @@ import {} from './index.js';import { CodexForkError } from './fork-error.js';import { Session } from '../../session.js';-import { Method } from './app-server/protocol.js';+import { Method, type TurnStartParams } from './app-server/protocol.js';+import type { Effort } from '../../types/common.js';import type { AppServerHost, ThreadEventHandlers } from './app-server/host.js';import {AUTO_REVIEW_SOURCE_CONTENT,@@ -7233,6 +7234,120 @@ describe('CodexAgent thread/settings/update channel', () => {});describe('CodexAgent send', () => {+ it.each([+ { remoteHostId: undefined, resume: false },+ { remoteHostId: 'ssh-builder', resume: false },+ { remoteHostId: undefined, resume: true },+ { remoteHostId: 'ssh-builder', resume: true },+ ])('omits no-effort sentinels on initial and subsequent turns ($remoteHostId, resume=$resume)', async ({ remoteHostId, resume }) => {+ const agent = new CodexAgent(createDeps());+ const turns: TurnStartParams[] = [];+ const host = installFakeHost(agent, (method, params) => {+ if (method === Method.TurnStart) {+ turns.push(JSON.parse(JSON.stringify(params)) as TurnStartParams);+ return { turn: { id: `turn-${turns.length}` } };+ }+ return undefined;+ });+ const handle = await agent.startSession({+ sessionId: 'session-no-effort',+ model: 'qwen3:14b',+ // Desktop persists this sentinel and passes it through the bootstrap boundary.+ effort: '' as Effort,+ workingDir: '/repo',+ remoteHostId,+ ...(resume ? { resumeSessionId: '11111111-1111-4111-8111-111111111111' } : {}),+ });+ try {+ await handle.send({ type: 'user', content: 'first message' });+ expect(turns).toHaveLength(1);+ expect(turns[0]).not.toHaveProperty('effort');+ host.getThreadHandlers()?.turnCompleted?.({+ threadId: turns[0].threadId,+ turn: { id: 'turn-1', status: 'completed' },+ });+ // A server default is not an explicit user choice for a no-effort model.+ host.getThreadHandlers()?.threadSettingsUpdated?.({+ threadId: turns[0].threadId,+ threadSettings: { model: 'qwen3:14b', effort: 'high', serviceTier: null },+ });+ await handle.send({ type: 'user', content: 'second message' });+ expect(turns).toHaveLength(2);+ expect(turns[1]).not.toHaveProperty('effort');+ expect(handle.getEffort?.()).toBe('');+ } finally {+ await handle.close();+ }+ });++ it.each([false, true])('uses null plan effort and omits turn effort for no-effort models (retry=%s)', async (retry) => {+ const agent = new CodexAgent(createDeps());+ const turns: TurnStartParams[] = [];+ const host = installFakeHost(agent, (method, params) => {+ if (method === Method.TurnStart) {+ turns.push(JSON.parse(JSON.stringify(params)) as TurnStartParams);+ if (retry && turns.length === 1) throw new Error('thread not found');+ return { turn: { id: `turn-${turns.length}` } };+ }+ return undefined;+ });+ const handle = await agent.startSession({+ sessionId: 'session-no-effort-plan',+ model: 'qwen3:14b',+ effort: '' as Effort,+ workingDir: '/repo',+ remoteHostId: 'ssh-builder',+ });+ try {+ await handle.send({ type: 'user', content: 'make a plan' }, { planMode: true });+ expect(turns).toHaveLength(retry ? 2 : 1);+ for (const turn of turns) {+ expect(turn).not.toHaveProperty('effort');+ expect(turn.collaborationMode).toMatchObject({+ mode: 'plan', settings: { reasoning_effort: null },+ });+ }+ host.getThreadHandlers()?.turnCompleted?.({+ threadId: turns.at(-1)!.threadId,+ turn: { id: `turn-${turns.length}`, status: 'completed' },+ });+ await handle.send({ type: 'user', content: 'continue normally' }, { planMode: false });+ expect(turns).toHaveLength(retry ? 3 : 2);+ expect(turns.at(-1)).not.toHaveProperty('effort');+ expect(turns.at(-1)?.collaborationMode).toMatchObject({+ mode: 'default', settings: { reasoning_effort: null },+ });+ } finally {+ await handle.close();+ }+ });++ it('keeps a runtime no-effort selection out of settings updates and turn/start', async () => {+ const agent = new CodexAgent(createDeps());+ const host = installFakeHost(agent, (method) => {+ if (method === Method.TurnStart) return { turn: { id: 'turn-1' } };+ if (method === Method.ThreadSettingsUpdate) return {};+ return undefined;+ });+ const handle = await agent.startSession({+ sessionId: 'session-set-no-effort', model: 'qwen3:14b',+ effort: 'medium', workingDir: '/repo',+ });+ try {+ await handle.setEffort?.('' as Effort);+ await handle.send({ type: 'user', content: 'hello' });+ const calls = host.request.mock.calls.filter(([method]) =>+ method === Method.TurnStart || method === Method.ThreadSettingsUpdate);+ expect(calls.some(([method]) => method === Method.TurnStart)).toBe(true);+ for (const [, params] of calls) {+ expect(JSON.parse(JSON.stringify(params))).not.toHaveProperty('effort');+ }+ expect(handle.getEffort?.()).toBe('');+ } finally {+ await handle.close();+ }+ });+it('clamps minimal effort to low before turn/start', async () => {const agent = new CodexAgent(createDeps());const host = installFakeHost(agent);diff --git a/packages/maker-core/src/agents/codex/index.ts b/packages/maker-core/src/agents/codex/index.tsindex 7225b5113a..1618746ed1 100644--- a/packages/maker-core/src/agents/codex/index.ts+++ b/packages/maker-core/src/agents/codex/index.ts@@ -358,7 +358,10 @@ function statusTextForItem(item: { type?: string; command?: string; tool?: strin* 把 minimal 收敛到 low。max / ultra 直接透传,不再静默降级为 xhigh(issue #352)。* 某模型是否真支持某档位由目录 efforts 与 UI/reconcile 门控保证。*/-function clampEffortForCodex(model: string, e: Effort): CodexEffort {+function clampEffortForCodex(model: string, e: Effort): CodexEffort | undefined {+ // Desktop's persisted no-effort sentinel is an empty string, not a Codex enum.+ // Keep it in session state, but let app-server use its default on the wire.+ if (!e) return undefined;if (e === 'minimal' && !CODEX_MINIMAL_EFFORT_MODELS.has(model)) return 'low';return e;}@@ -6640,7 +6643,7 @@ assertRouteCurrent();mode: 'plan',settings: {model: mutableModel,- reasoning_effort: clampEffortForCodex(mutableModel, mutableEffort),+ reasoning_effort: clampEffortForCodex(mutableModel, mutableEffort) ?? null,developer_instructions: null,},};@@ -6651,7 +6654,7 @@ assertRouteCurrent();mode: 'default',settings: {model: mutableModel,- reasoning_effort: clampEffortForCodex(mutableModel, mutableEffort),+ reasoning_effort: clampEffortForCodex(mutableModel, mutableEffort) ?? null,developer_instructions: developerInstructions,},};@@ -12664,7 +12667,8 @@ assertRouteCurrent();refreshCodexAutoReviewerRoute(params.threadId);}// ReasoningEffort 的 'none' 不属于 Effort; 排除后其余值都是合法 Effort, 无需 cast。- if (s.effort && s.effort !== 'none') mutableEffort = s.effort;+ // A server default must not replace an explicit no-effort session choice.+ if (mutableEffort && s.effort && s.effort !== 'none') mutableEffort = s.effort;if (before !== (mutableServiceTier ?? null)) {log.debug('thread/settings/updated reconciled serviceTier', {threadId: params.threadId,@@ -13719,7 +13723,7 @@ assertRouteCurrent();if (turnParams.collaborationMode) {turnParams.collaborationMode.settings.model = mutableModel;turnParams.collaborationMode.settings.reasoning_effort =- clampEffortForCodex(mutableModel, mutableEffort);+ clampEffortForCodex(mutableModel, mutableEffort) ?? null;}workspacePermissionProfileActive = 'permissions' in turnThreadWorkspaceConfig;workspacePermissionProfileFingerprint = workspacePermissionProfileActive@@ -14297,7 +14301,7 @@ assertRouteCurrent();mutableEffort = newEffort;// thread 已启动 → 立即经 thread/settings/update 生效; 未启动由首个 turn/start// 携带 (TurnStartParams.effort, v2.rs:5800)。发 clamp 后的值, 与 turn/start 一致。- await pushThreadSettings({ effort: clamped });+ if (clamped !== undefined) await pushThreadSettings({ effort: clamped });},getEffort() {