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(desktop): 保留模型切换时的显示名称 (#4557)

Chris Zhangff99bb6498db
diff --git a/apps/desktop/src/renderer/__tests__/modelSelectorProviderGroups.test.tsx b/apps/desktop/src/renderer/__tests__/modelSelectorProviderGroups.test.tsx
index dc0d8d318d..7caf149edd 100644
--- a/apps/desktop/src/renderer/__tests__/modelSelectorProviderGroups.test.tsx
+++ b/apps/desktop/src/renderer/__tests__/modelSelectorProviderGroups.test.tsx
@@ -32,6 +32,7 @@ vi.mock('react-i18next', async (importOriginal) => ({
'newChat.modelSelector.source.disconnected': '已断开',
'newChat.modelSelector.trigger.agent.claudeCode': 'Claude Code',
'newChat.modelSelector.trigger.agent.codex': 'Codex',
+ 'newChat.modelSelector.trigger.currentAndNext': `${options?.current} → ${options?.next}`,
'effortLevels.high': '最高',
};
return translations[key] ?? options?.defaultValue ?? key;
@@ -307,6 +308,140 @@ async function openDropdown(): Promise<void> {
});
}
+describe('model selector display identity during switches', () => {
+ const props = {
+ unifiedPanel: false,
+ modelId: 'chatgpt/gpt-6',
+ effort: 'high',
+ vendorKey: 'codex' as const,
+ currentProviderId: 'openai',
+ actualRoute: true,
+ onModelChange: vi.fn(),
+ onEffortChange: vi.fn(),
+ };
+ const provider = {
+ id: 'openai', name: 'OpenAI', source: 'builtin', agents: ['codex'],
+ auth: { method: 'oauth' }, routing: { codex: {} }, connected: true,
+ models: { codex: [{ id: 'gpt-6', name: 'GPT-6', efforts: ['high'] }] },
+ };
+ const trigger = () => screen.getByRole('button');
+
+ it.each([false, true])('resolves implicit aliases using the eligible default source (session=%s)', (actualRoute) => {
+ const gateway = { ...provider, id: 'xd', models: { codex: [{ id: 'gpt-6', name: 'Gateway GPT' }] } };
+ providersRef.providers = [gateway, provider];
+ const implicit = { ...props, currentProviderId: null, actualRoute };
+ const { rerender } = render(<ModelSelector {...implicit} switching />);
+ expect(trigger().textContent).toContain('GPT-6');
+ expect(trigger().textContent).not.toContain('Gateway GPT');
+ providersRef.providers = [gateway, { ...provider, connected: false }];
+ rerender(<ModelSelector {...implicit} />);
+ expect(trigger().textContent).toContain('Gateway GPT');
+ });
+
+ it.each([false, true])('preserves disabled-model eligibility for implicit sources (session=%s)', (actualRoute) => {
+ const gateway = { ...provider, id: 'xd', models: { codex: [{ id: 'gpt-6', name: 'Gateway GPT' }] } };
+ const disabled = { ...provider, models: { codex: [{ id: 'gpt-6', name: 'Saved GPT', disabled: true }] } };
+ providersRef.providers = [gateway, disabled];
+ render(<ModelSelector {...props} currentProviderId={null} actualRoute={actualRoute} />);
+ expect(trigger().textContent).toContain(actualRoute ? 'Saved GPT' : 'Gateway GPT');
+ });
+
+ it('resolves an implicit current model in the pending tooltip', () => {
+ providersRef.providers = [provider];
+ render(<ModelSelector {...props} currentProviderId={null}
+ agentIdentity={{ vendorKey: 'codex', state: 'pending' }}
+ currentSelection={{ agentKind: 'codex', model: props.modelId, providerId: null, effort: 'high', fastMode: false }} />);
+ expect(trigger().title).toContain('Codex · GPT-6 · OpenAI');
+ expect(trigger().title).not.toContain(props.modelId);
+ });
+
+ it.each([false, true])('keeps the long-context product when choosing an implicit source (session=%s)', (actualRoute) => {
+ providersRef.providers = [
+ { ...provider, models: { codex: [{ id: 'glm-5.2', name: 'Standard GLM' }] } },
+ { ...provider, id: 'xd', name: 'Gateway', models: { codex: [{ id: 'glm-5.2[1m]', name: 'GLM 1M' }] } },
+ ];
+ render(<ModelSelector {...props} modelId="glm-5.2[1m]" currentProviderId={null} actualRoute={actualRoute}
+ agentIdentity={{ vendorKey: 'codex', state: 'pending' }}
+ currentSelection={{ agentKind: 'codex', model: 'glm-5.2[1m]', providerId: null, effort: 'high', fastMode: false }} />);
+ expect(trigger().textContent).toContain('GLM 1M');
+ expect(trigger().title).toContain('Codex · GLM 1M · Cindy AI');
+ expect(trigger().title).not.toContain('Standard GLM');
+ expect(trigger().title).not.toContain('OpenAI');
+ });
+
+ it('resolves a wire alias immediately, including while the switch is in flight', () => {
+ providersRef.providers = [provider];
+ const { rerender } = render(<ModelSelector {...props} switching />);
+ expect(trigger().textContent).toContain('GPT-6');
+ expect(trigger().getAttribute('aria-label')).not.toContain(props.modelId);
+ rerender(<ModelSelector {...props} switching={false} />);
+ expect(trigger().textContent).toContain('GPT-6');
+ });
+
+ it('retains the selected name when discovery loses the catalog, then accepts updated names', () => {
+ providersRef.providers = [provider];
+ const { rerender } = render(<ModelSelector {...props} switching />);
+ providersRef.providers = [];
+ rerender(<ModelSelector {...props} switching sourceDisconnected />);
+ expect(trigger().textContent).toContain('GPT-6');
+ expect(trigger().textContent).not.toContain(props.modelId);
+ // A failed switch/refresh must not leave the wire ID behind once in-flight ends.
+ rerender(<ModelSelector {...props} sourceDisconnected />);
+ expect(trigger().textContent).toContain('GPT-6');
+ expect(trigger().textContent).toContain('已断开');
+ providersRef.providers = [{ ...provider, models: { codex: [{ id: 'gpt-6', name: 'Custom GPT label' }] } }];
+ rerender(<ModelSelector {...props} />);
+ expect(trigger().textContent).toContain('Custom GPT label');
+ });
+
+ it.each([
+ { modelId: 'chatgpt/unknown-model' },
+ { currentProviderId: 'another-account' },
+ { vendorKey: 'pi' as const },
+ { deviceId: 'another-device' },
+ ])('does not reuse the previous name across a selection boundary: %j', (change) => {
+ providersRef.providers = [provider];
+ const { rerender } = render(<ModelSelector {...props} />);
+ expect(trigger().textContent).toContain('GPT-6');
+ providersRef.providers = [];
+ rerender(<ModelSelector {...props} {...change} />);
+ expect(trigger().textContent).not.toContain('GPT-6');
+ expect(trigger().textContent).not.toContain(change.modelId ?? props.modelId);
+ });
+
+ it.each([false, true])('uses the placeholder for an unknown saved model (disconnected=%s)', (sourceDisconnected) => {
+ providersRef.providers = [];
+ render(<ModelSelector {...props} sourceDisconnected={sourceDisconnected} />);
+ expect(trigger().textContent).toContain('选择模型');
+ expect(trigger().textContent).not.toContain(props.modelId);
+ expect(trigger().getAttribute('title')).not.toContain(props.modelId);
+ expect(trigger().getAttribute('aria-label')).not.toContain(props.modelId);
+ });
+
+ it('preserves an explicitly supplied diagnostic label', () => {
+ providersRef.providers = [];
+ render(<ModelSelector {...props} unknownModelLabel={() => 'Unavailable saved model'} sourceDisconnected />);
+ expect(trigger().textContent).toContain('Unavailable saved model');
+ });
+
+ it('uses display names in the pending selection tooltip and accessibility label', () => {
+ providersRef.providers = [provider];
+ const pendingProps = {
+ ...props,
+ agentIdentity: { vendorKey: 'codex' as const, state: 'pending' as const },
+ currentSelection: { agentKind: 'codex' as const, model: 'chatgpt/missing', providerId: 'openai', effort: 'high', fastMode: false },
+ };
+ const { rerender } = render(<ModelSelector {...pendingProps} />);
+ providersRef.providers = [];
+ rerender(<ModelSelector {...pendingProps} />);
+ for (const attribute of ['title', 'aria-label']) {
+ expect(trigger().getAttribute(attribute)).toContain('GPT-6');
+ expect(trigger().getAttribute(attribute)).toContain('选择模型');
+ expect(trigger().getAttribute(attribute)).not.toContain('chatgpt/');
+ }
+ });
+});
+
type FloatingOptions = {
strategy: string;
placement: string;
diff --git a/apps/desktop/src/renderer/__tests__/modelSelectorTriggerVariant.test.ts b/apps/desktop/src/renderer/__tests__/modelSelectorTriggerVariant.test.ts
index 7351e5a2f8..a7ee28e12c 100644
--- a/apps/desktop/src/renderer/__tests__/modelSelectorTriggerVariant.test.ts
+++ b/apps/desktop/src/renderer/__tests__/modelSelectorTriggerVariant.test.ts
@@ -984,6 +984,9 @@ describe('ModelSelector trigger variants', () => {
providersRef.providers = [{
id: 'openai', name: 'OpenAI', connected: true, agents: ['codex'], routing: { codex: {} },
models: { codex: [{ id: 'gpt-6-astra', name: 'GPT-6 Astra', contextWindow: 1000000, efforts: ['high'], defaultEffort: 'high', supportsFastMode: true }] },
+ }, {
+ id: 'xd', name: 'Gateway', connected: true, agents: [currentAgent], routing: { [currentAgent]: {} },
+ models: { [currentAgent]: [{ id: 'previous-model', name: 'Previous model', efforts: ['high'], supportsFastMode: true }] },
}];
try {
const props = {
@@ -995,7 +998,8 @@ describe('ModelSelector trigger variants', () => {
currentSelection: { agentKind: currentAgent, model: 'previous-model', providerId: 'xd', effort: 'high' as const, fastMode: true },
};
const view = render(React.createElement(ModelSelector, props));
- const trigger = screen.getByRole('button', { name: /Current:.*previous-model/ });
+ const trigger = screen.getByRole('button', { name: /Current:.*Previous model/ });
+ expect(trigger.title).not.toContain('previous-model');
expect(trigger.title).toContain('Next message: Codex · GPT-6 Astra');
expect(trigger.title.split('Next message:')[1]).not.toContain('快速');
expect(trigger.querySelector('[data-model-selection-pending]')).not.toBeNull();
@@ -1037,7 +1041,8 @@ describe('ModelSelector trigger variants', () => {
onProviderChange: vi.fn(), onNavigateToProviders: vi.fn(), onReconnectSource: navigate, unifiedPanel: true,
}));
const trigger = screen.getByRole('button', { name: connected ? /模型不可用/ : /已断开/ });
- expect(trigger.textContent).toContain(connected ? 'gpt-6-astra' : 'GPT-6 Astra');
+ expect(trigger.textContent).toContain(connected ? '选择模型' : 'GPT-6 Astra');
+ expect(trigger.textContent).not.toContain('gpt-6-astra');
fireEvent.click(trigger);
const recovery = await screen.findByRole('button', { name: connected ? '管理来源' : '重新连接' });
fireEvent.click(recovery);
diff --git a/apps/desktop/src/renderer/components/new-chat/ModelSelector.tsx b/apps/desktop/src/renderer/components/new-chat/ModelSelector.tsx
index 574defa4fc..fbed9a3557 100644
--- a/apps/desktop/src/renderer/components/new-chat/ModelSelector.tsx
+++ b/apps/desktop/src/renderer/components/new-chat/ModelSelector.tsx
@@ -104,6 +104,8 @@ import {
chatEligibleSourcesForModel,
actualSourceIdForModel,
effectiveSourceIdForModel,
+ findCatalogModel,
+ nativeDefaultSourceId,
getModel,
modelSupportsFastMode,
providerOffersModel,
@@ -318,6 +320,23 @@ function providerDisplayName(p: ProviderView, t: (key: string) => string): strin
return sharedProviderDisplayName(p, t);
}
+/** Display-only alias lookup; implicit choices retain the default-source eligibility/order. */
+function modelDisplayProvider(
+ providers: ProviderView[], providerId: string | null | undefined,
+ modelId: string, agent: AgentKind, actualRoute: boolean,
+): ProviderView | undefined {
+ if (providerId) return providers.find((provider) => provider.id === providerId);
+ const resolveSource = actualRoute ? actualSourceIdForModel : effectiveSourceIdForModel;
+ const eligible = providers.filter((provider) => {
+ // Source eligibility must preserve distinct products such as [1m]. Metadata
+ // may fall back to the base model only after the source has been selected.
+ const model = findCatalogModel(provider, modelId, agent, { exact: true });
+ return model && resolveSource([provider], provider.id, model.id, agent) === provider.id;
+ });
+ const defaultId = nativeDefaultSourceId(eligible, agent);
+ return eligible.find((provider) => provider.id === defaultId);
+}
+
// 来源供应商 → 单色官方 mark(fill=currentColor)。trigger 默认右间距 + trigger 文字色;
// 列表行前缀通过 colorClass / withMargin 改用 secondary 色 + 由 flex gap 控间距。
export function ProviderMark({
@@ -3399,17 +3418,33 @@ export function ModelSelector({
const currentModel = routeModel
? { ...routeModel, displayName: routeModel.name, id: modelId }
: visibleModels.find((m) => m.id === modelId);
- // 已保存模型即使隐藏、断开或下架,实际任务仍保留模型 ID;偏好字段可通过
- // unknownModelLabel 提供诊断文案。没有保存选择的入口才显示选择模型占位符。
+ // Wire IDs can differ from catalog IDs during a switch. Resolve display metadata
+ // through the existing alias lookup without changing routing/capability decisions.
+ const displayProvider = agentKind
+ ? modelDisplayProvider(providers, currentProviderId, modelId, agentKind, actualRoute)
+ : undefined;
+ const resolvedModelName = (agentKind ? findCatalogModel(displayProvider, modelId, agentKind)?.name : undefined)
+ ?? currentModel?.displayName;
+ const labelKey = JSON.stringify([deviceId ?? null, currentProviderId ?? null, agentKind, modelId]);
+ const lastModelName = useRef<{ key: string; name: string | undefined } | null>(null);
+ const modelName = resolvedModelName
+ ?? (lastModelName.current?.key === labelKey ? lastModelName.current.name : undefined);
+ useEffect(() => {
+ // Retain only this selection's label through catalog refresh/failure. Never
+ // borrow the previous model, source, engine or device's name for a new choice.
+ lastModelName.current = { key: labelKey, name: modelName };
+ }, [labelKey, modelName]);
+ const localizedName = modelName ? localizedModelName(modelName, t) : undefined;
+ // Explicit diagnostic fields can supply unknownModelLabel; ordinary triggers
+ // must not expose internal wire IDs when no display metadata is available.
// unknown label 空串/全空白按缺省处理(否则 ?? 不回落,trigger 渲染成空白)。
const unknownLabel = modelId && unknownModelLabel ? unknownModelLabel(modelId).trim() : '';
const displayLabel = fallbackOption?.active
? fallbackOption.label
- : ((currentModel ? localizedModelName(currentModel.displayName, t) : undefined) ??
+ : (localizedName ??
(remoteModelLoading ? t('newChat.modelSelector.remoteLoading') : null) ??
(remoteModelLoadFailed ? t('newChat.modelSelector.remoteLoadFailedShort') : null) ??
(unknownLabel !== '' ? unknownLabel : null) ??
- (actualRoute && modelId ? modelId : null) ??
t('newChat.modelSelector.trigger.placeholder'));
const agentName =
agentIdentity && !fallbackOption?.active
@@ -3572,11 +3607,12 @@ export function ModelSelector({
// compact 会隐藏断连状态文字;原生 title 仍需保留同一状态,避免鼠标用户悬停
// 错误图标时只看到模型名、无法判断发送为何被阻断。
const describeSelection = (selection: SessionRuntimeProfileProjection): string => {
- const pid = actualSourceIdForModel(providers, selection.providerId, selection.model, selection.agentKind);
- const provider = providers.find((p) => p.id === (selection.providerId ?? pid));
- const model = provider ? getModel(provider, selection.model, selection.agentKind) : undefined;
+ const provider = modelDisplayProvider(providers, selection.providerId, selection.model, selection.agentKind, true);
+ const model = findCatalogModel(provider, selection.model, selection.agentKind);
+ const selectionKey = JSON.stringify([deviceId ?? null, selection.providerId, selection.agentKind, selection.model]);
+ const name = selectionKey === labelKey ? localizedName : model?.name ? localizedModelName(model.name, t) : undefined;
const vendor = selection.agentKind === 'claude-code' ? 'Claude Code' : selection.agentKind === 'pi' ? 'Pi' : 'Codex';
- return [vendor, model?.name ?? selection.model, provider ? providerDisplayName(provider, t) : selection.providerId,
+ return [vendor, name ?? t('newChat.modelSelector.trigger.placeholder'), provider ? providerDisplayName(provider, t) : selection.providerId,
selection.effort ? modelEffortLabel(t, model, selection.effort) : null,
selection.fastMode ? t('newChat.modelSelector.meta.fastBadge') : null].filter(Boolean).join(' · ');
};
@@ -3762,9 +3798,7 @@ export function ModelSelector({
isCreateAgentVariant ? 'text-12' : dense ? 'text-12' : 'text-13',
)}
>
- {/* 断开来源可能是该模型的唯一提供方 → visibleModels 查不到,回落显示原始 id,
- 比 "Select model" 占位更能说明「哪个模型的来源断了」。 */}
- {currentModel ? localizedModelName(currentModel.displayName, t) : modelId}
+ {displayLabel}
</span>
{/* 来源断开是**来源**的事,引擎身份位照常保留(规格 §1.2:引擎可见性靠一致的
结构位,不靠出错才显示)。 */}