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。

Merge pull request #6489 from qsoyq/fix/issue-6485-browser-reload-new-task

Liziee137fdd6aa6
diff --cc apps/desktop/src/renderer/features/right-sidebar/__tests__/RightSidebarShell.test.ts
index 77c71b50b0,12d1790bdb..3692fccbe0
--- a/apps/desktop/src/renderer/features/right-sidebar/__tests__/RightSidebarShell.test.ts
+++ b/apps/desktop/src/renderer/features/right-sidebar/__tests__/RightSidebarShell.test.ts
@@@ -318,157 -297,14 +318,159 @@@ describe('RightSidebarShell empty state
delete (window as unknown as { electronAPI?: unknown }).electronAPI;
});
+ // 测试价值
+ // - 生产入口与可观察结果:RightSidebarShell 同时投影全局页签(globalTabs,不跟对话)与任务
+ // 页签;可观察的是全局页签钉在条首并带图钉、切任务后仍在、点它只改本窗口的全局激活位
+ // 而不写任务桶的 setActive、有全局页签在场时任务页签关空不触发自动收起、关闭全局页签
+ // 是全局动作、插件停用后它从投影里消失但数据保留。
+ // - Bug / 规则依据:右侧栏「跟对话 / 不跟对话」两类页签模型(本 PR)。
+ // - 现有覆盖缺口:其余用例只覆盖任务桶。
+ // - 最小失败输入:一个 plugin-view 全局页签 + 一个任务页签,切换任务。
+ // - tier:unit(jsdom,localStorage 全局页签 + 进程内 store)。
+ it('pins global plugin-view tabs across tasks without touching the task bucket active marker', async () => {
+ installedGhostsMock.list = [
+ { manifest: { id: 'alpha', name: 'Alpha', panel: { html: 'p.html', title: 'Alpha Panel' } }, enabled: true },
+ ];
+ const globalTab = addGlobalPluginTab('alpha')!;
+ const onAllTabsClosed = vi.fn();
+ tabsIpc.list.mockResolvedValueOnce({
+ tabs: [{ id: 'tab-files', kind: 'file-browser', state: null }],
+ activeTabId: 'tab-files',
+ });
+ const { rerender } = render(
+ createElement(RightSidebarShell, {
+ sessionId: 's1',
+ workdir: '/tmp/repo',
+ remoteHostId: null,
+ isMac: true,
+ unifiedTopbar: true,
+ subagentsAvailable: false,
+ onAllTabsClosed,
+ }),
+ );
+ await waitFor(() => expect(screen.getByText('rightSidebar.tabs.kinds.fileBrowser')).toBeTruthy());
+ const pinned = screen.getByTestId('right-sidebar-pinned-tabs');
+ expect(pinned.textContent).toContain('rightSidebar.tabs.kinds.pluginView');
+ expect(pinned.querySelector('[data-pinned]')).toBeTruthy();
+
+ // 选中全局页签:只改本窗口的全局激活位,任务桶的 setActive 不落库。
+ tabsIpc.setActive.mockClear();
+ fireEvent.click(screen.getByText('rightSidebar.tabs.kinds.pluginView'));
+ expect(getActiveGlobalTabId()).toBe(globalTab.id);
+ await new Promise((resolve) => setTimeout(resolve, 0));
+ expect(tabsIpc.setActive).not.toHaveBeenCalled();
+
+ // 切到空任务:全局页签还在、仍是激活页签;任务没有页签但不渲染空态、不触发收起。
+ tabsIpc.list.mockResolvedValueOnce({ tabs: [], activeTabId: null });
+ rerender(
+ createElement(RightSidebarShell, {
+ sessionId: 's2',
+ workdir: '/tmp/repo',
+ remoteHostId: null,
+ isMac: true,
+ unifiedTopbar: true,
+ subagentsAvailable: false,
+ onAllTabsClosed,
+ }),
+ );
+ await waitFor(() => expect(getBucket('s2').hydrated).toBe(true));
+ expect(screen.getByTestId('right-sidebar-pinned-tabs').textContent).toContain(
+ 'rightSidebar.tabs.kinds.pluginView',
+ );
+ expect(screen.queryByText('rightSidebar.tabs.empty.title')).toBeNull();
+ expect(onAllTabsClosed).not.toHaveBeenCalled();
+
+ // 插件停用:页签从投影消失(数据保留),没有别的页签了才算关空。
+ installedGhostsMock.list = [
+ { manifest: { id: 'alpha', name: 'Alpha', panel: { html: 'p.html', title: 'Alpha Panel' } }, enabled: false },
+ ];
+ rerender(
+ createElement(RightSidebarShell, {
+ sessionId: 's2',
+ workdir: '/tmp/other',
+ remoteHostId: null,
+ isMac: true,
+ unifiedTopbar: true,
+ subagentsAvailable: false,
+ onAllTabsClosed,
+ }),
+ );
+ await waitFor(() => expect(screen.queryByTestId('right-sidebar-pinned-tabs')).toBeNull());
+ expect(screen.getByText('rightSidebar.tabs.empty.title')).toBeTruthy();
+ await waitFor(() => expect(onAllTabsClosed).toHaveBeenCalledOnce());
+ });
+
+ // 测试价值
+ // - 生产入口与可观察结果:同一任务的右侧组与左侧组两个 Shell;可观察的是页签右键
+ // 「移到左侧」后从右侧条消失、出现在左侧条并被选中(组归属落 localStorage),在左侧
+ // 组点它仍写任务级激活位;「关闭其他」只作用于本组。
+ // - Bug / 规则依据:页签组模型——页签可移到聊天区任一边,两边投影同一任务桶不串。
+ // - 现有覆盖缺口:Shell 此前只有单组。
+ // - 最小失败输入:两个任务页签 + 一次「移到左侧」。
+ // - tier:unit(jsdom,进程内 store + localStorage 组归属)。
+ it('moves a task tab between groups; each group projects only its own tabs', async () => {
+ tabsIpc.list.mockResolvedValueOnce({
+ tabs: [
+ { id: 'tab-files', kind: 'file-browser', state: null },
+ { id: 'tab-web', kind: 'web-browser', state: null },
+ ],
+ activeTabId: 'tab-files',
+ });
+ const shellProps = {
+ sessionId: 's1',
+ workdir: '/tmp/repo',
+ remoteHostId: null,
+ isMac: false,
+ subagentsAvailable: false,
+ };
+ const right = render(createElement(RightSidebarShell, { ...shellProps, groupId: 'right' }));
+ await waitFor(() => expect(getBucket('s1').hydrated).toBe(true));
+ const left = render(createElement(RightSidebarShell, { ...shellProps, groupId: 'left' }));
+ const stripOf = (view: ReturnType<typeof render>) =>
+ view.container.querySelector('[data-testid="right-sidebar-tab-strip"]')!;
+ expect(stripOf(right).textContent).toContain('rightSidebar.tabs.kinds.browser');
+ expect(stripOf(left).textContent).not.toContain('rightSidebar.tabs.kinds.browser');
+
+ // 右键浏览器页签 →「移到左侧」。
+ const webPill = right.getByText('rightSidebar.tabs.kinds.browser').closest('.group')!;
+ fireEvent.contextMenu(webPill);
+ fireEvent.click(screen.getByTestId('right-sidebar-tab-move-left'));
+ expect(getTabGroup('tab-web')).toBe('left');
+ await waitFor(() =>
+ expect(stripOf(left).textContent).toContain('rightSidebar.tabs.kinds.browser'),
+ );
+ expect(stripOf(right).textContent).not.toContain('rightSidebar.tabs.kinds.browser');
+ // 搬过去的页签在左侧组被选中并成为任务级激活页签;右侧组回落到自己剩下的页签。
+ await waitFor(() => expect(getBucket('s1').activeTabId).toBe('tab-web'));
+ expect(stripOf(left).querySelector('.group')?.className).toContain('font-medium');
+ expect(
+ right.getByText('rightSidebar.tabs.kinds.fileBrowser').closest('.group')?.className,
+ ).toContain('font-medium');
+
+ // 在右侧组点文件页签:任务级激活位照常落库。
+ tabsIpc.setActive.mockClear();
+ fireEvent.click(right.getByText('rightSidebar.tabs.kinds.fileBrowser'));
+ await waitFor(() => expect(tabsIpc.setActive).toHaveBeenCalled());
+ expect(getBucket('s1').activeTabId).toBe('tab-files');
+
+ // 右侧组「关闭其他」只关本组的页签(本组只剩文件页签,无其它可关)。
+ fireEvent.contextMenu(right.getByText('rightSidebar.tabs.kinds.fileBrowser').closest('.group')!);
+ const closeOthers = screen
+ .getByText('rightSidebar.tabs.contextMenu.closeOthers')
+ .closest('[role="menuitem"]')!;
+ expect(closeOthers.getAttribute('data-disabled')).not.toBeNull();
+ left.unmount();
+ right.unmount();
+ });
+
it.each([
- { otherBrowser: false, release: 'close' },
- { otherBrowser: true, release: 'close' },
- { otherBrowser: false, release: 'evict' },
- { otherBrowser: true, release: 'evict' },
- ])('keeps a live browser connected across task switches ($otherBrowser) until $release', async ({ otherBrowser, release }) => {
+ { otherBrowser: false, release: 'close', away: 'task-b' },
+ { otherBrowser: true, release: 'close', away: 'task-b' },
+ { otherBrowser: false, release: 'evict', away: 'task-b' },
+ { otherBrowser: true, release: 'evict', away: 'task-b' },
+ // New-task page without a project: the shell stays mounted with no foreground session (#6485).
+ { otherBrowser: false, release: 'close', away: null },
+ ])('keeps a live browser connected across task switches ($otherBrowser, away: $away) until $release', async ({ otherBrowser, release, away }) => {
Object.assign(window.electronAPI, { onRsbBrowserFocusUrlBar: () => () => undefined });
registerTabKind({
kind: 'web-browser',