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): 新建伙伴模型选择器支持双指滚动 (#6727)

xuzini-xzne00bfd4b1a45
diff --git a/apps/desktop/src/main/remote-agent/__tests__/guestHost.test.ts b/apps/desktop/src/main/remote-agent/__tests__/guestHost.test.ts
index e68b4bec50..cac812fe5e 100644
--- a/apps/desktop/src/main/remote-agent/__tests__/guestHost.test.ts
+++ b/apps/desktop/src/main/remote-agent/__tests__/guestHost.test.ts
@@ -397,12 +397,16 @@ describe('guest resume', () => {
})).rejects.toThrow(/REMOTE_AGENT_INVALID/);
await host.handle(GUEST, { op: 'open', runId: RUN_1, agentKind: 'claude-code', payload: { json: openPayload('task-1') } });
- await vi.waitFor(() => expect(started).toHaveLength(1));
+ // startHosted records its call before ownership is persisted and the public
+ // startup handshake completes. Observe the handshake before disposing.
+ await waitForStarted(host, GUEST, RUN_1);
+ expect(started).toHaveLength(1);
const nativeId = `sdk-${hostSessionIdFor(GUEST, 'task-1')}`;
- await vi.waitFor(() => expect(fs.existsSync(path.join(runsRoot, 'guest-sessions.json'))).toBe(true));
+ expect(fs.existsSync(path.join(runsRoot, 'guest-sessions.json'))).toBe(true);
host.dispose();
- // 等旧实例退出时的收尾(删除影子目录)做完,避免与新实例重建目录交错。
- await vi.waitFor(() => expect(fs.existsSync(sessionRoot(GUEST, 'task-1'))).toBe(false));
+ // Match startAndCall's async filesystem cleanup budget: Windows CI may need
+ // more than vi.waitFor's default second. Still require actual deletion.
+ await vi.waitFor(() => expect(fs.existsSync(sessionRoot(GUEST, 'task-1'))).toBe(false), { timeout: 10_000 });
// 新实例(重启)从落盘登记里认出自己的会话。
const restarted = makeHost(started);
@@ -412,9 +416,12 @@ describe('guest resume', () => {
agentKind: 'claude-code',
payload: { json: openPayload('task-1', { options: { model: 'claude-opus', resumeSessionId: nativeId } }) },
});
- await vi.waitFor(() => expect(started).toHaveLength(2));
+ await waitForStarted(restarted, GUEST, RUN_2);
+ expect(started).toHaveLength(2);
expect(started[1].input.options.resumeSessionId).toBe(nativeId);
restarted.dispose();
+ // Do not let afterEach remove files while asynchronous disposal still uses them.
+ await vi.waitFor(() => expect(fs.existsSync(sessionRoot(GUEST, 'task-1'))).toBe(false), { timeout: 10_000 });
});
it('does not restrict same-account resume', async () => {
diff --git a/apps/desktop/src/renderer/features/bots/BotRosterView.tsx b/apps/desktop/src/renderer/features/bots/BotRosterView.tsx
index 96ae3d4915..11dd6b7f11 100644
--- a/apps/desktop/src/renderer/features/bots/BotRosterView.tsx
+++ b/apps/desktop/src/renderer/features/bots/BotRosterView.tsx
@@ -153,12 +153,16 @@ export function BotRosterView({ onCreated, onClose, restoreFocus, inline = false
<main className="flex h-full items-center justify-center bg-[var(--surface)] px-6 text-[var(--text-primary)]"><div className={importing ? "flex max-h-[90vh] w-full max-w-lg flex-col" : "w-full max-w-lg"}>{content}</div></main>
);
return (
- <Dialog.Root open onOpenChange={open => { if (!open && !creating) close(); }}><Dialog.Portal>
- <Dialog.Overlay className="modal-scrim fixed inset-0 z-50" />
- <Dialog.Content aria-describedby={undefined} onPointerDownOutside={(event) => event.preventDefault()} onCloseAutoFocus={event => { if (restoreFocus) { event.preventDefault(); restoreFocus(); } }}
- className={`modal-panel fixed left-1/2 top-1/2 z-50 max-h-[90vh] w-[calc(100vw-32px)] max-w-[520px] -translate-x-1/2 -translate-y-1/2 ${importing ? 'flex flex-col overflow-hidden' : 'overflow-y-auto'} p-6 text-[var(--text-primary)] outline-none sm:p-8`}>
- {content}
- </Dialog.Content>
- </Dialog.Portal></Dialog.Root>
+ <Dialog.Root open onOpenChange={open => { if (!open && !creating) close(); }}>
+ <Dialog.Portal>
+ {/* Keep portaled controls inside the overlay’s React tree so its scroll lock allows them. */}
+ <Dialog.Overlay className="modal-scrim fixed inset-0 z-50">
+ <Dialog.Content aria-describedby={undefined} onPointerDownOutside={(event) => event.preventDefault()} onCloseAutoFocus={event => { if (restoreFocus) { event.preventDefault(); restoreFocus(); } }}
+ className={`modal-panel fixed left-1/2 top-1/2 z-50 max-h-[90vh] w-[calc(100vw-32px)] max-w-[520px] -translate-x-1/2 -translate-y-1/2 ${importing ? 'flex flex-col overflow-hidden' : 'overflow-y-auto'} p-6 text-[var(--text-primary)] outline-none sm:p-8`}>
+ {content}
+ </Dialog.Content>
+ </Dialog.Overlay>
+ </Dialog.Portal>
+ </Dialog.Root>
);
}
diff --git a/apps/desktop/src/renderer/features/bots/__tests__/botRosterView.test.tsx b/apps/desktop/src/renderer/features/bots/__tests__/botRosterView.test.tsx
index 7d69b00a56..9a89658f8f 100644
--- a/apps/desktop/src/renderer/features/bots/__tests__/botRosterView.test.tsx
+++ b/apps/desktop/src/renderer/features/bots/__tests__/botRosterView.test.tsx
@@ -54,50 +54,64 @@ vi.mock('../botStore', () => ({
fastMode: false,
}),
}));
-vi.mock('@/components/new-chat/ModelSelector', () => ({
- ModelSelector: ({
- unifiedAgents,
- onUnifiedSelect,
- disabled,
- vendorKey,
- onNavigateToProviders,
- }: {
- onNavigateToProviders?: () => void;
- disabled: boolean;
- vendorKey: string;
- unifiedAgents: string[];
- onUnifiedSelect: (selection: unknown) => void;
- }) => (
- <>
- {onNavigateToProviders && (
- <button type="button" onClick={onNavigateToProviders}>
- connect-source
- </button>
- )}
- <span data-testid="selected-engine">{vendorKey}</span>
- {(['pi', 'codex'] as const)
- .filter((engine) => unifiedAgents.includes(engine))
- .map((engine) => (
- <button
- key={engine}
- disabled={disabled}
- type="button"
- onClick={() =>
- onUnifiedSelect({
- engine,
- providerId: 'custom',
- modelId: 'custom-model',
- effort: 'high',
- fast: false,
- })
- }
- >
- {engine === 'pi' ? 'choose-custom-model' : 'choose-custom-codex-model'}
+vi.mock('@/components/new-chat/ModelSelector', async () => {
+ const { Popover, PopoverContent, PopoverTrigger } = await import('@/components/ui/popover');
+ return {
+ ModelSelector: ({
+ unifiedAgents,
+ onUnifiedSelect,
+ disabled,
+ vendorKey,
+ onNavigateToProviders,
+ }: {
+ onNavigateToProviders?: () => void;
+ disabled: boolean;
+ vendorKey: string;
+ unifiedAgents: string[];
+ onUnifiedSelect: (selection: unknown) => void;
+ }) => (
+ <>
+ {onNavigateToProviders && (
+ <button type="button" onClick={onNavigateToProviders}>
+ connect-source
</button>
- ))}
- </>
- ),
-}));
+ )}
+ <span data-testid="selected-engine">{vendorKey}</span>
+ {(['pi', 'codex'] as const)
+ .filter((engine) => unifiedAgents.includes(engine))
+ .map((engine) => (
+ <button
+ key={engine}
+ disabled={disabled}
+ type="button"
+ onClick={() =>
+ onUnifiedSelect({
+ engine,
+ providerId: 'custom',
+ modelId: 'custom-model',
+ effort: 'high',
+ fast: false,
+ })
+ }
+ >
+ {engine === 'pi' ? 'choose-custom-model' : 'choose-custom-codex-model'}
+ </button>
+ ))}
+ <Popover>
+ <PopoverTrigger>open-model-panel</PopoverTrigger>
+ <PopoverContent>
+ <div data-testid="provider-list" style={{ overflowY: 'auto', height: 100 }}>
+ <button type="button">Provider row</button>
+ </div>
+ <div data-testid="model-list" style={{ overflowY: 'auto', height: 100 }}>
+ <button type="button">Model row</button>
+ </div>
+ </PopoverContent>
+ </Popover>
+ </>
+ ),
+ };
+});
vi.mock('react-router-dom', () => ({ useNavigate: () => mocks.navigate }));
vi.mock('../BotPortraitPicker', () => ({
@@ -254,4 +268,34 @@ describe('name-only creation', () => {
expect((screen.getByRole('button', { name: 'bots.guided.generate' }) as HTMLButtonElement).disabled).toBe(true);
expect(mocks.addBotProfileAndWait).not.toHaveBeenCalled();
});
+
+ it('allows wheel events in the portaled provider and model lists while locking the background', async () => {
+ render(<BotRosterView />);
+ await waitFor(() => expect(mocks.galleryPortrait).toHaveBeenCalled());
+ fireEvent.click(screen.getByRole('button', { name: 'open-model-panel' }));
+ for (const id of ['provider-list', 'model-list']) {
+ const list = screen.getByTestId(id);
+ // jsdom has no layout; supply dimensions but let the real Dialog/Popover
+ // and react-remove-scroll decide whether to cancel the browser's wheel.
+ Object.defineProperties(list, {
+ scrollHeight: { value: 1000 },
+ clientHeight: { value: 100 },
+ scrollTop: { value: 400, writable: true },
+ });
+ expect(
+ screen.getByRole('button', { name: 'open-model-panel' }).closest('[role="dialog"]')?.contains(list),
+ ).toBe(false);
+ }
+ for (const name of ['Provider row', 'Model row']) {
+ for (const deltaY of [-50, 50]) {
+ const wheel = new WheelEvent('wheel', { bubbles: true, cancelable: true, deltaY });
+ fireEvent(screen.getByRole('button', { name }), wheel);
+ expect(wheel.defaultPrevented).toBe(false);
+ }
+ }
+ const backgroundWheel = new WheelEvent('wheel', { bubbles: true, cancelable: true, deltaY: 50 });
+ fireEvent(document.body, backgroundWheel);
+ expect(backgroundWheel.defaultPrevented).toBe(true);
+ expect(screen.getByRole('dialog', { name: 'bots.guided.title' })).toBeTruthy();
+ });
});