Consider it done. The open-source AI agent that works out of the box · 想到,就能做到。开源、开箱即用的 AI Agent。
TypeScript agentai-agentai-assistantandroidclaude-codecodexelectroniosllmmacosreact-nativetypescriptwindows
fix(desktop): widen model selector menu (#4802)
Dash91ba1de1ccb5
diff --git a/apps/desktop/src/renderer/__tests__/modelSelectorTriggerVariant.test.ts b/apps/desktop/src/renderer/__tests__/modelSelectorTriggerVariant.test.tsindex efa69ed074..1be15d3b3f 100644--- a/apps/desktop/src/renderer/__tests__/modelSelectorTriggerVariant.test.ts+++ b/apps/desktop/src/renderer/__tests__/modelSelectorTriggerVariant.test.ts@@ -438,6 +438,8 @@ vi.mock('@/state/deviceLinkModelMirror', () => ({import {ModelSelector as SharedModelSelector,ModelSelectorContent as SharedModelSelectorContent,+ UNIFIED_COMPACT_PANEL_MAX_WIDTH_PX,+ UNIFIED_COMPACT_PANEL_WIDTH_CLASS,modelCompactEffortLabel,modelEffortLabel,modelListMaxHeightForRows,@@ -560,8 +562,8 @@ describe('ModelSelector trigger variants', () => {// 会把模型名压成 GPT-...,所以此时只保留当前模型的已隐藏标识。expect(modelTagDensityForWidth(320)).toBe('hidden');expect(modelTagDensityForWidth(370)).toBe('subscription');- expect(modelTagDensityForWidth(449)).toBe('subscription');- expect(modelTagDensityForWidth(450)).toBe('full');+ expect(modelTagDensityForWidth(UNIFIED_COMPACT_PANEL_MAX_WIDTH_PX)).toBe('subscription');+ expect(modelTagDensityForWidth(UNIFIED_COMPACT_PANEL_MAX_WIDTH_PX + 1)).toBe('full');});// 打开选择器既发起刷新、又把「发现在途」状态推给内容区(见 useModelDiscoveryPending),@@ -915,12 +917,16 @@ describe('ModelSelector trigger variants', () => {};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))]');+ expect(UNIFIED_COMPACT_PANEL_WIDTH_CLASS).toContain(+ `max-w-[min(${UNIFIED_COMPACT_PANEL_MAX_WIDTH_PX}px,calc(100vw-48px))]`,+ );+ expect(pane.className).toContain(UNIFIED_COMPACT_PANEL_WIDTH_CLASS);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');+ expect(pane.className).not.toContain(UNIFIED_COMPACT_PANEL_WIDTH_CLASS);+ expect(pane.className).not.toContain(`${UNIFIED_COMPACT_PANEL_MAX_WIDTH_PX}px`);});it('keeps the session Agent explicit when Claude Code uses an OpenAI-branded model', () => {diff --git a/apps/desktop/src/renderer/components/new-chat/ModelSelector.tsx b/apps/desktop/src/renderer/components/new-chat/ModelSelector.tsxindex 09a2cd6989..7013abbecd 100644--- a/apps/desktop/src/renderer/components/new-chat/ModelSelector.tsx+++ b/apps/desktop/src/renderer/components/new-chat/ModelSelector.tsx@@ -128,16 +128,26 @@ import { buildProviderSections } from './sourceSwitch';// 300ms 门槛也与仓库其它本地/远程混合 loading 提示一致;真正的秒级发现仍会明确反馈。const MODEL_DISCOVERY_INDICATOR_DELAY_MS = 300;+/**+ * 工具栏紧凑统一面板宽度。规格 `docs/product-rules/model-selector-unified.md` §1.2:+ * max-content,下限 300px,上限 min(460px, 100vw-48px)。完整 class 字面量必须留在+ * 源码里给 Tailwind 扫描;改数字时同步规格。+ */+export const UNIFIED_COMPACT_PANEL_MAX_WIDTH_PX = 460;+export const UNIFIED_COMPACT_PANEL_WIDTH_CLASS =+ 'w-max min-w-[300px] max-w-[min(460px,calc(100vw-48px))]';+/*** 标签降级按选择器 pane 宽度生效。这里的 width 是整个 pane 宽度,不是模型名* 实际可用宽度;行还要扣掉左右 padding、来源图标、effort 和选中勾选。因此不能把* 300px 当成“能放下全部标签”的阈值,否则英文 Subscription 会先把模型名压成省略号。* 模型名优先:促销标签先收起,订阅标签随后收起,只保留「已隐藏」和选中勾选。+ * full 只在宽过紧凑面板上限时启用,避免 460px 触顶时促销标签把刚留给长模型名的空间吃回去。*/export type ModelTagDensity = 'full' | 'subscription' | 'hidden';export function modelTagDensityForWidth(width: number | null): ModelTagDensity {- if (width === null || width >= 450) return 'full';+ if (width === null || width > UNIFIED_COMPACT_PANEL_MAX_WIDTH_PX) return 'full';if (width >= 370) return 'subscription';return 'hidden';}@@ -2813,11 +2823,8 @@ function ModelSelectorContentView({// popover 裁掉超出部分,用户就翻不到最后几行(2026-08-13 实测)。列表侧配// min-h-0 + flex-1 收缩并内部滚动,搜索框与底部 footer 始终露着。'max-h-[min(560px,calc(100vh-120px))]',- // 紧凑内容宽度:长模型名在 420px 上限内省略,不为完整名称撑大面板。- // field 入口仍绑定字段宽度;窄窗口继续受视口与 morph 锚点约束。- fluidWidth- ? 'w-full min-w-0'- : 'w-max min-w-[300px] max-w-[min(420px,calc(100vw-48px))]',+ // 紧凑宽度契约见 UNIFIED_COMPACT_PANEL_WIDTH_CLASS;field 入口仍绑 trigger。+ fluidWidth ? 'w-full min-w-0' : UNIFIED_COMPACT_PANEL_WIDTH_CLASS,)}>{/* 设计稿 .search-wrap:无框平铺行 + 底部 hairline(不是独立的胶囊输入框)。 */}diff --git a/docs/product-rules/model-selector-unified.md b/docs/product-rules/model-selector-unified.mdindex dc50a561ac..8f71ffd49a 100644--- a/docs/product-rules/model-selector-unified.md+++ b/docs/product-rules/model-selector-unified.md@@ -26,7 +26,7 @@- 模型选择、配置编辑与“跟随默认”均等待保存结果;失败保留面板与原配置。选模型或跟随默认成功才收起,配置编辑保持浮层打开。无模型记忆表的设置入口编辑非当前模型时,直接应用其完整配置。已有待生效配置时再次远程选模,先展示最新用户选择;运行时当前配置的来源、模型、引擎、深度与 Fast 始终来自同一快照。- 结构:搜索框贴顶 → 左侧 rail(★收藏 / 全部 / 各供应商图标) → 右侧列表 → 底部「+配置模型」。- 列表主体固定高 428px(指定可见行数的入口按其既有高度配置),不随供应商筛选、收藏、搜索或空结果改变高度;窗口空间不足时按可用高度收缩。模型列表与供应商侧栏分别内部滚动,搜索与底部操作保持可见。-- 宽度自适应:`max-content`,min 300px / max min(420px, 100vw-48px);优先保持紧凑,超出可用宽度的模型名显示省略号,hover title 保留全名,不为显示完整名称额外扩宽(2026-09-17 用户反馈修订)。字段形态仍绑定字段宽度;视口和锚点可用空间不足时继续收缩。+- 宽度自适应:`max-content`,min 300px / max min(460px, 100vw-48px);优先保持紧凑,超出可用宽度的模型名显示省略号,hover title 保留全名,不为显示完整名称继续加宽(2026-09-17 截断原则;2026-09-21 将上限从 420px 调整为 460px,以完整显示「Codex GPT-6 Astra」量级的名称)。字段形态仍绑定字段宽度;视口和锚点可用空间不足时继续收缩。- 行(双行):- L1:厂商图标 · 模型名(弹性,截断) · 价格档/折扣/订阅徽标 · ☆ · 右侧**常驻三元组**`[引擎图标] 深度 [⚡]` · 选中勾。- L2:一句描述(截断)。