overcode 0.3.1__tar.gz → 0.3.3__tar.gz

{overcode-0.3.1/src/overcode.egg-info → overcode-0.3.3}/PKG-INFO

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

{overcode-0.3.1 → overcode-0.3.3}/pyproject.toml

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

{overcode-0.3.1 → overcode-0.3.3}/src/overcode/claude_config.py

@@ -137,6 +137,23 @@ class ClaudeConfigEditor:
                         results.append((event, cmd))
         return results
 
+    # ----- Hook detection -----
+
+    @staticmethod
+    def are_overcode_hooks_installed() -> bool:
+        """Check if core overcode hooks are installed at user level.
+
+        Requires at least UserPromptSubmit, Stop, and PostToolUse hooks
+        to consider hooks mode viable.
+        """
+        editor = ClaudeConfigEditor.user_level()
+        try:
+            editor.load()
+        except (ValueError, FileNotFoundError):
+            return False
+        core_events = ("UserPromptSubmit", "Stop", "PostToolUse")
+        return all(editor.has_hook(event, "overcode hook-handler") for event in core_events)
+
     # ----- Permission management -----
 
     def add_permission(self, tool_pattern: str) -> bool:

{overcode-0.3.1 → overcode-0.3.3}/src/overcode/cli/agent.py

@@ -970,9 +970,10 @@ def show(
     else:
         # Daemon not running — fall back to direct detection
         from ..status_detector_factory import create_status_detector
+        from ..settings import resolve_detection_mode
         detector = create_status_detector(
             session,
-            strategy="hooks" if sess.hook_status_detection else "polling",
+            strategy=resolve_detection_mode(session),
         )
         status, activity, pane_content_raw = detector.detect_status(sess)
 

{overcode-0.3.1 → overcode-0.3.3}/src/overcode/cli/split.py

@@ -34,6 +34,7 @@ from typing import Annotated
 import typer
 
 from ._shared import app, SessionOption
+from ..tmux_utils import get_pane_base_index
 
 
 def _acquire_setup_lock() -> bool:
@@ -179,11 +180,13 @@ def _setup_linked_session(agents_session: str) -> str:
 
 def _are_keybindings_installed() -> bool:
     """Check if overcode keybindings are already installed."""
-    # Check for our Tab binding as a sentinel
+    # Check for our M-j binding as a sentinel — look for the exact
+    # send-keys target rather than a substring match on the window name,
+    # to avoid false positives from unrelated bindings (#384).
     result = _tmux("list-keys", "-T", "root")
     if result.returncode != 0:
         return False
-    return SPLIT_WINDOW_NAME in result.stdout
+    return f"send-keys -t overcode:{SPLIT_WINDOW_NAME}." in result.stdout
 
 
 def _remove_keybindings() -> None:
@@ -232,27 +235,28 @@ def _setup_keybindings(linked_session: str = "", toggle_key: str = "") -> None:
     # --- Agent navigation from the bottom (terminal) pane ---
     # Option+J / Option+K (Meta+j/k) cycle agents by sending j/k
     # to the monitor pane, which navigates and syncs the terminal.
+    _base = get_pane_base_index()
     _in_bottom = (
         f"#{{&&:#{{==:#{{window_name}},{SPLIT_WINDOW_NAME}}},"
-        f"#{{!=:#{{pane_index}},0}}}}"
+        f"#{{!=:#{{pane_index}},{_base}}}}}"
     )
     _tmux(
         "bind-key", "-n", "M-j",
         "if-shell", "-F", _in_bottom,
-        f"send-keys -t overcode:{SPLIT_WINDOW_NAME}.0 j",
+        f"send-keys -t overcode:{SPLIT_WINDOW_NAME}.{_base} j",
         "send-keys M-j",
     )
     _tmux(
         "bind-key", "-n", "M-k",
         "if-shell", "-F", _in_bottom,
-        f"send-keys -t overcode:{SPLIT_WINDOW_NAME}.0 k",
+        f"send-keys -t overcode:{SPLIT_WINDOW_NAME}.{_base} k",
         "send-keys M-k",
     )
     # Option+B: navigate to bell (next agent needing attention)
     _tmux(
         "bind-key", "-n", "M-b",
         "if-shell", "-F", _in_bottom,
-        f"send-keys -t overcode:{SPLIT_WINDOW_NAME}.0 b",
+        f"send-keys -t overcode:{SPLIT_WINDOW_NAME}.{_base} b",
         "send-keys M-b",
     )
 
@@ -263,12 +267,12 @@ def _setup_keybindings(linked_session: str = "", toggle_key: str = "") -> None:
     # copy mode in the inner session via the tmux API.
     if linked_session:
         # PageUp: enter copy mode + scroll up, but only when in the
-        # bottom pane (pane_index != 0) of the split window.
+        # bottom pane (pane_index != base) of the split window.
         # Top pane (Textual TUI) and other windows get normal PageUp.
         _tmux(
             "bind-key", "-n", "PPage",
             "if-shell", "-F",
-            f"#{{&&:#{{==:#{{window_name}},{SPLIT_WINDOW_NAME}}},#{{!=:#{{pane_index}},0}}}}",
+            f"#{{&&:#{{==:#{{window_name}},{SPLIT_WINDOW_NAME}}},#{{!=:#{{pane_index}},{_base}}}}}",
             f"copy-mode -t {linked_session} -u",
             "send-keys PPage",
         )
@@ -276,7 +280,7 @@ def _setup_keybindings(linked_session: str = "", toggle_key: str = "") -> None:
         _tmux(
             "bind-key", "-n", "NPage",
             "if-shell", "-F",
-            f"#{{&&:#{{==:#{{window_name}},{SPLIT_WINDOW_NAME}}},#{{!=:#{{pane_index}},0}}}}",
+            f"#{{&&:#{{==:#{{window_name}},{SPLIT_WINDOW_NAME}}},#{{!=:#{{pane_index}},{_base}}}}}",
             f"send-keys -t {linked_session} NPage",
             "send-keys NPage",
         )
@@ -288,7 +292,7 @@ def _setup_keybindings(linked_session: str = "", toggle_key: str = "") -> None:
         # already active), then send scroll-up/down commands to it.
         _in_bottom = (
             f"#{{&&:#{{==:#{{window_name}},{SPLIT_WINDOW_NAME}}},"
-            f"#{{!=:#{{pane_index}},0}}}}"
+            f"#{{!=:#{{pane_index}},{_base}}}}}"
         )
         _tmux(
             "bind-key", "-n", "WheelUpPane",
@@ -410,7 +414,7 @@ def tmux_resize():
 
     # Apply the new ratio
     new_height = max(int(int(info.split(":")[1]) * next_ratio / 100), 5)
-    _tmux("resize-pane", "-t", f"{target}.0", "-y", str(new_height))
+    _tmux("resize-pane", "-t", f"{target}.{get_pane_base_index()}", "-y", str(new_height))
 
 
 @app.command("tmux")
@@ -487,11 +491,10 @@ def tmux_layout(
         rprint("  tmux set -g terminal-features ''")
         return
 
-    # Verify agents session exists
+    # Create agents session if it doesn't exist (#397)
     if not _tmux_check("has-session", "-t", session):
-        rprint(f"[red]No tmux session '{session}' found.[/red]")
-        rprint(f"[dim]Launch some agents first, or create it: tmux new-session -d -s {session}[/dim]")
-        raise typer.Exit(1)
+        rprint(f"[dim]Creating tmux session '{session}'...[/dim]")
+        _tmux("new-session", "-d", "-s", session)
 
     # --- Toggle key selection (runs if not yet configured) ---
     from ..config import get_tmux_toggle_key, set_tmux_toggle_key
@@ -601,20 +604,30 @@ def _tmux_layout_locked(session: str, ratio: int, rprint) -> None:
     if existing:
         if _is_split_window_healthy(existing):
             if in_tmux:
-                # Check if a real (non-tiny) client is already on overcode.
+                # Check if a real (non-nested) client is already on overcode.
                 # If so, no switch needed — the user is already there or
                 # another terminal has it open.  Switching blindly can
                 # accidentally move the bottom pane's nested client from
                 # oc-view-agents to overcode, creating a recursive display
                 # that collapses the window.
+                #
+                # Detect nested clients by comparing client TTYs against
+                # pane TTYs in the split window (#387). A nested tmux
+                # client's TTY matches one of the pane TTYs.
+                pane_ttys = set(
+                    _tmux_output(
+                        "list-panes", "-t", f"{oc_session}:{SPLIT_WINDOW_NAME}",
+                        "-F", "#{pane_tty}",
+                    ).splitlines()
+                )
                 oc_clients = _tmux_output(
                     "list-clients", "-t", oc_session,
-                    "-F", "#{client_height}",
+                    "-F", "#{client_tty}",
                 )
                 has_real_client = any(
-                    int(h) > 10
-                    for h in oc_clients.splitlines()
-                    if h.strip().isdigit()
+                    tty.strip() not in pane_ttys
+                    for tty in oc_clients.splitlines()
+                    if tty.strip()
                 )
                 if not has_real_client:
                     # No real client on overcode yet — switch the caller's
@@ -632,14 +645,14 @@ def _tmux_layout_locked(session: str, ratio: int, rprint) -> None:
             else:
                 # Respawn before attach — execlp replaces this process
                 _tmux("respawn-pane", "-k",
-                      "-t", f"{oc_session}:{SPLIT_WINDOW_NAME}.0",
+                      "-t", f"{oc_session}:{SPLIT_WINDOW_NAME}.{get_pane_base_index()}",
                       monitor_cmd)
                 rprint(f"[green]Attaching to existing {SPLIT_WINDOW_NAME} window (monitor restarted)...[/green]")
                 time.sleep(0.2)
                 os.execlp("tmux", "tmux", "attach-session", "-t", oc_session)
             # Always restart the monitor so code changes take effect
             _tmux("respawn-pane", "-k",
-                  "-t", f"{oc_session}:{SPLIT_WINDOW_NAME}.0",
+                  "-t", f"{oc_session}:{SPLIT_WINDOW_NAME}.{get_pane_base_index()}",
                   monitor_cmd)
             rprint(f"[green]Switched to existing {SPLIT_WINDOW_NAME} window (monitor restarted)[/green]")
             return
@@ -668,7 +681,7 @@ def _tmux_layout_locked(session: str, ratio: int, rprint) -> None:
 
     # The bottom pane runs a nested tmux attach. We must unset $TMUX
     # because tmux refuses to attach from inside an existing session.
-    attach_cmd = f"unset TMUX; tmux attach-session -t {linked}"
+    attach_cmd = f"sh -c 'unset TMUX; exec tmux attach-session -t {linked}'"
 
     # If an "overcode" session exists but has no split window, it might be:
     # (a) a stale session from a previous overcode run, or
@@ -749,7 +762,7 @@ def _tmux_layout_locked(session: str, ratio: int, rprint) -> None:
         result = _tmux(
             "split-window", "-v",
             "-t", f"{oc_session}:{SPLIT_WINDOW_NAME}",
-            "-p", str(100 - ratio),
+            "-l", f"{100 - ratio}%",
             attach_cmd,
         )
         if result.returncode != 0:
@@ -757,17 +770,23 @@ def _tmux_layout_locked(session: str, ratio: int, rprint) -> None:
             raise typer.Exit(1)
 
         # Focus top pane
-        _tmux("select-pane", "-t", f"{oc_session}:{SPLIT_WINDOW_NAME}.0")
+        _tmux("select-pane", "-t", f"{oc_session}:{SPLIT_WINDOW_NAME}.{get_pane_base_index()}")
 
         rprint(f"[green]Split layout ready.[/green] Tab toggles panes.")
 
     else:
         # --- Outside tmux: create detached, split, then attach ---
         if need_new_session:
+            # Use actual terminal size (fall back to 200x50 if unavailable)
+            try:
+                term_size = os.get_terminal_size()
+                term_x, term_y = str(term_size.columns), str(term_size.lines)
+            except OSError:
+                term_x, term_y = "200", "50"
             result = _tmux(
                 "new-session", "-d", "-s", oc_session,
                 "-n", SPLIT_WINDOW_NAME,
-                "-x", "200", "-y", "50",
+                "-x", term_x, "-y", term_y,
                 monitor_cmd,
             )
             if result.returncode != 0:
@@ -792,12 +811,12 @@ def _tmux_layout_locked(session: str, ratio: int, rprint) -> None:
         _tmux(
             "split-window", "-v",
             "-t", f"{oc_session}:{SPLIT_WINDOW_NAME}",
-            "-p", str(100 - ratio),
+            "-l", f"{100 - ratio}%",
             attach_cmd,
         )
 
         # Focus top pane
-        _tmux("select-pane", "-t", f"{oc_session}:{SPLIT_WINDOW_NAME}.0")
+        _tmux("select-pane", "-t", f"{oc_session}:{SPLIT_WINDOW_NAME}.{get_pane_base_index()}")
 
         # Attach to the session (replaces this process)
         rprint(f"[green]Attaching to split layout...[/green]")

{overcode-0.3.1 → overcode-0.3.3}/src/overcode/history_reader.py

@@ -33,8 +33,12 @@ CLAUDE_PROJECTS_PATH = Path.home() / ".claude" / "projects"
 
 # Model name → context window size in tokens.
 # Default 200K for unknown models.  Update as new models ship.
+# Claude Code with 1M context reports the same model ID — we detect
+# the actual context size from token counts at runtime and update here
+# for the models known to support extended context.
 MODEL_CONTEXT_WINDOWS: Dict[str, int] = {
-    "claude-opus-4-6": 200_000,
+    "claude-opus-4-6": 1_000_000,
+    "claude-sonnet-4-6": 1_000_000,
     "claude-sonnet-4-5-20250929": 200_000,
     "claude-haiku-4-5-20251001": 200_000,
     "claude-3-5-sonnet-20241022": 200_000,
@@ -45,6 +49,32 @@ MODEL_CONTEXT_WINDOWS: Dict[str, int] = {
 }
 DEFAULT_CONTEXT_WINDOW = 200_000
 
+# Model ID → human-readable short name for display
+MODEL_SHORT_NAMES: Dict[str, str] = {
+    "claude-opus-4-6": "Op4.6",
+    "claude-sonnet-4-6": "Sn4.6",
+    "claude-sonnet-4-5-20250929": "Sn4.5",
+    "claude-haiku-4-5-20251001": "Hk4.5",
+    "claude-3-5-sonnet-20241022": "Sn3.5",
+    "claude-3-5-haiku-20241022": "Hk3.5",
+    "claude-3-opus-20240229": "Op3",
+    "claude-3-sonnet-20240229": "Sn3",
+    "claude-3-haiku-20240307": "Hk3",
+}
+
+
+def model_short_name(model: Optional[str]) -> str:
+    """Return a short display name for a model ID.
+
+    Examples:
+        "claude-opus-4-6" → "Op4.6"
+        "claude-haiku-4-5-20251001" → "Hk4.5"
+        "unknown-model" → "unknown-model"
+    """
+    if not model:
+        return ""
+    return MODEL_SHORT_NAMES.get(model, model)
+
 
 def model_context_window(model: Optional[str]) -> int:
     """Return the context window size for a given model name.

{overcode-0.3.1 → overcode-0.3.3}/src/overcode/hook_handler.py

@@ -25,8 +25,11 @@ logger = logging.getLogger(__name__)
 # All hooks that overcode installs
 OVERCODE_HOOKS: list[tuple[str, str]] = [
     ("UserPromptSubmit", "overcode hook-handler"),
+    ("PreToolUse", "overcode hook-handler"),
     ("PostToolUse", "overcode hook-handler"),
+    ("PostToolUseFailure", "overcode hook-handler"),
     ("Stop", "overcode hook-handler"),
+    ("StopFailure", "overcode hook-handler"),
     ("PermissionRequest", "overcode hook-handler"),
     ("SessionEnd", "overcode hook-handler"),
 ]