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): 修复禁记门注释吞掉 selectedFavoriteUid 透传(@greptileai P1)

Zhang Yunjin20131ca048d1
diff --git a/apps/desktop/src/renderer/__tests__/unifiedModelPanelRendering.test.tsx b/apps/desktop/src/renderer/__tests__/unifiedModelPanelRendering.test.tsx
index 3e8f5e9e26..1bb68e0f4a 100644
--- a/apps/desktop/src/renderer/__tests__/unifiedModelPanelRendering.test.tsx
+++ b/apps/desktop/src/renderer/__tests__/unifiedModelPanelRendering.test.tsx
@@ -4197,6 +4197,51 @@ describe('harness configuration keeps the model menu open', () => {
});
});
+// 外层 ModelSelector 打开的面板必须把「当前选中的是哪条收藏」带进去(2026-10-10 @greptileai P1:
+// 上一次修复的注释把那行的属性透传一起注释掉了,面板恒收到 selectedFavoriteUid=null)。
+describe('外层 ModelSelector · 取消当前选中的收藏先应用默认配置', () => {
+ it('selectedFavoriteUid 透传到面板:删它是回落默认 + 清锚点,不是直接删记录', async () => {
+ const uid = addModelFavorite({ providerId: 'xd', modelId: 'gpt-5.5', agent: 'cc', effort: 'low' });
+ const onUnifiedSelect = vi.fn();
+ const onSessionFavoriteAnchorChange = vi.fn();
+ function Picker() {
+ return (
+ <ModelSelector
+ modelId="gpt-5.5"
+ effort="low"
+ fastMode={false}
+ vendorKey="cc"
+ currentProviderId="xd"
+ onModelChange={vi.fn()}
+ onEffortChange={vi.fn()}
+ onUnifiedSelect={onUnifiedSelect}
+ onSessionFavoriteAnchorChange={onSessionFavoriteAnchorChange}
+ selectedFavoriteUid={uid}
+ />
+ );
+ }
+ render(<Picker />);
+ await act(async () => {
+ fireEvent.click(screen.getByRole('button'));
+ });
+ const star = within(screen.getAllByRole('group')[0]).getByRole('button', { name: '取消收藏' });
+ await act(async () => {
+ fireEvent.click(star);
+ });
+ // 属性丢了只会走到「直接删记录」那一支:没有先应用默认配置,也不清锚点。
+ expect(onUnifiedSelect).toHaveBeenCalledWith({
+ providerId: 'xd',
+ modelId: 'gpt-5.5',
+ engine: 'codex',
+ effort: 'high',
+ fast: false,
+ favoriteUid: null,
+ resetToRecommended: true,
+ });
+ expect(listModelFavorites()).toHaveLength(0);
+ });
+});
+
describe('统一面板 · 最近使用记录与陈列', () => {
it('默认不记录(非对话入口不开 recordRecentUsage)', async () => {
renderPanel();
diff --git a/apps/desktop/src/renderer/components/new-chat/ModelSelector.tsx b/apps/desktop/src/renderer/components/new-chat/ModelSelector.tsx
index f0fd662436..6d5769aedb 100644
--- a/apps/desktop/src/renderer/components/new-chat/ModelSelector.tsx
+++ b/apps/desktop/src/renderer/components/new-chat/ModelSelector.tsx
@@ -4581,7 +4581,8 @@ export function ModelSelector({
unifiedAgents={unifiedAgents}
unifiedSelectionPolicy={unifiedSelectionPolicy}
recordRecentUsage={recordRecentUsage}
- // 浏览其他电脑目录时的禁记门在 Content 内按 remoteAgent 派生(它才知道 remoteBrowse)。 selectedFavoriteUid={selectedFavoriteUid}
+ // 浏览其他电脑目录时的禁记门在 Content 内按 remoteAgent 派生(它才知道 remoteBrowse)。
+ selectedFavoriteUid={selectedFavoriteUid}
onSessionFavoriteAnchorChange={onSessionFavoriteAnchorChange}
onUnifiedSelect={onUnifiedSelect}
reselectEmitsChange={reselectEmitsChange}