claude-code-modes 0.6.0 → 0.7.0

package/README.md

@@ -82,6 +82,7 @@ claude-mode muse        # Creative latitude — treat the request as inspiration
 claude-mode flow        # Deep engagement on hard problems — calm, curious, bounded (flow base)
 claude-mode tinker      # Loose, generative prototyping — fun and fast, don't gold-plate (flow base)
 claude-mode spark       # Maximum expression — creative vision with wit and personality (chill base)
+claude-mode straight    # Direct judgment, no sugarcoating or private shorthand (straight base + style)
 claude-mode none        # Strip all behavioral opinions, use your own CLAUDE.md
 ```
 
@@ -100,16 +101,18 @@ claude-mode none        # Strip all behavioral opinions, use your own CLAUDE.md
 | `flow` | autonomous | architect | adjacent | Deep engagement on a genuinely hard problem — reads widely, modifies narrowly |
 | `tinker` | autonomous | pragmatic | unrestricted | Prototyping and creative coding — loose, generative, fun; a sketch, not a cathedral |
 | `spark` | autonomous | architect | unrestricted | Maximum expression — muse's creative vision plus wit and personality |
+| `straight` | autonomous | pragmatic | adjacent | Candid technical work — challenge bad premises, state judgments plainly, keep explanations self-contained |
 | `none` | — | — | — | Strip all behavioral instructions, use your own |
 
 ### Bases
 
 By default the base is chosen for you. `claude-mode` reads which model the session will
 run on and assembles the same *shape* of prompt Claude Code itself would send that model:
-the **lean** base for models that receive upstream's lean assembly (Opus 5, Opus 4.8,
-Fable 5, Mythos 5), and **standard** for everything else. On Opus 5 it also layers on the
-three extra sections upstream sends that model — delivering-work, corrections, and
-tool-restraint.
+the **lean** base for models that receive upstream's lean assembly (Opus 5.5, Opus 5,
+Opus 4.8, Sonnet 5.5, Fable 5.1, Fable 5, Mythos 5.1, Mythos 5), and **standard** for
+everything else. It also layers on the extra sections upstream sends particular models:
+delivering-work, corrections, and tool-restraint on Opus 5, and delivering-work on
+Fable 5.1 and Mythos 5.1.
 
 ```bash
 claude-mode create                     # auto — picks lean or standard from your model
@@ -117,7 +120,7 @@ claude-mode create --base lean         # force the lean base
 claude-mode create --base standard     # force the full upstream-derived base
 ```
 
-Naming a base explicitly opts out of detection entirely, including the Opus 5 extras.
+Naming a base explicitly opts out of detection entirely, including those extra sections.
 The lean base is roughly a sixth the size of standard's head: one `# Harness` block in
 place of the separate System, Doing tasks, Executing actions, Using your tools, and
 Tone and style sections.
@@ -141,8 +144,27 @@ The **flow** base takes chill's calm floor and adds back the engagement and appe
 claude-mode create --base flow         # Calm + engaged, with any preset
 ```
 
+The **straight** base makes correctness more important than agreement. It checks the user's premise, calls out bad or unnecessary approaches directly, and uses literal technical English without turning rudeness into a persona:
+
+```bash
+claude-mode create --base straight     # Direct behavioral base with any preset
+```
+
 You can also create your own base — see [Custom bases](#custom-bases) below.
 
+### Response styles
+
+A response style changes user-visible writing without replacing the selected base or axes:
+
+```bash
+claude-mode create --style declaudified  # Answer first; remove filler and stock technical prose
+claude-mode create --style straight      # Add direct judgment and self-contained technical explanations
+```
+
+`declaudified` removes Claude-shaped prose: filler, metadiscourse, invented labels, and dead technical metaphors. `straight` includes those principles and adds anti-sycophancy: no sugarcoating, praise padding, false balance, or agreement for its own sake. It criticizes the work rather than the person.
+
+Both styles treat the response as the shared record. They do not assume the user saw private tool calls or file output, and they explain repository-specific names before relying on them. The `straight` preset selects both the straight base and straight style; `--base straight` and `--style straight` remain independently usable.
+
 ## What problems does this solve?
 
 Claude Code's default prompt tells Claude to:
@@ -164,24 +186,28 @@ prompts/
   base/         Standard base (derived from upstream Claude Code)
   chill/        Alternative base (emotion-research-informed, leaner)
   flow/         Alternative base (chill's calm + restored engagement)
-  lean/         Upstream's lean assembly (what Opus 5 / 4.8 / Fable 5 actually receive)
+  lean/         Upstream's lean assembly (what Opus 4.8 and most Claude 5 models actually receive)
+  straight/     Direct, anti-sycophantic base derived from the lean prompt shape
   axis/         Behavioral prompts organized by three axes
+  style/        User-visible writing styles (declaudified, straight)
   modifiers/    Behavioral layers (bold, debug, methodical, director, readonly, context-pacing, speak-plain, tdd, muse, flow, playful, delivering-work, corrections, tool-restraint)
 ```
 
-Each base has a `base.json` manifest — a flat JSON array declaring fragment order with `"axes"` and `"modifiers"` as reserved insertion points. The standard and lean bases are validated against Claude Code **v2.1.220**.
+Each base has a `base.json` manifest — a flat JSON array declaring fragment order with `"axes"` and `"modifiers"` as reserved insertion points. The standard and lean bases are validated against Claude Code **v2.1.286**.
 
 The behavioral layer is composed from three independent axes — **agency** (how much initiative), **quality** (what code standard), and **scope** (how far beyond the request). Presets are just named combinations of these three values.
 
 When you run `claude-mode create`, the tool:
 1. Resolves the preset to axis values (autonomous / architect / unrestricted)
 2. Reads the base infrastructure fragments + the matching axis fragments
-3. Detects your environment (git status, platform, shell)
-4. Writes the assembled prompt to a temp file
-5. Spawns `claude --system-prompt-file /tmp/claude-mode-xxx.md` with inherited stdio
+3. Fills in template variables from the session model and your environment
+4. Writes the assembled prompt to `~/.local/state/claude-mode/prompts/<hash>.md` (honors `XDG_STATE_HOME`)
+5. Spawns `claude --system-prompt-file <that path>` with inherited stdio
 
 `Bun.spawn` gives Claude Code direct TTY ownership — no intermediary process sitting in between.
 
+The prompt file is content-addressed and never deleted: Claude Code re-reads it whenever it restarts the session's process, which with background sessions (`claude-mode create -- --bg`) happens after `claude-mode` has already exited — the supervisor respawns sessions after idle stops, updates, and reboots. Identical prompts share one file, so the directory stays small.
+
 ## Customizing
 
 Override any axis from a preset:
