Consider it done. The open-source AI agent that works out of the box · 想到,就能做到。开源、开箱即用的 AI Agent。
TypeScript agentai-agentai-assistantandroidclaude-codecodexelectroniosllmmacosreact-nativetypescriptwindows
feat(model-default): 新建任务的 Pi 默认跟随服务端指定的 Cindy Auto
fmfsaisai34b055a13f58
diff --git a/apps/desktop/src/renderer/__tests__/draftModelCalibration.test.ts b/apps/desktop/src/renderer/__tests__/draftModelCalibration.test.tsindex 04389c0967..e5f08f851c 100644--- a/apps/desktop/src/renderer/__tests__/draftModelCalibration.test.ts+++ b/apps/desktop/src/renderer/__tests__/draftModelCalibration.test.ts@@ -945,3 +945,22 @@ describe('factory defaults survive send-time calibration', () => {.toEqual({ model: 'auto', providerId: 'xd' });});});++describe('模型组 Auto:服务端决定默认与来源', () => {+ const pool = (id: string, models: CatalogModel[], source: ProviderView['source'] = 'organization') =>+ ({ ...provider(id, true, { pi: models }), source }) as ProviderView;+ const groupAuto = (marked: boolean) =>+ model('auto/group-1', marked ? { newSessionDefault: ['pi'] } : {});++ it('上次自动落点不钉住默认:服务端改标号池里的组 Auto 后,校准与无人值守入口同步跟随', () => {+ const gateway = provider('xd', true, { pi: [model('auto')] });+ const byok = pool('org-pool', [model('pool-model'), groupAuto(true)]);+ const providers = [gateway, byok];+ const expected = { model: 'auto/group-1', providerId: 'org-pool' };+ expect(calibrateDraftModel({ providers, agent: 'pi', model: 'auto', chosenByUser: false,+ preferredProviderId: 'xd', providersLoading: false })).toEqual(expected);+ expect(resolveNewTaskDefaultRoute({ providers, agent: 'pi',+ draft: { model: 'auto', providerId: 'xd', chosenByUser: false } })).toEqual(expected);+ expect(resolveNewTaskDefaultRoute({ providers, agent: 'pi' })).toEqual(expected);+ });+});diff --git a/apps/desktop/src/renderer/lib/__tests__/newMakerDefaultTuple.test.ts b/apps/desktop/src/renderer/lib/__tests__/newMakerDefaultTuple.test.tsindex 611d082aa7..848f942fd5 100644--- a/apps/desktop/src/renderer/lib/__tests__/newMakerDefaultTuple.test.ts+++ b/apps/desktop/src/renderer/lib/__tests__/newMakerDefaultTuple.test.ts@@ -338,6 +338,62 @@ describe('resolveNewMakerDefaultTuple', () => {.toMatchObject({ providerId: 'xd', model: 'auto' });});+ describe('服务端标记的 Cindy Auto(模型组 Auto)', () => {+ function pool(id: string, models: CatalogModel[], source: ProviderView['source'] = 'organization') {+ return { ...provider({ id, access: 'managed', models: { pi: models } }), source };+ }+ const groupAuto = (newSessionDefault?: CatalogModel['newSessionDefault']) =>+ model('auto/group-1', 'high', newSessionDefault);++ it('目标是平台模型:跟随 Cindy AI 下被标记的组 Auto,不再用预设 auto', () => {+ const gateway = provider({ id: 'xd', access: 'managed', models: { pi: [model('auto'), groupAuto(['pi'])] } });+ expect(resolve([gateway])).toEqual({ vendor: 'pi', providerId: 'xd', model: 'auto/group-1', effort: 'high' });+ });++ it('目标是号池模型:Auto 在企业号池供应商下,用号池来源', () => {+ const gateway = provider({ id: 'xd', access: 'managed', models: { pi: [model('auto')] } });+ const byok = pool('org-pool', [model('pool-model'), groupAuto(['pi'])]);+ for (const sources of [[gateway, byok], [byok, gateway]]) {+ expect(resolve(sources)).toEqual({ vendor: 'pi', providerId: 'org-pool', model: 'auto/group-1', effort: 'high' });+ }+ // 没有订阅也要把默认切到 Pi,这条规则不能因为模型换了来源而失效。+ expect(resolve([byok])).toMatchObject({ vendor: 'pi', providerId: 'org-pool' });+ });++ it('旧服务端没有标记时回退预设 auto;号池里没被标记的模型不当默认', () => {+ const gateway = provider({ id: 'xd', access: 'managed', models: { pi: [model('auto')] } });+ const byok = pool('org-pool', [model('pool-model'), groupAuto()]);+ expect(resolve([byok, gateway])).toMatchObject({ providerId: 'xd', model: 'auto' });+ expect(resolve([byok])).toBeNull();+ });++ it('只认 Auto 系列的标记:个人目录里被标记的 GLM 不取代 Auto', () => {+ const gateway = provider({+ id: 'xd',+ access: 'managed',+ models: { pi: [model('z-ai/glm-5.3-flash', 'high', ['pi']), model('auto')] },+ });+ expect(resolve([gateway])).toMatchObject({ providerId: 'xd', model: 'auto' });+ });++ it('被隐藏、不是 Pi 标记或用户自己接的供应商里的 Auto 不算', () => {+ const gateway = provider({ id: 'xd', access: 'managed', models: { pi: [model('auto')] } });+ const hidden = pool('org-pool', [{ ...groupAuto(['pi']), defaultEnabled: false }]);+ const codexMarked = pool('org-pool', [groupAuto(['codex'])]);+ const userOwned = pool('custom-litellm', [groupAuto(['pi'])], 'user');+ for (const candidate of [hidden, codexMarked, userOwned]) {+ expect(resolve([candidate, gateway])).toMatchObject({ providerId: 'xd', model: 'auto' });+ }+ });++ it('个人订阅仍然优先', () => {+ const openai = provider({ id: 'openai', access: 'subscription', models: { codex: [model('gpt-6.1-sol')] } });+ const byok = pool('org-pool', [groupAuto(['pi'])]);+ expect(resolve([byok, openai])).toMatchObject({ providerId: 'openai', vendor: 'codex' });+ expect(resolve([byok, openai], new Set(['pi']))).toMatchObject({ providerId: 'org-pool', model: 'auto/group-1' });+ });+ });+it('recognizes earlier automatic tuples without declaring them current defaults', () => {for (const modelId of ['gpt-6-sol', 'chatgpt/gpt-6-sol']) {expect(isKnownProductDefaultTupleIdentity({ vendor: 'codex', providerId: 'openai', model: modelId })).toBe(true);diff --git a/apps/desktop/src/shared/draftModelCalibration.ts b/apps/desktop/src/shared/draftModelCalibration.tsindex 337edb3b76..352201b87b 100644--- a/apps/desktop/src/shared/draftModelCalibration.ts+++ b/apps/desktop/src/shared/draftModelCalibration.ts@@ -14,6 +14,7 @@import {connectedProvidersForAgent,effectiveSourceIdForModel,+ isCindyDistributedProvider,isCustomRoutedProvider,isModelSelectableForNewRoute,nativeDefaultSourceId,@@ -254,7 +255,12 @@ export function calibrateDraftModel({): undefined;if (connectedPreferred) {- const factory = factoryModelForAgent([connectedPreferred], agent, isModelEnabled);+ // Cindy AI 与企业号池由服务端统一编排:默认 Auto 可能落在其中任一家,也可能被挪走。+ // 用户没选过模型时,上次自动落点不能把出厂默认钉在原来那一家。+ const factoryScope = isCindyDistributedProvider(connectedPreferred)+ ? connectedProvidersForAgent([...providers], agent).filter(isCindyDistributedProvider)+ : [connectedPreferred];+ const factory = factoryModelForAgent(factoryScope, agent, isModelEnabled);if (factory) return factory;// marker 只需由策略来源声明一次(当前为 XD),用户选定的来源若也提供同一 ID,仍应由// 该来源承接;不能因它自己的目录副本没重复 marker 就退回旧模型或偷偷改走 XD。diff --git a/apps/desktop/src/shared/newMakerDefaultTuple.ts b/apps/desktop/src/shared/newMakerDefaultTuple.tsindex aaec284126..8343d1fbd5 100644--- a/apps/desktop/src/shared/newMakerDefaultTuple.ts+++ b/apps/desktop/src/shared/newMakerDefaultTuple.ts@@ -1,9 +1,12 @@import {+ isCindyAutoModelId,+ isCindyDistributedProvider,isModelSelectableForNewRoute,providerCatalogId,defaultEffortForCapabilities,clampEffortToSupported,type AgentKind,+ type CatalogModel,type Effort,type ProviderView,} from '@cindy/model-providers';@@ -23,14 +26,24 @@ interface ProviderDefaultPolicy {agents: readonly AgentKind[];modelIds: readonly string[];allowOtherModels?: boolean;+ /**+ * Also search Cindy-distributed pool connections, and try the Auto the server marked as this+ * agent's new-task default before `modelIds`.+ */+ serverMarkedAuto?: boolean;}/*** 新用户的产品默认顺序。*- * Codex / Claude 订阅优先,再采用服务端提供的 Cindy Auto,最后保留 xAI 回退。+ * Codex / Claude 订阅优先,再采用服务端指定的 Cindy Auto,最后保留 xAI 回退。* 出厂推荐按完整路由选择:Sol 使用 Codex,Opus 使用 Claude Code,Cindy Auto 使用 Pi。* 不为了提供默认值把订阅模型静默放到另一个 Harness。+ *+ * Cindy Auto 由服务端决定:模型组 Auto(`auto/<组ID>`)可能挂在 Cindy AI 或企业号池供应商下,+ * 这里在两类来源中跟随服务端的 Pi 新任务默认标记;没有标记时(旧服务端)回退预设 `auto`。+ * 只认 Auto 系列的标记:个人目录仍把旧 GLM 标为 Pi 默认,不能让它取代 Auto。+ * 这条规则同时负责把没有订阅的用户默认切到 Pi,不能删除。*/const DEFAULT_POLICIES: readonly ProviderDefaultPolicy[] = [{@@ -51,6 +64,7 @@ const DEFAULT_POLICIES: readonly ProviderDefaultPolicy[] = [agents: ['pi'],modelIds: ['auto'],allowOtherModels: false,+ serverMarkedAuto: true,},{providerId: 'xai',@@ -89,22 +103,35 @@ export function isKnownProductDefaultTupleIdentity(args: {);}+/** Search passes in priority order: server-marked Auto, the policy's own ids, other models. */+type ModelSearchPass = 'serverMarkedAuto' | 'preferred' | 'other';++function bySortOrder(a: CatalogModel, b: CatalogModel): number {+ return (a.sortOrder ?? Number.MAX_SAFE_INTEGER) - (b.sortOrder ?? Number.MAX_SAFE_INTEGER);+}++/** Only an Auto marker counts; other server markers (e.g. legacy GLM) are ignored. */+function isServerMarkedAuto(model: CatalogModel, agent: AgentKind): boolean {+ return isCindyAutoModelId(model.id) && (model.newSessionDefault?.includes(agent) ?? false);+}+function matchingModel(provider: ProviderView,agent: AgentKind,modelIds: readonly string[],- allowOtherModels = true,+ pass: ModelSearchPass,enabled?: (agent: AgentKind, providerId: string, model: { id: string; defaultEnabled?: boolean }) => boolean,) {const models = provider.models[agent] ?? [];- const preferred = modelIds.map((id) => models.find((model) => model.id === id));// Both renderer and unattended callers keep the same-provider fallback.// Without local visibility overrides, use the catalog's default visibility.// Cindy Auto is an upstream route identity; do not substitute a fixed model.- const fallback = allowOtherModels ? models.slice().sort(- (a, b) => (a.sortOrder ?? Number.MAX_SAFE_INTEGER) - (b.sortOrder ?? Number.MAX_SAFE_INTEGER),- ) : [];- return [...preferred, ...fallback]+ const candidates = pass === 'serverMarkedAuto'+ ? models.filter((model) => isServerMarkedAuto(model, agent)).sort(bySortOrder)+ : pass === 'preferred'+ ? modelIds.map((id) => models.find((model) => model.id === id))+ : models.slice().sort(bySortOrder);+ return candidates.find((model) =>model !== undefined &&@@ -133,16 +160,21 @@ export function resolveNewMakerDefaultTuples(args: {for (const policy of DEFAULT_POLICIES) {const matchingProviders = providers.filter((candidate) =>- providerCatalogId(candidate) === policy.providerId &&+ ((providerCatalogId(candidate) === policy.providerId &&+ candidate.access?.kind === policy.accessKind) ||+ (policy.serverMarkedAuto === true && isCindyDistributedProvider(candidate))) &&candidate.connected &&!candidate.suspended &&- !candidate.modelDiscoveryFailure &&- candidate.access?.kind === policy.accessKind,+ !candidate.modelDiscoveryFailure,);+ const passes: ModelSearchPass[] = [+ ...(policy.serverMarkedAuto ? ['serverMarkedAuto' as const] : []),+ 'preferred',+ ...(policy.allowOtherModels === false ? [] : ['other' as const]),+ ];// Search every account for the recommendation before falling back to other// enabled models. An earlier account's fallback must not hide a later Sol.- policySearch: for (const allowOtherModels of [false, true]) {- if (allowOtherModels && policy.allowOtherModels === false) break;+ policySearch: for (const pass of passes) {for (const provider of matchingProviders) {for (const agent of policy.agents) {const vendor = vendorForAgent(agent);@@ -151,7 +183,7 @@ export function resolveNewMakerDefaultTuples(args: {provider,agent,policy.modelIds,- allowOtherModels,+ pass,args.isModelEnabled,);if (!model) continue;diff --git a/docs/dev-rules/model-catalog-maintenance.md b/docs/dev-rules/model-catalog-maintenance.mdindex f012ab2f9b..d76bf4bd61 100644--- a/docs/dev-rules/model-catalog-maintenance.md+++ b/docs/dev-rules/model-catalog-maintenance.md@@ -126,10 +126,13 @@ xAI 保留 Registry 声明顺序,XD 以 Gateway `/models` 为准,均不受同名字段不进入活动目录。未标记时取排序第一的默认可见模型,即账号返回的第一个可见模型。未手动选择模型时,客户端出厂来源顺序为 Codex 订阅 GPT-6.1 Sol(Codex)、-Claude 订阅 Opus 5.5(Claude Code)、Cindy AI 下发的 Auto(Pi),最后保留 xAI 回退。-订阅按认证身份识别独立账号,始终保留实际账号 ID;Auto 必须存在于 Cindy AI 的可用 Pi-目录,不依赖旧 GLM 默认标记,也不在客户端将其替换成固定型号。草稿发送校准与无人值守-默认解析复用同一策略,避免初始化选中 Auto 后又被旧标记改回 GLM。+Claude 订阅 Opus 5.5(Claude Code)、服务端指定的 Cindy Auto(Pi),最后保留 xAI 回退。+订阅按认证身份识别独立账号,始终保留实际账号 ID。Cindy Auto 由服务端决定:在 Cindy AI 与+企业号池供应商(`source: organization`)中跟随被标为 Pi 新任务默认的 Auto 系列模型+(预设 `auto` 或模型组 Auto `auto/<组ID>`),没有标记时(旧服务端)回退 Cindy AI 的预设 `auto`。+只认 Auto 系列的标记:个人目录仍把旧 GLM 标为 Pi 默认,客户端不采纳,也不把 Auto 替换成固定型号。+上次自动落点不钉住默认:草稿记着的来源是这两类之一时,校准仍在两类来源中整体寻找。+草稿发送校准与无人值守默认解析复用同一策略,避免初始化选中 Auto 后又被旧标记改回 GLM。同一订阅策略先在全部匹配账号中寻找推荐型号,再取该来源按目录排序可见的其他型号;无人值守入口没有本地显示开关时按 `defaultEnabled` 判断,不能因缺少推荐型号提前换到下一供应商。策略在 `apps/desktop/src/shared/newMakerDefaultTuple.ts`;连接、型号和对应引擎必须实际可用,diff --git a/packages/model-providers/src/index.ts b/packages/model-providers/src/index.tsindex ef7985cea3..e5943c4180 100644--- a/packages/model-providers/src/index.ts+++ b/packages/model-providers/src/index.ts@@ -55,7 +55,7 @@ export type {} from "./types.js";export { NATIVE_SUBSCRIPTION_AUTHS, NATIVE_SUBSCRIPTION_DEFAULT_PROVIDER_IDS, PI_MODEL_APIS, PI_REASONING_EFFORTS } from "./types.js";-export { isLocalOnlyProviderForAgent, isOpenAiSubscriptionProvider, providerCatalogId, isCustomRoutedProvider, isOrganizationManagedProvider } from './provider-identity.js';+export { isLocalOnlyProviderForAgent, isOpenAiSubscriptionProvider, providerCatalogId, isCustomRoutedProvider, isOrganizationManagedProvider, isCindyDistributedProvider, isCindyAutoModelId } from './provider-identity.js';export { sourceProviderForPreset } from './providerPresetIdentity.js';export { isMimoTokenPlanPreset } from './mimoPresentation.js';diff --git a/packages/model-providers/src/provider-identity.ts b/packages/model-providers/src/provider-identity.tsindex c838b715ff..cd8470b740 100644--- a/packages/model-providers/src/provider-identity.ts+++ b/packages/model-providers/src/provider-identity.ts@@ -42,3 +42,22 @@ export function isOrganizationManagedProvider(): boolean {return provider?.source === 'organization';}++/**+ * Cindy AI (`xd`) or an enterprise pool connection distributed by Cindy. The server decides+ * which of them carries a model-group Auto and may move it between them; user-added+ * connections never take part.+ */+export function isCindyDistributedProvider(+ provider: Pick<Provider, 'id' | 'source'> | null | undefined,+): boolean {+ return (provider?.source === 'builtin' && provider.id === 'xd') || isOrganizationManagedProvider(provider);+}++/**+ * Cindy Auto, recognized by model id alone: the preset `auto` or a model-group Auto+ * (`auto/<groupId>`). The server routes it upstream and may move it between Cindy sources.+ */+export function isCindyAutoModelId(modelId: string): boolean {+ return modelId === 'auto' || (modelId.startsWith('auto/') && modelId.length > 'auto/'.length);+}