From 1048021e85b4e2ca3d7545cf916d24fb655d1806 Mon Sep 17 00:00:00 2001
From: Jinjing <6427696+AmethystLiang@users.noreply.github.com>
Date: Mon, 23 Mar 2026 09:52:26 -0700
Subject: [PATCH] fix: preserve terminal state when clearing active worktree
 (#51)

---
 src/renderer/src/App.tsx                 | 20 ++++---
 src/renderer/src/components/Terminal.tsx | 67 +++++++++++++-----------
 2 files changed, 45 insertions(+), 42 deletions(-)

diff --git a/src/renderer/src/App.tsx b/src/renderer/src/App.tsx
index 12be1363908..d1e50bb7ead 100644
--- a/src/renderer/src/App.tsx
+++ b/src/renderer/src/App.tsx
@@ -285,17 +285,15 @@ function App(): React.JSX.Element {
       <div className="flex flex-row flex-1 min-h-0 overflow-hidden">
         {showSidebar ? <Sidebar /> : null}
         <div className="relative flex flex-1 min-w-0 min-h-0 overflow-hidden">
-          {activeWorktreeId && (
-            <div
-              className={
-                activeView === 'settings'
-                  ? 'hidden flex-1 min-w-0 min-h-0'
-                  : 'flex flex-1 min-w-0 min-h-0'
-              }
-            >
-              <Terminal />
-            </div>
-          )}
+          <div
+            className={
+              activeView === 'settings'
+                ? 'hidden flex-1 min-w-0 min-h-0'
+                : 'flex flex-1 min-w-0 min-h-0'
+            }
+          >
+            <Terminal />
+          </div>
           {activeView === 'settings' ? <Settings /> : !activeWorktreeId ? <Landing /> : null}
         </div>
         {showSidebar && rightSidebarOpen ? <RightSidebar /> : null}
diff --git a/src/renderer/src/components/Terminal.tsx b/src/renderer/src/components/Terminal.tsx
index 697ae54a393..18f4f32318c 100644
--- a/src/renderer/src/components/Terminal.tsx
+++ b/src/renderer/src/components/Terminal.tsx
@@ -105,6 +105,13 @@ export default function Terminal(): React.JSX.Element | null {
   if (activeWorktreeId) {
     mountedWorktreeIdsRef.current.add(activeWorktreeId)
   }
+  // Prune IDs of worktrees that no longer exist (deleted/removed)
+  const allWorktreeIds = new Set(allWorktrees.map((wt) => wt.id))
+  for (const id of mountedWorktreeIdsRef.current) {
+    if (!allWorktreeIds.has(id)) {
+      mountedWorktreeIdsRef.current.delete(id)
+    }
+  }
   const tabBarRef = useRef<HTMLDivElement>(null)
   const initialTabCreationGuardRef = useRef<string | null>(null)
 
@@ -306,43 +313,41 @@ export default function Terminal(): React.JSX.Element | null {
     return () => window.removeEventListener('beforeunload', handler)
   }, [])
 
-  if (!activeWorktreeId) {
-    return null
-  }
-
   return (
-    <div className="flex flex-col flex-1 min-w-0 min-h-0 overflow-hidden">
+    <div className={`flex flex-col flex-1 min-w-0 min-h-0 overflow-hidden${activeWorktreeId ? '' : ' hidden'}`}>
       {/* Animated tab bar container using CSS grid for smooth height animation */}
       <div
         ref={tabBarRef}
         className="grid transition-[grid-template-rows] duration-200 ease-in-out"
-        style={{ gridTemplateRows: totalTabs >= 2 ? '1fr' : '0fr' }}
+        style={{ gridTemplateRows: activeWorktreeId && totalTabs >= 2 ? '1fr' : '0fr' }}
       >
         <div className="overflow-hidden">
-          <TabBar
-            tabs={tabs}
-            activeTabId={activeTabId}
-            worktreeId={activeWorktreeId}
-            onActivate={handleActivateTab}
-            onClose={handleCloseTab}
-            onCloseOthers={handleCloseOthers}
-            onCloseToRight={handleCloseTabsToRight}
-            onReorder={reorderTabs}
-            onNewTab={handleNewTab}
-            onSetCustomTitle={setTabCustomTitle}
-            onSetTabColor={setTabColor}
-            expandedPaneByTabId={expandedPaneByTabId}
-            onTogglePaneExpand={handleTogglePaneExpand}
-            editorFiles={openFiles}
-            activeFileId={activeFileId}
-            activeTabType={activeTabType}
-            onActivateFile={(fileId) => {
-              setActiveFile(fileId)
-              setActiveTabType('editor')
-            }}
-            onCloseFile={handleCloseFile}
-            onCloseAllFiles={closeAllFiles}
-          />
+          {activeWorktreeId && (
+            <TabBar
+              tabs={tabs}
+              activeTabId={activeTabId}
+              worktreeId={activeWorktreeId}
+              onActivate={handleActivateTab}
+              onClose={handleCloseTab}
+              onCloseOthers={handleCloseOthers}
+              onCloseToRight={handleCloseTabsToRight}
+              onReorder={reorderTabs}
+              onNewTab={handleNewTab}
+              onSetCustomTitle={setTabCustomTitle}
+              onSetTabColor={setTabColor}
+              expandedPaneByTabId={expandedPaneByTabId}
+              onTogglePaneExpand={handleTogglePaneExpand}
+              editorFiles={openFiles}
+              activeFileId={activeFileId}
+              activeTabType={activeTabType}
+              onActivateFile={(fileId) => {
+                setActiveFile(fileId)
+                setActiveTabType('editor')
+              }}
+              onCloseFile={handleCloseFile}
+              onCloseAllFiles={closeAllFiles}
+            />
+          )}
         </div>
       </div>
 
@@ -378,7 +383,7 @@ export default function Terminal(): React.JSX.Element | null {
       </div>
 
       {/* Editor panel - shown when editor tab is active */}
-      {activeTabType === 'editor' && openFiles.length > 0 && (
+      {activeWorktreeId && activeTabType === 'editor' && openFiles.length > 0 && (
         <Suspense
           fallback={
             <div className="flex-1 flex items-center justify-center text-muted-foreground text-sm">