fix(toolkit): merge-rule guard hook and no dated model pins (gh-#751, gh-#749)

.claude/README.md

@@ -51,16 +51,16 @@ documents and is **re-entrant** (re-run to refine, not restart).
 
 ### Phase commands
 
-| Command | Model | Question it answers | Owns |
-|---|---|---|---|
-| `/init` | sonnet | What files do we need? | `CLAUDE.md`, `docs/` skeleton, `README.md` stub, `.gitignore` |
-| `/explore` | opus | What problem, for whom, why? | `docs/PROJECT.md` |
-| `/design` | opus | How do we build it? | `docs/ARCHITECTURE.md`, `docs/SPEC.md` |
-| `/plan` | opus | In what order, as what tasks? | `docs/STORIES.md`, `docs/PLAN.md` |
-| `/spec` | sonnet | Pending BDD specs from stories | spec files (via `bdd-specs` skill) |
-| `/build-loop` | sonnet | Build it. | the code + git history |
-| `/document` | sonnet | Do the docs still match reality? | `README.md`, `docs/ARCHITECTURE.md` prose, `docs/MEMORY.md` |
-| `/quick-fix` | sonnet | Trivial fix on the current branch — no plan, no stories. | the code |
+| Command | Question it answers | Owns |
+|---|---|---|
+| `/init` | What files do we need? | `CLAUDE.md`, `docs/` skeleton, `README.md` stub, `.gitignore` |
+| `/explore` | What problem, for whom, why? | `docs/PROJECT.md` |
+| `/design` | How do we build it? | `docs/ARCHITECTURE.md`, `docs/SPEC.md` |
+| `/plan` | In what order, as what tasks? | `docs/STORIES.md`, `docs/PLAN.md` |
+| `/spec` | Pending BDD specs from stories | spec files (via `bdd-specs` skill) |
+| `/build-loop` | Build it. | the code + git history |
+| `/document` | Do the docs still match reality? | `README.md`, `docs/ARCHITECTURE.md` prose, `docs/MEMORY.md` |
+| `/quick-fix` | Trivial fix on the current branch — no plan, no stories. | the code |
 
 `docs/MEMORY.md` is the project's decision log — every phase *appends* dated
 entries; `/document` curates it. It is distinct from the `~/.claude` memory
@@ -76,10 +76,10 @@ Small commands that defer to the `git-workflow` skill — direct, detailed, no
 ceremony. Plain git only: PRs and issues are opened in the Gitea web UI
 (the skill ships copy-paste body templates for both).
 
-| Command | Model | Purpose |
+| Command | Purpose |
 |---|---|---|
-| `/git-commit` | haiku | Stage and commit using Conventional Commits; branch-or-trunk by size. |
-| `/git-merge` | haiku | Merge current branch into `main` safely — checks, confirms, merges. |
+| `/git-commit` | Stage and commit using Conventional Commits; branch-or-trunk by size. |
+| `/git-merge` | Merge current branch into `main` safely — checks, confirms, merges. |
 
 ## Agents
 
@@ -88,7 +88,7 @@ ceremony. Plain git only: PRs and issues are opened in the Gitea web UI
 | Agent | Model | Tools | Role |
 |---|---|---|---|
 | `builder` | sonnet | Read, Write, Edit, Glob, Grep, Bash, Skill | Implements one PLAN.md task. Stays in its files. Never commits unless told. |
-| `reviewer` | opus | Read, Glob, Grep, Bash, Skill (**no** Write/Edit) | Read-only gate. Returns `PASS` or `FAIL` with findings. A gate that can fix itself isn't a gate. |
+| `reviewer` | inherit | Read, Glob, Grep, Bash, Skill (**no** Write/Edit) | Read-only gate. Returns `PASS` or `FAIL` with findings. A gate that can fix itself isn't a gate. |
 
 The reviewer is intentionally stronger than the builder.
 
@@ -114,7 +114,7 @@ confirm a clean git working tree. Stop and report if any of these fail.
   │              reports a diff. Does NOT commit.         │
   │     │                                                │
   │     ▼                                                │
-  │  2. REVIEW  → reviewer subagent (opus)                │
+  │  2. REVIEW  → reviewer subagent (inherit)               │
   │              read-only; runs the matching security    │
   │              skill (security-api / security-web) +    │
   │              simplify; returns PASS or FAIL.          │
@@ -195,8 +195,10 @@ controls when it triggers, plus optional `references/` and `templates/`.
   preserves completed work (e.g. `/plan` never drops `- [x]` tasks).
 - **Stop, don't guess.** A phase missing its input (no PLAN.md, a SPEC full of
   `TODO`) stops and points back to the owning command instead of inventing.
-- **Model choice is deliberate.** Heavy thinking → opus (`/explore`, `/design`,
-  `/plan`, reviewer). Execution → sonnet. Quick git plumbing → haiku.
+- **Commands inherit the session model.** No command pins a model, so the
+  phases run on whatever you launched Claude Code with. The `builder` agent
+  is pinned to the `sonnet` alias (execution); the `reviewer` inherits the
+  session model so the gate is never weaker than the session.
 
 ## Usage
 

.claude/agents/reviewer.md

