Merge pull request #787 from web3dev1337/fix/worktree-visibility-persistence

fix: preserve worktree visibility state across workspace tab switches

Author: AnrokX

ai-memory/fix/worktree-visibility-persistence-55c4316/init.md

@@ -0,0 +1,6 @@
+# Fix: Worktree Visibility Persistence (Issue #786)
+
+## User Request
+Fix GitHub issue #786: "Closed worktrees become visible again after switching workspaces"
+
+When a user closes/hides worktrees in a workspace, switches to a different workspace, then switches back, the previously closed worktrees are restored to visible. The closed/hidden state should persist across workspace switches.

ai-memory/fix/worktree-visibility-persistence-55c4316/plan.md

@@ -0,0 +1,10 @@
+# Plan
+
+## Root Cause
+In `client/app.js`, the `workspace-changed` handler for existing tabs calls `handleInitialSessions(sessions)` AFTER `switchTab()` restores the tab's saved visibility state. `handleInitialSessions` checks `this.lastSessionsWorkspaceId` vs `this.currentWorkspace.id` to decide whether to preserve visibility. Since `lastSessionsWorkspaceId` still points to the previous workspace, it treats this as a workspace change and resets all terminals to visible.
+
+## Fix
+Set `this.lastSessionsWorkspaceId = workspace.id` before calling `handleInitialSessions` in the existing-tab branch. This makes `handleInitialSessions` treat it as a same-workspace refresh, preserving the visibility state restored from the tab.
+
+## Files Changed
+- `client/app.js` - Added 3 lines (comment + assignment) before `handleInitialSessions` call in existing-tab branch of `workspace-changed` handler

ai-memory/fix/worktree-visibility-persistence-55c4316/progress.md

@@ -0,0 +1,8 @@
+# Progress
+
+- [x] Read CODEBASE_DOCUMENTATION.md
+- [x] Investigate bug in workspace-tab-manager.js and app.js
+- [x] Identify root cause in workspace-changed handler
+- [x] Implement fix in client/app.js
+- [x] Run syntax check
+- [x] Commit, push, and create PR

client/app.js

@@ -1444,6 +1444,11 @@ class ClaudeOrchestrator {
             // Pre-fetch worktree-specific configs for all terminals
             await this.prefetchWorktreeConfigs(workspace, sessions);
 
+            // CRITICAL: Set lastSessionsWorkspaceId BEFORE handleInitialSessions so that
+            // it treats this as a same-workspace refresh and preserves the worktree
+            // visibility state that was just restored from the tab (fix #786).
+            this.lastSessionsWorkspaceId = workspace.id;
+
             this.handleInitialSessions(sessions);
 
             // Update workspace switcher