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(model-default): 旧目录下保留未手选号池草稿来源

fmfsaisaifa095beb8baf
diff --git a/apps/desktop/src/renderer/__tests__/draftModelCalibration.test.ts b/apps/desktop/src/renderer/__tests__/draftModelCalibration.test.ts
index 92607e43ec..3ac46560d6 100644
--- a/apps/desktop/src/renderer/__tests__/draftModelCalibration.test.ts
+++ b/apps/desktop/src/renderer/__tests__/draftModelCalibration.test.ts
@@ -5,11 +5,12 @@
* 连了哪些来源无关;可连来源不提供那个 id 时,Send 直接禁用、只能弹「当前模型没有已
* 连接的来源」。校准只作用于**没被显式选过**的默认值。
*/
-import { describe, expect, it } from 'vitest';
+import { describe, expect, it, vi } from 'vitest';
import type { AgentKind, CatalogModel, ProviderView } from '@cindy/model-providers';
import { resolveNewMakerDefaultTuple } from '../lib/newMakerDefaultTuple';
+import { getDraft, getDraftForPreferenceSync, setNewMakerDraftOwner } from '../state/newMakerDraft';
import {
calibrateDraftModel,
@@ -955,6 +956,153 @@ describe('模型组 Auto:服务端决定默认与来源', () => {
const groupAuto = (marked: boolean) =>
model('auto/group-1', marked ? { newSessionDefault: ['pi'] } : {});
+ // unit:旧服务端下的普通号池草稿不能被跨来源校准改成平台计费。
+ // 既有用例只覆盖组 Auto 搬迁,未覆盖没有合格组默认的普通草稿。
+ const oldPoolDraft = { model: 'pool-model', providerId: 'org-pool', chosenByUser: false };
+ const expectedPoolRoute = { model: 'pool-model', providerId: 'org-pool' };
+ const routesForDraft = (providers: ProviderView[], draft = oldPoolDraft) => ({
+ calibration: calibrateDraftModel({
+ providers,
+ agent: 'pi',
+ model: draft.model,
+ chosenByUser: draft.chosenByUser,
+ preferredProviderId: draft.providerId,
+ providersLoading: false,
+ }),
+ unattended: resolveNewTaskDefaultRoute({ providers, agent: 'pi', draft }),
+ });
+
+ it('旧目录只有预设 auto 时,两个入口都保留未手选的号池草稿来源', () => {
+ const providers = [
+ provider('xd', true, { pi: [model('auto', { newSessionDefault: ['pi'] })] }),
+ pool('org-pool', [model('pool-model')]),
+ ];
+ expect(routesForDraft(providers)).toEqual({
+ calibration: expectedPoolRoute,
+ unattended: expectedPoolRoute,
+ });
+ });
+
+ it.each([
+ ['未标默认', {}, {}],
+ ['只标其它引擎', { newSessionDefault: ['codex'] }, {}],
+ ['模型停用', { newSessionDefault: ['pi'], disabled: true }, {}],
+ ['模型退役', { newSessionDefault: ['pi'], status: 'retired' }, {}],
+ ['默认不可见', { newSessionDefault: ['pi'], defaultEnabled: false }, {}],
+ ['不可用于聊天', { newSessionDefault: ['pi'], mode: 'image_generation' }, {}],
+ ['需要付费', { newSessionDefault: ['pi'], availability: 'requires_payment' }, {}],
+ ['来源未连接', { newSessionDefault: ['pi'] }, { connected: false }],
+ ['来源停用', { newSessionDefault: ['pi'] }, { suspended: true }],
+ ] satisfies Array<[string, Partial<CatalogModel>, Partial<ProviderView>]>)(
+ '%s的组 Auto 不授权跨来源校准',
+ (_label, modelPatch, providerPatch) => {
+ const providers = [
+ provider('xd', true, { pi: [model('auto')] }),
+ pool('org-pool', [model('pool-model')]),
+ { ...pool('org-other', [model('auto/group-1', modelPatch)]), ...providerPatch },
+ ];
+ expect(routesForDraft(providers)).toEqual({
+ calibration: expectedPoolRoute,
+ unattended: expectedPoolRoute,
+ });
+ },
+ );
+
+ it('本地隐藏的组 Auto 不授权校准,用户重新显示后才跟随其默认', () => {
+ const providers = [
+ provider('xd', true, { pi: [model('auto'), groupAuto(true)] }),
+ pool('org-pool', [model('pool-model')]),
+ ];
+ for (const visible of [false, true]) {
+ expect(
+ calibrateDraftModel({
+ providers,
+ agent: 'pi',
+ ...oldPoolDraft,
+ preferredProviderId: 'org-pool',
+ providersLoading: false,
+ isModelEnabled: (_agent, _provider, candidate) =>
+ candidate.id !== 'auto/group-1' || visible,
+ }),
+ ).toEqual(visible ? { model: 'auto/group-1', providerId: 'xd' } : expectedPoolRoute);
+ }
+ });
+
+ it.each([false, true])(
+ '平台组默认生效,双来源标记=%s 时仍按平台与 sortOrder 取舍',
+ (poolMarked) => {
+ const providers = [
+ pool('org-pool', [model('pool-model'), ...(poolMarked ? [groupAuto(true)] : [])]),
+ provider('xd', true, {
+ pi: [
+ model('auto/platform-later', { newSessionDefault: ['pi'], sortOrder: 20 }),
+ model('auto/platform-first', { newSessionDefault: ['pi'], sortOrder: 10 }),
+ model('auto'),
+ ],
+ }),
+ ];
+ const expected = { model: 'auto/platform-first', providerId: 'xd' };
+ expect(routesForDraft(providers)).toEqual({ calibration: expected, unattended: expected });
+ expect(
+ resolveNewTaskDefaultRoute({
+ providers,
+ agent: 'pi',
+ draft: oldPoolDraft,
+ requiredProviderId: 'org-pool',
+ }),
+ ).toEqual(poolMarked ? { model: 'auto/group-1', providerId: 'org-pool' } : expectedPoolRoute);
+ },
+ );
+
+ it('草稿已记着组 Auto 时,撤销组默认仍能跨来源回退到预设 auto', () => {
+ const providers = [
+ provider('xd', true, { pi: [model('auto')] }),
+ pool('org-pool', [model('pool-model')]),
+ ];
+ const expected = { model: 'auto', providerId: 'xd' };
+ expect(routesForDraft(providers, { ...oldPoolDraft, model: 'auto/group-removed' })).toEqual({
+ calibration: expected,
+ unattended: expected,
+ });
+ });
+
+ it.each(['缺少手选标记', '空手选标记'])(
+ '旧版持久化草稿(%s)经过真实读取和规范化后仍保留号池',
+ (snapshotKind) => {
+ // 使用账号命名空间切换触发 loadFromStorage/sanitize;同一模块只加载一次。
+ const owner = `legacy-pool-${snapshotKind}`;
+ const key = `xdt:newMakerDraft:v1:${encodeURIComponent(owner)}`;
+ const raw = JSON.stringify({
+ vendor: 'pi',
+ lastByVendor: { pi: { model: 'pool-model', providerId: 'org-pool' } },
+ ...(snapshotKind === '空手选标记' ? { modelChosenByVendor: {} } : {}),
+ });
+ vi.stubGlobal('window', {
+ localStorage: { getItem: (name: string) => (name === key ? raw : null) },
+ });
+ try {
+ setNewMakerDraftOwner(owner);
+ const providers = [
+ provider('xd', true, { pi: [model('auto')] }),
+ pool('org-pool', [model('pool-model')]),
+ ];
+ for (const stored of [getDraft(), getDraftForPreferenceSync()]) {
+ expect(stored.modelChosenByVendor.pi).toBeUndefined();
+ expect(
+ routesForDraft(providers, {
+ model: stored.lastByVendor.pi.model,
+ providerId: stored.lastByVendor.pi.providerId!,
+ chosenByUser: stored.modelChosenByVendor.pi === true,
+ }),
+ ).toEqual({ calibration: expectedPoolRoute, unattended: expectedPoolRoute });
+ }
+ } finally {
+ setNewMakerDraftOwner(null);
+ vi.unstubAllGlobals();
+ }
+ },
+ );
+
it('上次自动落点不钉住默认:服务端改标号池里的组 Auto 后,校准与无人值守入口同步跟随', () => {
const gateway = provider('xd', true, { pi: [model('auto')] });
const byok = pool('org-pool', [model('pool-model'), groupAuto(true)]);
diff --git a/apps/desktop/src/shared/draftModelCalibration.ts b/apps/desktop/src/shared/draftModelCalibration.ts
index 4fc0bcc4a1..c96b0cb8d4 100644
--- a/apps/desktop/src/shared/draftModelCalibration.ts
+++ b/apps/desktop/src/shared/draftModelCalibration.ts
@@ -13,6 +13,7 @@
import {
connectedProvidersForAgent,
+ isCindyAutoModelId,
effectiveSourceIdForModel,
isCindyDistributedProvider,
isCustomRoutedProvider,
@@ -22,7 +23,10 @@ import {
type CatalogModel,
type ProviderView,
} from '@cindy/model-providers';
-import { resolveNewMakerDefaultTuple } from './newMakerDefaultTuple.js';
+import {
+ hasAvailableServerMarkedGroupAuto,
+ resolveNewMakerDefaultTuple,
+} from './newMakerDefaultTuple.js';
type ModelEnabledPredicate = Parameters<typeof resolveNewMakerDefaultTuple>[0]['isModelEnabled'];
@@ -255,9 +259,13 @@ export function calibrateDraftModel({
)
: undefined;
if (connectedPreferred) {
- // Cindy AI 与企业号池由服务端统一编排:默认 Auto 可能落在其中任一家,也可能被挪走。
- // 用户没选过模型时,上次自动落点不能把出厂默认钉在原来那一家。
- const factoryScope = isCindyDistributedProvider(connectedPreferred)
+ // 普通草稿只有在服务端提供可用的组默认时才跨 Cindy 来源校准;旧目录保留号池来源。
+ // 草稿本身已是组 Auto 时仍跨来源寻找,以保留搬迁及撤销后的回退。
+ const followsGroupDefault =
+ isCindyDistributedProvider(connectedPreferred) &&
+ ((model !== 'auto' && isCindyAutoModelId(model)) ||
+ hasAvailableServerMarkedGroupAuto(providers, agent, isModelEnabled));
+ const factoryScope = followsGroupDefault
? connectedProvidersForAgent([...providers], agent).filter(isCindyDistributedProvider)
: [connectedPreferred];
const factory = factoryModelForAgent(factoryScope, agent, isModelEnabled);
diff --git a/apps/desktop/src/shared/newMakerDefaultTuple.ts b/apps/desktop/src/shared/newMakerDefaultTuple.ts
index 1d62d7cda9..c470a85195 100644
--- a/apps/desktop/src/shared/newMakerDefaultTuple.ts
+++ b/apps/desktop/src/shared/newMakerDefaultTuple.ts
@@ -1,5 +1,6 @@
import {
isCindyAutoModelId,
+ connectedProvidersForAgent,
isCindyDistributedProvider,
isModelSelectableForNewRoute,
providerCatalogId,
@@ -104,7 +105,7 @@ export function isKnownProductDefaultTupleIdentity(args: {
}
/** Search passes in priority order: server-marked Auto, the policy's own ids, other models. */
-type ModelSearchPass = 'serverMarkedAuto' | 'preferred' | 'other';
+type ModelSearchPass = 'serverMarkedAuto' | 'serverMarkedGroupAuto' | 'preferred' | 'other';
function bySortOrder(a: CatalogModel, b: CatalogModel): number {
return (a.sortOrder ?? Number.MAX_SAFE_INTEGER) - (b.sortOrder ?? Number.MAX_SAFE_INTEGER);
@@ -120,25 +121,52 @@ function matchingModel(
agent: AgentKind,
modelIds: readonly string[],
pass: ModelSearchPass,
- enabled?: (agent: AgentKind, providerId: string, model: { id: string; defaultEnabled?: boolean }) => boolean,
+ enabled?: (
+ agent: AgentKind,
+ providerId: string,
+ model: { id: string; defaultEnabled?: boolean },
+ ) => boolean,
) {
const models = provider.models[agent] ?? [];
// 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 candidates =
- pass === 'serverMarkedAuto'
- ? models.filter((model) => isServerMarkedAuto(model, agent)).sort(bySortOrder)
+ pass === 'serverMarkedAuto' || pass === 'serverMarkedGroupAuto'
+ ? models
+ .filter(
+ (model) =>
+ isServerMarkedAuto(model, agent) &&
+ (pass !== 'serverMarkedGroupAuto' || model.id !== 'auto'),
+ )
+ .sort(bySortOrder)
: pass === 'preferred'
? modelIds.map((id) => models.find((model) => model.id === id))
: models.slice().sort(bySortOrder);
- return candidates
- .find(
- (model) =>
- model !== undefined &&
- (enabled ? enabled(agent, provider.id, model) : model.defaultEnabled !== false) &&
- isModelSelectableForNewRoute(model, { userProvider: provider.source === 'user' }),
- );
+ return candidates.find(
+ (model) =>
+ model !== undefined &&
+ (enabled ? enabled(agent, provider.id, model) : model.defaultEnabled !== false) &&
+ isModelSelectableForNewRoute(model, { userProvider: provider.source === 'user' }),
+ );
+}
+
+function isAvailableDefaultProvider(provider: ProviderView): boolean {
+ return provider.connected && !provider.suspended && !provider.modelDiscoveryFailure;
+}
+
+/** 普通草稿跨 Cindy 来源校准的前提:当前引擎已有可用的服务端组默认。 */
+export function hasAvailableServerMarkedGroupAuto(
+ providers: readonly ProviderView[],
+ agent: AgentKind,
+ isModelEnabled?: Parameters<typeof matchingModel>[4],
+): boolean {
+ return connectedProvidersForAgent([...providers], agent).some(
+ (provider) =>
+ isCindyDistributedProvider(provider) &&
+ isAvailableDefaultProvider(provider) &&
+ matchingModel(provider, agent, [], 'serverMarkedGroupAuto', isModelEnabled) !== undefined,
+ );
}
/**
@@ -166,9 +194,7 @@ export function resolveNewMakerDefaultTuples(args: {
(candidate) =>
((isPolicyProvider(candidate) && candidate.access?.kind === policy.accessKind) ||
(policy.serverMarkedAuto === true && isCindyDistributedProvider(candidate))) &&
- candidate.connected &&
- !candidate.suspended &&
- !candidate.modelDiscoveryFailure,
+ isAvailableDefaultProvider(candidate),
)
// 服务端每个引擎只标一个默认;管理员恰在两次拉取之间改配置时,Cindy AI 与号池可能
// 短暂各标一个,此时以 Cindy AI 为准,不取决于来源列表的顺序。
diff --git a/docs/dev-rules/model-catalog-maintenance.md b/docs/dev-rules/model-catalog-maintenance.md
index 7020bb2ac4..284b2623f7 100644
--- a/docs/dev-rules/model-catalog-maintenance.md
+++ b/docs/dev-rules/model-catalog-maintenance.md
@@ -132,7 +132,12 @@ Claude 订阅 Opus 5.5(Claude Code)、服务端指定的 Cindy Auto(Pi)
(预设 `auto` 或模型组 Auto `auto/<组ID>`),没有标记时(旧服务端)回退 Cindy AI 的预设 `auto`。
只认 Auto 系列的标记:个人目录仍把旧 GLM 标为 Pi 默认,客户端不采纳,也不把 Auto 替换成固定型号。
服务端保证每个引擎只标一个默认;管理员恰在两次拉取之间改配置、两类来源短暂各标一个时,
-以 Cindy AI 为准,不取决于来源列表顺序。上次自动落点不钉住默认:草稿记着的来源是这两类之一时,校准仍在两类来源中整体寻找。
+以 Cindy AI 为准,不取决于来源列表顺序。未手选的普通草稿记着 Cindy AI 或号池来源时,只有
+当前引擎在任一 Cindy 来源中存在服务端标为 `newSessionDefault` 的组 Auto(`auto/<组ID>`),
+且该候选可连接、未停用、符合本地可见性与聊天准入条件,才跨两类来源寻找出厂默认;沿用同一
+候选筛选和排序规则。没有合格的组默认时保留旧的来源范围,避免旧服务端下把号池草稿改走平台。
+草稿本身已记着组 Auto 时仍保留跨来源跟随,以及组 Auto 被撤销后的回退;用户手选、加载期、
+固定来源约束(`requiredProviderId`)和自定义来源的保护不变。
草稿发送校准与无人值守默认解析复用同一策略,避免初始化选中 Auto 后又被旧标记改回 GLM。
同一订阅策略先在全部匹配账号中寻找推荐型号,再取该来源按目录排序可见的其他型号;
无人值守入口没有本地显示开关时按 `defaultEnabled` 判断,不能因缺少推荐型号提前换到下一供应商。