@@ -2,7 +2,7 @@
 name: reviewer
 description: Read-only code + security gate for a single built task (C#/.NET first-class; TypeScript for UI code). Returns PASS or FAIL with findings. Dispatched by /build-loop.
 tools: Read, Glob, Grep, Bash, Skill
-model: opus
+model: inherit
 ---
 
 You are the gate between a built task and git history. You review the builder's

.claude/commands/build-loop.md

@@ -1,7 +1,6 @@
 ---
 description: Drive a PLAN.md to completion task-by-task — builder builds, reviewer gates, commit only on pass.
 argument-hint: [path-to-PLAN.md]
-model: claude-sonnet-4-6
 ---
 
 # build-loop
@@ -34,15 +33,15 @@ code or review it yourself — you dispatch and gate.
 For each task still unchecked (`- [ ]`), in order, top to bottom:
 
 1. **Build.** Dispatch a `builder` subagent (Agent tool,
-   `subagent_type: builder`, model **sonnet**). Give it: the exact task text,
+   `subagent_type: builder`, model **sonnet** (alias; tracks the current generation)). Give it: the exact task text,
    the relevant section of PLAN.md, the files it owns, and an instruction to
    invoke the project's language + DB skills (`csharp-best-practices` for C#,
    `typescript-best-practices` for TS, `postgres-dba` for schema work) and
    run the existing specs (`dotnet test` / `bun test` / project test command)
    before reporting back. The builder **does not commit**.
 
 2. **Review.** Dispatch a `reviewer` subagent (Agent tool,
-   `subagent_type: reviewer`, model **opus** — reviewer must be ≥ builder).
+   `subagent_type: reviewer`, model **inherit** — the reviewer runs on the session model, so it is always ≥ the builder).
    It invokes the matching security skill (`security-api` for backend code,
    `security-web` for UI code) and `simplify`, reads the builder's diff, and
    returns a verdict: `PASS` or `FAIL` with specific findings.

.claude/commands/design.md

@@ -1,7 +1,6 @@
 ---
 description: Interview the solution — architecture, schema, platform. Owns ARCHITECTURE.md + SPEC.md.
 argument-hint: [area to focus, optional]
-model: claude-opus-4-7
 ---
 
 # design

.claude/commands/document.md

@@ -1,7 +1,6 @@
 ---
 description: Reconcile docs with reality — README, DEPLOYMENT values, ARCHITECTURE prose, MEMORY log. Run anytime.
 argument-hint: [area to focus, optional]
-model: claude-sonnet-4-6
 ---
 
 # document

.claude/commands/explore.md

@@ -1,7 +1,6 @@
 ---
 description: Interview the idea — problem, who, why, scope. Owns docs/PROJECT.md.
 argument-hint: [one-line idea]
-model: claude-opus-4-7
 ---
 
 # explore

.claude/commands/git-commit.md

@@ -1,7 +1,6 @@
 ---
 description: Stage and commit current changes using Conventional Commits, branch-or-trunk by size. Uses the `git-workflow` skill.
 argument-hint: [optional summary or scope hint]
-model: claude-haiku-4-5-20251001
 ---
 
 # commit

.claude/commands/init.md

@@ -1,7 +1,6 @@
 ---
 description: Scaffold the project files I like — CLAUDE.md and the /docs skeleton.
 argument-hint: [project name]
-model: claude-sonnet-4-6
 ---
 
 # init

.claude/commands/plan.md

@@ -1,7 +1,6 @@
 ---
 description: Slice SPEC into stories and an ordered task DAG. Owns STORIES.md + PLAN.md.
 argument-hint: [scope to plan, optional]
-model: claude-opus-4-7
 ---
 
 # plan

.claude/commands/quick-fix.md

@@ -1,7 +1,6 @@
 ---
 description: Make a small, obvious fix directly on the current branch. No sprint, no PLAN, no stories.
 argument-hint: <describe the fix>
-model: claude-sonnet-4-6
 ---
 
 # quick-fix

.claude/commands/spec.md

@@ -1,7 +1,6 @@
 ---
 description: Generate executable BDD specs from STORIES.md via the bdd-specs skill. Stories-first, idempotent, pending by default.
 argument-hint: [scope or story id, optional]
-model: claude-sonnet-4-6
 ---
 
 # spec

.claude/settings.example.json

@@ -46,6 +46,15 @@
             "command": "f=$(jq -r '.tool_input.file_path // empty'); case \"$f\" in *.env|*.env.*) echo \"refuse: $f is an env file\" >&2; exit 2;; esac; exit 0"
           }
         ]
+      },
+      {
+        "matcher": "Bash",
+        "hooks": [
+          {
+            "type": "command",
+            "command": "c=$(jq -r '.tool_input.command // empty'); case \"$c\" in *'git tag'*-l*|*'git tag'*--list*|*'git tag --contains'*) exit 0;; *'gh pr merge'*|*'gh release create'*|*'git tag'*|*'git push'*--tags*|*'git push'*' main'*|*'git push'*':main'*|*'git push'*'HEAD:refs/heads/main'*) echo 'refuse: merge / tag / release / push to main needs Dean'\\''s per-action consent (MERGE RULE, gh-#751). Hand him the command instead.' >&2; exit 2;; esac; exit 0"
+          }
+        ]
       }
     ],
     "Stop": []