overcode 0.5.1__tar.gz → 0.5.2__tar.gz

{overcode-0.5.1/src/overcode.egg-info → overcode-0.5.2}/PKG-INFO

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

{overcode-0.5.1 → overcode-0.5.2}/pyproject.toml

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

{overcode-0.5.1 → overcode-0.5.2}/src/overcode/cli/split.py

@@ -348,6 +348,30 @@ def _setup_keybindings(linked_session: str = "", toggle_key: str = "") -> None:
             f"tmux show-window-option -t {linked_session} -v @is_ssh_proxy "
             "2>/dev/null | grep -q on"
         )
+        # Not every backend leaves its transcript in tmux's scrollback.
+        # Claude Code draws inline, so tmux history holds the trace and
+        # copy mode is the way to review it. opencode (and other
+        # full-screen TUIs) run on the alternate screen — tmux keeps no
+        # history for it — and scroll their own message list, asking
+        # tmux for mouse events to do so. Forcing such a pane into copy
+        # mode shows an empty, frozen buffer and swallows input until
+        # something cancels the mode. So the local branches below first
+        # ask the linked session's active pane whether its program owns
+        # scrolling (`alternate_on` / `mouse_any_flag`, the same signals
+        # tmux's own default WheelUpPane binding consults) and, if so,
+        # hand the gesture to the program instead of to copy mode.
+        #
+        # The pass-through is prefixed with `copy-mode -q` so a pane
+        # that was already stuck in copy mode (a scroll before these
+        # bindings were installed, or a stray prefix-[) is released
+        # first — `alternate_on` stays true inside copy mode, while
+        # `mouse_any_flag` reports the copy-mode screen and drops to 0.
+        # `-q` is a no-op outside a mode, unlike `send-keys -X cancel`,
+        # which errors and paints the status line (#454).
+        _pane_owns_screen = (
+            f"#{{||:#{{alternate_on}},#{{mouse_any_flag}}}}"
+        )
+        _release = f"copy-mode -q -t {linked_session}"
         _tmux(
             "bind-key", "-n", "PPage",
             "if-shell", "-F",
@@ -355,11 +379,15 @@ def _setup_keybindings(linked_session: str = "", toggle_key: str = "") -> None:
             # SSH proxy: send prefix + PPage so the REMOTE tmux enters
             # copy mode (the remote's root-table PPage is overridden by
             # overcode, but prefix PPage still maps to copy-mode -u).
-            # Local: enter copy mode directly on the linked session.
+            # Local: full-screen program → deliver PPage to it (opencode
+            # maps PageUp to messages_page_up); otherwise enter copy mode
+            # directly on the linked session.
             f'if-shell "{_ssh_check}" '
             f'"send-keys -t {linked_session} C-b ; '
             f'send-keys -t {linked_session} PPage" '
-            f'"copy-mode -t {linked_session} -u"',
+            f'"if-shell -t {linked_session} -F \'{_pane_owns_screen}\''
+            f' \'{_release} ; send-keys -t {linked_session} PPage\''
+            f' \'copy-mode -t {linked_session} -u\'"',
             "send-keys PPage",
         )
         # PageDown in the inner session's copy mode
@@ -377,8 +405,15 @@ def _setup_keybindings(linked_session: str = "", toggle_key: str = "") -> None:
         # which has no scrollback (just rendered inner tmux frames).
         #
         # For local agents: enter copy mode in the inner session then