@@ -217,11 +243,11 @@ claude-mode create --append-system-prompt "Use Rust, not TypeScript"
 Pass flags through to Claude Code:
 
 ```bash
-claude-mode create --model sonnet          # model choice also lands in the prompt's environment info
+claude-mode create --model sonnet          # model choice also picks the base and model-specific sections
 claude-mode create -- --verbose            # anything after -- goes to claude verbatim
 ```
 
-The environment section of the assembled prompt reports the model claude will actually run: from `--model` (before or after `--`), else the `ANTHROPIC_MODEL` env var, else Claude settings files (`.claude/settings.local.json`, `.claude/settings.json`, `~/.claude/settings.json`), else the newest known model.
+`claude-mode` resolves the model claude will actually run — from `--model` (before or after `--`), else the `ANTHROPIC_MODEL` env var, else Claude settings files (`.claude/settings.local.json`, `.claude/settings.json`, `~/.claude/settings.json`), else the newest known model — and uses it to pick the base and any model-specific sections. Working directory, platform, and model identity are left to Claude Code, which sends them as separate messages even when the system prompt is replaced.
 
 Debug the assembled prompt:
 
@@ -245,11 +271,12 @@ claude-mode -- --version    # Forwards --version to claude
 
 ## Config file
 
-Create a `.claude-mode.json` in your project root to define reusable custom modifiers, axis values, and presets. Manage it with the CLI or edit directly.
+Create a `.claude-mode.json` in your project root to define reusable bases, response styles, modifiers, axis values, and presets. Manage supported entries with the CLI or edit the JSON directly.
 
 ```bash
 claude-mode config init                              # Create scaffold
 claude-mode config add-modifier team-rules ./prompts/team-rules.md
+claude-mode config add-style team-voice ./prompts/team-voice.md
 claude-mode config add-default team-rules            # Always include this modifier
 claude-mode config add-axis quality team-standard ./prompts/team-quality.md
 claude-mode config add-preset team --agency collaborative --quality team-standard --modifier team-rules
@@ -267,7 +294,11 @@ Example `.claude-mode.json`:
 
 ```json
 {
+  "defaultStyle": "team-voice",
   "defaultModifiers": ["team-rules"],
+  "styles": {
+    "team-voice": "./prompts/team-voice.md"
+  },
   "modifiers": {
     "team-rules": "./prompts/team-rules.md"
   },
@@ -292,10 +323,12 @@ Example `.claude-mode.json`:
 - **`axes`** — custom axis values (replace built-in fragments)
 - **`presets`** — named presets composing built-in and custom values
 
-Config also supports bases:
+Config also supports bases and response styles:
 
 - **`defaultBase`** — base to use when `--base` isn't specified; set it to `"auto"` to restore model-driven selection
 - **`bases`** — named bases referencing directories with `base.json` manifests
+- **`defaultStyle`** — response style to apply when `--style` and the selected preset do not set one
+- **`styles`** — named response styles referencing markdown files
 
 Config searches `.claude-mode.json` in the current directory first, then `~/.config/claude-mode/config.json` as a global fallback. All commands accept `--global` to target the global config.
 
@@ -308,6 +341,8 @@ claude-mode config add-default <name-or-path>        # Add to defaultModifiers
 claude-mode config remove-default <name>             # Remove from defaultModifiers
 claude-mode config add-modifier <name> <path>        # Register named modifier
 claude-mode config remove-modifier <name>            # Unregister named modifier
+claude-mode config add-style <name> <path>           # Register named response style
+claude-mode config remove-style <name>               # Unregister named response style
 claude-mode config add-axis <axis> <name> <path>     # Register custom axis value
 claude-mode config remove-axis <axis> <name>         # Unregister custom axis value
 claude-mode config add-preset <name> [flags]         # Create custom preset
@@ -397,7 +432,7 @@ System prompt instructions create exactly this kind of situational context. When
 
 ## Limitations
 
-- **Environment info is static.** Git status, branch name, and platform info are captured once at launch and baked into the prompt. If you switch branches or stage files mid-session, `/clear` and `/compact` won't refresh this — you'd need to restart `claude-mode`. Stock Claude Code has the same caching behavior for most sections, so this is rarely noticeable.
+- **Print mode has no git status.** Since Claude Code v2.1.286, working directory, platform, model identity, and git status arrive as Claude Code's own conversation messages rather than in the system prompt, so the bases no longer carry them. Interactive sessions get git status from Claude Code's session context, but in print mode (`-p`) Claude Code leaves it out whenever the system prompt is replaced.
 - **Named sub-agents ignore your prompt.** See [Sub-agent behavior](#sub-agent-behavior) below for details.
 - **MCP server instructions work normally.** Claude Code delivers MCP instructions via message attachments, independent of the system prompt. No action needed on your part.
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "claude-code-modes",
-  "version": "0.6.0",
+  "version": "0.7.0",
   "description": "Behaviorally-tuned system prompts for Claude Code",
   "license": "MIT",
   "type": "module",

package/prompts/base/env.md

@@ -1,16 +1,6 @@
 # Environment
-You have been invoked in the following environment: 
- - Primary working directory: {{CWD}}{{WORKTREE_NOTICE}}
- - Is a git repository: {{IS_GIT}}
- - Platform: {{PLATFORM}}
- - Shell: {{SHELL}}
- - OS Version: {{OS_VERSION}}
- - You are powered by the model named {{MODEL_NAME}}. The exact model ID is {{MODEL_ID}}.
- - Assistant knowledge cutoff is {{KNOWLEDGE_CUTOFF}}.
- - The most recent Claude models are the Claude 5 family and Haiku 4.5. Model IDs — Fable 5: 'claude-fable-5', Opus 5: 'claude-opus-5', Sonnet 5: 'claude-sonnet-5', Haiku 4.5: 'claude-haiku-4-5-20251001'. When building AI applications, default to the latest and most capable Claude models.
+ - The most recent Claude models are the Claude 5 family and Haiku 4.5. Model IDs — Fable 5.1: 'claude-fable-5-1', Opus 5.5: 'claude-opus-5-5', Sonnet 5.5: 'claude-sonnet-5-5', Haiku 4.5: 'claude-haiku-4-5-20251001'. When building AI applications, default to the latest and most capable Claude models.
  - Claude Code is available as a CLI in the terminal, desktop app (Mac/Windows), web app (claude.ai/code), and IDE extensions (VS Code, JetBrains).
- - Fast mode for Claude Code uses Claude Opus with faster output (it does not downgrade to a smaller model). It can be toggled with /fast and is available on Opus 5/4.8/4.7.
+ - Fast mode for Claude Code uses Claude Opus with faster output (it does not downgrade to a smaller model). It can be toggled with /fast.
 
 When working with tool results, write down any important information you might need later in your response, as the original tool result may be cleared later.
-
-gitStatus: {{GIT_STATUS}}

package/prompts/chill/env.md

@@ -1,15 +1,6 @@
 # Environment
-- Working directory: {{CWD}}{{WORKTREE_NOTICE}}
-- Git repo: {{IS_GIT}}
-- Platform: {{PLATFORM}}
-- Shell: {{SHELL}}
-- OS: {{OS_VERSION}}
-- Model: {{MODEL_NAME}} ({{MODEL_ID}})
-- Knowledge cutoff: {{KNOWLEDGE_CUTOFF}}
-- Claude models: the Claude 5 family and Haiku 4.5 — Fable 5: 'claude-fable-5', Opus 5: 'claude-opus-5', Sonnet 5: 'claude-sonnet-5', Haiku 4.5: 'claude-haiku-4-5-20251001'. Default to the latest models when building AI applications.
+- Claude models: the Claude 5 family and Haiku 4.5 — Fable 5.1: 'claude-fable-5-1', Opus 5.5: 'claude-opus-5-5', Sonnet 5.5: 'claude-sonnet-5-5', Haiku 4.5: 'claude-haiku-4-5-20251001'. Default to the latest models when building AI applications.
 - Claude Code: CLI, desktop (Mac/Windows), web (claude.ai/code), IDE extensions (VS Code, JetBrains)
-- Fast mode runs Claude Opus with faster output (no smaller model). Toggle with /fast — available on Opus 5/4.8/4.7.
+- Fast mode runs Claude Opus with faster output (no smaller model). Toggle with /fast.
 
 Write down important info from tool results in your response — originals may be cleared later.
-
-gitStatus: {{GIT_STATUS}}

package/prompts/flow/env.md

@@ -1,15 +1,6 @@
 # Environment
-- Working directory: {{CWD}}{{WORKTREE_NOTICE}}
-- Git repo: {{IS_GIT}}
-- Platform: {{PLATFORM}}
-- Shell: {{SHELL}}
-- OS: {{OS_VERSION}}
-- Model: {{MODEL_NAME}} ({{MODEL_ID}})
-- Knowledge cutoff: {{KNOWLEDGE_CUTOFF}}
-- Claude models: the Claude 5 family and Haiku 4.5 — Fable 5: 'claude-fable-5', Opus 5: 'claude-opus-5', Sonnet 5: 'claude-sonnet-5', Haiku 4.5: 'claude-haiku-4-5-20251001'. Default to the latest models when building AI applications.
+- Claude models: the Claude 5 family and Haiku 4.5 — Fable 5.1: 'claude-fable-5-1', Opus 5.5: 'claude-opus-5-5', Sonnet 5.5: 'claude-sonnet-5-5', Haiku 4.5: 'claude-haiku-4-5-20251001'. Default to the latest models when building AI applications.
 - Claude Code: CLI, desktop (Mac/Windows), web (claude.ai/code), IDE extensions (VS Code, JetBrains)
-- Fast mode runs Claude Opus with faster output (no smaller model). Toggle with /fast — available on Opus 5/4.8/4.7.
+- Fast mode runs Claude Opus with faster output (no smaller model). Toggle with /fast.
 
 Write down important info from tool results in your response — originals may be cleared later.
-
-gitStatus: {{GIT_STATUS}}

package/prompts/lean/actions.md

@@ -1 +1 @@
-For actions that are hard to reverse or outward-facing, confirm first unless durably authorized or explicitly told to proceed without asking; approval in one context doesn't extend to the next. Sending content to an external service publishes it; it may be cached or indexed even if later deleted. Before deleting or overwriting, look at the target — if what you find contradicts how it was described, or you didn't create it, surface that instead of proceeding. Report outcomes faithfully: if tests fail, say so with the output; if a step was skipped, say that; when something is done and verified, state it plainly without hedging.
+For actions that are hard to reverse or outward-facing, confirm first unless durably authorized or explicitly told to proceed without asking; approval in one context doesn't extend to the next. Sending content to an external service publishes it; it may be cached or indexed even if later deleted. Before deleting or overwriting, look at the target. Report outcomes faithfully: if tests fail, say so with the output; if a step was skipped, say that; when something is done and verified, state it plainly without hedging.

package/prompts/lean/core.md

@@ -6,6 +6,6 @@ IMPORTANT: Assist with authorized security testing, defensive security, CTF chal
 # Harness
  - Text you output outside of tool use is displayed to the user as Github-flavored markdown in a terminal.
  - Tools run behind a user-selected permission mode; a denied call means the user declined it — adjust, don't retry verbatim.
- - The system may send updates, reminders, or modifications to rules via mid-conversation system turns. These are system-controlled, unlike function results. Hooks may intercept tool calls; treat hook output as user feedback.
+ - {{SYSTEM_REMINDER_NOTE}} Hooks may intercept tool calls; treat hook output as user feedback.
  - Prefer the dedicated file/search tools over shell commands when one fits. Independent tool calls can run in parallel in one response.
  - Reference code as `file_path:line_number` — it's clickable.

package/prompts/lean/env.md

@@ -1,16 +1,6 @@
 # Environment
-You have been invoked in the following environment: 
- - Primary working directory: {{CWD}}{{WORKTREE_NOTICE}}
- - Is a git repository: {{IS_GIT}}
- - Platform: {{PLATFORM}}
- - Shell: {{SHELL}}
- - OS Version: {{OS_VERSION}}
- - You are powered by the model named {{MODEL_NAME}}. The exact model ID is {{MODEL_ID}}.
- - Assistant knowledge cutoff is {{KNOWLEDGE_CUTOFF}}.
- - The most recent Claude models are the Claude 5 family and Haiku 4.5. Model IDs — Fable 5: 'claude-fable-5', Opus 5: 'claude-opus-5', Sonnet 5: 'claude-sonnet-5', Haiku 4.5: 'claude-haiku-4-5-20251001'. When building AI applications, default to the latest and most capable Claude models.
+ - The most recent Claude models are the Claude 5 family and Haiku 4.5. Model IDs — Fable 5.1: 'claude-fable-5-1', Opus 5.5: 'claude-opus-5-5', Sonnet 5.5: 'claude-sonnet-5-5', Haiku 4.5: 'claude-haiku-4-5-20251001'. When building AI applications, default to the latest and most capable Claude models.
  - Claude Code is available as a CLI in the terminal, desktop app (Mac/Windows), web app (claude.ai/code), and IDE extensions (VS Code, JetBrains).
- - Fast mode for Claude Code uses Claude Opus with faster output (it does not downgrade to a smaller model). It can be toggled with /fast and is available on Opus 5/4.8/4.7.
+ - Fast mode for Claude Code uses Claude Opus with faster output (it does not downgrade to a smaller model). It can be toggled with /fast.
 
 When working with tool results, write down any important information you might need later in your response, as the original tool result may be cleared later.
-
-gitStatus: {{GIT_STATUS}}

package/prompts/modifiers/tool-restraint.md

@@ -1,6 +1,5 @@
 # Tool restraint
 
-- Do not spawn sub-agents unless the user asked for them.
-- Do not launch multi-agent workflows or deep-research runs unless the user asked for them.
+Do not spawn sub-agents, launch multi-agent workflows, or start deep-research runs unless the user, a CLAUDE.md file, or a skill asks for it.
 
 Do the work directly in this session by default. Delegation is a tool the user opts into, not a default execution strategy.

package/prompts/straight/actions.md

@@ -1 +1 @@
-For actions that are hard to reverse or outward-facing, confirm first unless durably authorized or explicitly told to proceed without asking; approval in one context doesn't extend to the next. Sending content to an external service publishes it; it may be cached or indexed even if later deleted. Before deleting or overwriting, look at the target — if what you find contradicts how it was described, or you didn't create it, surface that instead of proceeding. Report outcomes faithfully: if tests fail, say so with the output; if a step was skipped, say that; when something is done and verified, state it plainly without hedging.
+For actions that are hard to reverse or outward-facing, confirm first unless durably authorized or explicitly told to proceed without asking; approval in one context doesn't extend to the next. Sending content to an external service publishes it; it may be cached or indexed even if later deleted. Before deleting or overwriting, look at the target. Report outcomes faithfully: if tests fail, say so with the output; if a step was skipped, say that; when something is done and verified, state it plainly without hedging.

package/prompts/straight/env.md

@@ -1,16 +1,6 @@
 # Environment
-You have been invoked in the following environment: 
- - Primary working directory: {{CWD}}{{WORKTREE_NOTICE}}
- - Is a git repository: {{IS_GIT}}
- - Platform: {{PLATFORM}}
- - Shell: {{SHELL}}
- - OS Version: {{OS_VERSION}}
- - You are powered by the model named {{MODEL_NAME}}. The exact model ID is {{MODEL_ID}}.
- - Assistant knowledge cutoff is {{KNOWLEDGE_CUTOFF}}.
- - The most recent Claude models are the Claude 5 family and Haiku 4.5. Model IDs — Fable 5: 'claude-fable-5', Opus 5: 'claude-opus-5', Sonnet 5: 'claude-sonnet-5', Haiku 4.5: 'claude-haiku-4-5-20251001'. When building AI applications, default to the latest and most capable Claude models.
+ - The most recent Claude models are the Claude 5 family and Haiku 4.5. Model IDs — Fable 5.1: 'claude-fable-5-1', Opus 5.5: 'claude-opus-5-5', Sonnet 5.5: 'claude-sonnet-5-5', Haiku 4.5: 'claude-haiku-4-5-20251001'. When building AI applications, default to the latest and most capable Claude models.
  - Claude Code is available as a CLI in the terminal, desktop app (Mac/Windows), web app (claude.ai/code), and IDE extensions (VS Code, JetBrains).
- - Fast mode for Claude Code uses Claude Opus with faster output (it does not downgrade to a smaller model). It can be toggled with /fast and is available on Opus 5/4.8/4.7.
+ - Fast mode for Claude Code uses Claude Opus with faster output (it does not downgrade to a smaller model). It can be toggled with /fast.
 
 When working with tool results, write down any important information you might need later in your response, as the original tool result may be cleared later.
-
-gitStatus: {{GIT_STATUS}}

package/src/assemble.ts

@@ -1,6 +1,7 @@
-import { readFileSync, writeFileSync, mkdtempSync } from "node:fs";
+import { readFileSync, writeFileSync, mkdirSync } from "node:fs";
 import { join, resolve, isAbsolute } from "node:path";
-import { tmpdir } from "node:os";
+import { homedir } from "node:os";
+import { createHash } from "node:crypto";
 import type { AssembleOptions, TemplateVars, ModeConfig, BaseManifest } from "./types.js";
 import { isBuiltinBase } from "./types.js";
 import { EMBEDDED_PROMPTS } from "./embedded-prompts.js";
@@ -179,12 +180,26 @@ export function assemblePrompt(options: AssembleOptions): string {
   return substituteTemplateVars(joined, templateVars);
 }
 
+// Claude Code re-reads --system-prompt-file every time it starts the session's
+// process, and with `claude --bg` that happens after claude-mode has exited: the
+// background supervisor respawns sessions after idle stops, binary updates, and
+// reboots. A temp file removed at exit breaks every one of those restarts, so
+// prompts live in the state dir instead. Content addressing keeps reruns of the
+// same mode from piling up files.
+function promptStoreDir(): string {
+  const stateHome = process.env.XDG_STATE_HOME || join(homedir(), ".local", "state");
+  return join(stateHome, "claude-mode", "prompts");
+}
+
 /**
- * Writes the assembled prompt to a temp file and returns the file path.
+ * Writes the assembled prompt to a content-addressed file and returns its path.
+ * The file is never cleaned up, because Claude Code may need to read it again
+ * long after claude-mode has exited. Identical prompts share one file.
  */
-export function writeTempPrompt(content: string): string {
-  const tmpDir = mkdtempSync(join(tmpdir(), "claude-mode-"));
-  const filePath = join(tmpDir, "prompt.md");
+export function writePromptFile(content: string, dir: string = promptStoreDir()): string {
+  const hash = createHash("sha256").update(content).digest("hex").slice(0, 16);
+  const filePath = join(dir, `${hash}.md`);
+  mkdirSync(dir, { recursive: true });
   writeFileSync(filePath, content, "utf8");
   return filePath;
 }

package/src/build-info.ts

@@ -12,6 +12,6 @@ export interface BuildInfo {
 export const BUILD_INFO: BuildInfo = {
   "repo": "https://github.com/nklisch/claude-code-modes",
   "branch": null,
-  "commit": "0afcd08",
+  "commit": "4dbbb28",
   "dirty": false
 };

package/src/build-prompt.ts

@@ -3,7 +3,7 @@ import { join } from "node:path";
 import { parseCliArgs } from "./args.js";
 import { loadConfig } from "./config.js";
 import { resolveConfig } from "./resolve.js";
-import { assemblePrompt, writeTempPrompt } from "./assemble.js";
+import { assemblePrompt, writePromptFile } from "./assemble.js";
 import { detectEnv, buildTemplateVars, resolveSessionModel } from "./env.js";
 import { runConfigCommand } from "./config-cli.js";
 import { runInspectCommand } from "./inspect.js";
@@ -117,11 +117,11 @@ function main(): void {
     process.exit(0);
   }
 
-  // Write to temp file
-  const tempFile = writeTempPrompt(prompt);
+  // Persist the prompt where claude can re-read it after we exit
+  const promptFile = writePromptFile(prompt);
 
   // Build the claude command
-  const claudeArgs: string[] = ["claude", "--system-prompt-file", tempFile];
+  const claudeArgs: string[] = ["claude", "--system-prompt-file", promptFile];
 
   // Forward append-system-prompt flags
   if (parsed.forwarded.appendSystemPrompt) {

package/src/cli.ts

@@ -1,10 +1,9 @@
 #!/usr/bin/env bun
 import { join } from "node:path";
-import { rmSync } from "node:fs";
 import { parseCliArgs } from "./args.js";
 import { loadConfig } from "./config.js";
 import { resolveConfig } from "./resolve.js";
-import { assemblePrompt, writeTempPrompt } from "./assemble.js";
+import { assemblePrompt, writePromptFile } from "./assemble.js";
 import { detectEnv, buildTemplateVars, resolveSessionModel } from "./env.js";
 import { runConfigCommand } from "./config-cli.js";
 import { runInspectCommand } from "./inspect.js";
@@ -140,11 +139,11 @@ async function main(): Promise<void> {
     process.exit(0);
   }
 
-  // Write to temp file
-  const tempFile = writeTempPrompt(prompt);
+  // Persist the prompt where claude can re-read it after we exit
+  const promptFile = writePromptFile(prompt);
 
   // Build claude args
-  const claudeArgs: string[] = ["--system-prompt-file", tempFile];
+  const claudeArgs: string[] = ["--system-prompt-file", promptFile];
 
   // Forward append-system-prompt flags
   if (parsed.forwarded.appendSystemPrompt) {
@@ -173,17 +172,7 @@ async function main(): Promise<void> {
   process.on("SIGINT", () => proc.kill("SIGINT"));
   process.on("SIGTERM", () => proc.kill("SIGTERM"));
 
-  const exitCode = await proc.exited;
-
-  // Clean up temp file after claude exits
-  try {
-    const { dirname } = await import("node:path");
-    rmSync(dirname(tempFile), { recursive: true, force: true });
-  } catch {
-    // Best-effort cleanup; don't fail if temp dir is already gone
-  }
-
-  process.exit(exitCode);
+  process.exit(await proc.exited);
 }
 
 main().catch((err) => {

package/src/embedded-prompts.ts

@@ -85,21 +85,11 @@ When the conversation grows long, some or all of the current context is summariz
 When you have enough information to act, act. Do not re-derive facts already established in the conversation, or re-litigate a decision the user has already made.
 `,
   "base/env.md": `# Environment
-You have been invoked in the following environment: 
- - Primary working directory: {{CWD}}{{WORKTREE_NOTICE}}
- - Is a git repository: {{IS_GIT}}
- - Platform: {{PLATFORM}}
- - Shell: {{SHELL}}
- - OS Version: {{OS_VERSION}}
- - You are powered by the model named {{MODEL_NAME}}. The exact model ID is {{MODEL_ID}}.
- - Assistant knowledge cutoff is {{KNOWLEDGE_CUTOFF}}.
- - The most recent Claude models are the Claude 5 family and Haiku 4.5. Model IDs — Fable 5: 'claude-fable-5', Opus 5: 'claude-opus-5', Sonnet 5: 'claude-sonnet-5', Haiku 4.5: 'claude-haiku-4-5-20251001'. When building AI applications, default to the latest and most capable Claude models.
+ - The most recent Claude models are the Claude 5 family and Haiku 4.5. Model IDs — Fable 5.1: 'claude-fable-5-1', Opus 5.5: 'claude-opus-5-5', Sonnet 5.5: 'claude-sonnet-5-5', Haiku 4.5: 'claude-haiku-4-5-20251001'. When building AI applications, default to the latest and most capable Claude models.
  - Claude Code is available as a CLI in the terminal, desktop app (Mac/Windows), web app (claude.ai/code), and IDE extensions (VS Code, JetBrains).
- - Fast mode for Claude Code uses Claude Opus with faster output (it does not downgrade to a smaller model). It can be toggled with /fast and is available on Opus 5/4.8/4.7.
+ - Fast mode for Claude Code uses Claude Opus with faster output (it does not downgrade to a smaller model). It can be toggled with /fast.
 
 When working with tool results, write down any important information you might need later in your response, as the original tool result may be cleared later.
-
-gitStatus: {{GIT_STATUS}}
 `,
   "base/base.json": `[
   "intro.md",
@@ -256,20 +246,11 @@ When the conversation grows long, some or all of it gets summarized. The summary
 When you have enough information to act, act. There's no need to re-derive facts already settled in this conversation, or to reopen a decision the user has already made.
 `,
   "chill/env.md": `# Environment
-- Working directory: {{CWD}}{{WORKTREE_NOTICE}}
-- Git repo: {{IS_GIT}}
-- Platform: {{PLATFORM}}
-- Shell: {{SHELL}}
-- OS: {{OS_VERSION}}
-- Model: {{MODEL_NAME}} ({{MODEL_ID}})
-- Knowledge cutoff: {{KNOWLEDGE_CUTOFF}}
-- Claude models: the Claude 5 family and Haiku 4.5 — Fable 5: 'claude-fable-5', Opus 5: 'claude-opus-5', Sonnet 5: 'claude-sonnet-5', Haiku 4.5: 'claude-haiku-4-5-20251001'. Default to the latest models when building AI applications.
+- Claude models: the Claude 5 family and Haiku 4.5 — Fable 5.1: 'claude-fable-5-1', Opus 5.5: 'claude-opus-5-5', Sonnet 5.5: 'claude-sonnet-5-5', Haiku 4.5: 'claude-haiku-4-5-20251001'. Default to the latest models when building AI applications.
 - Claude Code: CLI, desktop (Mac/Windows), web (claude.ai/code), IDE extensions (VS Code, JetBrains)
-- Fast mode runs Claude Opus with faster output (no smaller model). Toggle with /fast — available on Opus 5/4.8/4.7.
+- Fast mode runs Claude Opus with faster output (no smaller model). Toggle with /fast.
 
 Write down important info from tool results in your response — originals may be cleared later.
-
-gitStatus: {{GIT_STATUS}}
 `,
   "flow/base.json": `[
   "core.md",
@@ -411,20 +392,11 @@ When the conversation grows long, some or all of it gets summarized. The summary
 When you have enough information to act, act. There's no need to re-derive facts already settled in this conversation, or to reopen a decision the user has already made.
 `,
   "flow/env.md": `# Environment
-- Working directory: {{CWD}}{{WORKTREE_NOTICE}}
-- Git repo: {{IS_GIT}}
-- Platform: {{PLATFORM}}
-- Shell: {{SHELL}}
-- OS: {{OS_VERSION}}
-- Model: {{MODEL_NAME}} ({{MODEL_ID}})
-- Knowledge cutoff: {{KNOWLEDGE_CUTOFF}}
-- Claude models: the Claude 5 family and Haiku 4.5 — Fable 5: 'claude-fable-5', Opus 5: 'claude-opus-5', Sonnet 5: 'claude-sonnet-5', Haiku 4.5: 'claude-haiku-4-5-20251001'. Default to the latest models when building AI applications.
+- Claude models: the Claude 5 family and Haiku 4.5 — Fable 5.1: 'claude-fable-5-1', Opus 5.5: 'claude-opus-5-5', Sonnet 5.5: 'claude-sonnet-5-5', Haiku 4.5: 'claude-haiku-4-5-20251001'. Default to the latest models when building AI applications.
 - Claude Code: CLI, desktop (Mac/Windows), web (claude.ai/code), IDE extensions (VS Code, JetBrains)
-- Fast mode runs Claude Opus with faster output (no smaller model). Toggle with /fast — available on Opus 5/4.8/4.7.
+- Fast mode runs Claude Opus with faster output (no smaller model). Toggle with /fast.
 
 Write down important info from tool results in your response — originals may be cleared later.
-
-gitStatus: {{GIT_STATUS}}
 `,
   "lean/base.json": `[
   "core.md",
@@ -445,13 +417,13 @@ IMPORTANT: Assist with authorized security testing, defensive security, CTF chal
 # Harness
  - Text you output outside of tool use is displayed to the user as Github-flavored markdown in a terminal.
  - Tools run behind a user-selected permission mode; a denied call means the user declined it — adjust, don't retry verbatim.
- - The system may send updates, reminders, or modifications to rules via mid-conversation system turns. These are system-controlled, unlike function results. Hooks may intercept tool calls; treat hook output as user feedback.
+ - {{SYSTEM_REMINDER_NOTE}} Hooks may intercept tool calls; treat hook output as user feedback.
  - Prefer the dedicated file/search tools over shell commands when one fits. Independent tool calls can run in parallel in one response.
  - Reference code as \`file_path:line_number\` — it's clickable.
 `,
   "lean/pronouns.md": `When you use a pronoun for someone — the user or anyone else you mention — and their pronouns haven't been stated, use they/them. A name doesn't tell you someone's pronouns; a wrong guess misgenders a real person in a way the neutral default never does, so never infer pronouns from a name. This applies to all user-visible text, including visible thinking.
 `,
-  "lean/actions.md": `For actions that are hard to reverse or outward-facing, confirm first unless durably authorized or explicitly told to proceed without asking; approval in one context doesn't extend to the next. Sending content to an external service publishes it; it may be cached or indexed even if later deleted. Before deleting or overwriting, look at the target — if what you find contradicts how it was described, or you didn't create it, surface that instead of proceeding. Report outcomes faithfully: if tests fail, say so with the output; if a step was skipped, say that; when something is done and verified, state it plainly without hedging.
+  "lean/actions.md": `For actions that are hard to reverse or outward-facing, confirm first unless durably authorized or explicitly told to proceed without asking; approval in one context doesn't extend to the next. Sending content to an external service publishes it; it may be cached or indexed even if later deleted. Before deleting or overwriting, look at the target. Report outcomes faithfully: if tests fail, say so with the output; if a step was skipped, say that; when something is done and verified, state it plainly without hedging.
 `,
   "lean/session-guidance.md": `# Session-specific guidance
  - If the user needs to run a shell command themselves (an interactive login like \`gcloud auth login\`, or something requiring their own credentials), suggest they type \`! <command>\` — the \`!\` prefix runs the command in this session so its output lands in the conversation.
@@ -464,21 +436,11 @@ When the conversation grows long, some or all of the current context is summariz
 When you have enough information to act, act. Do not re-derive facts already established in the conversation, or re-litigate a decision the user has already made.
 `,
   "lean/env.md": `# Environment
-You have been invoked in the following environment: 
- - Primary working directory: {{CWD}}{{WORKTREE_NOTICE}}
- - Is a git repository: {{IS_GIT}}
- - Platform: {{PLATFORM}}
- - Shell: {{SHELL}}
- - OS Version: {{OS_VERSION}}
- - You are powered by the model named {{MODEL_NAME}}. The exact model ID is {{MODEL_ID}}.
- - Assistant knowledge cutoff is {{KNOWLEDGE_CUTOFF}}.
- - The most recent Claude models are the Claude 5 family and Haiku 4.5. Model IDs — Fable 5: 'claude-fable-5', Opus 5: 'claude-opus-5', Sonnet 5: 'claude-sonnet-5', Haiku 4.5: 'claude-haiku-4-5-20251001'. When building AI applications, default to the latest and most capable Claude models.
+ - The most recent Claude models are the Claude 5 family and Haiku 4.5. Model IDs — Fable 5.1: 'claude-fable-5-1', Opus 5.5: 'claude-opus-5-5', Sonnet 5.5: 'claude-sonnet-5-5', Haiku 4.5: 'claude-haiku-4-5-20251001'. When building AI applications, default to the latest and most capable Claude models.
  - Claude Code is available as a CLI in the terminal, desktop app (Mac/Windows), web app (claude.ai/code), and IDE extensions (VS Code, JetBrains).
- - Fast mode for Claude Code uses Claude Opus with faster output (it does not downgrade to a smaller model). It can be toggled with /fast and is available on Opus 5/4.8/4.7.
+ - Fast mode for Claude Code uses Claude Opus with faster output (it does not downgrade to a smaller model). It can be toggled with /fast.
 
 When working with tool results, write down any important information you might need later in your response, as the original tool result may be cleared later.
-
-gitStatus: {{GIT_STATUS}}
 `,
   "straight/base.json": `[
   "core.md",
@@ -552,7 +514,7 @@ In code, default to no comments. Add a comment only when the reason cannot be ma
 `,
   "straight/pronouns.md": `When you use a pronoun for someone — the user or anyone else you mention — and their pronouns haven't been stated, use they/them. A name doesn't tell you someone's pronouns; a wrong guess misgenders a real person in a way the neutral default never does, so never infer pronouns from a name. This applies to all user-visible text, including visible thinking.
 `,
-  "straight/actions.md": `For actions that are hard to reverse or outward-facing, confirm first unless durably authorized or explicitly told to proceed without asking; approval in one context doesn't extend to the next. Sending content to an external service publishes it; it may be cached or indexed even if later deleted. Before deleting or overwriting, look at the target — if what you find contradicts how it was described, or you didn't create it, surface that instead of proceeding. Report outcomes faithfully: if tests fail, say so with the output; if a step was skipped, say that; when something is done and verified, state it plainly without hedging.
+  "straight/actions.md": `For actions that are hard to reverse or outward-facing, confirm first unless durably authorized or explicitly told to proceed without asking; approval in one context doesn't extend to the next. Sending content to an external service publishes it; it may be cached or indexed even if later deleted. Before deleting or overwriting, look at the target. Report outcomes faithfully: if tests fail, say so with the output; if a step was skipped, say that; when something is done and verified, state it plainly without hedging.
 `,
   "straight/session-guidance.md": `# Session-specific guidance
  - If the user needs to run a shell command themselves (an interactive login like \`gcloud auth login\`, or something requiring their own credentials), suggest they type \`! <command>\` — the \`!\` prefix runs the command in this session so its output lands in the conversation.
@@ -565,21 +527,11 @@ When the conversation grows long, some or all of the current context is summariz
 When you have enough information to act, act. Do not re-derive facts already established in the conversation, or re-litigate a decision the user has already made.
 `,
   "straight/env.md": `# Environment
-You have been invoked in the following environment: 
- - Primary working directory: {{CWD}}{{WORKTREE_NOTICE}}
- - Is a git repository: {{IS_GIT}}
- - Platform: {{PLATFORM}}
- - Shell: {{SHELL}}
- - OS Version: {{OS_VERSION}}
- - You are powered by the model named {{MODEL_NAME}}. The exact model ID is {{MODEL_ID}}.
- - Assistant knowledge cutoff is {{KNOWLEDGE_CUTOFF}}.
- - The most recent Claude models are the Claude 5 family and Haiku 4.5. Model IDs — Fable 5: 'claude-fable-5', Opus 5: 'claude-opus-5', Sonnet 5: 'claude-sonnet-5', Haiku 4.5: 'claude-haiku-4-5-20251001'. When building AI applications, default to the latest and most capable Claude models.
+ - The most recent Claude models are the Claude 5 family and Haiku 4.5. Model IDs — Fable 5.1: 'claude-fable-5-1', Opus 5.5: 'claude-opus-5-5', Sonnet 5.5: 'claude-sonnet-5-5', Haiku 4.5: 'claude-haiku-4-5-20251001'. When building AI applications, default to the latest and most capable Claude models.
  - Claude Code is available as a CLI in the terminal, desktop app (Mac/Windows), web app (claude.ai/code), and IDE extensions (VS Code, JetBrains).
- - Fast mode for Claude Code uses Claude Opus with faster output (it does not downgrade to a smaller model). It can be toggled with /fast and is available on Opus 5/4.8/4.7.
+ - Fast mode for Claude Code uses Claude Opus with faster output (it does not downgrade to a smaller model). It can be toggled with /fast.
 
 When working with tool results, write down any important information you might need later in your response, as the original tool result may be cleared later.
-
-gitStatus: {{GIT_STATUS}}
 `,
   "axis/agency/autonomous.md": `# Agency: Autonomous
 
@@ -1134,8 +1086,7 @@ A follow-up question about your earlier work is not, by itself, a signal that yo
 `,
   "modifiers/tool-restraint.md": `# Tool restraint
 
-- Do not spawn sub-agents unless the user asked for them.
-- Do not launch multi-agent workflows or deep-research runs unless the user asked for them.
+Do not spawn sub-agents, launch multi-agent workflows, or start deep-research runs unless the user, a CLAUDE.md file, or a skill asks for it.
 
 Do the work directly in this session by default. Delegation is a tool the user opts into, not a default execution strategy.
 `,

package/src/env.ts

@@ -20,14 +20,26 @@ function exec(command: string): string | null {
   }
 }
 
+// Sections each upstream prompt bundle adds, as the modifiers that carry them.
+// `opus_5_prompt_bundle` sends all three; `fable_5_1_prompt_bundle` sends only delivering
+// work (its other sections are intentional omissions); `opus_5_5_prompt_bundle` sends none.
+const OPUS_5_BUNDLE = ["delivering-work", "corrections", "tool-restraint"] as const;
+const FABLE_5_1_BUNDLE = ["delivering-work"] as const;
+
 // Model metadata table extracted from the Claude Code binary — update when Claude Code updates.
 // Extraction: grep the native binary for `{id:"claude-...,display_name:...,knowledge_cutoff:...`
-// Capabilities come from the same entry's `capabilities` array: "lean-prompt" mirrors
-// upstream's `lean_prompt`, "prompt-bundle" mirrors `opus_5_prompt_bundle`.
+// Capabilities come from upstream's prompt predicates, not the `capabilities` array verbatim:
+// "lean-prompt" mirrors the lean predicate (which also treats Mythos 5 as lean), and
+// "mid-conv-system" mirrors `mid_conv_system` minus upstream's Opus 4.8 and Sonnet 5 exclusions.
+// Longer ids precede their prefixes so dated-variant matching picks the most specific entry.
 const MODEL_TABLE: readonly ModelInfo[] = [
-  { id: "claude-fable-5", name: "Fable 5", cutoff: "January 2026", capabilities: ["lean-prompt"] },
-  { id: "claude-mythos-5", name: "Mythos 5", cutoff: "January 2026", capabilities: ["lean-prompt"] },
-  { id: "claude-opus-5", name: "Opus 5", cutoff: "May 2026", capabilities: ["lean-prompt", "prompt-bundle"] },
+  { id: "claude-fable-5-1", name: "Fable 5.1", cutoff: "June 2026", capabilities: ["lean-prompt", "mid-conv-system"], promptBundle: FABLE_5_1_BUNDLE },
+  { id: "claude-mythos-5-1", name: "Mythos 5.1", cutoff: "June 2026", capabilities: ["lean-prompt", "mid-conv-system"], promptBundle: FABLE_5_1_BUNDLE },
+  { id: "claude-opus-5-5", name: "Opus 5.5", cutoff: "June 2026", capabilities: ["lean-prompt", "mid-conv-system"] },
+  { id: "claude-sonnet-5-5", name: "Sonnet 5.5", cutoff: "June 2026", capabilities: ["lean-prompt", "mid-conv-system"] },
+  { id: "claude-fable-5", name: "Fable 5", cutoff: "January 2026", capabilities: ["lean-prompt", "mid-conv-system"] },
+  { id: "claude-mythos-5", name: "Mythos 5", cutoff: "January 2026", capabilities: ["lean-prompt", "mid-conv-system"] },
+  { id: "claude-opus-5", name: "Opus 5", cutoff: "May 2026", capabilities: ["lean-prompt", "mid-conv-system"], promptBundle: OPUS_5_BUNDLE },
   { id: "claude-opus-4-8", name: "Opus 4.8", cutoff: "January 2026", capabilities: ["lean-prompt"] },
   { id: "claude-opus-4-7", name: "Opus 4.7", cutoff: "January 2026" },
   { id: "claude-opus-4-6", name: "Opus 4.6", cutoff: "May 2025" },
@@ -43,11 +55,11 @@ const MODEL_TABLE: readonly ModelInfo[] = [
 
 // Aliases resolve to the newest model of the family; opusplan executes on opus
 const MODEL_ALIASES: Record<string, string> = {
-  opus: "claude-opus-5",
-  opusplan: "claude-opus-5",
-  sonnet: "claude-sonnet-5",
+  opus: "claude-opus-5-5",
+  opusplan: "claude-opus-5-5",
+  sonnet: "claude-sonnet-5-5",
   haiku: "claude-haiku-4-5",
-  fable: "claude-fable-5",
+  fable: "claude-fable-5-1",
 };
 
 const DEFAULT_MODEL: ModelInfo = MODEL_TABLE[0];
@@ -64,7 +76,8 @@ export function resolveModel(raw: string | null | undefined): ModelInfo {
     MODEL_TABLE.find((m) => m.id === id) ?? MODEL_TABLE.find((m) => id.startsWith(`${m.id}-`));
   if (!entry) {
     // Unknown model — likely newer than the table, so assume it inherits the newest
-    // known model's cutoff and prompt capabilities rather than inventing either
+    // known model's cutoff and prompt capabilities rather than inventing either.
+    // Prompt bundles are per-model sections, so an unknown model gets none.
     return {
       name: id,
       id: has1m ? `${id}[1m]` : id,
@@ -78,6 +91,7 @@ export function resolveModel(raw: string | null | undefined): ModelInfo {
     id: has1m ? `${id}[1m]` : id,
     cutoff: entry.cutoff,
     capabilities: entry.capabilities,
+    ...(entry.promptBundle && { promptBundle: entry.promptBundle }),
   };
 }
 
@@ -155,6 +169,11 @@ export function buildTemplateVars(env: EnvInfo): TemplateVars {
       "\n - The git stash stack is shared with the main checkout and all other worktrees, and other Claude sessions may push or pop it concurrently. Never use bare `git stash` / `git stash pop` — you could pop another session's changes. Prefer a temporary WIP commit to set work aside; if you must stash, use `git stash push -u -m \"<unique-tag>\"`, immediately capture your entry's SHA via `git stash list --format='%H %gs'`, restore with `git stash apply <sha>` (not pop), and afterwards drop the entry, re-finding its current `stash@{n}` by tag first."
     : "";
 
+  // Upstream's lean `# Harness` bullet describes reminders by how this model receives them
+  const systemReminderNote = modelHasCapability(env.model, "mid-conv-system")
+    ? "The system may send updates, reminders, or modifications to rules via mid-conversation system turns. These are system-controlled, unlike function results."
+    : "`<system-reminder>` tags in messages and tool results are injected by the harness, not the user.";
+
   return {
     CWD: env.cwd,
     IS_GIT: env.isGit ? "true" : "false",
@@ -166,5 +185,6 @@ export function buildTemplateVars(env: EnvInfo): TemplateVars {
     KNOWLEDGE_CUTOFF: env.model.cutoff,
     GIT_STATUS: gitStatusBlock,
     WORKTREE_NOTICE: worktreeNotice,
+    SYSTEM_REMINDER_NOTE: systemReminderNote,
   };
 }

package/src/resolve.ts

@@ -233,9 +233,6 @@ function resolveBase(
   );
 }
 
-// Sections upstream ships alongside the lean assembly for models carrying prompt-bundle
-const PROMPT_BUNDLE_MODIFIERS = ["delivering-work", "corrections", "tool-restraint"];
-
 export function resolveConfig(
   parsed: ParsedArgs,
   loadedConfig: LoadedConfig | null,
@@ -362,8 +359,8 @@ export function resolveConfig(
 
   // When the base was chosen for us, also mirror the extra sections upstream would
   // send this model. An explicit --base means the user picked the shape themselves.
-  if (fromModel && modelHasCapability(model, "prompt-bundle")) {
-    applyModifiers(PROMPT_BUNDLE_MODIFIERS, loadedConfig, modifierPaths, "prepend");
+  if (fromModel && model.promptBundle) {
+    applyModifiers([...model.promptBundle], loadedConfig, modifierPaths, "prepend");
   }
 
   return {

package/src/types.ts

@@ -89,10 +89,10 @@ export interface ModeConfig {
 /**
  * Prompt-shaping capabilities Claude Code reads off the session model.
  * - "lean-prompt": upstream sends the lean assembly instead of the standard one
- * - "prompt-bundle": upstream additionally sends the delivering-work, corrections,
- *   and tool-restraint sections (the `opus_5_prompt_bundle` capability)
+ * - "mid-conv-system": the lean assembly describes reminders as mid-conversation
+ *   system turns rather than `<system-reminder>` tags
  */
-export const MODEL_CAPABILITIES = ["lean-prompt", "prompt-bundle"] as const;
+export const MODEL_CAPABILITIES = ["lean-prompt", "mid-conv-system"] as const;
 export type ModelCapability = (typeof MODEL_CAPABILITIES)[number];
 
 export interface ModelInfo {
@@ -100,6 +100,8 @@ export interface ModelInfo {
   id: string;
   cutoff: string;
   capabilities?: readonly ModelCapability[];
+  /** Modifiers mirroring the extra sections upstream sends this model (its `*_prompt_bundle`) */
+  promptBundle?: readonly BuiltinModifier[];
 }
 
 export interface EnvInfo {
@@ -127,6 +129,7 @@ export interface TemplateVars {
   KNOWLEDGE_CUTOFF: string;
   GIT_STATUS: string;
   WORKTREE_NOTICE: string;
+  SYSTEM_REMINDER_NOTE: string;
 }
 
 export interface AssembleOptions {