From 6504f33f498ae81b95bb61aef7b54dee4f25b259 Mon Sep 17 00:00:00 2001 From: Teknium <127238744+teknium1@users.noreply.github.com> Date: Mon, 7 Sep 2026 02:19:58 -0700 Subject: [PATCH] fix(desktop): honor explicit worktree sidebar dismissal Slim salvage of #103992: preserve dismissal provenance as removed ids rather than a second metadata schema; discovery only overrides successful git removals. Explicit hide is durable even before a discovery scan finishes. Co-authored-by: Tranquil-Flow <66773372+Tranquil-Flow@users.noreply.github.com> --- .../chat/sidebar/projects/entered-content.tsx | 11 +++--- ...sessions-section-new-session-drag.test.tsx | 37 ++++++++++++++++++- apps/desktop/src/store/layout.ts | 13 ++++++- 3 files changed, 53 insertions(+), 8 deletions(-) diff --git a/apps/desktop/src/app/chat/sidebar/projects/entered-content.tsx b/apps/desktop/src/app/chat/sidebar/projects/entered-content.tsx index 8f7af2f459..18024413c1 100644 --- a/apps/desktop/src/app/chat/sidebar/projects/entered-content.tsx +++ b/apps/desktop/src/app/chat/sidebar/projects/entered-content.tsx @@ -9,7 +9,7 @@ import type { HermesGitWorktree } from '@/global' import type { SessionInfo } from '@/hermes' import { useI18n } from '@/i18n' import { displayPath } from '@/lib/display-path' -import { $dismissedWorktreeIds, dismissWorktree, setWorkspaceNodeOpen } from '@/store/layout' +import { $dismissedWorktreeIds, $removedWorktreeIds, dismissWorktree, setWorkspaceNodeOpen } from '@/store/layout' import { notifyError } from '@/store/notifications' import { removeWorktreePath } from '@/store/projects' @@ -101,6 +101,7 @@ function RepoFlatSection({ const s = t.sidebar const [open, toggleOpen] = useWorkspaceNodeOpen(repo.id) const dismissedWorktrees = useStore($dismissedWorktreeIds) + const removedWorktrees = useStore($removedWorktreeIds) // The repo's session lanes already come fully built from the backend; this // only injects empty VISUAL lanes from a live `git worktree list`. @@ -131,11 +132,11 @@ function RepoFlatSection({ ) // Main lanes are always visible; linked worktrees can be user-dismissed. - // A live `git worktree list` hit wins over an old dismissal: if git says the - // worktree exists again (or still exists after "hide from sidebar"), surface it. + // Discovery may resurrect a removed worktree, never an explicit sidebar hide. const ordered = overlaidGroups.filter( group => - group.isMain || !dismissedWorktrees.includes(group.id) || (group.path && discoveredWorktreePaths.has(group.path)) + group.isMain || !dismissedWorktrees.includes(group.id) || + (removedWorktrees.includes(group.id) && group.path && discoveredWorktreePaths.has(group.path)) ) // Removal asks how: actually `git worktree remove` it, or just hide the lane @@ -151,7 +152,7 @@ function RepoFlatSection({ try { await removeWorktreePath(repo.path, group.path, { force }) - dismissWorktree(group.id) + dismissWorktree(group.id, { removed: true }) } catch (err) { // git refuses a non-force remove on a dirty/locked worktree — offer force // rather than dead-ending on an error toast. diff --git a/apps/desktop/src/app/chat/sidebar/sessions-section-new-session-drag.test.tsx b/apps/desktop/src/app/chat/sidebar/sessions-section-new-session-drag.test.tsx index b66cfc86a0..58f3dc4903 100644 --- a/apps/desktop/src/app/chat/sidebar/sessions-section-new-session-drag.test.tsx +++ b/apps/desktop/src/app/chat/sidebar/sessions-section-new-session-drag.test.tsx @@ -3,7 +3,8 @@ import type { ReactNode } from 'react' import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' import type { SessionInfo } from '@/hermes' -import { switchBranchInRepo } from '@/store/projects' +import { $dismissedWorktreeIds, dismissWorktree, restoreWorktree } from '@/store/layout' +import { removeWorktreePath, switchBranchInRepo } from '@/store/projects' import { EnteredProjectContent, @@ -148,9 +149,21 @@ function commitLatestDrag() { commit({ anchor: 'workspace', before: 'session-tile:next', dir: 'right' }) } +function renderEnteredProjectWithLiveWorktree() { + return render( + null} + repoWorktrees={{ '/repo': [{ branch: 'feature', detached: false, isMain: false, locked: false, path: '/repo/.worktrees/feature' }] }} + /> + ) +} + afterEach(cleanup) beforeEach(() => { + $dismissedWorktreeIds.set([]) + vi.mocked(removeWorktreePath).mockReset() noop.mockClear() startNewSessionDrag.mockReset() vi.mocked(switchBranchInRepo).mockReset() @@ -432,3 +445,25 @@ describe('flat-list date-divider new-session drag source', () => { expect(startNewSessionDrag).not.toHaveBeenCalled() }) }) + + +describe('explicit worktree dismissal', () => { + it('resurfaces removed worktrees on discovery but not a subsequent explicit hide', async () => { + dismissWorktree('/repo/.worktrees/feature', { removed: true }) + renderEnteredProjectWithLiveWorktree() + expect(screen.getByTitle(/feature/)).toBeTruthy() + dismissWorktree('/repo/.worktrees/feature') + await waitFor(() => expect(screen.queryByTitle(/feature/)).toBeNull()) + }) + + it('hides a live lane without removing the worktree and permits explicit restore', async () => { + renderEnteredProjectWithLiveWorktree() + fireEvent.pointerDown(screen.getByRole('button', { name: 'Actions' }), { button: 0, ctrlKey: false }) + fireEvent.click(await screen.findByText('Remove worktree…')) + fireEvent.click(await screen.findByRole('button', { name: 'Remove from sidebar' })) + await waitFor(() => expect(screen.queryByTitle(/feature/)).toBeNull()) + expect(removeWorktreePath).not.toHaveBeenCalled() + restoreWorktree('/repo/.worktrees/feature') + await waitFor(() => expect(screen.getByTitle(/feature/)).toBeTruthy()) + }) +}) diff --git a/apps/desktop/src/store/layout.ts b/apps/desktop/src/store/layout.ts index d9114604a3..374b23e24c 100644 --- a/apps/desktop/src/store/layout.ts +++ b/apps/desktop/src/store/layout.ts @@ -206,6 +206,13 @@ export const $dismissedWorktreeIds = persistentAtom( [] as string[], Codecs.stringArray ) +// Only successful git removals may reappear on discovery. Explicit hides, +// including legacy dismissals without provenance, remain hidden. +export const $removedWorktreeIds = persistentAtom( + 'hermes.desktop.removedWorktrees', + [] as string[], + Codecs.stringArray +) export const $sidebarPinsOpen = atom(true) export const $sidebarRecentsOpen = atom(true) // Cron-job sessions live in their own section below recents, collapsed by @@ -467,8 +474,9 @@ export function filterVisibleProjects !(project.isAuto && dismissed.has(project.id))) } -// Hide a worktree row after it's been removed via git. -export function dismissWorktree(id: string): void { +export function dismissWorktree(id: string, { removed = false }: { removed?: boolean } = {}): void { + const removedIds = $removedWorktreeIds.get().filter(worktreeId => worktreeId !== id) + $removedWorktreeIds.set(removed ? [...removedIds, id] : removedIds) const current = $dismissedWorktreeIds.get() if (!current.includes(id)) { @@ -479,6 +487,7 @@ export function dismissWorktree(id: string): void { // A hidden worktree becomes visible again as soon as the user explicitly starts // or opens work there (for example, selecting an already-checked-out branch). export function restoreWorktree(id: string): void { + $removedWorktreeIds.set($removedWorktreeIds.get().filter(worktreeId => worktreeId !== id)) const current = $dismissedWorktreeIds.get() if (current.includes(id)) {