patch-cc 0.2.1__tar.gz → 0.2.3__tar.gz

{patch_cc-0.2.1 → patch_cc-0.2.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: patch-cc
-Version: 0.2.1
+Version: 0.2.3
 Summary: Interactive patcher for the Claude Code native binary
 Project-URL: Homepage, https://github.com/anfreire/patch-cc
 Project-URL: Repository, https://github.com/anfreire/patch-cc

{patch_cc-0.2.1 → patch_cc-0.2.3}/docs/PLAYBOOK.md

@@ -17,10 +17,56 @@ constantly. These rules are what keep matchers alive:
   literals, `case` labels, prop names, or control-flow shape.
 - Match the *semantic shape* of a function body, not its symbol names.
 - When upstream ships more than one shape for the same feature, add a second
-  narrow branch — don't widen one regex until it over-matches.
+  narrow branch — don't widen one regex until it over-matches. A different
+  *spelling* of one shape is not a second shape, and does not earn a branch; see
+  "applied to, not reached through" below for where that line falls.
 - Accept statement variants a minifier flips between. The thinking gate broke
   on 2.1.216 solely because `if(x)return null;` became `if(x){return null}` —
   matchers should allow both from day one.
+- **Applied to, not reached through.** Match what a helper is applied to; say
+  nothing about how it is reached. The callee of a zod schema is pure minifier
+  noise — the persisted `effortLevel` reads `E.enum(` on 2.1.216, `A.enum(`,
+  `b.enum(`, `v.enum(`, `w.enum(` through 2.1.223, then `Ir(` on 2.1.224 — and
+  every matcher that named any of it dated itself to one build. 2.1.224 is the
+  proof: `.enum([` dropped from 241 sites to 23 in a single release, because the
+  spelling tracks which *module* a schema lives in (bundled namespace alias vs
+  bare standalone factory), never what the schema is. So the callee is
+  `base.ARRAY_CALL` — whatever sits between the prop name and the array literal,
+  bounded only by statement and block edges — and no spelling is enumerated.
+  Enumerating the spellings seen so far only defers the same break to the next
+  one; that is the boundary of the narrow-branch rule above.
+- **Dissolving the callee raises what the surviving anchors must carry**, and
+  that debt is per-site, never general. `effortLevel:` plus its level array is
+  unique on every build. `model:` plus an array is *not* — 6 sites on
+  2.1.216–220, 12 on 2.1.221–224 — so `MODEL_ENUM`'s
+  ``.optional().describe(`Optional model override`` tail is its sole
+  discriminator, not belt-and-braces. Trimmed, the matcher finds three sites, two
+  of them the settings-scope enum `["user","project","local"]`, and
+  `codex-models` splices Codex ids into it. Measure an anchor's match count on
+  every backup before removing any part of it: under the older, tighter callee
+  that same probe read 1 on all 8 builds, so a measurement taken before the
+  callee was dissolved does not survive it.
+- **Rewrite at the dispatch point; never model the arm.** When an update is
+  valid at arm entry, splice it in where the code dispatches on the semantic
+  string — after a `case` label chain, or by wrapping the dispatch test
+  itself, `(test&&((update),!0))`, which preserves the test's value exactly
+  and so survives any surrounding composition (wrapping the *enclosing*
+  condition instead would run the update for the other side of a bare `||`) —
+  and say nothing about what the arm already does. Arm bodies are upstream's
+  busiest surface: 2.1.226 threaded one flag through five arms of the stream
+  reducer (`stmt1,stmt2;` became `if(stmt1,stmt2,d)call;`) and appended a
+  declarator to the head's `let`, and every literal that had modelled those
+  bodies — a cross-product of `mode(` vs `mode?.(`, braced vs unbraced arms,
+  four `displayTransform` spellings — died or was already dead weight. The
+  dispatch strings themselves (`"thinking_delta"`, `"message_stop"`) are the
+  API's vocabulary and do not churn. Same doctrine as the callee rule above:
+  the arm is *reached through*, the dispatch point is what the update is
+  *applied to*. Entry insertion does reorder against mid-arm work (the
+  message-stop reset now runs before upstream's `finalize()`), so it asks
+  that the update be independent of the arm's own channels — decide that,
+  don't assume it. Bound heads at grammar edges for the same reason — in a
+  minified bundle only `;` or `,` can follow `let{…}=t`, and which one is
+  noise (`(?=[;,])`, not `;`).
 - Match an optional brace **pair** conditionally (`(\{)?…(?(1)\})`), never as
   two independent `\{?` / `\}?`. A lone optional closing brace eats the
   *enclosing* block's `}` on the unbraced shape, and a rewrite that emits its
@@ -41,8 +87,8 @@ Anything the binary can enumerate for us, it does:
   `agentType:"<name>",whenToUse:` carrying `source:"built-in"` in the same
   object (`agents.discover_agents`). Definitions whose `whenToUse` begins with
   `"Internal` are plumbing and are not offered.
-- **Model aliases** come from the Task tool's own input schema: the
-  `model:<zod>.enum([...])` whose describe-string starts
+- **Model aliases** come from the Task tool's own input schema: the `model`
+  enum whose describe-string starts
   `Optional model override` — `agents.MODEL_ENUM`, one compiled anchor because
   `codex-models` splices the chosen Codex ids into the very group
   `discover_models` reads back out.
@@ -149,7 +195,7 @@ first is how a manifest starts lying. The manifest is held to the same rule:
 
 ## Sub-steps, and why `live-thinking` has them
 
-Most patches are one rewrite. `live-thinking` is ~11 named sub-steps, because
+Most patches are one rewrite. `live-thinking` is ~20 named sub-steps, because
 upstream has reshaped the stream reducer at least three times and a single hit
 count cannot tell "all landed" from "half silently drifted".
 
@@ -158,9 +204,16 @@ kinds:
 
 - **Independent fixes** (`memo-cache`, `linger`, `display-mode`, `bottom-row`,
   …) — each may or may not be present on a given build.
-- **Mutually-exclusive reducer variants** — `reducer-destructured` (2.1.138+),
-  `reducer-inner` (2.1.183+), `reducer-legacy` (pre-2.1.138). On any one build
-  exactly one should land. On 2.1.216 it is `reducer-inner`.
+- **Mutually-exclusive reducer variants** — `reducer-options` (2.1.138+, the
+  options-bag head; whether the bag still destructures `onStreamingThinking`
+  is the same shape with the prop present or absent, not a second variant) and
+  `reducer-legacy` (pre-2.1.138, positional parameters). On any one build
+  exactly one should land; its count is *recognition*, one per reducer. The
+  state updates themselves are per-dispatch-point steps (`request-start`,
+  `message-stop`, `text-clear`, `message-delta-clear`, `thinking-start`,
+  `thinking-append`), so a build that folds one arm away reads as that point's
+  absence by name, never as a bare count drop inside an aggregate. On
+  2.1.216–2.1.226 the variant is `reducer-options` with all six points.
 
 An *optional* sub-step that finds nothing is reported as absent, not broken —
 it is just a shape this build doesn't have. A sub-step that finds a shape but
@@ -176,11 +229,11 @@ The rest carry expectations, so their absence is checked rather than noted:
   but *proof*: they are credited only when the rewritten reducer body actually
   contains the state updates, which is what recognising a reducer does not by
   itself establish.
-- **The `reducer` group** — `reducer-destructured`, `reducer-inner`,
-  `reducer-legacy`. At least one must land; none landing is the signal that
-  upstream shipped a fourth reducer shape that needs a new variant. Two landing
-  is allowed on purpose — a transitional build carrying two reducers would have
-  both correctly patched, and that is no reason to cry wolf.
+- **The `reducer` group** — `reducer-options`, `reducer-legacy`. At least one
+  must land; none landing is the signal that upstream shipped a new reducer
+  head that needs a new variant. Two landing is allowed on purpose — a
+  transitional build carrying two reducers would have both correctly patched,
+  and that is no reason to cry wolf.
 - **Optional** — `memo-cache`, `memo-removal`, `linger`, `bottom-row`,
   `final-summary`. The first four match nothing on 2.1.216+ and are kept for
   older builds; `discover` is a notes-only channel that records how far back the
@@ -329,11 +382,13 @@ for you. Each entry: what it changes, the stable anchor, and where it lives.
 
 ### Live thinking — `streaming.py`
 
-- **`live-thinking`** — the ~11-step patch above. Discovery anchor is
+- **`live-thinking`** — the ~20-step patch above. Discovery anchor is
   `onStreamingThinking:` → `useState(null)` (the older `hidePastThinking`
   anchor is gone as of 2.1.216 — the fallback back-scan is load-bearing).
   Reducer anchors: `type==="stream_request_start"`, `case"thinking_delta"`,
-  `content_block_start`.
+  `content_block_start` — the reducer is the function carrying all three, its
+  head bounded at the declarator edge, and every state update is an insertion
+  at a dispatch point (the rule above); the arm bodies are never matched.
   The `display-mode` sub-step defaults the request's thinking display to
   `"summarized"`; without it the API only streams summary text when the
   `showThinkingSummaries` setting is on. Two shapes: the legacy inline env

{patch_cc-0.2.1 → patch_cc-0.2.3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "patch-cc"
-version = "0.2.1"
+version = "0.2.3"
 description = "Interactive patcher for the Claude Code native binary"
 readme = "README.md"
 requires-python = ">=3.11"

{patch_cc-0.2.1 → patch_cc-0.2.3}/src/patch_cc/__init__.py

@@ -1,3 +1,3 @@
 """patch-cc: an interactive patcher for the Claude Code native binary."""
 
-__version__ = "0.2.1"
+__version__ = "0.2.3"

{patch_cc-0.2.1 → patch_cc-0.2.3}/src/patch_cc/bun/__init__.py

@@ -3,4 +3,4 @@
 from .container import Bundle, ContainerError, read, write
 from .errors import BunError
 
-__all__ = ["Bundle", "BunError", "ContainerError", "read", "write"]
+__all__ = ["BunError", "Bundle", "ContainerError", "read", "write"]

{patch_cc-0.2.1 → patch_cc-0.2.3}/src/patch_cc/bun/container.py

@@ -85,7 +85,7 @@ def write(
     compared against ``source`` -- *before* it is moved into place. A rebuild
     bug therefore fails without ever touching the live binary.
     """
-    import shutil  # noqa: PLC0415
+    import shutil
 
     new_blob = blobmod.rebuild(
         bundle.blob, source.encode("utf8"), drop_bytecode=drop_bytecode
@@ -120,7 +120,7 @@ def verify(path: str, expected: str) -> None:
     """Re-extract from a written binary and assert it round-trips exactly."""
     try:
         written = read(path)
-    except Exception as exc:  # noqa: BLE001
+    except Exception as exc:
         raise ContainerError(f"patched binary could not be re-read: {exc}") from exc
     if written.source != expected:
         raise ContainerError(

{patch_cc-0.2.1 → patch_cc-0.2.3}/src/patch_cc/bun/elf.py

@@ -224,11 +224,11 @@ def write_section(buf: bytes, payload: bytes, name: str = ".bun") -> bytes:
             and seg.filesz
             and seg.offset >= end
             and seg.align
+            and (seg.offset + delta) % seg.align != seg.vaddr % seg.align
         ):
-            if (seg.offset + delta) % seg.align != seg.vaddr % seg.align:
-                raise ElfError(
-                    f"shifting LOAD segment {seg.index} would break its alignment"
-                )
+            raise ElfError(
+                f"shifting LOAD segment {seg.index} would break its alignment"
+            )
 
     new_size = bun.size + delta
     body = bytearray(payload)

{patch_cc-0.2.1 → patch_cc-0.2.3}/src/patch_cc/bun/macho.py

@@ -27,7 +27,7 @@ class MachOError(BunError):
 
 def _lief():
     try:
-        import lief  # noqa: PLC0415
+        import lief
     except ImportError as exc:  # pragma: no cover - platform dependent
         raise MachOError(
             "LIEF is required to patch macOS binaries. Install it with "
@@ -107,6 +107,7 @@ def codesign(path: str) -> None:
         ["codesign", "--sign", "-", "--force", path],
         capture_output=True,
         text=True,
+        check=False,
     )
     if result.returncode != 0:  # pragma: no cover - macOS only
         raise MachOError(f"codesign failed: {result.stderr.strip()}")

{patch_cc-0.2.1 → patch_cc-0.2.3}/src/patch_cc/cli.py

@@ -36,7 +36,7 @@ from pathlib import Path
 from rich.markup import escape
 
 from . import cache, locate, patcher
-from .bun import BunError, Bundle
+from .bun import Bundle, BunError
 from .codex import DEFAULT_PORT, is_valid_port
 from .codex.models import CodexModel, catalogue, is_reserved_id, is_valid_id, reconcile
 from .patches import (
@@ -549,7 +549,7 @@ def _doctor_target(path: str | None) -> tuple[Bundle, str] | None:
     given -- that is how any kept backup becomes a regression corpus -- while the
     installed binary falls back to its pristine copy when it is already patched.
     """
-    from .bun import container  # noqa: PLC0415
+    from .bun import container
 
     if path is not None:
         # A name the user typed is data, not markup: an unescaped `claude[old]`
@@ -695,7 +695,7 @@ def _baked_port() -> int | None:
     why ``serve`` asks once at startup rather than per request -- and why a re-bake
     onto a different port needs a ``serve`` restart, as the apply report says.
     """
-    from .bun import container  # noqa: PLC0415
+    from .bun import container
 
     install = locate.find()
     if install is None:

{patch_cc-0.2.1 → patch_cc-0.2.3}/src/patch_cc/codex/gateway.py

@@ -155,7 +155,7 @@ class _Handler(BaseHTTPRequestHandler):
     def log_message(self, *_args) -> None:  # keep the terminal clean
         pass
 
-    def do_POST(self) -> None:  # noqa: N802 (BaseHTTPRequestHandler's name)
+    def do_POST(self) -> None:
         # One request per connection: an SSE reply is open-ended (no
         # Content-Length), so the stream ends by connection close.
         self.close_connection = True
@@ -177,7 +177,9 @@ class _Handler(BaseHTTPRequestHandler):
                 # this API just as unparseable bytes are, and is answered the same
                 # way. Reaching `_messages` with one used to raise straight out of
                 # the handler thread: a traceback, a reset connection, no reply.
-                raise ValueError("not a JSON object")
+                raise ValueError(  # noqa: TRY004 - lands in json's own handler below
+                    "not a JSON object"
+                )
         except ValueError:
             return self._error(
                 400, "invalid_request_error", "request body must be a JSON object"

{patch_cc-0.2.1 → patch_cc-0.2.3}/src/patch_cc/codex/oauth.py

@@ -74,7 +74,7 @@ class Credentials:
         }
 
     @classmethod
-    def from_json(cls, data: object) -> "Credentials | None":
+    def from_json(cls, data: object) -> Credentials | None:
         if not isinstance(data, dict):
             return None
         access, refresh = data.get("access"), data.get("refresh")

{patch_cc-0.2.1 → patch_cc-0.2.3}/src/patch_cc/locate.py

@@ -78,7 +78,7 @@ def _resolve(path: Path) -> Installation | None:
 
 def _is_native(binary: Path) -> bool:
     """Is this file one of the containers we can actually open?"""
-    from .bun import BunError, container  # noqa: PLC0415 - keeps import order flat
+    from .bun import BunError, container
 
     try:
         container.detect(str(binary))

{patch_cc-0.2.1 → patch_cc-0.2.3}/src/patch_cc/menu.py

@@ -27,8 +27,9 @@ from __future__ import annotations
 import sys
 import textwrap
 import threading
+from collections.abc import Callable
 from dataclasses import dataclass, field
-from typing import TYPE_CHECKING, Any, Callable
+from typing import TYPE_CHECKING, Any
 
 from blessed import Terminal
 from rich import box
@@ -140,7 +141,7 @@ class MenuModel:
     """Everything the menu operates on, independent of the rendering engine."""
 
     install: locate.Installation
-    status: "Status"
+    status: Status
     pristine: Bundle
     agents: list[BuiltinAgent]
     models: list[str]
@@ -154,8 +155,8 @@ class MenuModel:
 
     @classmethod
     def build(
-        cls, install: locate.Installation, status: "Status", pristine: Bundle
-    ) -> "MenuModel":
+        cls, install: locate.Installation, status: Status, pristine: Bundle
+    ) -> MenuModel:
         agents = discover_agents(pristine.source)
         models = [INHERIT, *discover_models(pristine.source)]
         model = cls(
@@ -577,7 +578,7 @@ class MenuApp:
         self.view = "select"  # select | busy | report | doctor
         self.stack: list[tuple[Modal, Callable[[object], None] | None]] = []
         self.report: patcher.PatchReport | None = None
-        self.doctor_result: "DryRun | None" = None
+        self.doctor_result: DryRun | None = None
         self.busy_message = ""
         self.flash = ""
         self.exit_code = 0
@@ -642,7 +643,7 @@ class MenuApp:
             attrs = termios.tcgetattr(fd)
             attrs[0] &= ~(termios.IXON | termios.IXOFF)
             termios.tcsetattr(fd, termios.TCSANOW, attrs)
-        except Exception:
+        except Exception:  # noqa: BLE001, S110 - best effort; no termios, no freeze risk
             pass
 
     def _key_name(self, keystroke) -> str:
@@ -1080,7 +1081,7 @@ class MenuApp:
 
     def _apply(
         self, selection: cache.Selection
-    ) -> tuple[patcher.PatchReport, "Status | None"]:
+    ) -> tuple[patcher.PatchReport, Status | None]:
         options = selection.options
         if options.codex_models:
             # Fill in each model's name and window right before baking. A pick
@@ -1154,7 +1155,7 @@ class MenuApp:
         def run() -> None:
             try:
                 self._worker_result = (kind, work(), None)
-            except Exception as exc:
+            except Exception as exc:  # noqa: BLE001 - the worker's failure IS the result
                 self._worker_result = (kind, None, str(exc) or exc.__class__.__name__)
 
         threading.Thread(target=run, daemon=True).start()

{patch_cc-0.2.1 → patch_cc-0.2.3}/src/patch_cc/patcher.py

@@ -326,7 +326,7 @@ def restore(install: locate.Installation) -> Path:
             "for this version was never saved -- reinstall to get a clean binary."
         )
     # A full-file copy-back, so it works for both ELF and Mach-O.
-    from .bun.elf import atomic_write  # noqa: PLC0415
+    from .bun.elf import atomic_write
 
     atomic_write(str(install.binary), backup.read_bytes(), mode_from=str(backup))
     return install.binary

{patch_cc-0.2.1 → patch_cc-0.2.3}/src/patch_cc/patches/agents.py

@@ -17,6 +17,7 @@ import re
 from dataclasses import dataclass
 
 from .base import (
+    ARRAY_CALL,
     GROUP_MODELS,
     GROUP_OUTPUT,
     IDENT,
@@ -78,7 +79,7 @@ def _subagent_prompt(content: str, _options: Options, outcome: Outcome) -> str:
         transcript_var = transcript.group(1)
         gate_pattern = compile_js(rf"{re.escape(transcript_var)}&&({IDENT})&&")
 
-        def drop_gate(match: re.Match[str]) -> str:
+        def drop_gate(match: re.Match[str], segment: str = segment) -> str:
             prompt_var = match.group(1)
             nearby = segment[match.end() : match.end() + 260]
             if f"{{prompt:{prompt_var},theme:" not in nearby:
@@ -156,7 +157,7 @@ _DEF_WINDOW = 3000
 #: why that ordering is load-bearing). Matched separately, the two would drift
 #: apart on the next upstream reshape, and only one of them would be repaired.
 MODEL_ENUM = compile_js(
-    rf'model:{IDENT}\.enum\(\[((?:"{_MODEL_CHARS}+",?)+)\]\)\.optional\(\)'
+    rf'model:{ARRAY_CALL}((?:"{_MODEL_CHARS}+",?)+)\]\)\.optional\(\)'
     rf'\.describe\([`"]Optional model override'
 )
 #: Used only if the Task-tool schema anchor ever disappears.

{patch_cc-0.2.1 → patch_cc-0.2.3}/src/patch_cc/patches/base.py

@@ -69,7 +69,7 @@ def derived_brand() -> str:
 
     try:
         user = getpass.getuser().strip()
-    except Exception:
+    except Exception:  # noqa: BLE001 - however it fails, the answer is the same
         user = ""
     return f"{user}'s Code" if user else DEFAULT_BRAND
 
@@ -84,7 +84,7 @@ class Options:
     #: Codex models to register and route -- ordinary patch configuration, like
     #: every field here: chosen in the menu or with ``--codex``, and recorded in
     #: the manifest by the patch that bakes it.
-    codex_models: list["CodexModel"] = field(default_factory=list)
+    codex_models: list[CodexModel] = field(default_factory=list)
     #: Localhost port shared by the redirect patch and the gateway. Defaulted
     #: from the one home (:data:`patch_cc.codex.DEFAULT_PORT`) so the number
     #: never lives in two places.
@@ -116,7 +116,7 @@ class Outcome:
     applied: int = 0
     notes: list[str] = field(default_factory=list)
     #: Named sub-steps, for patches built from several independent rewrites.
-    steps: dict[str, "Outcome"] = field(default_factory=dict)
+    steps: dict[str, Outcome] = field(default_factory=dict)
     #: What this sub-step's absence means (set via :meth:`step`). ``False`` --
     #: a shape some builds simply lack; ``True`` -- the patch is broken without
     #: it; a string -- name of a group of which at least one member must land.
@@ -153,7 +153,7 @@ class Outcome:
     def note(self, message: str) -> None:
         self.notes.append(message)
 
-    def step(self, name: str, expect: bool | str = False) -> "Outcome":
+    def step(self, name: str, expect: bool | str = False) -> Outcome:
         """Get (or create) a named sub-outcome.
 
         A single scalar count cannot distinguish "all twelve rewrites landed"
@@ -167,7 +167,7 @@ class Outcome:
             sub.expect = expect
         return sub
 
-    def finalize(self) -> "Outcome":
+    def finalize(self) -> Outcome:
         """Roll sub-step totals up into this outcome."""
         if self.steps:
             self.candidates += sum(s.candidates for s in self.steps.values())
@@ -277,6 +277,19 @@ def compile_js(pattern: str, flags: int = 0) -> re.Pattern[str]:
 # Matches a minified identifier, the JS `[A-Za-z_$][\w$]*` idiom.
 IDENT = r"[A-Za-z_$][\w$]*"
 
+#: From a schema's property name to the *opening* of the array literal it is
+#: built from -- the ``([`` included, so a site composes this as
+#: ``prop:{ARRAY_CALL}`` and never spells the call open itself.
+#:
+#: Whatever expression the build reaches the factory through is skipped
+#: unmodelled, because the callee is minifier noise that churns every few
+#: releases (``E.enum(`` ... ``w.enum(`` ... ``Ir(`` for one unchanged schema).
+#: Lazy but not unbounded: ``[^;{}]`` cannot cross a statement or block edge,
+#: and the spans it actually spends are 47-51 and 88-92 characters on every
+#: build we hold. What the surviving anchors must carry instead -- which is a
+#: debt this raises, per site: docs/PLAYBOOK.md.
+ARRAY_CALL = r"[^;{}]*?\(\["
+
 
 def switch_case_end(content: str, start: int) -> int:
     """End offset of a ``switch`` arm beginning at ``start``.

{patch_cc-0.2.1 → patch_cc-0.2.3}/src/patch_cc/patches/codex.py

@@ -304,12 +304,8 @@ def _register_picker(
     # because this is the only place in the picker where a model leaves Anthropic,
     # and nothing else in the list would say so.
     entries = ",".join(
-        "{value:%s,label:%s,description:%s}"
-        % (
-            js_string(value),
-            js_string(_display_name(value)),
-            js_string(_describe(model)),
-        )
+        f"{{value:{js_string(value)},label:{js_string(_display_name(value))},"
+        f"description:{js_string(_describe(model))}}}"
         for value, model in picks
     )
     # Every row is emitted with no build-time "already present?" filter, and dedup