From d34401bc0ec5b2fd0dce62112065b2bed0afb896 Mon Sep 17 00:00:00 2001
From: bendtherules <abhasbhattacharya2@gmail.com>
Date: Fri, 20 Mar 2026 08:34:38 +0530
Subject: [PATCH] fix: streamline tmux session termination and cleanup logic

---
 src/core/close.ts | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/core/close.ts b/src/core/close.ts
index 7ca5912..fdcbd27 100644
--- a/src/core/close.ts
+++ b/src/core/close.ts
@@ -53,6 +53,11 @@ export async function closeMultiModel(options: CloseSessionOptions): Promise<Clo
     // Check if session exists
     const { ok: sessionExists } = await runCommand(["tmux", "has-session", "-t", options.sessionName]);
 
+    // Kill tmux session if it exists
+    if (sessionExists) {
+      await runCommand(["tmux", "kill-session", "-t", options.sessionName]);
+    }
+
     // Get list of worktrees for this session before killing tmux
     const worktrees = await getWorktreesForSession(options.sessionName);
 
@@ -71,11 +76,6 @@ export async function closeMultiModel(options: CloseSessionOptions): Promise<Clo
       }
     }
 
-    // Kill tmux session if it exists
-    if (sessionExists) {
-      await runCommand(["tmux", "kill-session", "-t", options.sessionName]);
-    }
-
     let cleanupPerformed = false;
 
     // Cleanup worktrees and optionally branches
@@ -106,12 +106,12 @@ export async function closeMultiModel(options: CloseSessionOptions): Promise<Clo
         }
       }
 
-      // Also remove the base directory if empty
+      // Also remove the base directory
       const worktreeBase = getSessionPath(options.sessionName);
       try {
-        await runCommand(["rmdir", worktreeBase]);
+        await runCommand(["rm", "-rf", worktreeBase]);
       } catch {
-        // Ignore errors if directory not empty
+        // Ignore errors
       }
 
       cleanupPerformed = worktreesRemoved.length > 0;