patch-cc 0.2.0__tar.gz → 0.2.2__tar.gz

{patch_cc-0.2.0 → patch_cc-0.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: patch-cc
-Version: 0.2.0
+Version: 0.2.2
 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
@@ -34,8 +34,16 @@ Description-Content-Type: text/markdown
 
 An interactive patcher for the **Claude Code native binary**. Pick the tweaks
 you want — inline and live thinking, detailed tool calls, subagent model
-overrides, your own startup name — and apply them to your installed `claude`
-in one keystroke. Pure Python; no Node, no Bun.
+overrides, your own startup name, your **ChatGPT/Codex-plan GPT models as
+native models** — and apply them to your installed `claude` in one keystroke.
+Fully reversible: a pristine backup is kept, `patch-cc restore` puts it back.
+Pure Python; no Node, no Bun.
+
+```bash
+uvx patch-cc                   # fullscreen menu, no install needed
+```
+
+![patch-cc: pick tweaks, register a Codex model, pin the Plan agent to it, bake — the patched binary is 161 MB smaller](https://raw.githubusercontent.com/anfreire/patch-cc/main/docs/demo.gif)
 
 ## Requirements
 
@@ -48,17 +56,14 @@ in one keystroke. Pure Python; no Node, no Bun.
 - **macOS only:** the Xcode command line tools, for `codesign` — a patched
   binary has to be re-signed or macOS refuses to run it.
 
-```bash
-uvx patch-cc                   # fullscreen menu, no install needed
-```
-
 The menu is a single centered panel: move with `↑ ↓`, toggle with `space`,
 press `s` to save. Patches that carry a setting — subagent models, Codex models,
-the startup name, the `--version` marker — open a centered modal on `enter`, and
-the row then shows what you chose. Everything choosable is a picker: the agent
-names and model aliases are **discovered from your binary itself** (and the
-Codex ones from your plan), so the menu can never offer something your build
-would reject. Typing exists only for the genuinely free-text values.
+the startup name, the `--version` marker, the org/email label — open a centered
+modal on `enter`, and the row then shows what you chose. Everything choosable
+is a picker: the agent names and model aliases are **discovered from your
+binary itself** (and the Codex ones from your plan), so the menu can never
+offer something your build would reject. Typing exists only for the genuinely
+free-text values.
 
 A patched binary records what was applied inside itself, so the menu always
 comes up showing the real current state, and `patch-cc status` answers
@@ -75,17 +80,19 @@ patch-cc                       # then just run it
 
 | Group | Patch | |
 |---|---|---|
-| Output & diffs | Detailed tool calls | Show full read/search calls, not collapsed summaries |
+| Output & display | Detailed tool calls | Show full read/search calls, not collapsed summaries |
 | | Colour new files as diffs | Created files render with `+` lines and green |
-| Thinking | Fix blank thinking blocks | Opt out of the server-side experiment that can empty every thinking block |
+| | Fix blank thinking blocks | Opt out of the server-side experiment that can empty every thinking block |
 | | Always show thinking | Thinking blocks stay inline — no `ctrl+o` |
 | | Stream thinking live | See reasoning as it is generated, inline and in order |
-| Subagents | Show subagent prompts | Prompt blocks visible during normal use |
+| | Show subagent prompts | Prompt blocks visible during normal use |
+| Models & effort | Persist max effort | `/effort max` saves as your default for new sessions, like the other levels |
+| | Codex models | Use OpenAI/Codex-plan models in Claude Code — see [Codex models](#codex-models) |
 | | Override subagent models | Pick the model per built-in agent (discovered from your binary) |
-| Chrome | Disable spinner tips | No rotating tips on the spinner |
-| | Custom startup name | Defaults to `<your username>'s Code` |
+| Chrome & branding | Disable spinner tips | No rotating tips on the spinner |
 | | Mark `--version` | Appends `(patched)` — or any marker you choose |
-| Codex | Codex models | Use OpenAI/Codex-plan models in Claude Code — see [Codex models](#codex-models) |
+| | Custom startup name | Defaults to `<your username>'s Code` |
+| | Startup org/email label | Replace the org/email on the welcome screen — or hide it |
 
 ## Usage
 
@@ -99,6 +106,8 @@ uvx patch-cc apply --brand                    # + branding as <username>'s Code
 uvx patch-cc apply --brand "Ada's Code"       # + branding, explicit name
 uvx patch-cc apply --model Explore=haiku --model general-purpose=opus
 uvx patch-cc apply --suffix "(mine)"          # custom --version marker
+uvx patch-cc apply --org-label                # hide the welcome screen's org/email
+uvx patch-cc apply --org-label "Ada's Lab"    # ...or show this instead
 uvx patch-cc apply --codex gpt-5.6-sol        # + a Codex model (see below)
 uvx patch-cc apply --from-cache               # replay your last remembered selection
 uvx patch-cc status                           # exactly what is applied
@@ -108,9 +117,9 @@ uvx patch-cc list                             # every patch, described
 uvx patch-cc restore                          # put the original back
 ```
 
-`--brand`, `--model` and `--codex` imply their patches; agents and models are
-validated against what your installed binary actually ships, and Codex model ids
-against what your plan offers. `apply --help` lists all three.
+A flag that configures a patch also selects it — `apply --help` lists them
+all. Agents and models are validated against what your installed binary
+actually ships, and Codex model ids against what your plan offers.
 
 ## Codex models
 
@@ -210,3 +219,7 @@ bundle rather than with clodex's TLS interception.
 ## License
 
 MIT
+
+---
+
+**More agent tooling** — [summon-cc](https://github.com/anfreire/summon-cc): give your agent a crew of Claude Code workers · [cc-oc](https://github.com/anfreire/cc-oc): drive opencode from inside Claude Code · [omoctl](https://github.com/anfreire/omoctl): manage oh-my-openagent profiles · [wiki-spaces](https://github.com/anfreire/wiki-spaces): a wiki your AI agent keeps

{patch_cc-0.2.0 → patch_cc-0.2.2}/README.md

@@ -5,8 +5,16 @@
 
 An interactive patcher for the **Claude Code native binary**. Pick the tweaks
 you want — inline and live thinking, detailed tool calls, subagent model
-overrides, your own startup name — and apply them to your installed `claude`
-in one keystroke. Pure Python; no Node, no Bun.
+overrides, your own startup name, your **ChatGPT/Codex-plan GPT models as
+native models** — and apply them to your installed `claude` in one keystroke.
+Fully reversible: a pristine backup is kept, `patch-cc restore` puts it back.
+Pure Python; no Node, no Bun.
+
+```bash
+uvx patch-cc                   # fullscreen menu, no install needed
+```
+
+![patch-cc: pick tweaks, register a Codex model, pin the Plan agent to it, bake — the patched binary is 161 MB smaller](https://raw.githubusercontent.com/anfreire/patch-cc/main/docs/demo.gif)
 
 ## Requirements
 
@@ -19,17 +27,14 @@ in one keystroke. Pure Python; no Node, no Bun.
 - **macOS only:** the Xcode command line tools, for `codesign` — a patched
   binary has to be re-signed or macOS refuses to run it.
 
-```bash
-uvx patch-cc                   # fullscreen menu, no install needed
-```
-
 The menu is a single centered panel: move with `↑ ↓`, toggle with `space`,
 press `s` to save. Patches that carry a setting — subagent models, Codex models,
-the startup name, the `--version` marker — open a centered modal on `enter`, and
-the row then shows what you chose. Everything choosable is a picker: the agent
-names and model aliases are **discovered from your binary itself** (and the
-Codex ones from your plan), so the menu can never offer something your build
-would reject. Typing exists only for the genuinely free-text values.
+the startup name, the `--version` marker, the org/email label — open a centered
+modal on `enter`, and the row then shows what you chose. Everything choosable
+is a picker: the agent names and model aliases are **discovered from your
+binary itself** (and the Codex ones from your plan), so the menu can never
+offer something your build would reject. Typing exists only for the genuinely
+free-text values.
 
 A patched binary records what was applied inside itself, so the menu always
 comes up showing the real current state, and `patch-cc status` answers
@@ -46,17 +51,19 @@ patch-cc                       # then just run it
 
 | Group | Patch | |
 |---|---|---|
-| Output & diffs | Detailed tool calls | Show full read/search calls, not collapsed summaries |
+| Output & display | Detailed tool calls | Show full read/search calls, not collapsed summaries |
 | | Colour new files as diffs | Created files render with `+` lines and green |
-| Thinking | Fix blank thinking blocks | Opt out of the server-side experiment that can empty every thinking block |
+| | Fix blank thinking blocks | Opt out of the server-side experiment that can empty every thinking block |
 | | Always show thinking | Thinking blocks stay inline — no `ctrl+o` |
 | | Stream thinking live | See reasoning as it is generated, inline and in order |
-| Subagents | Show subagent prompts | Prompt blocks visible during normal use |
+| | Show subagent prompts | Prompt blocks visible during normal use |
+| Models & effort | Persist max effort | `/effort max` saves as your default for new sessions, like the other levels |
+| | Codex models | Use OpenAI/Codex-plan models in Claude Code — see [Codex models](#codex-models) |
 | | Override subagent models | Pick the model per built-in agent (discovered from your binary) |
-| Chrome | Disable spinner tips | No rotating tips on the spinner |
-| | Custom startup name | Defaults to `<your username>'s Code` |
+| Chrome & branding | Disable spinner tips | No rotating tips on the spinner |
 | | Mark `--version` | Appends `(patched)` — or any marker you choose |
-| Codex | Codex models | Use OpenAI/Codex-plan models in Claude Code — see [Codex models](#codex-models) |
+| | Custom startup name | Defaults to `<your username>'s Code` |
+| | Startup org/email label | Replace the org/email on the welcome screen — or hide it |
 
 ## Usage
 
@@ -70,6 +77,8 @@ uvx patch-cc apply --brand                    # + branding as <username>'s Code
 uvx patch-cc apply --brand "Ada's Code"       # + branding, explicit name
 uvx patch-cc apply --model Explore=haiku --model general-purpose=opus
 uvx patch-cc apply --suffix "(mine)"          # custom --version marker
+uvx patch-cc apply --org-label                # hide the welcome screen's org/email
+uvx patch-cc apply --org-label "Ada's Lab"    # ...or show this instead
 uvx patch-cc apply --codex gpt-5.6-sol        # + a Codex model (see below)
 uvx patch-cc apply --from-cache               # replay your last remembered selection
 uvx patch-cc status                           # exactly what is applied
@@ -79,9 +88,9 @@ uvx patch-cc list                             # every patch, described
 uvx patch-cc restore                          # put the original back
 ```
 
-`--brand`, `--model` and `--codex` imply their patches; agents and models are
-validated against what your installed binary actually ships, and Codex model ids
-against what your plan offers. `apply --help` lists all three.
+A flag that configures a patch also selects it — `apply --help` lists them
+all. Agents and models are validated against what your installed binary
+actually ships, and Codex model ids against what your plan offers.
 
 ## Codex models
 
@@ -181,3 +190,7 @@ bundle rather than with clodex's TLS interception.
 ## License
 
 MIT
+
+---
+
+**More agent tooling** — [summon-cc](https://github.com/anfreire/summon-cc): give your agent a crew of Claude Code workers · [cc-oc](https://github.com/anfreire/cc-oc): drive opencode from inside Claude Code · [omoctl](https://github.com/anfreire/omoctl): manage oh-my-openagent profiles · [wiki-spaces](https://github.com/anfreire/wiki-spaces): a wiki your AI agent keeps

{patch_cc-0.2.0 → patch_cc-0.2.2}/docs/INTERNALS.md

@@ -93,7 +93,7 @@ its shape; [PLAYBOOK.md](PLAYBOOK.md) covers what it means for matcher health:
 
 ```
 //patch-cc {"v":1,"tool":"<version>","patches":[...],"brand":...,"models":{...},
-            "codex":{"port":8817,"models":["gpt-5.6-sol", ...]}}
+            "org":...,"codex":{"port":8817,"models":["gpt-5.6-sol", ...]}}
 ```
 
 That line is why `patch-cc status` can name exactly what is applied: several

{patch_cc-0.2.0 → patch_cc-0.2.2}/docs/PLAYBOOK.md

@@ -17,10 +17,35 @@ 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.
 - 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 +66,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.
@@ -233,9 +258,10 @@ that broke a patch along with every note.
 
 ## Patch reference
 
-Grouped by source module — the UI folds `live-thinking` into the Thinking group,
-but it still lives in `streaming.py`. Each entry: what it changes, the stable
-anchor, and where it lives.
+Grouped by source module. The menu's three groups (Output & display, Models &
+effort, Chrome & branding) are display categories that each draw from several
+modules — module says where a matcher lives, group says what the patch changes
+for you. Each entry: what it changes, the stable anchor, and where it lives.
 
 ### Output & diffs — `output.py`
 
@@ -288,6 +314,36 @@ anchor, and where it lives.
   A column of `0`s is this patch missing (or a bucket it does not yet cover);
   a spread of real lengths means the text arrived and the problem is rendering.
 
+- **`max-effort`** — let `/effort max` save as the session default, as
+  low–xhigh already do. `max` is first-class in session (the binary's level
+  list is `["low","medium","high","xhigh","max"]`; the CLI `--effort` and
+  `CLAUDE_CODE_EFFORT_LEVEL` both accept it) — only *persistence* runs through
+  two whitelists that stop at xhigh, and both are required rewrites because
+  either alone changes nothing:
+
+  - **`gate`** — one tiny whitelist function
+    (`if(e==="low"||…||e==="xhigh")return e;return`), and the whole choke
+    point: the `/effort` save path writes `effortLevel` to userSettings only
+    when it returns a value, the startup resolver reads the setting back
+    through it, and the model-picker flow persists through it too — so write
+    and read widen together in one rewrite. The matcher accepts both
+    minifier statement forms and the whole-body match keeps it off any other
+    function that merely compares levels.
+  - **`schema`** — the settings validator's
+    `effortLevel:*.enum(["low","medium","high","xhigh"])`, anchored on the
+    prop name (the describe-string `Persisted effort level` is the listed
+    anchor). Its `.catch(void 0)` is the safety property: a **clean** binary
+    reading a settings file that still says `"max"` (baked, then reverted by
+    a Claude update) treats it as unset — the default effort, never a broken
+    settings parse. Losing the patch costs the preference, nothing else.
+
+  Both matchers tolerate the level already being present and count it as
+  landed — an upstream that adopts `max` persistence itself is the goal
+  achieved, not a miss (the same judged-on-achievement rule
+  `subagent-models` follows). Effort semantics downstream are untouched: the
+  org-limit clamp runs before the save, and a model that cannot run `max`
+  clamps at request time exactly as an interactive `/effort max` does today.
+
 - **`thinking-inline`** — make historical thinking blocks render inline.
   Anchor: `case"thinking":` containing `isTranscriptMode:`. Two rewrites:
   remove the early null-return (both `if(!a&&!b)return null;` and the 2.1.216
@@ -516,6 +572,20 @@ anchor, and where it lives.
   chosen name. Several string shapes, each its own sub-step. On by default,
   deriving `<username>'s Code`; `--brand NAME` names it explicitly, and selects
   the patch when it is not already in the set.
+- **`org-label`** — replace or hide the welcome screen's third segment
+  (`model · plan · <organizationName>`; for a personal claude.ai account the
+  org name *is* the account email). Anchor: the one conditional template
+  joining `.organizationName` behind `!process.env.IS_DEMO`, whose false
+  branch is upstream's own no-org shape `` `${model} \xB7 ${plan}` ``. An
+  empty label (`--org-label` with no value — empty is the *value* "hide", not
+  "unset") emits that false branch verbatim, so the separator leaves with the
+  segment; a label takes the org text's place, escaped for the template
+  literal it lands in. Candidates count off the `\xB7 ${*.organizationName}`
+  composition, so a reshaped ternary reads as `candidates > 0, applied == 0`
+  — a matcher to repair — rather than the zero that would equally mean
+  upstream retired the segment. Only this line is touched: the `/status`
+  Organization/Email rows, the login screen, and the org's startup message
+  (`"Message from <org>:"`) still show the real account.
 
 ## Removed patches
 

{patch_cc-0.2.0 → patch_cc-0.2.2}/pyproject.toml

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

{patch_cc-0.2.0 → patch_cc-0.2.2}/src/patch_cc/__init__.py

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

{patch_cc-0.2.0 → patch_cc-0.2.2}/src/patch_cc/cache.py

@@ -59,6 +59,7 @@ def load_strict() -> Selection | None:
         known = set(ids())
         brand = data.get("brand", DEFAULT_BRAND)
         suffix = data.get("suffix", DEFAULT_SUFFIX)
+        org = data.get("org_label", "")
         models = data.get("subagent_models", {})
         # Codex ids only, the same as the manifest keeps: a name and a context
         # window are the plan's to report, and remembering either would let a
@@ -72,6 +73,7 @@ def load_strict() -> Selection | None:
                 version_suffix=suffix
                 if isinstance(suffix, str) and suffix
                 else DEFAULT_SUFFIX,
+                org_label=org if isinstance(org, str) else "",
                 subagent_models={
                     a: m
                     for a, m in models.items()
@@ -98,6 +100,7 @@ def save(selection: Selection) -> None:
                     "patches": selection.patches,
                     "brand": selection.options.brand,
                     "suffix": selection.options.version_suffix,
+                    "org_label": selection.options.org_label,
                     "subagent_models": selection.options.subagent_models,
                     "codex_models": [m.id for m in selection.options.codex_models],
                     "codex_port": selection.options.codex_port,

{patch_cc-0.2.0 → patch_cc-0.2.2}/src/patch_cc/cli.py

@@ -4,7 +4,8 @@ Bare ``patch-cc`` opens the interactive menu. Every action is also a
 subcommand so nothing needs the TUI:
 
     patch-cc apply [PATCH ...] [--brand [NAME]] [--model AGENT=MODEL]
-                   [--suffix TEXT] [--codex MODEL] [--codex-port N]
+                   [--suffix TEXT] [--org-label [TEXT]]
+                   [--codex MODEL] [--codex-port N]
     patch-cc status
     patch-cc doctor [PATH]       # PATH: check any binary, e.g. an old backup
     patch-cc list
@@ -102,6 +103,12 @@ def _list_hint(patch: Patch, cached: cache.Selection) -> str:
         parts.append(f"default {DEFAULT_SUFFIX!r}")
         if opts.version_suffix != DEFAULT_SUFFIX:
             parts.append(f"cached {opts.version_suffix!r}")
+    elif patch.id == "org-label":
+        parts.append("default hides it")
+        if "org-label" in cached.patches:
+            parts.append(
+                f"cached {opts.org_label!r}" if opts.org_label else "cached hidden"
+            )
     elif patch.id == "subagent-models" and opts.subagent_models:
         picks = ", ".join(f"{a}={m}" for a, m in opts.subagent_models.items())
         parts.append(f"cached {picks}")
@@ -218,6 +225,11 @@ def _requested(args, source: str) -> tuple[list[str], Options]:
         if "version-marker" not in selected:
             selected.append("version-marker")
 
+    if args.org_label is not None:
+        options.org_label = args.org_label.strip()
+        if "org-label" not in selected:
+            selected.append("org-label")
+
     # Order-preserving, and deduplicated: a repeated `--codex` is one model asked
     # for twice, and every array it reaches -- the enum, the routing list, the
     # remembered selection, the manifest `status` reads back -- would otherwise
@@ -272,6 +284,7 @@ def _has_selection_args(args) -> bool:
         or args.brand is not None
         or args.model
         or args.suffix
+        or args.org_label is not None
         or args.codex
         or args.codex_port is not None
     )
@@ -332,7 +345,8 @@ def _from_cache(args, source: str) -> tuple[list[str], Options]:
     if _has_selection_args(args):
         err(
             "--from-cache replays your last interactive selection; do not combine "
-            "it with patch ids or --brand / --model / --suffix / --codex."
+            "it with patch ids or --brand / --model / --suffix / --org-label / "
+            "--codex."
         )
         raise SystemExit(2)
     if not cache.cache_path().exists():
@@ -494,6 +508,8 @@ def cmd_status(args) -> int:
             console.print(f"  brand:     {st.manifest['brand']}")
         if "suffix" in st.manifest:
             console.print(f"  suffix:    {st.manifest['suffix']}")
+        if "org" in st.manifest:
+            console.print(f"  org:       {st.manifest['org'] or '(hidden)'}")
         for agent, model in (st.manifest.get("models") or {}).items():
             console.print(f"  model:     {agent} = {model}")
         codex = st.manifest.get("codex")
@@ -863,6 +879,7 @@ def _apply_epilog() -> str:
         "configuring patches:",
         f"  --brand [NAME]       selects branding  ·  no value -> {derived_brand()!r}",
         f"  --suffix TEXT        selects version-marker  ·  default {DEFAULT_SUFFIX!r}",
+        "  --org-label [TEXT]   selects org-label  ·  no value -> hide the segment",
         "  --model AGENT=MODEL  selects subagent-models  ·  repeatable, one per agent",
     ]
     if agents:
@@ -1004,6 +1021,14 @@ def build_parser() -> argparse.ArgumentParser:
         help="`claude --version` marker text; selects `version-marker` "
         "(default: (patched))",
     )
+    p_apply.add_argument(
+        "--org-label",
+        nargs="?",
+        const="",
+        metavar="TEXT",
+        help="welcome-screen org/email text; selects `org-label` "
+        "(no value: hide the segment)",
+    )
     p_apply.add_argument(
         "--codex",
         action="append",

{patch_cc-0.2.0 → patch_cc-0.2.2}/src/patch_cc/doctor.py

@@ -110,7 +110,12 @@ def _synthetic_options(agents: list[BuiltinAgent], models: list[str]) -> Options
         if (target := next((m for m in models if m != agent.effective_model), None))
     }
     return Options(
-        brand="patch-cc doctor", subagent_models=overrides, codex_models=codex
+        brand="patch-cc doctor",
+        subagent_models=overrides,
+        codex_models=codex,
+        # The replace branch; the hidden form differs only in the emitted tail,
+        # so one configuration holds the whole matcher in the net.
+        org_label="patch-cc doctor",
     )
 
 

{patch_cc-0.2.0 → patch_cc-0.2.2}/src/patch_cc/menu.py

@@ -4,9 +4,10 @@ A fullscreen frame: fixed title and status on top, fixed key hints at the
 bottom, and only the patch list scrolling in between. Every choice is a picker
 driven by what the binary itself offers -- agents and models are discovered,
 never typed -- and typing exists only where a value is genuinely free text
-(the startup name, the --version marker). All configuration happens in
-centered modals floating over the dimmed list; the list itself never grows
-sub-rows. ``s`` saves, and the same frame then shows the per-patch results.
+(the startup name, the --version marker, the org/email label). All
+configuration happens in centered modals floating over the dimmed list; the
+list itself never grows sub-rows. ``s`` saves, and the same frame then shows
+the per-patch results.
 
 The engine is deliberately small: ``blessed`` owns the terminal (fullscreen,
 cbreak, parsed keystrokes, live size) and Rich owns every pixel drawn. A frame
@@ -43,6 +44,7 @@ from .bun import Bundle, BunError, container
 from .codex import DEFAULT_PORT, is_valid_port
 from .codex.models import CodexModel, discover, reconcile
 from .patches import (
+    ALL_PATCHES,
     DEFAULT_BRAND,
     DEFAULT_SUFFIX,
     GROUP_ORDER,
@@ -83,8 +85,11 @@ def _hints(*pairs: tuple[str, str]) -> Text:
     return text
 
 
-#: Patches whose row opens a modal on enter instead of plain toggling.
-_CONFIGURABLE = {"subagent-models", "branding", "version-marker", "codex-models"}
+#: Patches whose row opens a modal on enter instead of plain toggling --
+#: exactly the ones that carry a configurable value, which is what
+#: :attr:`Patch.option` declares. Derived, so a new option-carrying patch
+#: cannot be left off this list with its hint reading "enter toggle".
+_CONFIGURABLE = {patch.id for patch in ALL_PATCHES if patch.option}
 
 
 # ----------------------------------------------------------------- rows
@@ -182,6 +187,7 @@ class MenuModel:
         model.text_rows["suffix"] = TextRow(
             "suffix", "marker", seed.options.version_suffix
         )
+        model.text_rows["org"] = TextRow("org", "label", seed.options.org_label)
         return model
 
     def _seed(self) -> cache.Selection:
@@ -191,6 +197,7 @@ class MenuModel:
             codex = manifest.get("codex")
             codex = codex if isinstance(codex, dict) else {}
             port = codex.get("port")
+            org = manifest.get("org")
             seed = cache.Selection()
             seed.patches = [
                 p for p in manifest.get("patches", []) if isinstance(p, str)
@@ -198,6 +205,9 @@ class MenuModel:
             seed.options = Options(
                 brand=manifest.get("brand") or DEFAULT_BRAND,
                 version_suffix=manifest.get("suffix") or DEFAULT_SUFFIX,
+                # `or ""` would also be right, but only by luck: "" (hidden) is
+                # a meaningful manifest value, unlike an absent brand/suffix.
+                org_label=org if isinstance(org, str) else "",
                 subagent_models={
                     a: m
                     for a, m in (manifest.get("models") or {}).items()
@@ -269,6 +279,10 @@ class MenuModel:
             options.version_suffix = (
                 self.text_rows["suffix"].value.strip() or DEFAULT_SUFFIX
             )
+        if "org-label" in selected:
+            # Empty stays empty: it is the "hide the segment" value, so unlike
+            # brand and suffix there is no default to fall back to.
+            options.org_label = self.text_rows["org"].value.strip()
         # A subagent pinned to a Codex model needs codex-models applied too -- it
         # registers the id and installs the redirect, without which the pin
         # resolves to nothing. That coupling is enforced where the user can see
@@ -709,15 +723,20 @@ class MenuApp:
     def _activate(self, row: PatchRow) -> None:
         """Enter on a patch: toggle plain ones, configure configurable ones."""
         patch_id = row.patch.id
+        text_keys = {
+            "branding": "brand",
+            "version-marker": "suffix",
+            "org-label": "org",
+        }
         if patch_id == "subagent-models":
             if not self.model.agent_rows:
                 self.flash = "no agents discovered in this bundle"
                 return
             row.on = True
             self._open_agents_modal()
-        elif patch_id in ("branding", "version-marker"):
+        elif patch_id in text_keys:
             row.on = True
-            self._open_text_modal("brand" if patch_id == "branding" else "suffix")
+            self._open_text_modal(text_keys[patch_id])
         elif patch_id == "codex-models":
             self._open_codex_menu(row)  # submenu: pick models / set gateway port
         else:
@@ -813,10 +832,16 @@ class MenuApp:
 
     def _open_text_modal(self, key: str) -> None:
         row = self.model.text_rows[key]
-        titles = {"brand": "Startup name", "suffix": "--version marker"}
+        titles = {
+            "brand": "Startup name",
+            "suffix": "--version marker",
+            "org": "Org/email label (empty hides it)",
+        }
 
         def entered(value: object) -> None:
-            if isinstance(value, str) and value.strip():
+            # For the org label an emptied field is the point -- it means hide
+            # the segment -- where an empty brand or marker means "never mind".
+            if isinstance(value, str) and (value.strip() or key == "org"):
                 row.value = value.strip()
 
         self._push(InputModal(titles[key], row.value), entered)
@@ -1412,6 +1437,9 @@ class MenuApp:
             return Text(model.text_rows["brand"].value, style=_VALUE)
         if row.patch.id == "version-marker":
             return Text(model.text_rows["suffix"].value, style=_VALUE)
+        if row.patch.id == "org-label":
+            value = model.text_rows["org"].value
+            return Text(value, style=_VALUE) if value else Text("hidden", style="dim")
         if row.patch.id == "codex-models":
             count = len(model.codex_models)
             if not count:

{patch_cc-0.2.0 → patch_cc-0.2.2}/src/patch_cc/patcher.py

@@ -92,6 +92,11 @@ def manifest_payload(landed: list[str], options: Options) -> dict:
         payload["suffix"] = options.version_suffix
     if options.subagent_models and "subagent-models" in applied:
         payload["models"] = options.subagent_models
+    if "org-label" in applied:
+        # Recorded even when empty: "" is the asked-for value (hide the
+        # segment), and omitting it would make hidden indistinguishable from
+        # never-configured when the menu seeds from this manifest.
+        payload["org"] = options.org_label
     if options.codex_models and "codex-models" in applied:
         # Ids and a port -- the whole of what was asked for. A model's name and
         # context window are baked into the bundle itself (the picker rows, the

{patch_cc-0.2.0 → patch_cc-0.2.2}/src/patch_cc/patches/__init__.py

@@ -19,11 +19,9 @@ from . import agents, chrome, codex, output, streaming, thinking
 from .base import (
     DEFAULT_BRAND,
     DEFAULT_SUFFIX,
-    GROUP_AGENTS,
     GROUP_CHROME,
-    GROUP_CODEX,
+    GROUP_MODELS,
     GROUP_OUTPUT,
-    GROUP_THINKING,
     SENTINEL,
     Options,
     Outcome,
@@ -40,7 +38,7 @@ ALL_PATCHES: list[Patch] = [
     *chrome.PATCHES,
 ]
 
-GROUP_ORDER = [GROUP_OUTPUT, GROUP_THINKING, GROUP_AGENTS, GROUP_CODEX, GROUP_CHROME]
+GROUP_ORDER = [GROUP_OUTPUT, GROUP_MODELS, GROUP_CHROME]
 
 
 def ids() -> list[str]:

{patch_cc-0.2.0 → patch_cc-0.2.2}/src/patch_cc/patches/agents.py

@@ -16,7 +16,17 @@ from __future__ import annotations
 import re
 from dataclasses import dataclass
 
-from .base import GROUP_AGENTS, IDENT, Options, Outcome, Patch, compile_js, splice
+from .base import (
+    ARRAY_CALL,
+    GROUP_MODELS,
+    GROUP_OUTPUT,
+    IDENT,
+    Options,
+    Outcome,
+    Patch,
+    compile_js,
+    splice,
+)
 
 # ------------------------------------------------------- prompt visibility
 
@@ -147,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.
@@ -366,7 +376,7 @@ PATCHES = [
         id="subagent-prompt",
         title="Show subagent prompts",
         summary="Show a subagent's Prompt block during normal use, not only in transcript mode.",
-        group=GROUP_AGENTS,
+        group=GROUP_OUTPUT,
         fn=_subagent_prompt,
         anchors=('"Backgrounded agent"', 'action:"app:toggleTranscript"'),
     ),
@@ -374,7 +384,7 @@ PATCHES = [
         id="subagent-models",
         title="Override subagent models",
         summary="Choose the default model for the built-in agents found in your binary.",
-        group=GROUP_AGENTS,
+        group=GROUP_MODELS,
         fn=_subagent_models,
         default=False,
         option="--model",

{patch_cc-0.2.0 → patch_cc-0.2.2}/src/patch_cc/patches/base.py

@@ -37,11 +37,12 @@ if TYPE_CHECKING:
 #: indistinguishable from the 11 that upstream already ships.
 SENTINEL = "__cc_"
 
-# Groups, in display order.
-GROUP_OUTPUT = "Output & diffs"
-GROUP_THINKING = "Thinking"
-GROUP_AGENTS = "Subagents"
-GROUP_CODEX = "Codex models"
+# Groups, in display order: what renders, what runs (and how hard), how it is
+# dressed. Generic on purpose -- a group named after a feature (Thinking,
+# Subagents, Codex) fits exactly that feature, and the next patch that is
+# about behaviour rather than a surface has no home.
+GROUP_OUTPUT = "Output & display"
+GROUP_MODELS = "Models & effort"
 GROUP_CHROME = "Chrome & branding"
 
 #: Default brand: the name shown unless the user overrides it. One home so the
@@ -88,6 +89,11 @@ class Options:
     #: from the one home (:data:`patch_cc.codex.DEFAULT_PORT`) so the number
     #: never lives in two places.
     codex_port: int = DEFAULT_PORT
+    #: The welcome screen's org segment (for personal claude.ai accounts,
+    #: upstream shows the account email there). Empty is a *value* -- hide the
+    #: segment -- not "unset": whether the patch acts at all is the selection's
+    #: question, never this field's.
+    org_label: str = ""
 
     @property
     def rebrands(self) -> bool:
@@ -271,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.0 → patch_cc-0.2.2}/src/patch_cc/patches/chrome.py

@@ -175,6 +175,52 @@ def _branding(content: str, options: Options, outcome: Outcome) -> str:
     return output
 
 
+# ---------------------------------------------------------- startup org label
+
+# The separator as the bundle may spell it: today's bundler writes the `·` as
+# the escape text `\xB7`, and a charset flip would emit the raw character. Both
+# spell the same string, so both are accepted -- a representation variant like
+# the minifier's brace flips, not a second shape.
+_SEP = r"(?:\\xB7|\xB7)"
+
+# The welcome screen's info line: `model · plan` -- and, when the account has an
+# organizationName (for personal claude.ai accounts, that is the account email),
+# ` · <organizationName>` after it. One conditional template, and upstream ships
+# the no-org variant as its own false branch, so hiding the segment is selecting
+# a shape the bundle already carries -- separator and all -- not inventing one.
+_ORG_LINE = compile_js(
+    rf"!process\.env\.IS_DEMO&&({IDENT})\?\.organizationName\?"
+    rf"`\$\{{({IDENT})\}} {_SEP} \$\{{({IDENT})\}} {_SEP} \$\{{\1\.organizationName\}}`"
+    rf":`\$\{{\2\}} {_SEP} \$\{{\3\}}`"
+)
+
+#: The composition itself -- a separator joining the account's organizationName
+#: into a template -- is the durable fingerprint; candidates count off it so a
+#: reshaped ternary reads as "found it, rewrote nothing" (a matcher to repair)
+#: instead of the zero that would equally mean upstream retired the segment.
+_ORG_NEEDLE = compile_js(rf"{_SEP} \$\{{{IDENT}\.organizationName\}}")
+
+
+def _org_label(content: str, options: Options, outcome: Outcome) -> str:
+    """Replace -- or, with an empty label, drop -- the welcome line's org segment.
+
+    One rule builds the replacement either way: the line is `model · plan`,
+    plus ` · <label>` exactly when there is a label. Empty therefore removes
+    the separator with the segment, and a custom label takes the org text's
+    place. The `IS_DEMO`/has-org gate goes with the ternary: a baked label is
+    unconditional by construction, and the hidden form needs no gate at all.
+    """
+    outcome.candidates += len(_ORG_NEEDLE.findall(content))
+    label = options.org_label
+    tail = f" \\xB7 {_js_template_escape(label)}" if label else ""
+
+    def rewrite(match: re.Match[str]) -> str:
+        outcome.applied += 1
+        return f"`${{{match.group(2)}}} \\xB7 ${{{match.group(3)}}}{tail}`"
+
+    return _ORG_LINE.sub(rewrite, content)
+
+
 PATCHES = [
     Patch(
         id="spinner-tips",
@@ -203,4 +249,14 @@ PATCHES = [
         option="--brand",
         anchors=('"Welcome to Claude Code"', '{bold:!0},"Claude Code"'),
     ),
+    Patch(
+        id="org-label",
+        title="Startup org/email label",
+        summary="Replace or hide the org/email shown after the plan name on the welcome screen.",
+        group=GROUP_CHROME,
+        fn=_org_label,
+        default=False,
+        option="--org-label",
+        anchors=("organizationName", "IS_DEMO"),
+    ),
 ]

{patch_cc-0.2.0 → patch_cc-0.2.2}/src/patch_cc/patches/codex.py

@@ -50,7 +50,7 @@ import re
 from ..codex.models import family_aliases, family_of
 from .agents import MODEL_ENUM
 from .base import (
-    GROUP_CODEX,
+    GROUP_MODELS,
     IDENT,
     Options,
     Outcome,
@@ -507,7 +507,7 @@ PATCHES = [
         id="codex-models",
         title="Codex models",
         summary="Register your OpenAI/Codex models and route them to the local gateway.",
-        group=GROUP_CODEX,
+        group=GROUP_MODELS,
         fn=_codex_models,
         default=False,
         option="--codex",

{patch_cc-0.2.0 → patch_cc-0.2.2}/src/patch_cc/patches/streaming.py

@@ -23,7 +23,7 @@ from __future__ import annotations
 import re
 from dataclasses import dataclass
 
-from .base import GROUP_THINKING, IDENT, Options, Outcome, Patch, compile_js, splice
+from .base import GROUP_OUTPUT, IDENT, Options, Outcome, Patch, compile_js, splice
 
 #: The mutually-exclusive reducer variants. On any one build one of them lands;
 #: none landing means upstream shipped a fourth shape and live thinking is dead.
@@ -974,7 +974,7 @@ PATCHES = [
         title="Stream thinking live",
         summary="Show thinking as it is generated, inline and in order, instead of "
         "only after the turn finishes.",
-        group=GROUP_THINKING,
+        group=GROUP_OUTPUT,
         fn=_live_thinking,
         anchors=(
             "onStreamingThinking:",

{patch_cc-0.2.0 → patch_cc-0.2.2}/src/patch_cc/patches/thinking.py

@@ -22,6 +22,9 @@ Rendering is only half of it. A fourth gate is not in the UI at all: the
 account's server-side experiment bucket, which decides whether the API puts any
 text in the thinking blocks it returns. `thinking-summaries` is that half, and
 without it the other three render an empty string perfectly.
+
+`max-effort` lives here too: effort is thinking depth, so the module that owns
+how thinking is shown also owns how hard it is asked for.
 """
 
 from __future__ import annotations
@@ -29,7 +32,9 @@ from __future__ import annotations
 import re
 
 from .base import (
-    GROUP_THINKING,
+    ARRAY_CALL,
+    GROUP_MODELS,
+    GROUP_OUTPUT,
     IDENT,
     Options,
     Outcome,
@@ -189,12 +194,73 @@ def _thinking_summaries(content: str, _options: Options, outcome: Outcome) -> st
     return _CLIENT_BUCKET.sub(rewrite, content)
 
 
+# ------------------------------------------------------------- max effort
+#
+# `max` is a first-class level in session -- the level list the binary ships is
+# ["low","medium","high","xhigh","max"], and the CLI and env var both accept it
+# -- but persistence runs through two whitelists that stop at xhigh. Both are
+# widened; either alone changes nothing (docs/PLAYBOOK.md), which is also why
+# both steps are required.
+#
+# The gate is one tiny function, and it is the whole choke point: the /effort
+# save path writes settings only when it returns a value, the startup resolver
+# reads settings back through it, and the model-picker flow persists through it
+# too. The statement variants and the optional `||x==="max"` follow the matcher
+# rules: minifiers flip `return e;` and `{return e}`, and a build where upstream
+# has adopted the level itself is the goal already achieved, not a miss.
+_EFFORT_GATE = compile_js(
+    rf"function ({IDENT})\(({IDENT})\)\{{"
+    rf'if\(\2==="low"\|\|\2==="medium"\|\|\2==="high"\|\|\2==="xhigh"'
+    rf'(\|\|\2==="max")?\)'
+    rf"(?:\{{return \2\}}|return \2;?)return;?\}}"
+)
+
+# The persisted-settings schema entry. Its zod chain ends in `.catch(void 0)`,
+# so a clean binary reading a settings file that carries "max" (baked by us,
+# then reverted by a Claude update) treats it as unset rather than failing the
+# whole settings parse -- the property that makes this patch safe to lose.
+_EFFORT_SCHEMA = compile_js(
+    rf'(effortLevel:{ARRAY_CALL})"low","medium","high","xhigh"(?:,"max")?(\]\))'
+)
+
+
+def _max_effort(content: str, _options: Options, outcome: Outcome) -> str:
+    """Let ``/effort max`` save as the default for new sessions."""
+    gate = outcome.step("gate", expect=True)
+    schema = outcome.step("schema", expect=True)
+
+    def widen_gate(match: re.Match[str]) -> str:
+        gate.candidates += 1
+        gate.applied += 1
+        if match.group(3):
+            return match.group(0)
+        name, value = match.group(1), match.group(2)
+        return (
+            f"function {name}({value}){{"
+            f'if({value}==="low"||{value}==="medium"||{value}==="high"'
+            f'||{value}==="xhigh"||{value}==="max")return {value};return}}'
+        )
+
+    output = _EFFORT_GATE.sub(widen_gate, content)
+
+    # No already-applied branch, unlike the gate above: the levels are spliced
+    # into the array the match found, so a bundle that already carries `max` is
+    # rewritten to itself. `widen_gate` needs one because its unconditional path
+    # also normalises the brace form, and would churn a bundle that was fine.
+    def widen_schema(match: re.Match[str]) -> str:
+        schema.candidates += 1
+        schema.applied += 1
+        return f'{match.group(1)}"low","medium","high","xhigh","max"{match.group(2)}'
+
+    return _EFFORT_SCHEMA.sub(widen_schema, output)
+
+
 PATCHES = [
     Patch(
         id="thinking-summaries",
         title="Fix blank thinking blocks",
         summary="Opt out of the server-side experiment bucket that can return empty thinking blocks on some accounts. Drops all experiment enrollment, not just this one.",
-        group=GROUP_THINKING,
+        group=GROUP_OUTPUT,
         fn=_thinking_summaries,
         anchors=(_BUCKET_HEADER, "?.atis"),
     ),
@@ -202,8 +268,20 @@ PATCHES = [
         id="thinking-inline",
         title="Always show thinking",
         summary="Render thinking blocks inline instead of hiding them behind ctrl+o.",
-        group=GROUP_THINKING,
+        group=GROUP_OUTPUT,
         fn=_thinking_inline,
         anchors=('case"thinking":', "isTranscriptMode:", "latestThinkingSummary"),
     ),
+    Patch(
+        id="max-effort",
+        title="Persist max effort",
+        summary="Let /effort max save as your default for new sessions, like the other levels.",
+        group=GROUP_MODELS,
+        fn=_max_effort,
+        anchors=(
+            '==="low"||',
+            '"low","medium","high","xhigh"]',
+            "Persisted effort level",
+        ),
+    ),
 ]

{patch_cc-0.2.0 → patch_cc-0.2.2}/src/patch_cc/ui.py

@@ -57,6 +57,8 @@ def applied_value(patch: Patch, outcome: Outcome, options: Options) -> str | Non
         return options.brand
     if patch.id == "version-marker":
         return options.version_suffix
+    if patch.id == "org-label":
+        return options.org_label or "hidden"
     if patch.id == "subagent-models" and options.subagent_models:
         return ", ".join(f"{a}={m}" for a, m in options.subagent_models.items())
     if patch.id == "codex-models" and options.codex_models:

{patch_cc-0.2.0 → patch_cc-0.2.2}/uv.lock

@@ -256,7 +256,7 @@ wheels = [
 
 [[package]]
 name = "patch-cc"
-version = "0.2.0"
+version = "0.2.1"
 source = { editable = "." }
 dependencies = [
     { name = "blessed" },