overcode 0.2.4__tar.gz → 0.2.5__tar.gz

{overcode-0.2.4/src/overcode.egg-info → overcode-0.2.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: overcode
-Version: 0.2.4
+Version: 0.2.5
 Summary: A supervisor for managing multiple Claude Code instances in tmux
 Author: Mike Bond
 Project-URL: Homepage, https://github.com/mkb23/overcode

{overcode-0.2.4 → overcode-0.2.5}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "overcode"
-version = "0.2.4"
+version = "0.2.5"
 description = "A supervisor for managing multiple Claude Code instances in tmux"
 authors = [
     {name = "Mike Bond"}

{overcode-0.2.4 → overcode-0.2.5}/src/overcode/cli/agent.py

@@ -464,6 +464,11 @@ def list_agents(
     if terminated_count > 0:
         rprint(f"\n[dim]{terminated_count} terminated session(s). Run 'overcode cleanup' to remove.[/dim]")
 
+    # Hint about untracked tmux windows (#344)
+    if use_daemon and daemon_state.untracked_window_count > 0:
+        n = daemon_state.untracked_window_count
+        rprint(f"\n[dim]{n} untracked tmux window(s). Run 'overcode cleanup --untracked' to remove.[/dim]")
+
 
 @app.command()
 def attach(
@@ -598,6 +603,9 @@ def cleanup(
     done: Annotated[
         bool, typer.Option("--done", help="Also archive 'done' child agents (#244)")
     ] = False,
+    untracked: Annotated[
+        bool, typer.Option("--untracked", help="Kill tmux windows not tracked by any agent (#344)")
+    ] = False,
     session: SessionOption = "agents",
 ):
     """Remove terminated sessions from tracking.
@@ -606,6 +614,7 @@ def cleanup(
     (e.g., after a machine reboot). Use 'overcode list' to see them.
 
     Use --done to also archive done child agents (kill tmux window, move to archive).
+    Use --untracked to kill tmux windows that exist but aren't tracked by any agent.
     """
     launcher = ClaudeLauncher(session)
     count = launcher.cleanup_terminated_sessions()
@@ -619,6 +628,10 @@ def cleanup(
             launcher._kill_single_session(sess)
             done_count += 1
 
+    # Kill untracked tmux windows (#344)
+    if untracked:
+        launcher.list_sessions(kill_untracked=True)
+
     total = count + done_count
     if total > 0:
         parts = []
@@ -627,7 +640,7 @@ def cleanup(
         if done_count > 0:
             parts.append(f"{done_count} done")
         rprint(f"[green]✓ Cleaned up {' + '.join(parts)} session(s)[/green]")
-    else:
+    elif not untracked:
         rprint("[dim]No sessions to clean up[/dim]")
 
 

{overcode-0.2.4 → overcode-0.2.5}/src/overcode/monitor_daemon.py

@@ -679,14 +679,37 @@ class MonitorDaemon:
 
             # Archive: kill tmux window and mark terminated
             try:
-                from .tmux_utils import TmuxHelper
-                tmux = TmuxHelper()
+                from .implementations import RealTmux
+                tmux = RealTmux()
                 tmux.kill_window(self.tmux_session, session.tmux_window)
             except Exception:
                 pass  # Window may already be gone
             self.session_manager.update_session_status(session.id, "terminated")
             self.log.info(f"Auto-archived done agent: {session.name}")
 
+    def _count_untracked_windows(self, sessions: list) -> int:
+        """Count tmux windows not tracked by any active session (#344).
+
+        Returns count of windows that exist in tmux but aren't tracked
+        (excluding window 0 which is the default shell).
+        """
+        try:
+            from .implementations import RealTmux
+            tmux = RealTmux()
+            if not tmux.session_exists(self.tmux_session):
+                return 0
+            tmux_windows = tmux.list_windows(self.tmux_session)
+            active_sessions = [s for s in sessions if s.status != "terminated"]
+            tracked_windows = {s.tmux_window for s in active_sessions}
+            count = 0
+            for window_info in tmux_windows:
+                window_idx = int(window_info['index'])
+                if window_idx != 0 and window_idx not in tracked_windows:
+                    count += 1
+            return count
+        except Exception:
+            return 0
+
     def _enforce_oversight_timeouts(self, sessions: list) -> None:
         """Enforce oversight timeouts for waiting_oversight sessions."""
         now = datetime.now()
@@ -849,12 +872,30 @@ class MonitorDaemon:
         session_states = []
         all_waiting_user = True
 
+        # Detect window index collisions: when multiple sessions share
+        # a window index, only the most recently launched one owns it.
+        # Others are truly terminated (their window was reused).
+        from collections import Counter
+        window_counts = Counter(s.tmux_window for s in sessions if s.status != "done")
+        # For colliding windows, find the rightful owner (latest start_time)
+        window_owner = {}
+        for s in sessions:
+            if s.status == "done":
+                continue
+            w = s.tmux_window
+            if window_counts[w] > 1:
+                # Multiple sessions claim this window — latest launch wins
+                if w not in window_owner or s.start_time > window_owner[w].start_time:
+                    window_owner[w] = s
+
         for session in sessions:
-            # Skip sessions already known to be terminated/done —
-            # avoids a wasted tmux call and prevents desync where
-            # detect_status returns waiting_user for a gone window.
-            if session.status == "terminated":
+            # If this window is contested and we're not the owner, skip
+            pane_content = ""
+            if (window_counts.get(session.tmux_window, 0) > 1
+                    and window_owner.get(session.tmux_window) is not session):
                 status, activity = STATUS_TERMINATED, "Session terminated"
+                if session.status != "terminated":
+                    self.session_manager.update_session_status(session.id, "terminated")
             elif session.status == "done":
                 status, activity = STATUS_DONE, "Completed"
             else:
@@ -912,9 +953,17 @@ class MonitorDaemon:
             else:
                 effective_status = status
 
-            # Persist terminated status so future loops skip detect_status
-            if effective_status == STATUS_TERMINATED and session.status != "terminated":
+            # Persist terminated status when window is truly gone.
+            # Only persist when pane_content is empty (window gone), not when
+            # a shell prompt is briefly visible (e.g. during agent revival).
+            if (effective_status == STATUS_TERMINATED
+                    and session.status != "terminated"
+                    and not pane_content):
                 self.session_manager.update_session_status(session.id, "terminated")
+            # Un-persist terminated if agent is found alive (revival or false positive)
+            elif (session.status == "terminated"
+                    and effective_status != STATUS_TERMINATED):
+                self.session_manager.update_session_status(session.id, "running")
 
             session_state = self.track_session_stats(session, effective_status)
             session_state.current_activity = activity
@@ -981,8 +1030,10 @@ class MonitorDaemon:
         self._enforce_oversight_timeouts(sessions)
 
         # Auto-archive "done" agents after 1 hour (#244)
+        # Count untracked tmux windows every 2 minutes (#344)
         if self.state.loop_count % 60 == 0:
             self._auto_archive_done_agents(sessions)
+            self.state.untracked_window_count = self._count_untracked_windows(sessions)
 
         # Log summary
         green = sum(1 for s in session_states if s.current_status == STATUS_RUNNING)

{overcode-0.2.4 → overcode-0.2.5}/src/overcode/monitor_daemon_state.py

@@ -174,6 +174,9 @@ class MonitorDaemonState:
     relay_last_push: Optional[str] = None  # ISO timestamp of last successful push
     relay_last_status: str = "disabled"  # "ok", "error", "disabled"
 
+    # Untracked tmux windows (#344)
+    untracked_window_count: int = 0
+
     def to_dict(self) -> dict:
         """Convert to dictionary for JSON serialization."""
         return dataclasses.asdict(self)

{overcode-0.2.4 → overcode-0.2.5}/src/overcode/summary_columns.py

@@ -156,8 +156,8 @@ class ColumnContext:
     local_hostname: str = ""
 
     def mono(self, colored: str, simple: str = "bold") -> str:
-        """Return simplified style when monochrome is enabled."""
-        return simple if self.monochrome else colored
+        """Return colored style (monochrome only applies to preview pane, not summaries)."""
+        return colored
 
     def e(self, char: str) -> str:
         """Return ASCII fallback if emoji_free mode is active (#315)."""

{overcode-0.2.4 → overcode-0.2.5}/src/overcode/tui.py

@@ -27,7 +27,7 @@ from . import __version__
 from .session_manager import SessionManager, Session
 from .launcher import ClaudeLauncher
 from .status_detector_factory import StatusDetectorDispatcher
-from .status_constants import DEFAULT_CAPTURE_LINES, STATUS_RUNNING, STATUS_RUNNING_HEARTBEAT, STATUS_WAITING_HEARTBEAT, STATUS_WAITING_OVERSIGHT, STATUS_WAITING_USER, is_green_status
+from .status_constants import DEFAULT_CAPTURE_LINES, STATUS_RUNNING, STATUS_RUNNING_HEARTBEAT, STATUS_TERMINATED, STATUS_WAITING_HEARTBEAT, STATUS_WAITING_OVERSIGHT, STATUS_WAITING_USER, is_green_status
 from .history_reader import get_session_stats, ClaudeSessionStats, HistoryFile
 from .settings import signal_activity, write_tui_heartbeat, get_event_loop_timing_path, TUIPreferences  # Activity signaling to daemon
 from .monitor_daemon_state import get_monitor_daemon_state
@@ -850,13 +850,30 @@ class SupervisorTUI(
                 session = fresh_sessions.get(widget.session.id, widget.session)
                 sessions_to_check.append((widget.session.id, session))
 
+            # Detect window index collisions: when multiple sessions share
+            # a window, only the most recently launched one owns it.
+            from collections import Counter
+            all_sessions = [s for _, s in sessions_to_check if s.status != "done"]
+            window_counts = Counter(s.tmux_window for s in all_sessions)
+            window_owner = {}
+            for s in all_sessions:
+                w = s.tmux_window
+                if window_counts[w] > 1:
+                    if w not in window_owner or s.start_time > window_owner[w].start_time:
+                        window_owner[w] = s
+
             # Fetch only detect_status (capture_pane) in parallel — no heavy I/O
             def fetch_status(session):
                 try:
                     if session.is_remote:
                         return (session.stats.current_state or "running", session.stats.current_task, session.pane_content or "")
+                    # Window index collision — not the owner, truly terminated
+                    if (window_counts.get(session.tmux_window, 0) > 1
+                            and window_owner.get(session.tmux_window) is not session):
+                        return (STATUS_TERMINATED, "Session terminated", "")
                     if session.status == "terminated":
-                        return ("terminated", "(tmux window no longer exists)", "")
+                        # Re-check to detect revival (window is uncontested)
+                        return self.detector.detect_status(session)
                     if session.status == "done":
                         # Still capture pane content so preview shows output
                         content = self.detector.get_pane_content(session.tmux_window) or ""
@@ -1389,7 +1406,6 @@ class SupervisorTUI(
                     )
                     widget.session = new_session
                     # Sync display modes
-                    widget.monochrome = self.monochrome
                     widget.emoji_free = self.emoji_free
                     # Sync pr_number from session (propagates both detection and clearing)
                     widget.pr_number = new_session.pr_number
@@ -1449,7 +1465,6 @@ class SupervisorTUI(
                 # Apply current summary content mode (#140)
                 widget.summary_content_mode = self.summary_content_mode
                 # Apply display modes
-                widget.monochrome = self.monochrome
                 widget.emoji_free = self.emoji_free
                 widget.show_cost = self.show_cost
                 widget.any_has_budget = any_has_budget

{overcode-0.2.4 → overcode-0.2.5}/src/overcode/tui_widgets/command_bar.py

@@ -70,7 +70,7 @@ class CommandBar(Static):
     """Inline command bar for sending instructions to agents.
 
     Supports single-line (Input) and multi-line (TextArea) modes.
-    Toggle with Ctrl+E. Send with Enter (single) or Ctrl+Enter (multi).
+    Toggle with Ctrl+E. Send with Enter (single) or Ctrl+S / Ctrl+Enter (multi).
     Use Ctrl+O to set as standing order instead of sending.
 
     Modes:
@@ -242,7 +242,7 @@ class CommandBar(Static):
         elif event.key == "escape":
             self.action_clear_and_unfocus()
             event.stop()
-        elif event.key == "ctrl+enter" and self.expanded:
+        elif event.key in ("ctrl+enter", "ctrl+s") and self.expanded:
             self.action_send_multiline()
             event.stop()
 

{overcode-0.2.4 → overcode-0.2.5}/src/overcode/tui_widgets/daemon_status_bar.py

@@ -155,6 +155,9 @@ class DaemonStatusBar(Static):
             # Version mismatch warning
             if state.daemon_version != DAEMON_VERSION:
                 content.append(f" ⚠v{state.daemon_version}→{DAEMON_VERSION}", style="bold yellow")
+            # Untracked tmux windows warning (#344)
+            if state.untracked_window_count > 0:
+                content.append(f" ⚠{state.untracked_window_count} untracked", style="bold yellow")
         else:
             content.append("○ ", style="red")
             content.append("stopped", style="red")

{overcode-0.2.4 → overcode-0.2.5}/src/overcode/tui_widgets/help_overlay.py

@@ -81,7 +81,7 @@ class HelpOverlay(Static):
         section("COMMAND BAR (i or :)")
         row("Enter", "Send instruction", "Esc", "Clear & unfocus")
         row("Ctrl+E", "Multi-line mode", "Ctrl+O", "Set standing order")
-        row("Ctrl+Enter", "Send (multi-line)")
+        row("Ctrl+S", "Send (multi-line)")
 
         return t
 

{overcode-0.2.4 → overcode-0.2.5}/src/overcode/tui_widgets/session_summary.py

@@ -70,7 +70,7 @@ class SessionSummary(Static, can_focus=True):
         # AI-generated summaries (from daemon's SummarizerComponent)
         self.ai_summary_short: str = ""  # Short: current activity (~50 chars)
         self.ai_summary_context: str = ""  # Context: wider context (~80 chars)
-        self.monochrome: bool = False  # B&W mode for terminals with ANSI issues (#138)
+        self.monochrome: bool = False  # Legacy, kept for compatibility but no longer used for summaries
         self.emoji_free: bool = False  # ASCII fallbacks for emoji (#315)
         self.show_cost: bool = False  # Show $ cost instead of token counts
         self.any_has_budget: bool = False  # True if any agent has a cost budget (#173)
@@ -258,14 +258,9 @@ class SessionSummary(Static, can_focus=True):
         # Status styling
         from ..status_constants import emoji_or_ascii
         ef = self.emoji_free
-        if self.monochrome:
-            bg = ""
-            status_symbol, _ = get_status_symbol(self.detected_status, emoji_free=ef)
-            status_color = "bold"
-        else:
-            bg = " on #0d2137"
-            status_symbol, base_color = get_status_symbol(self.detected_status, emoji_free=ef)
-            status_color = f"bold {base_color}{bg}"
+        bg = " on #0d2137"
+        status_symbol, base_color = get_status_symbol(self.detected_status, emoji_free=ef)
+        status_color = f"bold {base_color}{bg}"
 
         # Permissiveness mode emoji
         if s.permissiveness_mode == "bypass":

{overcode-0.2.4 → overcode-0.2.5/src/overcode.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: overcode
-Version: 0.2.4
+Version: 0.2.5
 Summary: A supervisor for managing multiple Claude Code instances in tmux
 Author: Mike Bond
 Project-URL: Homepage, https://github.com/mkb23/overcode