From 71a268ecb6c8526aca46e6664a59d9064063bb34 Mon Sep 17 00:00:00 2001
From: MartianGreed <valentin@pupucecorp.com>
Date: Thu, 5 Feb 2026 14:34:15 +0100
Subject: [PATCH] fix: prioritize active pane in findClaudePane to show correct
 window

---
 internal/daemon/monitor.go | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/internal/daemon/monitor.go b/internal/daemon/monitor.go
index 54b31c2..dbb88cb 100644
--- a/internal/daemon/monitor.go
+++ b/internal/daemon/monitor.go
@@ -209,6 +209,21 @@ func (m *Monitor) findClaudePane(session string) (*tmux.Pane, string) {
 		return nil, ""
 	}
 
+	// First pass: check active pane
+	for _, p := range panes {
+		if !p.Active {
+			continue
+		}
+		content, err := m.tmux.CapturePane(session, p.WindowIndex, p.PaneIndex)
+		if err != nil {
+			continue
+		}
+		if m.detector.IsClaudeSession(content) {
+			pane := p
+			return &pane, content
+		}
+	}
+	// Second pass: check all panes if active pane isn't Claude
 	for _, p := range panes {
 		content, err := m.tmux.CapturePane(session, p.WindowIndex, p.PaneIndex)
 		if err != nil {