-        # send scroll commands. For SSH proxies: forward mouse events
-        # to the remote tmux through the pane.
+        # send scroll commands — unless the program owns its screen (see
+        # `_pane_owns_screen`), in which case `send-keys -M` passes the
+        # mouse event through to the nested tmux client. That client is
+        # on this same server, so the event re-enters this root table;
+        # its window is the agent's, not the split window, so it falls
+        # to the default branch below, whose `mouse_any_flag` test hands
+        # the wheel to the program (opencode scrolls its transcript).
+        # For SSH proxies: forward mouse events to the remote tmux
+        # through the pane.
         _in_bottom = (
             f"#{{&&:#{{==:#{{window_name}},{SPLIT_WINDOW_NAME}}},"
             f"#{{!=:#{{pane_index}},{_base}}}}}"
@@ -388,12 +423,15 @@ def _setup_keybindings(linked_session: str = "", toggle_key: str = "") -> None:
             "if-shell", "-F", _in_bottom,
             # SSH proxy: send prefix+PPage to enter copy mode on remote
             # (no-op if already in copy mode, then PPage scrolls up).
-            # Local: enter copy mode + scroll up directly.
+            # Local: program owns screen → pass the mouse event through;
+            # otherwise enter copy mode + scroll up directly.
             f'if-shell "{_ssh_check}" '
             f'"send-keys -t {linked_session} C-b ; '
             f'send-keys -t {linked_session} PPage" '
-            f'"copy-mode -t {linked_session} -e ; '
-            f'send-keys -t {linked_session} -X -N 3 scroll-up"',
+            f'"if-shell -t {linked_session} -F \'{_pane_owns_screen}\''
+            f' \'{_release} ; send-keys -M\''
+            f' \'copy-mode -t {linked_session} -e ; '
+            f'send-keys -t {linked_session} -X -N 3 scroll-up\'"',
             # Default behaviour for other contexts
             "if-shell -F '#{||:#{pane_in_mode},#{mouse_any_flag}}' "
             "'send-keys -M' 'copy-mode -e'",
@@ -405,10 +443,15 @@ def _setup_keybindings(linked_session: str = "", toggle_key: str = "") -> None:
         # `send-keys -X -N 3 scroll-down` only works inside copy mode; out
         # of copy mode it errors with "not in a mode" and tmux paints the
         # status line, leaving the client looking frozen (#454). So for
-        # the local branch we gate on `pane_in_mode` of the linked
-        # session: in copy mode → scroll-down 3 lines (matches wheel-up);
-        # out of copy mode (already at the bottom) → NPage, a plain
-        # keystroke that's harmlessly delivered to the agent.
+        # the local branch we gate on the linked session's pane: in copy
+        # mode over real scrollback (not alternate screen) → scroll-down
+        # 3 lines (matches wheel-up); otherwise → release any copy mode
+        # and `send-keys -M`, which passes the wheel to the nested
+        # client. A program that asked for mouse events (opencode)
+        # scrolls its own transcript; one that didn't (Claude Code,
+        # already at the bottom) never sees it — tmux drops mouse events
+        # for panes without a mouse mode, so it's as harmless as the
+        # plain NPage keystroke this branch used to send.
         #
         # SSH proxy branch keeps the unconditional NPage: we can't
         # observe the remote tmux's mode from here, and NPage is safe in
@@ -419,9 +462,10 @@ def _setup_keybindings(linked_session: str = "", toggle_key: str = "") -> None:
             "if-shell", "-F", _in_bottom,
             f'if-shell "{_ssh_check}" '
             f'"send-keys -t {linked_session} NPage" '
-            f'"if-shell -t {linked_session} -F \'#{{pane_in_mode}}\''
+            f'"if-shell -t {linked_session} -F '
+            f'\'#{{&&:#{{pane_in_mode}},#{{==:#{{alternate_on}},0}}}}\''
             f' \'send-keys -t {linked_session} -X -N 3 scroll-down\''
-            f' \'send-keys -t {linked_session} NPage\'"',
+            f' \'{_release} ; send-keys -M\'"',
             "send-keys -M",
         )
 

{overcode-0.5.1 → overcode-0.5.2}/src/overcode/history_reader.py

