From 324c6f5e2ecabdf05a9fe2fef1143f3b34341739 Mon Sep 17 00:00:00 2001
From: Serhii Vecherenko <SDSLeon999@gmail.com>
Date: Sun, 24 May 2026 17:03:26 -0700
Subject: [PATCH] fix(worktree): close dev terminal panel if active worktree is
 removed

---
 src/renderer/actions/worktreeActions.ts | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/renderer/actions/worktreeActions.ts b/src/renderer/actions/worktreeActions.ts
index 500613d2..72e3597f 100644
--- a/src/renderer/actions/worktreeActions.ts
+++ b/src/renderer/actions/worktreeActions.ts
@@ -27,9 +27,14 @@ export async function performWorktreeRemoval(
     });
   }
 
-  const removedTabIds = useDevTerminalStore.getState().removeTabsForWorktree(worktreePath);
+  const termStore = useDevTerminalStore.getState();
+  const removedTabIds = termStore.removeTabsForWorktree(worktreePath);
   await closeThreads(removedTabIds);
 
+  if (termStore.isOpen && termStore.activeWorktreePath === worktreePath) {
+    termStore.closePanel();
+  }
+
   useGitStore.getState().clearWorktreeStatus(worktreePath);
 
   const panelStore = usePanelStore.getState();