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): 切换 Harness 配置后保持模型菜单展开 (#4853)

Dashcfe22c1a9954
diff --git a/apps/desktop/src/renderer/__tests__/selectedFavoritePersistenceRollback.test.ts b/apps/desktop/src/renderer/__tests__/selectedFavoritePersistenceRollback.test.ts
index b82ed72e37..7082a631b7 100644
--- a/apps/desktop/src/renderer/__tests__/selectedFavoritePersistenceRollback.test.ts
+++ b/apps/desktop/src/renderer/__tests__/selectedFavoritePersistenceRollback.test.ts
@@ -17,7 +17,7 @@ const compiled = ts.transpileModule(`const apply = ${expression}`, {
compilerOptions: { target: ts.ScriptTarget.ES2022 },
}).outputText;
-it.each(['effort', 'fast', 'engine', 'draft'])('restores %s before propagating persistence failure', async mode => {
+it.each(['effort', 'fast', 'engine', 'draft', 'draft-configure'])('restores %s before propagating persistence failure', async mode => {
const before = { agent: 'codex', engine: 'codex', wireModelId: 'old', effort: 'low', fast: false };
const target = { ...before, effort: 'high', fast: true, agent: 'pi', wireModelId: 'new' };
let state = { ...before };
@@ -30,12 +30,13 @@ it.each(['effort', 'fast', 'engine', 'draft'])('restores %s before propagating p
state = { ...before };
return true;
});
- const apply = new Function('isLiveRow', 'inSession', 'runCrossEngineSwitch', 'sessionEngineFilter', 'runLive', 'onSelect',
+ const apply = new Function('isLiveRow', 'inSession', 'runCrossEngineSwitch', 'sessionEngineFilter', 'runLive', 'onSelect', 'onConfigure',
`${compiled}; return apply;`)(
- () => true, mode !== 'draft',
+ () => true, !mode.startsWith('draft'),
async (args: any) => { state = { ...target }; return args.onApplied(); },
{ onCrossEngineSelect: restoreSelection },
async () => { state = { ...target }; return true; }, restoreSelection,
+ mode === 'draft-configure' ? restoreSelection : undefined,
);
const failure = new Error('remote persistence rejected');
const favorite = { ...before };
diff --git a/apps/desktop/src/renderer/__tests__/sessionAgentSwitchRemoteRouting.test.ts b/apps/desktop/src/renderer/__tests__/sessionAgentSwitchRemoteRouting.test.ts
index d0b90b83ba..2e832b2d74 100644
--- a/apps/desktop/src/renderer/__tests__/sessionAgentSwitchRemoteRouting.test.ts
+++ b/apps/desktop/src/renderer/__tests__/sessionAgentSwitchRemoteRouting.test.ts
@@ -1204,8 +1204,8 @@ describe('ChatInput 的入口门控与调用路由', () => {
expect(matches).toHaveLength(2);
expect(selectorSource).not.toContain('(open || keepOpenForAgentConfirmation) && !disabled');
expect(selectorSource).not.toContain('(open && !disabled) || keepOpenForAgentConfirmation');
- // 切引擎成功后收选单;取消才 setOpen(true) 留在原地。disabled 仍不得参与开关。
- expect(selectorSource).toContain('setOpenWithoutAutoRefresh(applied === false)');
+ // 配置切引擎保持展开;选中模型行成功后收起。disabled 仍不得参与开关。
+ expect(selectorSource).toContain('setOpenWithoutAutoRefresh(configuring || applied === false)');
expect(selectorSource).toContain(
"onProviderChange(args.providerId, args.wireModelId, args.effort ?? '', args.config.fast)",
);
diff --git a/apps/desktop/src/renderer/__tests__/unifiedModelPanelRendering.test.tsx b/apps/desktop/src/renderer/__tests__/unifiedModelPanelRendering.test.tsx
index 1c28ed0ecc..c77b095308 100644
--- a/apps/desktop/src/renderer/__tests__/unifiedModelPanelRendering.test.tsx
+++ b/apps/desktop/src/renderer/__tests__/unifiedModelPanelRendering.test.tsx
@@ -196,7 +196,7 @@ vi.mock('@/state/deviceLinkModelMirror', () => ({
useDeviceLinkModelMirrorVersion: () => 0,
}));
-import { ModelSelectorContent } from '@/components/new-chat/ModelSelector';
+import { ModelSelector, ModelSelectorContent } from '@/components/new-chat/ModelSelector';
import {
__resetForTest as resetEnginePrefs,
getModelEngineOverride,
@@ -3841,7 +3841,7 @@ describe('统一面板 · 重选与草稿失败恢复', () => {
await act(async () => {
finish(true);
});
- expect(onDismiss).toHaveBeenCalledTimes(1);
+ expect(onDismiss).toHaveBeenCalledTimes(operation === 'select' ? 1 : 0);
if (operation === 'reset') expect(getModelEngineOverride('xd', 'gpt-5.5')).toBeUndefined();
if (uid) expect(listModelFavorites()).toHaveLength(0);
},
@@ -4048,3 +4048,61 @@ it('teammate fallback exposes supported Harness choices and preserves the primar
await act(async () => { fireEvent.click(within(rowFor('GPT-5.6')).getByText('GPT-5.6')); });
expect(change).toHaveBeenLastCalledWith([primary, expect.objectContaining({ harness: 'claude', providerId: 'openai', model: 'chatgpt/gpt-5.6' })]);
});
+
+
+describe('harness configuration keeps the model menu open', () => {
+ it.each(['success', 'cancel', 'error'] as const)('%s keeps both menus available', async (outcome) => {
+ let finish!: (value: boolean) => void;
+ let fail!: (error: Error) => void;
+ const change = vi.fn(() => new Promise<boolean>((resolve, reject) => {
+ finish = resolve;
+ fail = reject;
+ }));
+ function Picker() {
+ const [pendingTarget, setPendingTarget] = React.useState<'claude-code' | undefined>();
+ return <ModelSelector
+ modelId="gpt-5.5" effort="high" vendorKey="codex"
+ currentProviderId="xd" onModelChange={vi.fn()} onEffortChange={vi.fn()}
+ sessionEngineFilter={{
+ currentAgent: 'codex',
+ runtimeAgent: 'codex',
+ pendingTarget,
+ onCrossEngineSelect: async ({ targetAgent }) => {
+ const applied = await change();
+ if (applied) setPendingTarget(targetAgent === 'claude-code' ? targetAgent : undefined);
+ return applied;
+ },
+ }}
+ />;
+ }
+ render(<Picker />);
+ await act(async () => { fireEvent.click(screen.getByRole('button')); });
+ await act(async () => { fireEvent.click(screen.getByRole('button', { name: '全部' })); });
+ const flyout = await openRowFlyout('GPT-5.5');
+ await act(async () => {
+ fireEvent.click(flyout.querySelector('[data-engine-capsule="cc"]') as HTMLElement);
+ });
+ expect(change).toHaveBeenCalledTimes(1);
+ expect(screen.getByRole('listbox')).toBeTruthy();
+ await act(async () => {
+ if (outcome === 'error') fail(new Error('switch failed'));
+ else finish(outcome === 'success');
+ });
+ expect(screen.getByRole('listbox')).toBeTruthy();
+ expect(screen.getByTestId('unified-model-config-flyout')).toBeTruthy();
+ if (outcome === 'success') {
+ expect(screen.getByTestId('unified-model-config-flyout')
+ .querySelector('[data-engine-capsule="cc"]')?.getAttribute('aria-pressed')).toBe('true');
+ // Switching back must clear the pending intent through the same transaction.
+ await act(async () => {
+ fireEvent.click(screen.getByTestId('unified-model-config-flyout')
+ .querySelector('[data-engine-capsule="codex"]') as HTMLElement);
+ });
+ expect(change).toHaveBeenCalledTimes(2);
+ await act(async () => { finish(true); });
+ }
+ expect(screen.getByRole('listbox')).toBeTruthy();
+ expect(screen.getByTestId('unified-model-config-flyout')
+ .querySelector('[data-engine-capsule="codex"]')?.getAttribute('aria-pressed')).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 7013abbecd..2cd380efea 100644
--- a/apps/desktop/src/renderer/components/new-chat/ModelSelector.tsx
+++ b/apps/desktop/src/renderer/components/new-chat/ModelSelector.tsx
@@ -2948,7 +2948,8 @@ function ModelSelectorContentView({
...(nextEffort ? { effort: nextEffort } : {}),
engine: rowConfig.engine,
fast: rowConfig.fast,
- favoriteUid: null,
+ favoriteUid: rowConfig.favoriteUid,
+ ...(rowConfig.resetToRecommended ? { resetToRecommended: true as const } : {}),
});
}
return applyUnifiedSessionSelect({
@@ -3331,7 +3332,7 @@ export function ModelSelector({
// 统一面板下没有「先切分段再选模型」那一步,跨引擎的确认落在**真正选中那一行**的这一下。
// 确认用的 AlertDialog 同样会被 Popover 当成外部交互顺手把面板收掉,所以复用上面那把
- // 保命锁。成功后关掉选单(确认已经变成「下一条才生效」的意图,应露出 composer 提示);
+ // 保命锁。模型行选中成功后关掉选单;配置浮层切换成功后保持展开;
// 取消 / 失败留在原地,方便重选。
//
// 2026-08-17 review 第二项之后,这个 await 等的是**整条切换事务**(确认框 + 登记往返),
@@ -3349,23 +3350,29 @@ export function ModelSelector({
const contentSessionEngineFilter = useMemo(() => {
if (!sessionEngineFilter) return undefined;
const { onCrossEngineSelect } = sessionEngineFilter;
+ const switchEngine = async (
+ args: Parameters<typeof onCrossEngineSelect>[0],
+ configuring: boolean,
+ ): Promise<boolean> => {
+ setKeepOpenForAgentConfirmation(true);
+ try {
+ const applied = await onCrossEngineSelect(args);
+ // 配置浮层里的切换保持展开;选中模型行成功后才收起。
+ setOpenWithoutAutoRefresh(configuring || applied === false);
+ return applied !== false;
+ } catch {
+ setOpenWithoutAutoRefresh(true);
+ return false;
+ } finally {
+ setKeepOpenForAgentConfirmation(false);
+ }
+ };
return {
...sessionEngineFilter,
- onCrossEngineSelect: async (
- args: Parameters<typeof onCrossEngineSelect>[0],
- ): Promise<boolean> => {
- setKeepOpenForAgentConfirmation(true);
- try {
- const applied = await onCrossEngineSelect(args);
- // 成功后收起选单:确认切换已经落成「下一条才生效」的意图,胶囊用「下条:」标明;
- // 窗口留着会让轨跟着意图翻到目标 Harness,再点任意模型又弹一次确认。
- // 取消 / 失败留在原地,方便重选。
- setOpenWithoutAutoRefresh(applied === false);
- return applied !== false;
- } finally {
- setKeepOpenForAgentConfirmation(false);
- }
- },
+ onCrossEngineSelect: (args: Parameters<typeof onCrossEngineSelect>[0]) =>
+ switchEngine(args, false),
+ onCrossEngineConfigure: (args: Parameters<typeof onCrossEngineSelect>[0]) =>
+ switchEngine(args, true),
};
}, [sessionEngineFilter, setOpenWithoutAutoRefresh]);
diff --git a/apps/desktop/src/renderer/components/new-chat/UnifiedModelPanel.tsx b/apps/desktop/src/renderer/components/new-chat/UnifiedModelPanel.tsx
index feed89255a..8f328551ce 100644
--- a/apps/desktop/src/renderer/components/new-chat/UnifiedModelPanel.tsx
+++ b/apps/desktop/src/renderer/components/new-chat/UnifiedModelPanel.tsx
@@ -158,6 +158,8 @@ export interface UnifiedModelPanelProps {
runtimeAgent?: AgentKind;
/** 已登记、下一条消息才落地的切换目标。缺省 = 没有挂着的意图。 */
pendingTarget?: AgentKind;
+ /** Configuration edits keep the menu open after applying the switch. */
+ onCrossEngineConfigure?: NonNullable<UnifiedModelPanelProps['sessionEngineFilter']>['onCrossEngineSelect'];
/**
* 返回 `false` = 调用方**没有**执行这次切换(典型:跨引擎确认弹窗被取消)。
* 面板本身不消费返回值,但包在外面的 ModelSelector 靠它决定「收起面板」还是
@@ -334,14 +336,11 @@ export function UnifiedModelPanel({
const predicatesRef = useRef({ isVisible, excludeProvider, excludeModel });
predicatesRef.current = { isVisible, excludeProvider, excludeModel };
const agentsKey = agents ? agents.join(',') : 'all';
- // 「正在用的引擎」的单一口径:会话内以 sessionAgent 为准(已确认的会话引擎 ⊕ **待切换
- // 意图目标** —— 调用方 ChatInput 在跨引擎意图登记后把 currentAgent 换成意图目标,
- // 2026-08-17 review:意图期内 selected.modelId / effort / fast 全是目标值,引擎口径不跟上
- // 会把目标模型画成旧引擎、浮层摆出旧引擎档位而回调写目标引擎;liveAgentKind 在元数据
- // 未到时可能回退成 cc),草稿才用 liveAgentKind(= 草稿 vendor)。选中行豁免
- // (keepModel.agent)、isLiveRow 与选中行的 forceEngine 必须用**同一个**口径,否则强制显示
- // 出来的引擎反而让 isLiveRow 判不中(2026-08-14 测试当场抓到)。
- const liveEngineAgent = sessionAgent ?? liveAgentKind;
+ // 选中配置与 ChatInput 的展示快照一致:意图期的 model / effort / fast 已是目标值,
+ // Harness 也取 pendingTarget。currentAgent 仍用于其它行的默认引擎,
+ // runtimeAgent 仍用于切换确认;显示目标不代表运行时已经切换。
+ // keepModel、isLiveRow 与选中行 forceEngine 共用这一口径。
+ const liveEngineAgent = sessionEngineFilter?.pendingTarget ?? sessionAgent ?? liveAgentKind;
/**
* 选中行豁免(`keepModel`)只对**已建会话**开:
* - `scope:'session'` = 面板画的是一个正在跑的会话,它选中的模型即便被下架 / 停用也必须
diff --git a/apps/desktop/src/renderer/components/new-chat/useUnifiedRowActions.ts b/apps/desktop/src/renderer/components/new-chat/useUnifiedRowActions.ts
index 8058097997..8e85f9151f 100644
--- a/apps/desktop/src/renderer/components/new-chat/useUnifiedRowActions.ts
+++ b/apps/desktop/src/renderer/components/new-chat/useUnifiedRowActions.ts
@@ -84,7 +84,7 @@ export interface UnifiedRowActionsOptions {
effort: Effort | '',
config: UnifiedSelectedRow,
) => ActionResult;
- /** 没有模型记忆表的设置入口,直接应用完整配置并保持配置菜单打开。 */
+ /** 配置编辑直接应用完整配置,并保持配置菜单打开。 */
onConfigure?: UnifiedRowActionsOptions['onSelect'];
/**
* 清掉「当前选中的收藏」锚点 —— 用户在**同模型的普通模型行**上改了实时深度 / Fast 时用
@@ -111,6 +111,7 @@ export interface UnifiedRowActionsOptions {
* (same-engine-reselect 清意图);点同一个目标 Harness 的其它模型则更新意图、不再弹确认。
*/
pendingTarget?: AgentKind;
+ onCrossEngineConfigure?: NonNullable<UnifiedRowActionsOptions['sessionEngineFilter']>['onCrossEngineSelect'];
onCrossEngineSelect: (args: {
providerId: string;
modelId: string;
@@ -404,7 +405,7 @@ export function useUnifiedRowActions(options: UnifiedRowActionsOptions): Unified
}): Promise<void> => {
if (!sessionEngineFilter) return Promise.resolve();
return runLive(() =>
- sessionEngineFilter.onCrossEngineSelect({
+ (sessionEngineFilter.onCrossEngineConfigure ?? sessionEngineFilter.onCrossEngineSelect)({
providerId: args.providerId,
modelId: args.wireModelId,
targetAgent: args.targetAgent,
@@ -436,7 +437,7 @@ export function useUnifiedRowActions(options: UnifiedRowActionsOptions): Unified
wireModelId: string;
effort: Effort | null;
}): ActionResult => {
- return onSelect(args.anchor.providerId, args.wireModelId, args.effort ?? '', {
+ return (onConfigure ?? onSelect)(args.anchor.providerId, args.wireModelId, args.effort ?? '', {
engine: args.engine,
fast: false,
favoriteUid: null,
@@ -514,7 +515,7 @@ export function useUnifiedRowActions(options: UnifiedRowActionsOptions): Unified
// 按编辑后的目标值(wire id / 引擎)重记这条锚点。草稿分支下面那条 onSelect 里的
// `favoriteUid: args.uid` 是同一个语义,两条链路必须一致(2026-08-17 review K3)。
favoriteUid: args.uid,
- onApplied: () => commitOrRestore(() => sessionEngineFilter?.onCrossEngineSelect({
+ onApplied: () => commitOrRestore(() => sessionEngineFilter && (sessionEngineFilter.onCrossEngineConfigure ?? sessionEngineFilter.onCrossEngineSelect)({
providerId: args.anchor.providerId,
modelId: args.config.wireModelId ?? args.anchor.modelId,
targetAgent: args.config.agent,
@@ -525,14 +526,14 @@ export function useUnifiedRowActions(options: UnifiedRowActionsOptions): Unified
});
}
return runLive(() =>
- onSelect(args.anchor.providerId, wireModelId, args.target.effort ?? '', {
+ (onConfigure ?? onSelect)(args.anchor.providerId, wireModelId, args.target.effort ?? '', {
engine: args.target.engine,
fast: args.target.fast,
favoriteUid: args.uid,
rowModelId: args.anchor.modelId,
}),
).then((applied) => {
- if (applied) return commitOrRestore(() => onSelect(
+ if (applied) return commitOrRestore(() => (onConfigure ?? onSelect)(
args.anchor.providerId, args.config.wireModelId ?? args.anchor.modelId,
args.config.effort ?? '', {
engine: args.config.engine, fast: args.config.fast,
@@ -617,7 +618,7 @@ export function useUnifiedRowActions(options: UnifiedRowActionsOptions): Unified
if (!shouldCrossEngine(targetAgent)) return;
// 会话内改选中行的引擎 = 一次跨引擎切换:交给 performAgentSwitch 事务(确认弹窗
// + 上下文重建)。**不预写全局 override**:用户取消确认时不该留下任何痕迹。
- return sessionEngineFilter.onCrossEngineSelect({
+ return (sessionEngineFilter.onCrossEngineConfigure ?? sessionEngineFilter.onCrossEngineSelect)({
providerId: anchor.providerId,
modelId: next?.wireModelId ?? anchor.modelId,
targetAgent,
@@ -634,7 +635,7 @@ export function useUnifiedRowActions(options: UnifiedRowActionsOptions): Unified
// (与选中一行同一条链路),行随之按新引擎显示。
if (next) {
return runLive(() =>
- onSelect(anchor.providerId, next.wireModelId ?? anchor.modelId, next.effort ?? '', {
+ (onConfigure ?? onSelect)(anchor.providerId, next.wireModelId ?? anchor.modelId, next.effort ?? '', {
engine: next.engine,
fast: next.fast,
favoriteUid: null,
@@ -976,7 +977,9 @@ export function useUnifiedRowActions(options: UnifiedRowActionsOptions): Unified
if (sessionEngineFilter && shouldCrossEngine(config.agent)) {
// 收藏锚点一并交出去:会话侧要在事务**真成功后**才把它记成「当前选中的收藏」
// (取消 / 失败时什么都没换,锚点当然不能动)。同引擎那一路由 onSelect 的 config 带走。
- return sessionEngineFilter.onCrossEngineSelect({
+ return (configuring && sessionEngineFilter.onCrossEngineConfigure
+ ? sessionEngineFilter.onCrossEngineConfigure
+ : sessionEngineFilter.onCrossEngineSelect)({
providerId: anchor.providerId,
modelId: wireModelId,
targetAgent: config.agent,