From a761be80a54777e329d8821e6b528e035a4b35eb Mon Sep 17 00:00:00 2001
From: Alexander Farber <farber72@outlook.de>
Date: Fri, 12 Dec 2025 19:06:34 +0100
Subject: [PATCH] Filter out empty sessions

---
 .../src/ui/components/ResumeSessionPicker.tsx | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/packages/cli/src/ui/components/ResumeSessionPicker.tsx b/packages/cli/src/ui/components/ResumeSessionPicker.tsx
index 0057d700..c520d5b9 100644
--- a/packages/cli/src/ui/components/ResumeSessionPicker.tsx
+++ b/packages/cli/src/ui/components/ResumeSessionPicker.tsx
@@ -72,13 +72,18 @@ function SessionPicker({
     };
   }, []);
 
-  // Filter sessions by current branch if filter is enabled
-  const filteredSessions =
-    filterByBranch && currentBranch
-      ? sessionState.sessions.filter(
-          (session) => session.gitBranch === currentBranch,
-        )
-      : sessionState.sessions;
+  // Filter sessions: exclude empty sessions (0 messages) and optionally by branch
+  const filteredSessions = sessionState.sessions.filter((session) => {
+    // Always exclude sessions with no messages
+    if (session.messageCount === 0) {
+      return false;
+    }
+    // Apply branch filter if enabled
+    if (filterByBranch && currentBranch) {
+      return session.gitBranch === currentBranch;
+    }
+    return true;
+  });
 
   const hasSentinel = sessionState.hasMore;