@@ -49,12 +49,15 @@ CLAUDE_PROJECTS_PATH = Path.home() / ".claude" / "projects"
 # support extended context.
 MODEL_CONTEXT_WINDOWS: Dict[str, int] = {
     "claude-fable-5": 1_000_000,
+    "claude-opus-5": 1_000_000,
+    "claude-sonnet-5": 1_000_000,
     "claude-opus-4-8": 1_000_000,
     "claude-opus-4-7": 1_000_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-haiku-4-5": 200_000,
     "claude-3-5-sonnet-20241022": 200_000,
     "claude-3-5-haiku-20241022": 200_000,
     "claude-3-opus-20240229": 200_000,
@@ -78,6 +81,12 @@ MODEL_CONTEXT_WINDOWS: Dict[str, int] = {
     "gpt-5.4": 258_400,
     "gpt-5.6-sol": 258_400,
     "gpt-5.6-terra": 258_400,
+    # gpt-4o family, reachable via opencode (not by codex, which only drives
+    # the 5.x line). 128K per OpenAI's own model docs — these predate the
+    # codex CLI's `model_context_window` reporting, so unlike the 5.x rows
+    # above there is no live cross-check available for them.
+    "gpt-4o-mini": 128_000,
+    "gpt-4o": 128_000,
 
     # xAI Grok Build models (#469). Sourced from docs.x.ai/docs/models
     # (verified 2026-08-28) — the same source Phase 5's `pricing.py` entries
@@ -123,12 +132,15 @@ MODEL_SHORT_NAME_MAX_LEN = 7
 
 MODEL_SHORT_NAMES: Dict[str, str] = {
     "claude-fable-5": "Fb5",
+    "claude-opus-5": "Op5",
+    "claude-sonnet-5": "Sn5",
     "claude-opus-4-8": "Op4.8",
     "claude-opus-4-7": "Op4.7",
     "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-haiku-4-5": "Hk4.5",
     "claude-3-5-sonnet-20241022": "Sn3.5",
     "claude-3-5-haiku-20241022": "Hk3.5",
     "claude-3-opus-20240229": "Op3",
@@ -142,6 +154,8 @@ MODEL_SHORT_NAMES: Dict[str, str] = {
     "gpt-5.4": "G5.4",
     "gpt-5.6-sol": "G5.6Sol",
     "gpt-5.6-terra": "G5.6Ter",
+    "gpt-4o-mini": "G4oMn",
+    "gpt-4o": "G4o",
 
     # xAI Grok (#469).
     "grok-4.6": "Gk4.6",
@@ -194,6 +208,8 @@ _FAMILY_PREFIX_TAGS = [
 ]
 
 _DATE_SUFFIX_RE = re.compile(r"-20\d{6}$")
+# Trailing capacity-variant suffix, e.g. the "[1m]" in "claude-opus-5[1m]".
+_CAPACITY_SUFFIX_RE = re.compile(r"\[[^\]]*\]$")
 
 
 def _heuristic_short_name(bare: str) -> str:
@@ -243,7 +259,10 @@ def _heuristic_short_name(bare: str) -> str:
 
 
 def _bare_model_id(model: str) -> str:
-    """Strip an opencode-style ``provider/model`` qualifier, if present.
+    """Normalise a model id to the bare form this module's tables key on.
+
+    Strips an opencode-style ``provider/model`` qualifier and a trailing
+    capacity-variant suffix in brackets, if present.
 
     opencode's stats reader stores the qualified id it launched with (e.g.
     ``"openai/gpt-5.6-sol"``, ``"anthropic/claude-opus-4-6"`` — see
@@ -255,8 +274,16 @@ def _bare_model_id(model: str) -> str:
     "unrecognized." This was very likely the underlying mechanism behind
     the #469 bug report, independent of which models the table happens to
     cover at any given time.
+
+    The bracket suffix is a capacity variant, not a distinct model: Claude
+    Code names its 1M-context Opus 5 ``claude-opus-5[1m]``. Left in place it
+    breaks *both* lookups — an exact-match table miss (dash instead of a
+    window) and, worse, a wrong short name, since the rule-based shortener
+    joins every digit it finds and renders "Op5.1", which reads as a
+    different model rather than as an unrecognized one.
     """
-    return model.rsplit("/", 1)[-1] if "/" in model else model
+    bare = model.rsplit("/", 1)[-1] if "/" in model else model
+    return _CAPACITY_SUFFIX_RE.sub("", bare)
 
 
 def model_short_name(model: Optional[str]) -> str:
@@ -336,7 +363,9 @@ class AgentSessionStats:
     cache_creation_tokens: int
     cache_read_tokens: int
     work_times: List[float]  # seconds per work cycle (prompt to next prompt)
-    current_context_tokens: int = 0  # Most recent input_tokens (current context size)
+    # Size of the most recent turn's prompt: uncached input + cache reads +
+    # cache writes (all three are processed prompt — see read_session_file_stats).
+    current_context_tokens: int = 0
     subagent_count: int = 0  # Number of subagent files (#176)
     live_subagent_count: int = 0  # Subagents with recently-modified files (#256)
     background_task_count: int = 0  # Number of background/farm tasks (#177)
@@ -817,7 +846,16 @@ def _parse_session_lines(
                     totals["output_tokens"] += output_tokens
                     totals["cache_creation_tokens"] += cache_creation
                     totals["cache_read_tokens"] += cache_read
-                    context_size = input_tokens + cache_read
+                    # Every one of these three is prompt the model actually
+                    # processed this turn, so all three count toward context
+                    # occupancy. Omitting cache_creation under-reports badly
+                    # rather than slightly: on a turn that *writes* the cache
+                    # (the first turn after /clear, or after a cache expiry)
+                    # the whole prompt lands in cache_creation and
+                    # input_tokens is a literal handful — a 48K-token context
+                    # reported as 2 tokens, rendering "0%" in a column whose
+                    # entire job is to warn before the window fills.
+                    context_size = input_tokens + cache_read + cache_creation
                     if context_size > 0:
                         totals["current_context_tokens"] = context_size
                     # Only track model/provider from messages with actual API
@@ -974,7 +1012,7 @@ def read_token_usage_from_session_file(
 
     Returns:
         Dict with input_tokens, output_tokens, cache_creation_tokens, cache_read_tokens,
-        and current_context_tokens (most recent input_tokens value)
+        and current_context_tokens (most recent turn's full prompt size)
     """
     totals, _ = read_session_file_stats(session_file, since)
     return totals

{overcode-0.5.1 → overcode-0.5.2/src/overcode.egg-info}/PKG-INFO

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