Skip to content

armgit / cindy

Public Imported from GitHub
0

Consider it done. The open-source AI agent that works out of the box · 想到,就能做到。开源、开箱即用的 AI Agent。

fix(models): 默认选择 GPT-6.1 Sol (#5895)

Chris Zhang7736710157bc
diff --git a/apps/desktop/src/renderer/__tests__/draftModelCalibration.test.ts b/apps/desktop/src/renderer/__tests__/draftModelCalibration.test.ts
index f44f48b285..04389c0967 100644
--- a/apps/desktop/src/renderer/__tests__/draftModelCalibration.test.ts
+++ b/apps/desktop/src/renderer/__tests__/draftModelCalibration.test.ts
@@ -885,10 +885,29 @@ describe('resolveNewTaskDefaultRoute(无人值守入口的新建任务默认)',
});
describe('factory defaults survive send-time calibration', () => {
+ it('keeps unattended Codex defaults on visible OpenAI fallback before xAI', () => {
+ const oldSol = model('gpt-6-sol');
+ const openai = provider('openai', true, { codex: [oldSol] }, 'subscription');
+ const xai = provider('xai', true, { codex: [model('xai/grok-4.6')] }, 'subscription');
+ const providers = [xai, openai];
+ const startup = resolveNewMakerDefaultTuple({ providers, providersLoading: false,
+ availableAgents: new Set(['codex']), availableAgentsLoaded: true,
+ isModelEnabled: (_agent, _id, m) => m.defaultEnabled !== false });
+ expect(startup).toMatchObject({ model: 'gpt-6-sol', providerId: 'openai' });
+ expect(resolveNewTaskDefaultRoute({ providers, agent: 'codex' }))
+ .toEqual({ model: 'gpt-6-sol', providerId: 'openai' });
+ expect(resolveNewTaskDefaultRoute({ providers, agent: 'codex',
+ draft: { model: 'xai/grok-4.6', providerId: 'xai', chosenByUser: true } }))
+ .toEqual({ model: 'xai/grok-4.6', providerId: 'xai' });
+ oldSol.defaultEnabled = false;
+ expect(resolveNewTaskDefaultRoute({ providers, agent: 'codex' }))
+ .toEqual({ model: 'xai/grok-4.6', providerId: 'xai' });
+ });
+
it.each([null, 'openai'])('keeps startup visibility switches during calibration (source %s)', preferredProviderId => {
- const openai = provider('openai', true, { codex: [model('gpt-6-sol'), model('gpt-6-astra')] }, 'subscription');
+ const openai = provider('openai', true, { codex: [model('gpt-6.1-sol'), model('gpt-6-astra')] }, 'subscription');
const isModelEnabled = (agent: AgentKind, providerId: string, candidate: { id: string }) =>
- !(agent === 'codex' && providerId === 'openai' && candidate.id === 'gpt-6-sol');
+ !(agent === 'codex' && providerId === 'openai' && candidate.id === 'gpt-6.1-sol');
const startup = resolveNewMakerDefaultTuple({ providers: [openai], providersLoading: false,
availableAgents: new Set(['codex']), availableAgentsLoaded: true, isModelEnabled });
expect(startup).toMatchObject({ model: 'gpt-6-astra', providerId: 'openai' });
@@ -898,10 +917,10 @@ describe('factory defaults survive send-time calibration', () => {
.toEqual({ model: 'gpt-6-astra', providerId: 'openai' });
// Reopening the switch makes the factory recommendation eligible again.
expect(calibrateDraftModel({ ...input, isModelEnabled: () => true }))
- .toEqual({ model: 'gpt-6-sol', providerId: 'openai' });
+ .toEqual({ model: 'gpt-6.1-sol', providerId: 'openai' });
// A hidden model explicitly selected by the user still wins.
- expect(calibrateDraftModel({ ...input, model: 'gpt-6-sol', chosenByUser: true, isModelEnabled }))
- .toEqual({ model: 'gpt-6-sol', providerId: null });
+ expect(calibrateDraftModel({ ...input, model: 'gpt-6.1-sol', chosenByUser: true, isModelEnabled }))
+ .toEqual({ model: 'gpt-6.1-sol', providerId: null });
// Hiding every model must not disable the existing usable-route fallback.
expect(calibrateDraftModel({ ...input, isModelEnabled: () => false }))
.toEqual({ model: 'gpt-6-astra', providerId: 'openai' });
diff --git a/apps/desktop/src/renderer/__tests__/newMakerDraft.test.ts b/apps/desktop/src/renderer/__tests__/newMakerDraft.test.ts
index af157d8294..584736bba5 100644
--- a/apps/desktop/src/renderer/__tests__/newMakerDraft.test.ts
+++ b/apps/desktop/src/renderer/__tests__/newMakerDraft.test.ts
@@ -161,7 +161,7 @@ describe('newMakerDraft store', () => {
expect(getDraft().vendor).toBe('cc');
sources.push({ ...sources[0]!, id: 'openai', agents: ['codex'],
access: { kind: 'subscription', product: 'ChatGPT' },
- models: { codex: [{ id: 'gpt-6-sol', name: 'Sol', contextWindow: 272000, efforts: ['high'], defaultEffort: 'high' }] },
+ models: { codex: [{ id: 'gpt-6.1-sol', name: 'Sol', contextWindow: 272000, efforts: ['high'], defaultEffort: 'high' }] },
});
expect(applySuggestedDefaultTuple(resolve())).toBe(!customized);
const draft = getDraft();
diff --git a/apps/desktop/src/renderer/lib/__tests__/newMakerDefaultTuple.test.ts b/apps/desktop/src/renderer/lib/__tests__/newMakerDefaultTuple.test.ts
index d40837e322..611d082aa7 100644
--- a/apps/desktop/src/renderer/lib/__tests__/newMakerDefaultTuple.test.ts
+++ b/apps/desktop/src/renderer/lib/__tests__/newMakerDefaultTuple.test.ts
@@ -63,9 +63,9 @@ describe('resolveNewMakerDefaultTuple', () => {
{ defaultEffort: 'max', efforts: ['low', 'medium', 'high'], expected: 'high' },
{ defaultEffort: undefined, efforts: [], expected: null },
])('keeps a usable model with incomplete or stale effort metadata: %j', ({ defaultEffort, efforts, expected }) => {
- const candidate = { ...model('gpt-6-sol'), defaultEffort, efforts } as CatalogModel;
+ const candidate = { ...model('gpt-6.1-sol'), defaultEffort, efforts } as CatalogModel;
expect(resolve([provider({ id: 'openai', access: 'subscription', models: { codex: [candidate] } })]))
- .toMatchObject({ model: 'gpt-6-sol', effort: expected });
+ .toMatchObject({ model: 'gpt-6.1-sol', effort: expected });
});
it('没有来源或清单仍在加载时不编造默认组合', () => {
@@ -87,13 +87,13 @@ describe('resolveNewMakerDefaultTuple', () => {
id: 'openai',
access: 'subscription',
models: {
- codex: [{ ...model('chatgpt/gpt-6-sol', 'medium'), efforts: ['medium', 'high'] }],
+ codex: [{ ...model('chatgpt/gpt-6.1-sol', 'medium'), efforts: ['medium', 'high'] }],
},
}),
expected: {
vendor: 'codex',
providerId: 'openai',
- model: 'chatgpt/gpt-6-sol',
+ model: 'chatgpt/gpt-6.1-sol',
effort: 'medium',
},
},
@@ -156,13 +156,13 @@ describe('resolveNewMakerDefaultTuple', () => {
const openai = provider({
id: 'openai',
access: 'subscription',
- models: { codex: [model('chatgpt/gpt-6-sol')] },
+ models: { codex: [model('chatgpt/gpt-6.1-sol')] },
});
for (const sources of [
[gateway, anthropic, openai],
[openai, anthropic, gateway],
]) {
- expect(resolve(sources)).toMatchObject({ vendor: 'codex', providerId: 'openai', model: 'chatgpt/gpt-6-sol' });
+ expect(resolve(sources)).toMatchObject({ vendor: 'codex', providerId: 'openai', model: 'chatgpt/gpt-6.1-sol' });
}
expect(resolve([anthropic, openai])).toMatchObject({ providerId: 'openai' });
expect(resolve([gateway, anthropic])).toMatchObject({ providerId: 'anthropic' });
@@ -205,7 +205,7 @@ describe('resolveNewMakerDefaultTuple', () => {
const openai = provider({
id: 'openai',
access: 'subscription',
- models: { codex: [model('gpt-6-sol')] },
+ models: { codex: [model('gpt-6.1-sol')] },
});
if (reason === 'disconnected') gateway.connected = false;
if (reason === 'suspended') gateway.suspended = true;
@@ -242,7 +242,7 @@ describe('resolveNewMakerDefaultTuple', () => {
'claude-code': [model('claude-opus-5-5')], pi: [model('claude-opus-5-5')], codex: [model('claude-opus-5-5')],
} });
const openai = provider({ id: 'openai', access: 'subscription', models: {
- codex: [model('gpt-6-sol')], pi: [model('gpt-6-sol')], 'claude-code': [model('gpt-6-sol')],
+ codex: [model('gpt-6.1-sol')], pi: [model('gpt-6.1-sol')], 'claude-code': [model('gpt-6.1-sol')],
} });
expect(resolve([anthropic], new Set(['codex', 'pi']))).toBeNull();
expect(resolve([openai], new Set(['cc', 'pi']))).toBeNull();
@@ -252,7 +252,7 @@ describe('resolveNewMakerDefaultTuple', () => {
const failedOpenai = provider({
id: 'openai',
access: 'subscription',
- models: { codex: [model('chatgpt/gpt-6-sol')] },
+ models: { codex: [model('chatgpt/gpt-6.1-sol')] },
failed: true,
});
const gateway = provider({
@@ -303,22 +303,22 @@ describe('resolveNewMakerDefaultTuple', () => {
const openai = provider({
id: 'openai',
access: 'subscription',
- models: { codex: [model('chatgpt/gpt-6-sol', 'medium')] },
+ models: { codex: [model('chatgpt/gpt-6.1-sol', 'medium')] },
});
expect(resolve([openai])).toMatchObject({ effort: 'medium' });
});
it.each([false, true])('searches independent accounts before model fallback (visibility callback: %s)', withVisibility => {
- const stale = provider({ id: 'openai', access: 'subscription', models: { codex: [model('gpt-old')] } });
- const account = provider({ id: 'openai-account', access: 'subscription', models: { codex: [model('gpt-6-sol')] } });
+ const stale = provider({ id: 'openai', access: 'subscription', models: { codex: [model('gpt-6-sol')] } });
+ const account = provider({ id: 'openai-account', access: 'subscription', models: { codex: [model('gpt-6.1-sol')] } });
account.auth = { method: 'oauth', native: 'codex' };
const args = { providers: [stale, account], providersLoading: false, availableAgents: allAgents,
availableAgentsLoaded: true, ...(withVisibility ? { isModelEnabled: () => true } : {}) };
- expect(resolveNewMakerDefaultTuple(args)).toMatchObject({ providerId: account.id, model: 'gpt-6-sol' });
+ expect(resolveNewMakerDefaultTuple(args)).toMatchObject({ providerId: account.id, model: 'gpt-6.1-sol' });
if (withVisibility) {
// Once no account has a visible Sol, retain the enabled model fallback.
- expect(resolveNewMakerDefaultTuple({ ...args, isModelEnabled: (_agent, _providerId, m) => m.id !== 'gpt-6-sol' }))
- .toMatchObject({ providerId: stale.id, model: 'gpt-old' });
+ expect(resolveNewMakerDefaultTuple({ ...args, isModelEnabled: (_agent, _providerId, m) => m.id !== 'gpt-6.1-sol' }))
+ .toMatchObject({ providerId: stale.id, model: 'gpt-6-sol' });
}
const claude = provider({ id: 'claude-account', access: 'subscription', models: { 'claude-code': [model('claude-opus-5-5')] } });
claude.auth = { method: 'oauth', native: 'claude' };
@@ -331,6 +331,7 @@ describe('resolveNewMakerDefaultTuple', () => {
const args = { providers: [gateway], providersLoading: false, availableAgents: allAgents,
availableAgentsLoaded: true, isModelEnabled: (_agent: AgentKind, _id: string, m: { id: string }) => m.id !== 'auto' };
expect(resolveNewMakerDefaultTuple(args)).toBeNull();
+ expect(resolve([gateway])).toBeNull();
gateway.models.pi!.push(model('auto'));
expect(resolveNewMakerDefaultTuple(args)).toBeNull();
expect(resolveNewMakerDefaultTuple({ ...args, isModelEnabled: () => true }))
@@ -338,6 +339,9 @@ describe('resolveNewMakerDefaultTuple', () => {
});
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);
+ }
expect(isKnownProductDefaultTupleIdentity({ vendor: 'codex', providerId: 'openai', model: 'gpt-6-astra' })).toBe(true);
expect(isKnownProductDefaultTupleIdentity({ vendor: 'pi', providerId: 'xd', model: 'z-ai/glm-5.3-flash' })).toBe(true);
expect(isKnownProductDefaultTupleIdentity({ vendor: 'pi', providerId: 'xd', model: 'auto' })).toBe(true);
diff --git a/apps/desktop/src/shared/newMakerDefaultTuple.ts b/apps/desktop/src/shared/newMakerDefaultTuple.ts
index bc95c72243..aaec284126 100644
--- a/apps/desktop/src/shared/newMakerDefaultTuple.ts
+++ b/apps/desktop/src/shared/newMakerDefaultTuple.ts
@@ -37,7 +37,7 @@ const DEFAULT_POLICIES: readonly ProviderDefaultPolicy[] = [
providerId: 'openai',
accessKind: 'subscription',
agents: ['codex'],
- modelIds: ['gpt-6-sol', 'chatgpt/gpt-6-sol'],
+ modelIds: ['gpt-6.1-sol', 'chatgpt/gpt-6.1-sol'],
},
{
providerId: 'anthropic',
@@ -75,6 +75,7 @@ export function isKnownProductDefaultTupleIdentity(args: {
}): boolean {
// Old automatic selections remain recognizable after the factory policy changes.
const legacyPolicies: readonly ProviderDefaultPolicy[] = [
+ { providerId: 'openai', accessKind: 'subscription', agents: ['codex'], modelIds: ['gpt-6-sol', 'chatgpt/gpt-6-sol'] },
{ providerId: 'openai', accessKind: 'subscription', agents: ['codex'], modelIds: ['gpt-6-astra', 'chatgpt/gpt-6-astra'] },
{ providerId: 'xd', accessKind: 'managed', agents: ['pi'], modelIds: ['z-ai/glm-5.3-flash', 'glm-5.3-flash'] },
{ providerId: 'openai', accessKind: 'subscription', agents: ['codex', 'claude-code', 'pi'], modelIds: ['chatgpt/gpt-5.6-sol', 'gpt-5.6-sol'] },
@@ -97,10 +98,13 @@ function matchingModel(
) {
const models = provider.models[agent] ?? [];
const preferred = modelIds.map((id) => models.find((model) => model.id === id));
- // Once the owner has an enabled list, a disabled factory recommendation must
- // yield to another enabled model from this source, never bypass that list.
+ // 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.
- return (enabled && allowOtherModels ? [...preferred, ...models] : preferred)
+ const fallback = allowOtherModels ? models.slice().sort(
+ (a, b) => (a.sortOrder ?? Number.MAX_SAFE_INTEGER) - (b.sortOrder ?? Number.MAX_SAFE_INTEGER),
+ ) : [];
+ return [...preferred, ...fallback]
.find(
(model) =>
model !== undefined &&
@@ -112,8 +116,8 @@ function matchingModel(
/**
* 为“尚未自定义”的本地新任务与伙伴按产品顺序挑选可用默认组合。
*
- * 返回空数组表示没有足够证据给默认值:供应商仍在加载、没有可用来源,或推荐模型不在
- * 当前账号目录里。调用方此时保留连接引导/既有空态,绝不编造一个看似可发送的组合。
+ * 返回空数组表示没有足够证据给默认值:供应商仍在加载、没有可用来源,或推荐与允许的回退
+ * 都不在当前账号的可用目录里。调用方此时保留连接引导/既有空态,绝不编造一个看似可发送的组合。
*/
export function resolveNewMakerDefaultTuples(args: {
providers: readonly ProviderView[];
@@ -138,7 +142,7 @@ export function resolveNewMakerDefaultTuples(args: {
// 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 && (!args.isModelEnabled || policy.allowOtherModels === false)) break;
+ if (allowOtherModels && policy.allowOtherModels === false) break;
for (const provider of matchingProviders) {
for (const agent of policy.agents) {
const vendor = vendorForAgent(agent);
diff --git a/docs/dev-rules/model-catalog-maintenance.md b/docs/dev-rules/model-catalog-maintenance.md
index abb7d69d53..e92408bf11 100644
--- a/docs/dev-rules/model-catalog-maintenance.md
+++ b/docs/dev-rules/model-catalog-maintenance.md
@@ -99,11 +99,13 @@ xAI 保留 Registry 声明顺序,XD 以 Gateway `/models` 为准,均不受
来源内的默认推荐可由服务端按区域下发的 `newSessionDefault` 指定;公共 Registry 的
同名字段不进入活动目录。未标记时取排序第一的默认可见模型,即账号返回的第一个可见模型。
-未手动选择模型时,客户端出厂来源顺序为 Codex 订阅 GPT-6 Sol(Codex)、
+未手动选择模型时,客户端出厂来源顺序为 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。
+同一订阅策略先在全部匹配账号中寻找推荐型号,再取该来源按目录排序可见的其他型号;
+无人值守入口没有本地显示开关时按 `defaultEnabled` 判断,不能因缺少推荐型号提前换到下一供应商。
策略在 `apps/desktop/src/shared/newMakerDefaultTuple.ts`;连接、型号和对应引擎必须实际可用,
不能为了满足推荐而把 Sol / Opus 放入另一个引擎。用户手动选择及型号开关始终优先,
不修改已有任务的运行配置;伙伴默认复用应用选择,不另造一套来源优先级。
diff --git a/docs/product-rules/model-selector-unified.md b/docs/product-rules/model-selector-unified.md
index a6133ef55e..d58ab9d093 100644
--- a/docs/product-rules/model-selector-unified.md
+++ b/docs/product-rules/model-selector-unified.md
@@ -176,7 +176,7 @@
| 情形 | 行为 |
|---|---|
-| 新用户 | 本地新任务按完整组合落点:OpenAI 订阅→GPT-6 Sol / Codex;Anthropic 订阅→Claude Opus 5.5 / Claude Code;Cindy AI→服务端下发的 Auto / Pi;之后保留 xAI 订阅→Grok / Pi 回退。深度沿用各模型目录默认值;来源、模型和引擎必须可用,不伪造 Auto,也不借旧 GLM 默认标记选固定型号 |
+| 新用户 | 本地新任务按完整组合落点:OpenAI 订阅→GPT-6.1 Sol / Codex;Anthropic 订阅→Claude Opus 5.5 / Claude Code;Cindy AI→服务端下发的 Auto / Pi;之后保留 xAI 订阅→Grok / Pi 回退。深度沿用各模型目录默认值;来源、模型和引擎必须可用,不伪造 Auto,也不借旧 GLM 默认标记选固定型号 |
| 多来源 | 未自定义时按 OpenAI→Anthropic→Cindy AI→xAI 选择可用组合(CN / Global 一致);独立订阅账号按认证身份识别,保留真实账号 ID。用户手动选择保持优先;来源仍在加载、账号没有可用目标、或零来源时不编造组合 |
| 未自定义老用户 | 同新用户;自动下放不设置 `modelChosenByVendor`。仅由旧版 cc 不可用触发并持久化的非 cc Harness 仍属于系统回退,不算用户自定义 |
| 已自定义老用户 | 任一明确的 Harness / 来源 / 模型 / 思考深度 / Fast 选择会封住后续自动下放;`modelChosenByVendor`、providerModelMemory、引擎 override 与形态偏好全部保留 |