Consider it done. The open-source AI agent that works out of the box · 想到,就能做到。开源、开箱即用的 AI Agent。
TypeScript agentai-agentai-assistantandroidclaude-codecodexelectroniosllmmacosreact-nativetypescriptwindows
fix(desktop): 自定义模型未声明推理档位时不再把显式档位判成 valid: none
ficowang1a32e1acef55
diff --git a/apps/desktop/src/main/maker-host/catalog-to-descriptors.ts b/apps/desktop/src/main/maker-host/catalog-to-descriptors.tsindex 772d0df8c0..5c0e730a55 100644--- a/apps/desktop/src/main/maker-host/catalog-to-descriptors.ts+++ b/apps/desktop/src/main/maker-host/catalog-to-descriptors.ts@@ -58,6 +58,8 @@ function toDescriptor(m: CatalogModel): ModelDescriptor {// 实际路由解析 —— 见下方 resolveVerifiedContextWindow(provenance 只活在 host 侧,// 不进这份跨端 descriptor)。if (m.description !== undefined) d.description = m.description;+ // 「未声明档位」要跟着走到准入:否则 sendToSession/新建任务会把占位的 [] 当成明确无档位(#5535)。+ if (m.effortsUnknown === true) d.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;@@ -95,7 +97,11 @@ function intersectPiEffortCapabilities(? next.defaultEffort: (efforts[0] ?? null);}- return { ...first, efforts, defaultEffort };+ const merged: ModelDescriptor = { ...first, efforts, defaultEffort };+ // 只要有一条路由声明过档位,交集就是已声明的结论;两条都未声明才保留「未知」。+ if (first.effortsUnknown === true && next.effortsUnknown === true) merged.effortsUnknown = true;+ else delete merged.effortsUnknown;+ return merged;}/**diff --git a/apps/desktop/src/main/maker-ipc/__tests__/orcaWorkerCreationService.test.ts b/apps/desktop/src/main/maker-ipc/__tests__/orcaWorkerCreationService.test.tsindex 522a2f14e4..b28bcbb4f4 100644--- a/apps/desktop/src/main/maker-ipc/__tests__/orcaWorkerCreationService.test.ts+++ b/apps/desktop/src/main/maker-ipc/__tests__/orcaWorkerCreationService.test.ts@@ -1476,6 +1476,43 @@ describe('OrcaWorkerCreationService', () => {expect(deps.addOrUpdateWorker).not.toHaveBeenCalled();});+ it('keeps an explicit effort for a custom model whose capabilities were never declared (#5535)', async () => {+ // 自定义来源只填了 id/name:目录与路由快照都没有档位声明,[] 只是占位而不是 valid: none。+ const model = 'custom/step-5-preview';+ const { deps, service } = createDeps({+ getAvailableModels: vi.fn((agent: AgentKind) => (+ agent === 'claude-code'+ ? [{ id: model, efforts: [], defaultEffort: null, effortsUnknown: true }]+ : [{ id: 'gpt-5.5', efforts: ['low', 'medium', 'high', 'xhigh'], defaultEffort: 'high', supportsFastMode: true }]+ )),+ getProviderRoutingContext: vi.fn(async () => providerRoutingContext({+ 'claude-code': [{+ id: 'custom-anthropic',+ name: 'Custom Anthropic Messages',+ models: [model],+ effortMetaByModel: { [model]: { efforts: [], defaultEffort: null, effortsUnknown: true } },+ requiresExplicitRoute: true,+ }],+ codex: [{ id: 'xd', name: 'XD Gateway', models: ['gpt-5.5'] }],+ })),+ });++ await expect(+ service.createWorker({+ leadSessionId: 'lead-1',+ role: 'reviewer',+ agent: 'claude-code',+ label: 'reviewer',+ model,+ effort: 'medium',+ }),+ ).resolves.toMatchObject({+ ok: true,+ resolved: { model, effort: 'medium' },+ });+ expect(deps.buildCreateOptsWithStderr).toHaveBeenCalledWith(expect.objectContaining({ model, effort: 'medium' }));+ });+it('rejects explicit minimal effort for a Claude Code worker at the creation boundary', async () => {const { deps, service } = createDeps();diff --git a/apps/desktop/src/main/maker-ipc/__tests__/sendToSessionExecutionConfig.test.ts b/apps/desktop/src/main/maker-ipc/__tests__/sendToSessionExecutionConfig.test.tsindex 649bcd0323..7cea2c6576 100644--- a/apps/desktop/src/main/maker-ipc/__tests__/sendToSessionExecutionConfig.test.ts+++ b/apps/desktop/src/main/maker-ipc/__tests__/sendToSessionExecutionConfig.test.ts@@ -276,6 +276,62 @@ describe('resolveSendToSessionExecutionConfig', () => {})).toMatchObject({ ok: false, errorCode: 'INVALID_ARGS' });});+ it('keeps an explicit effort for a custom model whose capabilities were never declared (#5535)', () => {+ // 自定义来源只填了 id/name:目录与路由快照都没有档位声明,[] 只是占位,不是 valid: none。+ const undeclared = { id: 'custom/step-5-preview', efforts: [], defaultEffort: null, effortsUnknown: true };+ const routing: OrcaWorkerProviderRoutingContext = {+ availability: {+ codex: [], pi: [],+ 'claude-code': [{+ id: 'custom-anthropic',+ name: 'Custom Anthropic Messages',+ models: [undeclared.id],+ effortMetaByModel: { [undeclared.id]: { efforts: [], defaultEffort: null, effortsUnknown: true } },+ requiresExplicitRoute: true,+ }],+ },+ resolveDefaultProviderIdForModel: (agent, model) =>+ agent === 'claude-code' && model === undeclared.id ? 'custom-anthropic' : null,+ };+ expect(resolveSendToSessionExecutionConfig({+ source: { agentKind: 'claude-code', model: undeclared.id, fastMode: false, providerId: 'custom-anthropic' },+ overrides: { effort: 'medium' },+ availableModels: [undeclared],+ providerRouting: routing,+ hasCindyAiApiKey: false,+ })).toEqual({+ ok: true,+ config: {+ agentKind: 'claude-code',+ model: undeclared.id,+ effort: 'medium',+ fastMode: false,+ providerId: 'custom-anthropic',+ },+ });++ // 明确无档位(已声明空表,无 effortsUnknown)仍按原规则拒绝显式档位。+ const declaredNone = { id: 'custom/no-reasoning', efforts: [], defaultEffort: null };+ expect(resolveSendToSessionExecutionConfig({+ source: { agentKind: 'claude-code', model: declaredNone.id, fastMode: false, providerId: 'custom-anthropic' },+ overrides: { effort: 'medium' },+ availableModels: [declaredNone],+ providerRouting: {+ ...routing,+ availability: {+ ...routing.availability,+ 'claude-code': [{+ ...routing.availability['claude-code'][0]!,+ models: [declaredNone.id],+ effortMetaByModel: { [declaredNone.id]: { efforts: [], defaultEffort: null } },+ }],+ },+ resolveDefaultProviderIdForModel: () => 'custom-anthropic',+ },+ hasCindyAiApiKey: false,+ })).toMatchObject({ ok: false, errorCode: 'INVALID_ARGS', message: expect.stringContaining('valid: none') });+ });+it('keeps the legacy inherited route when no Agent/model change is requested', () => {expect(resolveSendToSessionExecutionConfig({source: fableSource(),diff --git a/apps/desktop/src/main/maker-ipc/__tests__/sessionExecutionSelection.test.ts b/apps/desktop/src/main/maker-ipc/__tests__/sessionExecutionSelection.test.tsindex 5ccb53fc93..dece7719b1 100644--- a/apps/desktop/src/main/maker-ipc/__tests__/sessionExecutionSelection.test.ts+++ b/apps/desktop/src/main/maker-ipc/__tests__/sessionExecutionSelection.test.ts@@ -74,6 +74,42 @@ describe('ordinary Session model selection', () => {const { resolve } = setup({ availableModels: () => [{ id: 'glm-5.3', efforts: [] }] });expect(await resolve({ agentKind: 'cc', model: 'glm-5.3', providerId: 'glm' })).toMatchObject({ effort: undefined });});+ it('creates a task on an undeclared custom Anthropic Messages model when the draft carries medium (#5535)', async () => {+ // 复现 #5535:自定义来源模型只有 id/name,草稿 effort 预填 medium,之前被当成 valid: none 拒绝。+ const model = 'custom/step-5-preview';+ const custom = {+ availability: {+ ...routing.availability,+ 'claude-code': [{+ id: 'custom-anthropic', name: 'Custom Anthropic Messages', models: [model],+ effortMetaByModel: { [model]: { efforts: [], defaultEffort: null, effortsUnknown: true } },+ requiresExplicitRoute: true,+ }],+ },+ resolveDefaultProviderIdForModel: (agent: string, id: string) =>+ agent === 'claude-code' && id === model ? 'custom-anthropic' : null,+ };+ const { resolve } = setup({+ availableModels: () => [{ id: model, efforts: [], defaultEffort: null, effortsUnknown: true }],+ readProviderRouting: async () => custom,+ });+ await expect(resolve({ agentKind: 'cc', model, providerId: 'custom-anthropic', effort: 'medium' }))+ .resolves.toEqual({ agentKind: 'claude-code', model, providerId: 'custom-anthropic', effort: 'medium', fastMode: false });+ // 重启后草稿还在:同一选择重复提交仍可创建,模型与来源都不被替换。+ await expect(resolve({ agentKind: 'cc', model, providerId: 'custom-anthropic', effort: 'medium' }))+ .resolves.toMatchObject({ model, providerId: 'custom-anthropic', effort: 'medium' });+ // 已声明的空档位(reasoning:false)仍拒绝显式 medium,不被「未知」放行误伤。+ const { resolve: resolveDeclared } = setup({+ availableModels: () => [{ id: model, efforts: [], defaultEffort: null }],+ readProviderRouting: async () => ({+ ...custom,+ availability: { ...custom.availability, 'claude-code': [{ ...custom.availability['claude-code'][0]!,+ effortMetaByModel: { [model]: { efforts: [], defaultEffort: null } } }] },+ }),+ });+ await expect(resolveDeclared({ agentKind: 'cc', model, providerId: 'custom-anthropic', effort: 'medium' }))+ .rejects.toThrow('valid: none');+ });it('does not silently choose a hardcoded model when default selection is missing', async () => {await expect(setup({ readDefault: () => undefined }).resolve({})).rejects.toThrow('尚未选择');});diff --git a/apps/desktop/src/main/maker-ipc/orcaProviderRoutingContext.ts b/apps/desktop/src/main/maker-ipc/orcaProviderRoutingContext.tsindex 5f2f6ab138..b53c2a1be8 100644--- a/apps/desktop/src/main/maker-ipc/orcaProviderRoutingContext.ts+++ b/apps/desktop/src/main/maker-ipc/orcaProviderRoutingContext.ts@@ -26,7 +26,11 @@ export function sshCodexWorkerRoutingContext(views: ProviderView[]): OrcaWorkerPid: 'openai', name: views[0]!.name, models: models.map((model) => model.id),fastModels: models.filter((model) => model.supportsFastMode).map((model) => model.id),effortMetaByModel: Object.fromEntries(models.map((model) =>- [model.id, { efforts: model.efforts, defaultEffort: model.defaultEffort }])),+ [model.id, {+ efforts: model.efforts,+ defaultEffort: model.defaultEffort,+ ...(model.effortsUnknown === true ? { effortsUnknown: true } : {}),+ }])),}] : [],},resolveDefaultProviderIdForModel: (agent, model) =>@@ -86,7 +90,12 @@ export async function readOrcaWorkerProviderRoutingContext(deps: {effortMetaByModel: Object.fromEntries(models.map((model) => [model.id,- { efforts: model.efforts, defaultEffort: model.defaultEffort },+ {+ efforts: model.efforts,+ defaultEffort: model.defaultEffort,+ // 未声明档位要随快照进入准入,否则自定义来源的占位 [] 会被当成明确无档位(#5535)。+ ...(model.effortsUnknown === true ? { effortsUnknown: true } : {}),+ },]),),requiresExplicitRoute: providerRouteRequiresExplicitSelection(diff --git a/apps/desktop/src/main/maker-ipc/orcaWorkerCreationService.ts b/apps/desktop/src/main/maker-ipc/orcaWorkerCreationService.tsindex a1a521e863..913c68140e 100644--- a/apps/desktop/src/main/maker-ipc/orcaWorkerCreationService.ts+++ b/apps/desktop/src/main/maker-ipc/orcaWorkerCreationService.ts@@ -77,7 +77,10 @@ export interface OrcaWorkerProviderSnapshot {* 元数据,effort 归一保留拍平清单解析(兼容旧组装方)。*/effortMetaByModel?: Readonly<- Record<string, { efforts: readonly string[]; defaultEffort: string | null }>+ Record<+ string,+ { efforts: readonly string[]; defaultEffort: string | null; effortsUnknown?: boolean }+ >>;/** true 表示该来源必须写入 session provider store 才能注入自己的 API key/OAuth token。 */requiresExplicitRoute?: boolean;@@ -110,6 +113,8 @@ export interface OrcaWorkerModelCapabilities {id: string;efforts?: readonly string[];defaultEffort?: string | null;+ /** true = 没有任何来源声明过档位,efforts 只是占位;显式档位交给引擎裁决而不是拒绝(#5535)。 */+ effortsUnknown?: boolean;supportsFastMode?: boolean;}@@ -469,6 +474,9 @@ function normalizeResolvedEffort(params: {const defaultEffort = model.defaultEffort ?? null;if (effort == null) return { ok: true, effort: defaultEffort };if (validEfforts.includes(effort)) return { ok: true, effort };+ // 未声明档位(#5535):目录与路由来源都没说过这个模型支持什么,[] 只是占位。显式档位+ // 原样交给引擎/供应商裁决,不再以 valid: none 拒绝;明确无档位(已声明空表)仍走下方拒绝。+ if (explicit && model.effortsUnknown === true) return { ok: true, effort };if (effort === 'minimal' && !explicit && validEfforts.includes('low')) {return { ok: true, effort: 'low' };}@@ -884,6 +892,7 @@ export function createOrcaWorkerCreationService(deps: OrcaWorkerCreationDeps): Oid: resolved.model,efforts: routeEffortMeta.efforts,defaultEffort: routeEffortMeta.defaultEffort,+ effortsUnknown: routeEffortMeta.effortsUnknown,},effort: params.effort ?? defaults.effort ?? lead.effort,explicit: params.effort !== undefined,diff --git a/apps/desktop/src/main/maker-ipc/sendToSessionExecutionConfig.ts b/apps/desktop/src/main/maker-ipc/sendToSessionExecutionConfig.tsindex 6e27d1d404..f6cc1e8c09 100644--- a/apps/desktop/src/main/maker-ipc/sendToSessionExecutionConfig.ts+++ b/apps/desktop/src/main/maker-ipc/sendToSessionExecutionConfig.ts@@ -11,6 +11,8 @@ interface ModelCapabilities {id: string;efforts?: readonly string[];defaultEffort?: string | null;+ /** true = 没有任何来源声明过档位,efforts 只是占位;显式档位交给引擎裁决而不是拒绝(#5535)。 */+ effortsUnknown?: boolean;supportsFastMode?: boolean;}@@ -57,6 +59,10 @@ function normalizeEffort(params: {};}if (validEfforts.includes(effort)) return { ok: true, effort };+ // 未声明档位(#5535):自定义来源的模型只填了 id/name 时,目录与路由快照都没有档位声明,+ // 这里的 [] 只是占位而不是「valid: none」。显式档位原样放行交给引擎/供应商裁决;+ // 明确无档位(reasoning:false / 已声明空表)与已声明列表仍按下面的规则校验。+ if (explicit && model.effortsUnknown === true) return { ok: true, effort };if (!explicit) {if (effort === 'minimal' && validEfforts.includes('low')) return { ok: true, effort: 'low' };if (effort === 'ultra' && validEfforts.includes('max')) return { ok: true, effort: 'max' };@@ -203,6 +209,7 @@ export function resolveSendToSessionExecutionConfig(params: {id: model,efforts: routeEffortMeta.efforts,defaultEffort: routeEffortMeta.defaultEffort,+ effortsUnknown: routeEffortMeta.effortsUnknown,}: modelCapabilities;const normalizedEffort = normalizeEffort({diff --git a/packages/maker-core/src/types/capabilities.ts b/packages/maker-core/src/types/capabilities.tsindex 431262fb6d..a6fb721816 100644--- a/packages/maker-core/src/types/capabilities.ts+++ b/packages/maker-core/src/types/capabilities.ts@@ -246,6 +246,11 @@ export interface ModelDescriptor {effortDisplayNames?: Partial<Record<Effort, string>>;/** 该模型默认 effort; null = 不支持 effort。 */defaultEffort: Effort | null;+ /**+ * true = 目录里没有任何来源声明过该模型的 effort 能力(自定义来源只填了 id/name 等)。+ * 这时 `efforts: []` 只是占位,不等于「明确无档位」;准入校验不应据此拒绝显式档位(#5535)。+ */+ effortsUnknown?: boolean;/*** 该模型是否支持 Fast Mode (Claude 1M context 通道 / Codex priority service tier)。* UI 据此显示 / 隐藏 Fast Mode 开关, 不再自己 startsWith 解析 model id。diff --git a/packages/model-providers/src/__tests__/user-provider.test.ts b/packages/model-providers/src/__tests__/user-provider.test.tsindex e9cae5e835..169aac52e8 100644--- a/packages/model-providers/src/__tests__/user-provider.test.ts+++ b/packages/model-providers/src/__tests__/user-provider.test.ts@@ -406,6 +406,8 @@ describe("buildUserProvider (per-runtime)", () => {id: "unknown-model",efforts: [],defaultEffort: null,+ // 没有任何来源声明过档位:[] 只是占位,准入不得当成明确无档位(#5535)。+ effortsUnknown: true,}),expect.objectContaining({id: "discovered-model",@@ -427,6 +429,12 @@ describe("buildUserProvider (per-runtime)", () => {expect(provider.models[agent]?.[0].userModelConfig).not.toHaveProperty("reasoning",);+ // 发现元数据、显式 reasoning:true 与 reasoning:false 都算已声明,不带「未知」标记。+ for (const index of [1, 2, 3]) {+ expect(provider.models[agent]?.[index]).not.toHaveProperty(+ "effortsUnknown",+ );+ }}},);@@ -631,6 +639,7 @@ describe("buildUserProvider (per-runtime)", () => {id: "custom/my-model",efforts: [],defaultEffort: null,+ effortsUnknown: true,});});diff --git a/packages/model-providers/src/types.ts b/packages/model-providers/src/types.tsindex e496743915..55248200ff 100644--- a/packages/model-providers/src/types.ts+++ b/packages/model-providers/src/types.ts@@ -394,6 +394,13 @@ export interface CatalogModel {effortDisplayNames?: Partial<Record<Effort, string>>;/** 默认 effort;null = 不支持。 */defaultEffort: Effort | null;+ /**+ * true = 该 (provider, agent) 下没有任何来源声明过推理档位:用户/运行时没填 reasoning,+ * 目录、发现元数据与用户元数据也都没有 efforts。此时 `efforts: []` 只是占位,不等于+ * 「明确无档位」(reasoning:false 或已声明空列表);准入校验不得据此把显式档位判成+ * valid: none(#5535)。+ */+ effortsUnknown?: boolean;/** 思考只有开/关两档时,选择器显示开关而不是档位列表。 */thinkingToggle?: boolean;/**diff --git a/packages/model-providers/src/user-provider.ts b/packages/model-providers/src/user-provider.tsindex dc317f296b..afd261d752 100644--- a/packages/model-providers/src/user-provider.ts+++ b/packages/model-providers/src/user-provider.ts@@ -354,7 +354,15 @@ function toCatalogModel(generationDefaults,): pickModelMetadata(user);- return applyModelMetadata(model, resolved);+ // 「未声明」与「明确无档位」要分开(#5535):用户/运行时 reasoning、目录继承、发现或用户+ // 元数据任一来源给过 efforts 就算已声明;都没有时 `efforts: []` 只是占位,打上+ // effortsUnknown 让准入校验不要把显式档位判成 valid: none。+ const effortsDeclared =+ m.reasoning !== undefined ||+ registryEfforts !== undefined ||+ resolved.efforts !== undefined;+ const projected = applyModelMetadata(model, resolved);+ return effortsDeclared ? projected : { ...projected, effortsUnknown: true };}function defaultWireProtocol(agent: AgentKind): ProviderWireProtocol {