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): 收窄模型选择器并修复共享预览空目录 (#4562)

Dash57f93c9be916
diff --git a/apps/desktop/src/main/maker-host/__tests__/model-visibility-mirror.test.ts b/apps/desktop/src/main/maker-host/__tests__/model-visibility-mirror.test.ts
index 4ec533f540..e96619d399 100644
--- a/apps/desktop/src/main/maker-host/__tests__/model-visibility-mirror.test.ts
+++ b/apps/desktop/src/main/maker-host/__tests__/model-visibility-mirror.test.ts
@@ -174,6 +174,20 @@ describe('initialized model visibility policy', () => {
describe('model visibility synchronization readiness', () => {
+ it('invalidates a ready snapshot when legacy migration becomes pending and recovers after synchronization', async () => {
+ const invalidate = vi.fn();
+ setModelVisibilityMirror({});
+ expect(getModelVisibilityOverride('pi', 'xd', 'recommended')).toBeUndefined();
+ expect(syncModelVisibilityMirror({}, invalidate, { pending: true })).toBe(true);
+ expect(() => getModelVisibilityMirrorSnapshot()).toThrow('MODEL_VISIBILITY_NOT_READY');
+ expect(syncModelVisibilityMirror({}, invalidate, { pending: true })).toBe(false);
+ expect(invalidate).toHaveBeenCalledOnce();
+ const waiting = waitForModelVisibilityMirror();
+ setModelVisibilityMirror({ 'pi:xd:recommended': false });
+ await waiting;
+ expect(getModelVisibilityOverride('pi', 'xd', 'recommended')).toBe(false);
+ });
+
it('waits for a complete snapshot, retaining explicit on/off instead of inventing an empty list', async () => {
const done = vi.fn();
const waiting = waitForModelVisibilityMirror().then(done);
diff --git a/apps/desktop/src/main/maker-host/model-visibility-mirror.ts b/apps/desktop/src/main/maker-host/model-visibility-mirror.ts
index 84d58323ac..0148aae983 100644
--- a/apps/desktop/src/main/maker-host/model-visibility-mirror.ts
+++ b/apps/desktop/src/main/maker-host/model-visibility-mirror.ts
@@ -60,7 +60,13 @@ function keyOf(agent: AgentKind, providerId: string, modelId: string): string {
*/
export function setModelVisibilityMirror(raw: unknown, policy?: unknown): boolean {
const candidate = policy as { fallback?: unknown; followCatalogKeys?: unknown; pending?: unknown } | undefined;
- if (candidate?.pending === true) return false;
+ if (candidate?.pending === true) {
+ if (!ready) return false;
+ // Legacy preferences can appear after an empty origin first becomes ready.
+ // Stop serving its earlier defaults until the renderer finishes migration.
+ clearModelVisibilityMirror();
+ return true;
+ }
const wasReady = ready;
const nextStrict = candidate?.fallback === false;
const nextFollow = new Set<string>(nextStrict && Array.isArray(candidate?.followCatalogKeys)
diff --git a/apps/desktop/src/renderer/__tests__/localCatalogSnapshot.test.ts b/apps/desktop/src/renderer/__tests__/localCatalogSnapshot.test.ts
index a355bcfb3f..567282be45 100644
--- a/apps/desktop/src/renderer/__tests__/localCatalogSnapshot.test.ts
+++ b/apps/desktop/src/renderer/__tests__/localCatalogSnapshot.test.ts
@@ -149,6 +149,67 @@ describe('refreshLocalCatalogSnapshot', () => {
expect(mocks.commitCapabilities).not.toHaveBeenCalled();
});
+ it.each(['new', 'existing'] as const)('publishes a shared %s profile with no legacy preferences and preserves scoped choices', async (profileOrigin) => {
+ const legacyKey = 'xdt:modelVisibilityPrefs:v1';
+ const mapKey = `${legacyKey}.owner.owner-a`;
+ const saved = new Map<string, string>([[mapKey, JSON.stringify({ 'pi:xd:hidden': false })]]);
+ const storage = {
+ getItem: (key: string) => saved.get(key) ?? null,
+ setItem: (key: string, value: string) => { saved.set(key, value); },
+ removeItem: (key: string) => { saved.delete(key); },
+ };
+ const sync = vi.fn(async () => undefined);
+ const listeners = new Set<(event: StorageEvent) => void>();
+ vi.stubGlobal('navigator', { locks: { request: async (_key: string, run: () => boolean) => run() } });
+ vi.stubGlobal('localStorage', storage);
+ vi.stubGlobal('window', {
+ localStorage: storage,
+ addEventListener: (_type: string, listener: (event: StorageEvent) => void) => listeners.add(listener),
+ removeEventListener: (_type: string, listener: (event: StorageEvent) => void) => listeners.delete(listener),
+ electronAPI: { maker: {
+ syncModelVisibility: sync,
+ claimLegacyModelVisibilityOwner: () => ({
+ dataOwnerId: 'owner-a', ownerGeneration: 1, canWriteOwnerScoped: true,
+ claimed: true, claimedByOtherOwner: false, canInitialize: false, profileOrigin,
+ }),
+ } },
+ });
+ vi.resetModules();
+ const prefs = await vi.importActual<typeof import('@/state/modelVisibilityPrefs')>('@/state/modelVisibilityPrefs');
+ prefs.__resetForTest();
+ // The reset clears preference keys; restore the existing scoped choice.
+ storage.setItem(mapKey, JSON.stringify({ 'pi:xd:hidden': false }));
+ try {
+ await prefs.setModelVisibilityOwner('owner-a', 1, 'cloud');
+ const provider = { id: 'xd', agents: ['pi'], routing: {}, models: { pi: [
+ { id: 'recommended', defaultEnabled: true }, { id: 'hidden', defaultEnabled: true },
+ ] } } as unknown as ProviderView;
+ const snapshot = { dataOwnerId: 'owner-a', ownerGeneration: 1, providers: [provider], providerOrder: ['xd'] };
+ mocks.loadProviders.mockResolvedValue(snapshot);
+ mocks.loadCapabilities.mockResolvedValue([]);
+ mocks.initializeVisibility.mockImplementation(prefs.migrateModelVisibilityDefaults);
+ await expect(refreshLocalCatalogSnapshot()).resolves.toBe(true);
+ expect(mocks.commitProviders).toHaveBeenCalledWith(expect.anything(), snapshot);
+ expect(prefs.isModelEnabled('pi', 'xd', { id: 'recommended', defaultEnabled: true })).toBe(true);
+ expect(prefs.isModelEnabled('pi', 'xd', { id: 'hidden', defaultEnabled: true })).toBe(false);
+ expect(saved.get(`${legacyKey}.migration-complete.owner.owner-a`)).toBeUndefined();
+ expect(sync).toHaveBeenLastCalledWith('owner-a', 1, { 'pi:xd:hidden': false },
+ expect.not.objectContaining({ pending: true }));
+
+ // A concurrent old window can create legacy data later: do not lose its
+ // choices or continue presenting uninitialized defaults as ready.
+ storage.setItem(legacyKey, JSON.stringify({ 'pi:xd:recommended': false }));
+ for (const listener of listeners) listener({ key: legacyKey, storageArea: storage } as unknown as StorageEvent);
+ await vi.waitFor(() => expect(sync).toHaveBeenLastCalledWith('owner-a', 1,
+ { 'pi:xd:hidden': false }, expect.objectContaining({ pending: true })));
+ expect(prefs.isModelEnabled('pi', 'xd', { id: 'recommended', defaultEnabled: true })).toBe(false);
+ await expect(refreshLocalCatalogSnapshot()).resolves.toBe(false);
+ expect(storage.getItem(legacyKey)).toBe(JSON.stringify({ 'pi:xd:recommended': false }));
+ } finally {
+ prefs.__resetForTest();
+ }
+ });
+
it.each([
['storage', true], ['lock', true], ['storage', false], ['lock', false],
] as const)('propagates real %s initialization failures through preload (recovers: %s)', async (failure, recovers) => {
diff --git a/apps/desktop/src/renderer/__tests__/modelSelectorTriggerVariant.test.ts b/apps/desktop/src/renderer/__tests__/modelSelectorTriggerVariant.test.ts
index a7ee28e12c..fdb0ab2663 100644
--- a/apps/desktop/src/renderer/__tests__/modelSelectorTriggerVariant.test.ts
+++ b/apps/desktop/src/renderer/__tests__/modelSelectorTriggerVariant.test.ts
@@ -857,7 +857,7 @@ describe('ModelSelector trigger variants', () => {
expect(modelListMaxHeightForRows(100)).toBe(300);
});
- it('bounds the default-session trigger in narrow and ultra-narrow composers', () => {
+ it('bounds the default-session trigger in wide, narrow and ultra-narrow composers', () => {
const props = {
modelId: 'claude-opus-4-8',
effort: 'xhigh' as Effort,
@@ -866,7 +866,16 @@ describe('ModelSelector trigger variants', () => {
vendorKey: 'cc' as const,
compactToolbar: true,
};
- const view = render(React.createElement(ModelSelector, props));
+ const view = render(React.createElement(ModelSelector, { ...props, compactToolbar: false }));
+
+ const wideTrigger = screen.getByRole('button', {
+ name: /Current: Opus 4\.8, effort: 超高/,
+ });
+ expect(wideTrigger.className).toContain('max-w-[min(320px,100%)]');
+ expect(within(wideTrigger).getByText('Opus 4.8').className).toContain('truncate');
+ expect(wideTrigger.getAttribute('title')).toContain('Opus 4.8');
+
+ view.rerender(React.createElement(ModelSelector, props));
let trigger = screen.getByRole('button', {
name: /Current: Opus 4\.8, effort: 超高/,
@@ -893,6 +902,25 @@ describe('ModelSelector trigger variants', () => {
expect(trigger.getAttribute('aria-label')).toContain('超高');
});
+ it('caps the toolbar panel while field panels still follow their field width', () => {
+ const props = {
+ modelId: 'claude-opus-4-8',
+ effort: 'high' as Effort,
+ onModelChange: vi.fn(),
+ onEffortChange: vi.fn(),
+ vendorKey: 'cc' as const,
+ unifiedPanel: true,
+ };
+ const view = render(React.createElement(ModelSelectorContent, props));
+ let pane = view.container.querySelector('[data-unified-model-panel]') as HTMLElement;
+ expect(pane.className).toContain('max-w-[min(420px,calc(100vw-48px))]');
+
+ view.rerender(React.createElement(ModelSelectorContent, { ...props, fluidWidth: true }));
+ pane = view.container.querySelector('[data-unified-model-panel]') as HTMLElement;
+ expect(pane.className).toContain('w-full min-w-0');
+ expect(pane.className).not.toContain('420px');
+ });
+
it('keeps the session Agent explicit when Claude Code uses an OpenAI-branded model', () => {
const model = {
id: 'chatgpt/gpt-5.6-terra',
diff --git a/apps/desktop/src/renderer/__tests__/modelVisibilityPrefs.test.ts b/apps/desktop/src/renderer/__tests__/modelVisibilityPrefs.test.ts
index 4f12ab2e55..e358dab3a9 100644
--- a/apps/desktop/src/renderer/__tests__/modelVisibilityPrefs.test.ts
+++ b/apps/desktop/src/renderer/__tests__/modelVisibilityPrefs.test.ts
@@ -110,6 +110,39 @@ beforeEach(() => {
vi.resetModules();
});
+describe('shared origin readiness', () => {
+ it('does not publish transient pending while a reloaded renderer waits for its owner lock', async () => {
+ memStorage.setItem('xdt:modelVisibilityPrefs:v1.migration-complete.owner.owner-a', '1');
+ memStorage.setItem('xdt:modelVisibilityPrefs:v1.owner.owner-a', JSON.stringify({ 'pi:xd:kept': false }));
+ const locks = new Locks();
+ vi.stubGlobal('navigator', { locks });
+ const release = locks.hold();
+ const prefs = await loadModule();
+ const initialization = prefs.setModelVisibilityOwner('owner-a', 1, 'cloud');
+ await Promise.resolve();
+ expect(prefs.isModelEnabled('pi', 'xd', { id: 'kept' })).toBe(false);
+ expect(syncModelVisibility).not.toHaveBeenCalled();
+ release();
+ await initialization;
+ expect(syncModelVisibility).toHaveBeenCalled();
+ expect(syncModelVisibility).not.toHaveBeenCalledWith('owner-a', 1,
+ expect.anything(), expect.objectContaining({ pending: true }));
+ });
+
+ it('does not repeat owner claims for preference operations while legacy storage stays absent', async () => {
+ setOwnerClaim('owner-a', 1, true, false);
+ ownerClaim.profileOrigin = 'existing';
+ memStorage.setItem('xdt:modelVisibilityPrefs:v1.local-adoption.owner.owner-a', '1');
+ const claim = vi.spyOn(window.electronAPI.maker, 'claimLegacyModelVisibilityOwner');
+ const prefs = await loadModuleForOwner();
+ await prefs.migrateModelVisibilityDefaults('owner-a', 1, []);
+ claim.mockClear();
+ expect(await prefs.setModelVisibility('pi', 'xd', 'kept', false)).toBe(true);
+ expect(claim).not.toHaveBeenCalled();
+ expect(memStorage.getItem('xdt:modelVisibilityPrefs:v1.migration-complete.owner.owner-a')).toBeNull();
+ });
+});
+
describe('local profile visibility adoption', () => {
const initKey = (owner: string) => `xdt:modelVisibilityPrefs:v1.initialization.owner.${owner}`;
const mapKey = (owner: string) => `xdt:modelVisibilityPrefs:v1.owner.${owner}`;
@@ -1250,7 +1283,10 @@ describe('compact model defaults upgrade', () => {
const prefs = await upgrade();
await prefs.setModelVisibility('pi', 'xd', 'fable-5-1', false);
if (hasLegacy) expect(memStorage.getItem(markerKey)).toBeNull();
- else expect(JSON.parse(memStorage.getItem(markerKey)!)).toMatchObject({ eligibleForDefaults: true, scopes: [] });
+ else expect(JSON.parse(memStorage.getItem(markerKey)!)).toMatchObject({
+ eligibleForDefaults: true,
+ scopes: provider.agents.map((agent) => JSON.stringify([provider.id, agent])),
+ });
setOwnerClaim('owner-a', 1);
await prefs.migrateModelVisibilityDefaults('owner-a', 1, [provider]);
expect(prefs.isModelEnabled('pi', 'xd', { id: 'gemini', defaultEnabled: true })).toBe(true);
diff --git a/apps/desktop/src/renderer/components/new-chat/ModelSelector.tsx b/apps/desktop/src/renderer/components/new-chat/ModelSelector.tsx
index fbed9a3557..1fefc98a70 100644
--- a/apps/desktop/src/renderer/components/new-chat/ModelSelector.tsx
+++ b/apps/desktop/src/renderer/components/new-chat/ModelSelector.tsx
@@ -2813,12 +2813,11 @@ function ModelSelectorContentView({
// popover 裁掉超出部分,用户就翻不到最后几行(2026-08-13 实测)。列表侧配
// min-h-0 + flex-1 收缩并内部滚动,搜索框与底部 footer 始终露着。
'max-h-[min(560px,calc(100vh-120px))]',
- // 宽度自适应(规格 §1.2):长模型名先把面板撑宽,到上限才截断,不硬砍名字。
- // 最小宽只兜「搜索行 + 空态不局促」的底(Chris 2026-08-13:min 460 让短名列表
- // 中间留一条空隙 —— 面板应该贴着最长行收窄,理论最小值可以很小)。
+ // 紧凑内容宽度:长模型名在 420px 上限内省略,不为完整名称撑大面板。
+ // field 入口仍绑定字段宽度;窄窗口继续受视口与 morph 锚点约束。
fluidWidth
? 'w-full min-w-0'
- : 'w-max min-w-[300px] max-w-[min(600px,calc(100vw-48px))]',
+ : 'w-max min-w-[300px] max-w-[min(420px,calc(100vw-48px))]',
)}
>
{/* 设计稿 .search-wrap:无框平铺行 + 底部 hairline(不是独立的胶囊输入框)。 */}
@@ -3727,7 +3726,7 @@ export function ModelSelector({
? 'w-[64px] min-w-[64px]'
: isCompactToolbar
? 'w-[148px] min-w-[72px]'
- : 'min-w-[72px]',
+ : 'min-w-[72px] max-w-[min(320px,100%)]',
'border border-transparent bg-transparent',
'hover:border-[var(--border-default)] hover:bg-[var(--composer-pill-bg,#FCFCFC)] dark:hover:bg-[var(--composer-pill-bg,#393838)]',
),
diff --git a/apps/desktop/src/renderer/state/modelVisibilityPrefs.ts b/apps/desktop/src/renderer/state/modelVisibilityPrefs.ts
index f699714918..0cb5f7bc33 100644
--- a/apps/desktop/src/renderer/state/modelVisibilityPrefs.ts
+++ b/apps/desktop/src/renderer/state/modelVisibilityPrefs.ts
@@ -337,6 +337,12 @@ function migrateLegacyVisibility(ownerId: string, ownerGeneration: number): Migr
migrationPending: false,
};
}
+ if (!claim.canInitialize && window.localStorage.getItem(LEGACY_STORAGE_KEY) === null) {
+ // A fresh renderer origin (for example a parallel dev port) has no legacy
+ // preferences to import. Publish its owner-scoped catalog without claiming
+ // migration completion; another window may still create the legacy key.
+ return { readyForWrites: true, migrationPending: false };
+ }
if (claim.claimed !== true) {
// A missing/blocked legacy marker only defers importing the pre-account snapshot. The
// stable current owner can still write its isolated key; a later import merges scoped
@@ -378,7 +384,9 @@ function migrateLegacyVisibility(ownerId: string, ownerGeneration: number): Migr
function ensureActiveOwnerReadyForWrites(): boolean {
if (!activeOwnerId) return false;
- if (activeOwnerReadyForWrites && !activeOwnerMigrationPending) return true;
+ if (activeOwnerReadyForWrites && !activeOwnerMigrationPending
+ && (window.localStorage.getItem(ownerMigrationCompleteKey(activeOwnerId)) === '1'
+ || window.localStorage.getItem(LEGACY_STORAGE_KEY) === null)) return true;
if (activeOwnerMode === 'signed-out') return false;
const migration = migrateLegacyVisibility(activeOwnerId, activeOwnerGeneration);
activeOwnerReadyForWrites = migration.readyForWrites;
@@ -534,10 +542,13 @@ export async function setModelVisibilityOwner(
readOwnerState(ownerId);
} catch { /* Storage unavailable: never infer permission to initialize an existing profile. */ }
}
- mirrorToMain(cache ?? {});
version += 1;
for (const listener of listeners) listener();
await withOwnerLock(ownerId, ownerGeneration, ensureActiveOwnerReadyForWrites);
+ // Reloading a renderer is not evidence that the current owner's valid Main
+ // mirror became stale. Publish pending only after checking under the owner lock.
+ if (activeOwnerId === ownerId && activeOwnerGeneration === ownerGeneration
+ && activeOwnerMode === mode) mirrorToMain(cache ?? {});
}
/**
@@ -768,7 +779,6 @@ const removeStorageListener = (() => {
if (!activeOwnerId) return false;
if (key === LEGACY_STORAGE_KEY) {
return activeOwnerMode !== 'signed-out'
- && activeOwnerMigrationPending
&& window.localStorage.getItem(ownerMigrationCompleteKey(activeOwnerId)) !== '1';
}
if (activeOwnerMode !== 'cloud' || activeOwnerId === LOCAL_OWNER_ID) return false;
diff --git a/docs/product-rules/model-selector-unified.md b/docs/product-rules/model-selector-unified.md
index 6b7954ee50..60a0e821f8 100644
--- a/docs/product-rules/model-selector-unified.md
+++ b/docs/product-rules/model-selector-unified.md
@@ -15,7 +15,7 @@
### 1.1 触发器(composer pill)
- 单一 pill:`[厂商图标] 模型名 · [引擎图标] 深度 [⚡]`。独立的引擎选择器(AgentSelect)从**新会话工具条**撤除。
-- 模型名超长:max-width 截断 + hover title 全名。
+- 模型名超长:max-width 截断 + hover title 全名。正常工具栏 pill 按内容展开,整体上限 320px(不超过父容器);窄 / 超窄仍为 148px / 64px。避免超长 pill 通过 MorphPopover 的锚点宽度下限撑大展开面板。
- hover tooltip:`引擎名 · 思考深度 <档> [· Fast] [· 已自定义/收藏配置]`。
- 智能模式(Cindy Fast/Smart)**本版不做**(无后端 = 假按钮);面板结构预留组位。
@@ -26,7 +26,7 @@
- 模型选择、配置编辑与“跟随默认”均等待保存结果;失败保留面板与原配置。选模型或跟随默认成功才收起,配置编辑保持浮层打开。无模型记忆表的设置入口编辑非当前模型时,直接应用其完整配置。已有待生效配置时再次远程选模,先展示最新用户选择;运行时当前配置的来源、模型、引擎、深度与 Fast 始终来自同一快照。
- 结构:搜索框贴顶 → 左侧 rail(★收藏 / 全部 / 各供应商图标) → 右侧列表 → 底部「+配置模型」。
- 列表主体固定高 428px(指定可见行数的入口按其既有高度配置),不随供应商筛选、收藏、搜索或空结果改变高度;窗口空间不足时按可用高度收缩。模型列表与供应商侧栏分别内部滚动,搜索与底部操作保持可见。
-- 宽度自适应:`max-content`,min 460px / max min(600px, 100vw-48px)——长名先撑宽,到上限才截断,不硬砍。
+- 宽度自适应:`max-content`,min 300px / max min(420px, 100vw-48px);优先保持紧凑,超出可用宽度的模型名显示省略号,hover title 保留全名,不为显示完整名称额外扩宽(2026-09-17 用户反馈修订)。字段形态仍绑定字段宽度;视口和锚点可用空间不足时继续收缩。
- 行(双行):
- L1:厂商图标 · 模型名(弹性,截断) · 价格档/折扣/订阅徽标 · ☆ · 右侧**常驻三元组**`[引擎图标] 深度 [⚡]` · 选中勾。
- L2:一句描述(截断)。