From 8f526c7136d04433ba88bd8d4017bc1d208f69dd Mon Sep 17 00:00:00 2001 From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com> Date: Wed, 11 Nov 2026 01:04:43 -0800 Subject: [PATCH] Skip retained search projection while the palette is closed --- .../use-worktree-jump-palette-store-state.ts | 35 +++++--- .../use-worktree-jump-palette-worktrees.ts | 15 ++-- ...ained-workspace-presentation.perf.test.tsx | 87 +++++++++++++++++++ 3 files changed, 118 insertions(+), 19 deletions(-) diff --git a/src/renderer/src/components/worktree-jump/use-worktree-jump-palette-store-state.ts b/src/renderer/src/components/worktree-jump/use-worktree-jump-palette-store-state.ts index ee62700c200..7293c9e6bc4 100644 --- a/src/renderer/src/components/worktree-jump/use-worktree-jump-palette-store-state.ts +++ b/src/renderer/src/components/worktree-jump/use-worktree-jump-palette-store-state.ts @@ -25,6 +25,7 @@ import { } from '@/store/workspaces/catalog/workspace-record-fields' import { getFolderWorkspaceWorktree } from '../../../../shared/folder-workspaces/folder-workspace-worktree' import { selectWorkspacePresentationWorktrees } from '@/store/workspaces/catalog/retained-workspace-presentation' +import { EMPTY_SORTED_WORKTREES } from './worktree-jump-palette-model' export function useWorktreeJumpPaletteStoreState({ visible, @@ -34,6 +35,7 @@ export function useWorktreeJumpPaletteStoreState({ lingering: boolean }) { useTranslation() + const paletteStatusInputsActive = visible || lingering // Freeze age labels for one palette session; live status dots own their clock separately. // oxlint-disable-next-line react-hooks/exhaustive-deps -- visibility intentionally starts a new session clock. const paletteNowMs = useMemo(() => Date.now(), [visible]) @@ -74,23 +76,32 @@ export function useWorktreeJumpPaletteStoreState({ [folderWorkspaces, projectGroups, repos, worktreesByRepo] ) const projects = useAppStore((state) => state.projects) - const presentationWorkspaces = useMemo( - () => - dedupePaletteWorktrees([ - ...withoutHiddenVmWorktrees( - Object.values(presentationWorktreesByRepo).flat(), - hiddenVmCheckouts - ), - ...workspaces.filter((workspace) => workspace.id.startsWith('folder:')) - ]), - [presentationWorktreesByRepo, hiddenVmCheckouts, workspaces] - ) + const presentationWorkspaces = useMemo(() => { + if (!paletteStatusInputsActive) { + return EMPTY_SORTED_WORKTREES + } + if (presentationWorktreesByRepo === storedWorktreesByRepo) { + return workspaces + } + return dedupePaletteWorktrees([ + ...withoutHiddenVmWorktrees( + Object.values(presentationWorktreesByRepo).flat(), + hiddenVmCheckouts + ), + ...workspaces.filter((workspace) => workspace.id.startsWith('folder:')) + ]) + }, [ + paletteStatusInputsActive, + presentationWorktreesByRepo, + storedWorktreesByRepo, + hiddenVmCheckouts, + workspaces + ]) const projectHostSetups = useAppStore((state) => state.projectHostSetups) const detectedWorktreesByRepo = useAppStore((state) => selectDetectedWorktreesByRepo(state)) const pendingWorktreeCreations = useAppStore((state) => state.pendingWorktreeCreations) const pluginCommands = usePluginCommands() const pluginNewFiles = usePluginNewFiles() - const paletteStatusInputsActive = visible || lingering const { ptyIdsByTabId, terminalLayoutsByTabId, tabsByWorktree } = useAppStore( useShallow((state) => selectPaletteStatusInputs(state, paletteStatusInputsActive)) ) diff --git a/src/renderer/src/components/worktree-jump/use-worktree-jump-palette-worktrees.ts b/src/renderer/src/components/worktree-jump/use-worktree-jump-palette-worktrees.ts index 5311a6c397a..f493a97795c 100644 --- a/src/renderer/src/components/worktree-jump/use-worktree-jump-palette-worktrees.ts +++ b/src/renderer/src/components/worktree-jump/use-worktree-jump-palette-worktrees.ts @@ -185,13 +185,14 @@ export function useWorktreeJumpPaletteWorktrees({ migrationUnsupportedByPtyId, terminalLayoutsByTabId ]) - const openTabWorkspaces = useMemo( - () => - filterPredicate - ? presentationWorkspaces.filter(filterPredicate.matchesWorktree) - : presentationWorkspaces, - [presentationWorkspaces, filterPredicate] - ) + const openTabWorkspaces = useMemo(() => { + if (!paletteStatusInputsActive) { + return EMPTY_SORTED_WORKTREES + } + return filterPredicate + ? presentationWorkspaces.filter(filterPredicate.matchesWorktree) + : presentationWorkspaces + }, [paletteStatusInputsActive, presentationWorkspaces, filterPredicate]) const sortedWorktrees = useMemo( () => hasQuery diff --git a/src/renderer/src/store/workspaces/catalog/retained-workspace-presentation.perf.test.tsx b/src/renderer/src/store/workspaces/catalog/retained-workspace-presentation.perf.test.tsx index 991d16c7c4a..6818ba83d1a 100644 --- a/src/renderer/src/store/workspaces/catalog/retained-workspace-presentation.perf.test.tsx +++ b/src/renderer/src/store/workspaces/catalog/retained-workspace-presentation.perf.test.tsx @@ -3,6 +3,7 @@ import { afterEach, expect, it, vi } from 'vitest' import { act, cleanup, renderHook } from '@testing-library/react' import { useAppStore } from '@/store' +import type { AppState } from '@/store/types' import { makeWorktree } from '@/store/slices/worktrees/worktree.test-fixture' import { makeTab } from '@/store/terminals/terminal-tab.test-fixture' import { makeAgentEntry } from '@/components/worktree-jump/worktree-jump-palette-test-fixtures' @@ -14,6 +15,8 @@ import { selectWorkspacePresentationWorktrees } from './retained-workspace-presentation' import type { Worktree } from '../../../../../shared/worktree/types' +import type * as PaletteRepoResolution from '@/lib/workspace/search/palette-repo-resolution' +import { useWorktreeJumpPaletteStoreState } from '@/components/worktree-jump/use-worktree-jump-palette-store-state' vi.mock('../../../../../shared/sidebar-inputs-switch', () => ({ ORCA_SIDEBAR_INPUTS_IS_MAIN: false @@ -22,6 +25,27 @@ vi.mock('@/runtime/rpc/calls/runtime-rpc-call', () => ({ callRuntimeRpc: vi.fn(async () => undefined) })) +const { dedupeRows } = vi.hoisted(() => ({ dedupeRows: vi.fn() })) +vi.mock('@/lib/workspace/search/palette-repo-resolution', async (importOriginal) => { + const actual = await importOriginal() + return { + ...actual, + dedupePaletteWorktrees: (rows: Worktree[]) => { + dedupeRows(rows.length) + return actual.dedupePaletteWorktrees(rows) + } + } +}) +vi.mock('@/hooks/useSettingsNavigationMetadata', () => ({ + useSettingsNavigationMetadata: () => [] +})) +vi.mock('@/store/plugins/catalog/plugin-contribution-catalog', () => ({ + usePluginCommands: () => [] +})) +vi.mock('@/store/plugins/file-creation/plugin-new-files', () => ({ + usePluginNewFiles: () => [] +})) + const initialState = useAppStore.getInitialState() afterEach(() => { cleanup() @@ -209,3 +233,66 @@ it.each([100, 1000])( expect(selectPresentation(useAppStore.getState())).toBe(useAppStore.getState().worktreesByRepo) } ) + +it.each([100, 1000])( + 'adds no closed-palette listing work after an activity write among %i workspaces', + (count) => { + const rows = Array.from({ length: count }, (_, index) => + makeWorktree({ id: `repo-${index}::/checkout`, repoId: `repo-${index}`, hostId: 'local' }) + ) + const hidden = makeWorktree({ + id: 'repo-0::/.bare', + repoId: 'repo-0', + hostId: 'local', + isBare: true + }) + useAppStore.setState( + { + ...initialState, + worktreesByRepo: Object.fromEntries(rows.map((row) => [row.repoId, [row]])), + detectedWorktreesByRepo: { + 'repo-0': { + repoId: 'repo-0', + source: 'git', + authoritative: true, + worktrees: [ + { ...hidden, ownership: 'external', selectedCheckout: false, visible: false } + ] + } + }, + tabsByWorktree: { [hidden.id]: [makeTab({ id: 'saved-shell', worktreeId: hidden.id })] } + }, + true + ) + const palette = renderHook( + ({ visible }) => useWorktreeJumpPaletteStoreState({ visible, lingering: false }), + { + initialProps: { visible: true } + } + ) + expect(palette.result.current.presentationWorkspaces.some((row) => row.id === hidden.id)).toBe( + true + ) + palette.rerender({ visible: false }) + dedupeRows.mockClear() + act(() => { + useAppStore.getState().bumpWorktreeActivity(rows[0].id) + }) + // Only the pre-existing checkout list may run while closed; retained search has no output. + expect(dedupeRows.mock.calls).toEqual([[count]]) + expect(palette.result.current.presentationWorkspaces).toEqual([]) + palette.rerender({ visible: true }) + expect(palette.result.current.presentationWorkspaces.some((row) => row.id === hidden.id)).toBe( + true + ) + act(() => { + useAppStore.setState((state) => ({ + tabsByWorktree: replaceRecordEntries( + state.tabsByWorktree, + [[hidden.id, null]] + ) + })) + }) + expect(palette.result.current.presentationWorkspaces).toBe(palette.result.current.workspaces) + } +)