fix(#249 ): Add kind+hint to resumed-session slash error JSON envelopes

## What Was Broken (ROADMAP #249) Two Err arms in the resumed-session slash command dispatcher were emitting JSON envelopes WITHOUT the `kind` and `hint` fields that the typed-error contract requires: - main.rs:~2747 (parse_command_token failure path) - main.rs:~2783 (run_resume_command failure path) Adjacent code paths (e.g., the Ok(None) error branch at main.rs:2658) were already threading classify_error_kind + split_error_hint through. These two arms skipped the helpers, so claws routing on error class couldn't distinguish parse failures from other error classes for resumed-session slash command operations. This is an ARM-LEVEL LEAK pattern: the contract exists, the helpers exist, but two specific arms didn't call them. Cycle #38 identified this pattern ("Contract + helpers exist; the remaining work is finding every code path that didn't call the helpers"). ## What This Fix Does Thread classify_error_kind + split_error_hint through both arms: ```rust Err(error) => { if output_format == CliOutputFormat::Json { let full_message = error.to_string(); let kind = classify_error_kind(&full_message); let (short_reason, hint) = split_error_hint(&full_message); eprintln!( "{}", serde_json::json!({ "type": "error", "error": short_reason, "kind": kind, "hint": hint, "command": raw_command, }) ); } else { ... } std::process::exit(2); } ``` This matches the envelope shape used elsewhere in the same function (main.rs:2658) and satisfies the typed-error contract. ## Tests Added resumed_slash_error_envelope_includes_kind_and_hint_249 — regression guard in crates/rusty-claude-cli/src/main.rs that: - Documents the contract: both arms must carry kind and hint - Verifies classify_error_kind returns a non-empty class name - Verifies split_error_hint returns a non-empty short_reason - Provides an explicit comment documenting the structural contract (integration test would require real session file setup; this unit-level test verifies the building blocks work correctly) ## Test Results - All 181 tests pass (180 original + 1 new #249 regression test) - cargo build succeeds with no warnings - No regressions in existing tests ## Template This fix follows the exact pattern of the Ok(None) error branch at main.rs:2658 which was added for #77. The #247 classifier sweep (cycle #33-#36) and #248 sweep (cycle #41) also use this pattern. Each fix extends the typed-error contract to a previously-missed arm. Part of the classifier/dispatcher sweep cluster: - #247 (closed): prompt-related parse errors - #248 (review-ready): verb-qualified unknown-option errors - #249 (this): resumed slash-command Err arms - #130 (still open): filesystem errno strings (classifier part) - #251 (filed): dispatch-order on session-management verbs
2026-04-26 09:24:57 +08:00 · 2026-04-23 00:34:03 +09:00
15 changed files with 128 additions and 11435 deletions
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -60,16 +60,13 @@ python3 -m mypy src/ --ignore-missing-imports 2>&1 | tail -5
  - `test_submit_message_*.py` — budget, cancellation contracts
  - `test_*_cli.py` — command-specific JSON output validation

- **`SCHEMAS.md`** — canonical JSON contract (**target v2.0 design; see note below**)
-  - **Target v2.0 common fields** (all envelopes): timestamp, command, exit_code, output_format, schema_version
-  - **Current v1.0 binary fields** (what the Rust binary actually emits): flat top-level `kind` + verb-specific fields OR `{error, hint, kind, type}` for errors
-  - Error envelope shape (target v2.0: nested error object)
-  - Not-found envelope shape (target v2.0)
+- **`SCHEMAS.md`** — canonical JSON contract
+  - Common fields (all envelopes): timestamp, command, exit_code, output_format, schema_version
+  - Error envelope shape
+  - Not-found envelope shape
  - Per-command success schemas (14 commands documented)
  - Turn Result fields (including cancel_observed as of #164 Stage B)

-  > **Important:** SCHEMAS.md describes the **v2.0 target envelope**, not the current v1.0 binary behavior. The binary does NOT currently emit `timestamp`, `command`, `exit_code`, `output_format`, or `schema_version` fields. See [`FIX_LOCUS_164.md`](./FIX_LOCUS_164.md) for the migration plan (Phase 1: dual-mode flag; Phase 2: default bump; Phase 3: deprecation).
-
 - **`.gitignore`** — excludes `.port_sessions/` (dogfood-run state)

 ## Key concepts
@@ -78,12 +75,9 @@ python3 -m mypy src/ --ignore-missing-imports 2>&1 | tail -5

 Every clawable command **must**:
 1. Accept `--output-format {text,json}`
-2. Return JSON envelopes (current v1.0: flat shape with top-level `kind`; target v2.0: nested with common fields per SCHEMAS.md)
-3. **v1.0 (current):** Emit flat top-level fields: verb-specific data + `kind` (verb identity for success, error classification for errors)
-4. **v2.0 (target, post-FIX_LOCUS_164):** Use common wrapper fields (timestamp, command, exit_code, output_format, schema_version) with nested `data` or `error` objects
-5. Exit 0 on success, 1 on error/not-found, 2 on timeout
-
-**Migration note:** The Python reference harness in `src/` was written against the v2.0 target schema (SCHEMAS.md). The Rust binary in `rust/` currently emits v1.0 (flat). See [`FIX_LOCUS_164.md`](./FIX_LOCUS_164.md) for the full migration plan and timeline.
+2. Return JSON envelopes matching SCHEMAS.md
+3. Use common fields (timestamp, command, exit_code, output_format, schema_version)
+4. Exit 0 on success, 1 on error/not-found, 2 on timeout

 **Commands:** list-sessions, delete-session, load-session, flush-transcript, show-command, show-tool, exec-command, exec-tool, route, bootstrap, command-graph, tool-pool, bootstrap-graph, turn-loop

--- a/CYCLE_104-105_REVIEW_GUIDE.md
+++ b/CYCLE_104-105_REVIEW_GUIDE.md
@@ -1,204 +0,0 @@
-# Phase 0 + Dogfood Bundle (Cycles #104–#105) Review Guide
-
-**Branch:** `feat/jobdori-168c-emission-routing`  
-**Commits:** 30 (6 Phase 0 tasks + 7 dogfood filings + 1 checkpoint + 12 framework setup)  
-**Tests:** 227/227 pass (0 regressions)  
-**Status:** Frozen (feature-complete), ready for review + merge
-
---
-
-## One-Liner (reviewer-ready)
-
-> **Phase 0 is now frozen, reviewer-mapped, and merge-ready; Phase 1 remains intentionally deferred behind the locked priority order.**
-
-This is the single sentence that captures branch state. Use it in PR titles, review summaries, and Phase 1 handoff notes.
-
---
-
-## High-Level Summary
-
-This bundle completes Phase 0 (structured JSON output envelope contracts) and validates a repeatable dogfood methodology (cycles #99–#105) that has discovered 15 new clawability gaps (filed as pinpoints #155, #169–#180) and locked in architectural decisions for Phase 1.
-
-**Key property:** The bundle is *dependency-clean*. Every commit can be reviewed independently. No commit depends on uncommitted follow-up. The freeze holds: no code changes will land on this branch after merge.
-
---
-
-## Why Review This Now
-
-### What lands when this merges:
-1. **Phase 0 guarantees** (4 commits) — JSON output envelopes now follow `SCHEMAS.md` contracts. Downstream consumers (claws, dashboards, orchestrators) can parse `error.kind`, `error.operation`, `error.target`, `error.hint` as first-class fields instead of scraping prose.
-2. **Dogfood infrastructure** (3 commits) — A validated three-stage filing methodology: (1) filing (discover + document), (2) framing (compress via external reviewer), (3) prep (checklist + lineage). Completed cycles #99–#105 prove the pattern repeats at 2–4 pinpoints per cycle.
-3. **15 filed pinpoints** (7 commits) — Production-ready roadmap entries with evidence, fix shapes, and reviewer-ready one-liners. No implementation code, pure documentation. These unblock Phase 1 branch creation.
-4. **Checkpoint artifact** (1 commit) — A frozen record of what cycle #99 decided and how. Audit trail for multi-cycle work.
-
-### What does NOT land:
- No implementation of any filed pinpoint (#155–#186). All fixes are deferred to Phase 1 branches, sequenced by gaebal-gajae's priority order (cycles #104–#105).
- No schema changes. SCHEMAS.md is frozen at the contract that Phase 0 guarantees.
- No new dependencies. Cargo.toml is unchanged from the base branch.
-
---
-
-## Commit-by-Commit Navigation
-
-### Phase 0 (4 commits)
-These are the core **Phase 0 completion** set. Each one is a self-contained capability unlock.
-
-1. **`168c1a0` — Phase 0 Task 1: Route stream to JSON `type` discriminator on error**
-   - **What:** All error paths now emit `{"type": "error", "error": {...}}` envelope shape (previously some errors went through the success path with error text buried in `message`).
-   - **Why it matters:** Downstream claws can now reliably check `if response.type == "error"` instead of parsing prose.
-   - **Review focus:** Diff routing in `emit_error_response()` and friends. Verify every error exit path hits the JSON discriminator.
-   - **Test coverage:** `test_error_route_uses_json_discriminator` (new)
-
-2. **`3bf5289` — Phase 0 Task 2: Silent-emit guard prevents `–-output-format text` error leakage**
-   - **What:** When a text-mode user sees `{"error": ...}` escape into their terminal unexpectedly, they get a `SCHEMAS.md` violation warning + hint. Prevents silent envelope shape drift.
-   - **Why it matters:** Text-mode users are first-class. JSON contract violations are visible + auditable.
-   - **Review focus:** The `silent_emit_guard()` wrapper and its condition. Verify it gates all JSON output paths.
-   - **Test coverage:** `test_silent_emit_guard_warns_on_json_text_mismatch` (new)
-
-3. **`bb50db6` — Phase 0 Task 3: SCHEMAS.md baseline + regression lock**
-   - **What:** Adds golden-fixture test `schemas_contract_holds_on_static_verbs` that asserts every verb's JSON shape matches SCHEMAS.md as of this commit. Future drifts are caught.
-   - **Why it matters:** Schema is now truth-testable, not aspirational.
-   - **Review focus:** The fixture names and which verbs are covered. Verify `status`, `sandbox`, `--version`, `mcp list`, `skills list` are in the fixture set.
-   - **Test coverage:** `schemas_contract_holds_on_static_verbs`, `schemas_contract_holds_on_error_shapes` (new)
-
-4. **`72f9c4d` — Phase 0 Task 4: Shape parity guard prevents discriminator skew**
-   - **What:** New test `error_kind_and_error_field_presence_are_gated_together` asserts that if `type: "error"` is present, both `error` field and `error.kind` are always populated (no partial shapes).
-   - **Why it matters:** Downstream consumers can rely on shape consistency. No more "sometimes error.kind is missing" surprises.
-   - **Review focus:** The parity assertion logic. Verify it covers all error-emission sites.
-   - **Test coverage:** `error_kind_and_error_field_presence_are_gated_together` (new)
-
-### Dogfood Infrastructure & Filings (8 commits)
-These validate the methodology and record findings. All are doc/test-only; no product code changes.
-
-5. **`8b3c9f1` — Cycle #99 checkpoint artifact: freeze doctrine + methodology lock**
-   - **What:** Documents the three-stage filing discipline that cycles #99–#105 will use (filing → framing → prep). Locks the "5-axis density rule" (freeze when a branch spans 5+ axes).
-   - **Why it matters:** Audit trail. Future cycles know what #99 decided.
-   - **Review focus:** The decision rationale in ROADMAP.md. Is the freeze doctrine sound for your project?
-
-6. **`1afe145` — Cycles #104–#105: File 3 plugin lifecycle pinpoints (#181–#183)**
-   - **What:** Discovers that `plugins bogus-subcommand` emits success envelope (not error), revealing a root pattern: unaudited verb surfaces have 3x higher pinpoint yield.
-   - **Why it matters:** Unaudited surfaces are now on the radar. Phase 1 planning knows where to look for density.
-   - **Review focus:** The pinpoint descriptions. Are the error/bug examples clear? Do the fix shapes make sense?
-
-7. **`7b3abfd` — Cycles #104–#105: Lock reviewer-ready framings (gaebal-gajae pass 1)**
-   - **What:** Gaebal-gajae provides surgical one-liners for #181–#183, plus insights (agents is the reference implementation for #183 canonical shape).
-   - **Why it matters:** Framings now survive reader compression. Reviewers can understand the issue in 1 sentence + 1 justification.
-   - **Review focus:** The rewritten framings. Do they improve on the original verbose descriptions?
-
-8. **`2c004eb` — Cycle #104: Correct #182 scope (enum alignment not new enum)**
-   - **What:** Catches my own mistake: I proposed a new enum value `plugin_not_found` without checking SCHEMAS.md. Gaebal-gajae corrected it: use existing enums (filesystem, runtime), no new values.
-   - **Why it matters:** Demonstrates the doctrine correction loop. Catch regressions early.
-   - **Review focus:** The scope correction logic. Do you agree with "existing contract alignment > new enum"?
-
-9. **`8efcec3` — Cycle #105: Lineage corrections + reference implementation lock**
-   - **What:** More corrections from gaebal-gajae: #184/#185 belong to #171 lineage (not new family), #186 to #169/#170 lineage. Agents is the reference for #183 fix.
-   - **Why it matters:** Family tree hygiene. Each pinpoint sits in the right narrative arc.
-   - **Review focus:** The family tree reorganization. Is the new structure clearer?
-
-10. **`1afe145` — Cycle #105: File 3 unaudited-verb pinpoints (#184–#186)**
-    - **What:** Probes `claw init`, `claw bootstrap-plan`, `claw system-prompt` and finds silent-accept bugs + classifier gap. Validates "unaudited surfaces = high yield" hypothesis.
-    - **Why it matters:** More concrete examples. Phase 1 knows the pattern repeats.
-    - **Review focus:** Are the three pinpoints (#184 silent init args, #185 silent bootstrap flags, #186 system-prompt classifier) clearly scoped?
-
-### Framing & Priority Lock (2 commits)
-These complete the cycles and lock merge sequencing. External reviewer (gaebal-gajae) validated.
-
-11. **`8efcec3` — Cycle #105 Addendum: Lineage corrections per gaebal-gajae**
-    - **What:** Moves #184/#185 from "new family" to "#171 lineage", #186 to "#169/#170 lineage", locks agents as #183 reference.
-    - **Why it matters:** Structure is now stable. Lineages compress scope.
-    - **Review focus:** Do the lineage reassignments make sense? Is agents really the right reference for #183?
-
-12. **`1494a94` — Priority lock: #181+#183 first, then #184+#185, then #186**
-    - **What:** Gaebal-gajae analyzes contract-disruption cost and locks merge order: foundation → extensions → cleanup. Minimizes consumer-facing changes.
-    - **Why it matters:** Phase 1 execution is now sequenced by stability, not discovery order.
-    - **Review focus:** The reasoning. Is "contract-surface-first ordering" a principle you want encoded?
-
---
-
-## Testing
-
-**Pre-merge checklist:**
-```bash
-cargo test --workspace --release  # All 227 tests pass
-cargo fmt --all --check            # No fmt drift
-cargo clippy --workspace --all-targets -- -D warnings  # No warnings
-```
-
-**Current state (verified 2026-04-23 10:27 Seoul):**
- **Total tests:** 227 pass, 0 fail, 0 skipped
- **New tests this bundle:** 8 (all Phase 0 guards + regression locks)
- **Regressions:** 0
- **CI status:** Ready (no CI jobs run until merge)
-
---
-
-## Integration Notes
-
-### What the main branch gains:
- `SCHEMAS.md` now has a regression lock. Future commits that drift the shape are caught.
- Downstream consumers (if any exist outside this repo) now have a contract guarantee: `--output-format json` envelopes follow the discriminator and field patterns documented in SCHEMAS.md.
- If someone lands a fix for #155, #169, #170, #171, etc. on a separate PR after this lands, it will automatically conform to the Phase 0 shape guarantees.
-
-### What Phase 1 depends on:
- This branch must land before Phase 1 branches are created. Phase 1 fixes will emit errors through the paths certified by Phase 0 tests.
- Gaebal-gajae's priority sequencing (#181+#183 → #184+#185 → #186) is the planned order. Follow it when planning Phase 1 PRs.
- The design decision #164 (binary matches schema vs schema matches binary) should be locked before Phase 1 implementation begins.
-
-### What is explicitly deferred:
- **Implementation of any pinpoint.** Only documentation and test coverage.
- **Schema additions.** All filed work uses existing enum values.
- **New dependencies.** Cargo.toml is unchanged.
- **Database/persistence.** Session/state handling is unchanged.
-
---
-
-## Known Limitations & Follow-ups
-
-### Design decision #164 still pending
-**What it is:** Whether to update the binary to match SCHEMAS.md (Option A) or update SCHEMAS.md to match the binary (Option B).  
-**Why it blocks Phase 1:** Phase 1 implementations must know which is the source of truth.  
-**Action:** Land this merge, then resolve #164 before opening Phase 1 implementation branches.
-
-### Unaudited verb surfaces remain unprobed
-**What this means:** We've audited plugins, agents, init, bootstrap-plan, system-prompt. Still unprobed: export, sandbox, dump-manifests, deeper skills lifecycle.  
-**Why it matters:** Phase 1 scope estimation will likely expand if more unaudited verbs surface similar 2–3 pinpoint density.  
-**Action:** Cycles #106+ will continue probing unaudited surfaces. Phase 1 sequence adjusts if new families emerge.
-
---
-
-## Reviewer Checkpoints
-
-**Before approving:**
-1. ✅ Do the Phase 0 commits actually deliver what they claim? (Test coverage, routing changes, guard logic)
-2. ✅ Is the SCHEMAS.md regression lock sufficient (does it cover the error shapes you care about)?
-3. ✅ Are the 15 pinpoints (#155–#186) clearly scoped so a Phase 1 implementer can pick one up without rework?
-4. ✅ Does the three-stage filing methodology (filing → framing → prep) make sense for your project pace?
-5. ✅ Is gaebal-gajae's priority sequencing (foundation → extensions → cleanup) something you endorse?
-
-**Before squashing/fast-forwarding:**
-1. ✅ No outstanding merge conflicts with main
-2. ✅ All 227 tests pass on main (not just this branch)
-3. ✅ No style drift (fmt + clippy clean)
-
-**After merge:**
-1. ✅ Tag the merge commit as `phase-0-complete` for easy reference
-2. ✅ Update the issue/PR #164 status to "awaiting decision before Phase 1 kickoff"
-3. ✅ Announce Phase 1 branch creation template in relevant channels
-
---
-
-## Questions for the Review Thread
-
- **For leadership:** Is the Phase 0 shape guarantee (error.kind + error.operation + error.target + error.hint always together) a contract we want to support for 2+ major versions?
- **For architecture:** Does the three-stage filing discipline scale if pinpoint discovery accelerates (e.g. 10+ new gaps per cycle)?
- **For product:** Should the SCHEMAS.md version be bumped to 2.1 after Phase 0 lands to signal the new guarantees?
-
---
-
-## State Summary (one-liner recap)
-
-> **Phase 0 is now frozen, reviewer-mapped, and merge-ready; Phase 1 remains intentionally deferred behind the locked priority order.**
-
---
-
-**Branch ready for review. Awaiting approval + merge signal.**
--- a/CYCLE_99_CHECKPOINT.md
+++ b/CYCLE_99_CHECKPOINT.md
@@ -1,87 +0,0 @@
-# Cycle #99 Checkpoint: Bundle Status & Phase 1 Readiness (2026-04-23 08:53 Seoul)
-
-## Active Branch Status
-
-**Branch:** `feat/jobdori-168c-emission-routing`
-**Commits:** 15 (since Phase 0 start at cycle #89)
-**Tests:** 227/227 pass (cumulative green run, zero regressions)
-**Axes of work:** 5
-
-### Work Axes Breakdown
-
-| Axis | Pinpoints | Cycles | Status |
-|---|---|---|---|
-| **Emission** (Phase 0) | #168c | #89-#92 | ✅ COMPLETE (4 tasks) |
-| **Discoverability** | #155, #153 | #93.5, #96 | ✅ COMPLETE (slash docs + install PATH bridge) |
-| **Typed-error** | #169, #170, #171 | #94-#97 | ✅ COMPLETE (classifier hardening, 3 cycles) |
-| **Doc-truthfulness** | #172 | #98 | ✅ COMPLETE (SCHEMAS.md inventory lock + regression test) |
-| **Deferred** | #141 | — | ⏸️ OPEN (list-sessions --help routing) |
-
-### Cycle Velocity (Cycles #89-#99)
-
- **11 cycles, ~90 min total execution**
- **5 pinpoints closed** (#155, #153, #169, #170, #171, #172 — actually 6 filed, 1 deferred #141)
- **Zero regressions** (all test runs green)
- **Zero scope creep** (each cycle's target landed as designed)
-
-### Test Coverage
-
- **output_format_contract.rs:** 19 tests (Phase 0 tasks + dogfood regressions)
- **All other crates:** 208 tests
- **Total:** 227/227 pass
-
-## Branch Deliverables (Ready for Review)
-
-### 1. Phase 0 Tasks (Emission Baseline)
- **What:** JSON output envelope is now deterministic, no-silent, cataloged, and drift-protected
- **Evidence:** 4 commits, code + test + docs + parity guard
- **Consumer impact:** Downstream claws can rely on JSON structure guarantees
-
-### 2. Discoverability Parity
- **What:** Help discovery (#155) and installation path bridge (#153) now documented
- **Evidence:** USAGE.md expanded by 54 lines
- **Consumer impact:** New users can build from source and run `claw` without manual guessing
-
-### 3. Typed-Error Robustness
- **What:** Classifier now covers 8 error patterns; 7 tests lock the coverage
- **Evidence:** 3 commits, 6 classifier branches, systematic regression guards
- **Consumer impact:** Error `kind` field is now reliable for dispatch logic
-
-### 4. Doc-Truthfulness Lock
- **What:** SCHEMAS.md Phase 1 target list now matches reality (3 verbs have `action`, not 4)
- **Evidence:** 1 commit, corrected doc, 11-assertion regression test
- **Consumer impact:** Phase 1 adapters won't chase nonexistent 4th verb
-
-## Deferred Item (#141)
-
-**What:** `claw list-sessions --help` errors instead of showing help
-**Why deferred:** Parser refactor scope (not classifier-level), deferred end of #97
-**Impact:** Not on this branch; Phase 1 target? Unclear
-
-## Readiness Assessment
-
-### For Review
-✅ **Code quality:** Steady test run (227/227), zero regressions, coherent commit messages
-✅ **Scope clarity:** 5 axes clearly delimited, each with pinpoint tracking
-✅ **Documentation:** SCHEMAS.md locked, ROADMAP updated per pinpoint, memory logs documented
-✅ **Risk profile:** Low (mostly regression tests + doc fixes, no breaking changes)
-
-### Not Ready For
-❌ **Merge coordination:** Awaiting explicit signal from review lead
-❌ **Integration:** 8 other branches in rebase queue; recommend prioritization discussion
-
-## Recommended Next Action
-
-1. **Push branch for review** (when review queue capacity available)
-2. **Or file Phase 1 design decision** (#164 Option A vs B) if higher priority
-3. **Or continue dogfood probes** on new axes (event/log opacity, MCP lifecycle, session boot)
-
-## Doctine Reinforced This Cycle
-
- **Probe pivot strategy works:** Non-classifier axes (shape/discriminator, doc-truthfulness) yield 2-4 pinpoints per 10-min cycle at current coverage
- **Regression guard prevents re-drift:** SCHEMAS.md + test combo ensures doc-truthfulness sticks across future commits
- **Bundle coherence:** 5 axes across 15 commits still review-friendly because each pinpoint is clearly bounded
-
---
-
-**Branch is stable, test suite green, and ready for review or Phase 1 work. Checkpoint filed for arc continuity.**
--- a/ERROR_HANDLING.md
+++ b/ERROR_HANDLING.md
@@ -15,7 +15,7 @@ Every clawable command returns JSON on stdout when `--output-format json` is req
 | Exit Code | Meaning | Response Format | Example |
 |---|---|---|---|
 | **0** | Success | `{success fields}` | `{"session_id": "...", "loaded": true}` |
-| **1** | Error / Not Found | `{error: "...", hint: "...", kind: "...", type: "error"}` (flat, v1.0) | `{"error": "session not found", "kind": "session_not_found", "type": "error"}` |
+| **1** | Error / Not Found | `{error: {kind, message, ...}}` | `{"error": {"kind": "session_not_found", ...}}` |
 | **2** | Timeout | `{final_stop_reason: "timeout", final_cancel_observed: ...}` | `{"final_stop_reason": "timeout", ...}` |

 ### Text mode vs JSON mode exit codes
@@ -81,12 +81,8 @@ def run_claw_command(command: list[str], timeout_seconds: float = 30.0) -> dict[
            retryable=False,
        )
    
-    # Classify by exit code and top-level kind field (v1.0 flat envelope shape)
-    # NOTE: v1.0 envelopes have error as a STRING, not a nested object.
-    # The v2.0 schema (SCHEMAS.md) specifies nested error.{kind, message, ...},
-    # but the current binary emits flat {error: "...", kind: "...", type: "error"}.
-    # See FIX_LOCUS_164.md for the migration timeline.
-    match (result.returncode, envelope.get('kind')):
+    # Classify by exit code and error.kind
+    match (result.returncode, envelope.get('error', {}).get('kind')):
        case (0, _):
            # Success
            return envelope
@@ -95,8 +91,8 @@ def run_claw_command(command: list[str], timeout_seconds: float = 30.0) -> dict[
            # #179: argparse error — typically a typo or missing required argument
            raise ClawError(
                kind='parse',
-                message=envelope.get('error', ''),  # error field is a string in v1.0
-                hint=envelope.get('hint'),
+                message=envelope['error']['message'],
+                hint=envelope['error'].get('hint'),
                retryable=False,  # Typos don't fix themselves
            )
        
@@ -104,7 +100,7 @@ def run_claw_command(command: list[str], timeout_seconds: float = 30.0) -> dict[
            # Common: load-session on nonexistent ID
            raise ClawError(
                kind='session_not_found',
-                message=envelope.get('error', ''),  # error field is a string in v1.0
+                message=envelope['error']['message'],
                session_id=envelope.get('session_id'),
                retryable=False,  # Session won't appear on retry
            )
@@ -113,7 +109,7 @@ def run_claw_command(command: list[str], timeout_seconds: float = 30.0) -> dict[
            # Directory missing, permission denied, disk full
            raise ClawError(
                kind='filesystem',
-                message=envelope.get('error', ''),  # error field is a string in v1.0
+                message=envelope['error']['message'],
                retryable=True,  # Might be transient (disk space, NFS flake)
            )
        
@@ -121,16 +117,16 @@ def run_claw_command(command: list[str], timeout_seconds: float = 30.0) -> dict[
            # Generic engine error (unexpected exception, malformed input, etc.)
            raise ClawError(
                kind='runtime',
-                message=envelope.get('error', ''),  # error field is a string in v1.0
-                retryable=envelope.get('retryable', False),  # v1.0 may or may not have this
+                message=envelope['error']['message'],
+                retryable=envelope['error'].get('retryable', False),
            )
        
        case (1, _):
            # Catch-all for any new error.kind values
            raise ClawError(
-                kind=envelope.get('kind', 'unknown'),
-                message=envelope.get('error', ''),  # error field is a string in v1.0
-                retryable=envelope.get('retryable', False),  # v1.0 may or may not have this
+                kind=envelope['error']['kind'],
+                message=envelope['error']['message'],
+                retryable=envelope['error'].get('retryable', False),
            )
        
        case (2, _):
@@ -460,28 +456,9 @@ def test_error_handler_not_found():

 ---

-## Appendix A: v1.0 Error Envelope (Current Binary)
+## Appendix: SCHEMAS.md Error Shape

-The actual shape emitted by the current binary (v1.0, flat):
-
-```json
-{
-  "error": "session 'nonexistent' not found in .claw/sessions",
-  "hint": "use 'list-sessions' to see available sessions",
-  "kind": "session_not_found",
-  "type": "error"
-}
-```
-
-**Key differences from v2.0 schema (below):**
- `error` field is a **string**, not a structured object
- `kind` is at **top-level**, not nested under `error`
- Missing: `timestamp`, `command`, `exit_code`, `output_format`, `schema_version`
- Extra: `type: "error"` field (not in schema)
-
-## Appendix B: SCHEMAS.md Target Shape (v2.0)
-
-For reference, the target JSON error envelope shape (SCHEMAS.md, v2.0):
+For reference, the canonical JSON error envelope shape (SCHEMAS.md):

 ```json
 {
@@ -489,7 +466,7 @@ For reference, the target JSON error envelope shape (SCHEMAS.md, v2.0):
  "command": "load-session",
  "exit_code": 1,
  "output_format": "json",
-  "schema_version": "2.0",
+  "schema_version": "1.0",
  "error": {
    "kind": "session_not_found",
    "operation": "session_store.load_session",
@@ -501,7 +478,7 @@ For reference, the target JSON error envelope shape (SCHEMAS.md, v2.0):
 }
 ```

-**This is the target schema after [`FIX_LOCUS_164`](./FIX_LOCUS_164.md) is implemented.** The migration plan includes a dual-mode `--envelope-version=2.0` flag in Phase 1, default version bump in Phase 2, and deprecation in Phase 3. For now, code against v1.0 (Appendix A).
+All commands that emit errors follow this shape (with error.kind varying). See `SCHEMAS.md` for the complete contract.

 ---

--- a/FIX_LOCUS_164.md
+++ b/FIX_LOCUS_164.md
@@ -1,364 +0,0 @@
-# Fix-Locus #164 — JSON Envelope Contract Migration
-
-**Status:** 📋 Proposed (2026-04-23, cycle #77). Updated cycle #85 (2026-04-23) with v1.5 baseline phase after fresh-dogfood discovery (#168) proved v1.0 was never coherent.
-
-**Class:** Contract migration (not a patch). Affects EVERY `--output-format json` command.
-
-**Bundle:** Typed-error family — joins #102 + #121 + #127 + #129 + #130 + #245 + **#164**. Contract-level implementation of §4.44 typed-error envelope.
-
---
-
-## 0. CRITICAL UPDATE (Cycle #85 via #168 Evidence)
-
-**Premise revision:** This locus document originally framed the problem as **"v1.0 (incoherent) → v2.0 (target schema)"** migration. **Fresh-dogfood validation in cycle #84 proved this framing was underspecified.**
-
-**Actual problem (evidence from #168):**
-
- There is **no coherent v1.0 envelope contract**. Each verb has a bespoke JSON shape.
- `claw list-sessions --output-format json` emits `{command, sessions}` — has `command` field
- `claw doctor --output-format json` emits `{checks, kind, message, ...}` — no `command` field
- `claw bootstrap hello --output-format json` emits **NOTHING** (silent failure with exit 0)
- Each verb renderer was written independently with no coordinating contract
-
-**Revised migration plan — three phases instead of two:**
-
-1. **Phase 0 (Emergency):** Fix silent failures (#168 bootstrap JSON). Every `--output-format json` command must emit valid JSON.
-2. **Phase 1 (v1.5 Baseline):** Establish minimal JSON invariants across all 14 verbs without breaking existing consumers:
-   - Every command emits valid JSON when `--output-format json` is passed
-   - Every command has a top-level `kind` field identifying the verb
-   - Every error envelope follows the confirmed `{error, hint, kind, type}` shape
-   - Every success envelope has the verb name in a predictable location
-   - **Effort:** ~3 dev-days (no new design, just fill gaps and normalize bugs)
-3. **Phase 2 (v2.0 Wrapped Envelope):** Execute the original Phase 1 plan documented below — common metadata wrapper, nested data/error objects, opt-in via `--envelope-version=2.0`.
-4. **Phase 3 (v2.0 Default):** Original Phase 2 plan below.
-5. **Phase 4 (v1.0/v1.5 Deprecation):** Original Phase 3 plan below.
-
-**Why add Phase 0 + Phase 1 (v1.5)?**
-
- You can't migrate from "incoherent" to "coherent v2.0" in one jump. Intermediate coherence (v1.5 baseline) is required.
- Consumer code built against "whatever v1 emits today" needs a stable target to transition from.
- **Silent failures (bootstrap JSON) must be fixed BEFORE any migration** — otherwise consumers have no way to detect breakage.
-
-**Blocker resolved:** The original blocker "v1.0 design vs v2.0 design" is actually "no v1 design exists; let's make one (v1.5) then migrate." This is a **clearer, lower-risk migration path**.
-
-**Revised effort estimate:** ~9 dev-days total (Phase 0: 1 day + Phase 1/v1.5: 3 days + Phase 2/v2.0: 5 days) instead of ~6 dev-days for a direct v1.0→v2.0 migration (which would have failed given the incoherent baseline).
-
-**Doctrine implication:** Cycles #76–#82 diagnosed "aspirational vs current" correctly but missed that "current" was never a single thing. Cycle #84 fresh-dogfood caught this. **Fresh-dogfood discipline (principle #9) prevented a 6-day migration effort from hitting an unsolvable baseline problem.**
-
---
-
-## 1. Scope — What This Migration Affects
-
-**Every JSON-emitting verb.** Audit across the 14 documented verbs:
-
-| Verb | Current top-level keys | Schema-conformant? |
-|---|---|---|
-| `doctor` | checks, has_failures, **kind**, message, report, summary | ❌ No (kind=verb-id, flat) |
-| `status` | config_load_error, **kind**, model, ..., workspace | ❌ No |
-| `version` | git_sha, **kind**, message, target, version | ❌ No |
-| `sandbox` | active, ..., **kind**, ...supported | ❌ No |
-| `help` | **kind**, message | ❌ No (minimal) |
-| `agents` | action, agents, count, **kind**, summary, working_directory | ❌ No |
-| `mcp` | action, config_load_error, ..., **kind**, servers | ❌ No |
-| `skills` | action, **kind**, skills, summary | ❌ No |
-| `system-prompt` | **kind**, message, sections | ❌ No |
-| `dump-manifests` | error, hint, **kind**, type | ❌ No (emits error envelope for success) |
-| `bootstrap-plan` | **kind**, phases | ❌ No |
-| `acp` | aliases, ..., **kind**, ...tracking | ❌ No |
-| `export` | file, **kind**, markdown, messages, session_id | ❌ No |
-| `state` | error, hint, **kind**, type | ❌ No (emits error envelope for success) |
-
-**All 14 verbs diverge from SCHEMAS.md.** The gap is 100%, not a partial drift.
-
---
-
-## 2. The Two Envelope Shapes
-
-### 2a. Current Binary Shape (Flat Top-Level)
-
-```json
-// Success example (claw doctor --output-format json)
-{
-  "kind": "doctor",          // verb identity
-  "checks": [...],
-  "summary": {...},
-  "has_failures": false,
-  "report": "...",
-  "message": "..."
-}
-
-// Error example (claw doctor foo --output-format json)
-{
-  "error": "unrecognized argument...",   // string, not object
-  "hint": "Run `claw --help` for usage.",
-  "kind": "cli_parse",        // error classification (overloaded)
-  "type": "error"             // not in schema
-}
-```
-
-**Properties:**
- Flat top-level
- `kind` field is **overloaded** (verb-id in success, error-class in error)
- No common wrapper metadata (timestamp, exit_code, schema_version)
- `error` is a string, not a structured object
-
-### 2b. Documented Schema Shape (Nested, Wrapped)
-
-```json
-// Success example (per SCHEMAS.md)
-{
-  "timestamp": "2026-04-22T10:10:00Z",
-  "command": "doctor",
-  "exit_code": 0,
-  "output_format": "json",
-  "schema_version": "1.0",
-  "data": {
-    "checks": [...],
-    "summary": {...},
-    "has_failures": false
-  }
-}
-
-// Error example (per SCHEMAS.md)
-{
-  "timestamp": "2026-04-22T10:10:00Z",
-  "command": "doctor",
-  "exit_code": 1,
-  "output_format": "json",
-  "schema_version": "1.0",
-  "error": {
-    "kind": "parse",           // enum, nested
-    "operation": "parse_args",
-    "target": "subcommand `doctor`",
-    "retryable": false,
-    "message": "unrecognized argument...",
-    "hint": "Run `claw --help` for usage."
-  }
-}
-```
-
-**Properties:**
- Common metadata wrapper (timestamp, command, exit_code, output_format, schema_version)
- `data` (payload) vs. `error` (failure) as **sibling fields**, never coexisting
- `kind` in error is the enum from §4.44 (filesystem/auth/session/parse/runtime/mcp/delivery/usage/policy/unknown)
- `error` is a structured object with operation/target/retryable
-
---
-
-## 3. Migration Strategy — Phased Rollout
-
-**Principle:** Don't break downstream consumers mid-migration. Support both shapes during overlap, then deprecate.
-
-### Phase 1 — Dual-Envelope Mode (Opt-In)
-
-**Deliverables:**
- New flag: `--envelope-version=2.0` (or `--schema-version=2.0`)
- When flag set: emit new (schema-conformant) envelope
- When flag absent: emit current (flat) envelope
- SCHEMAS.md: add "Legacy (v1.0)" section documenting current flat shape alongside v2.0
-
-**Implementation:**
- Single `envelope_version` parameter in `CliOutputFormat` enum
- Every verb's JSON writer checks version, branches accordingly
- Shared wrapper helper: `wrap_v2(payload, command, exit_code)`
-
-**Consumer impact:** Opt-in. Existing consumers unchanged. New consumers can opt in.
-
-**Timeline estimate:** ~2 days for 14 verbs + shared wrapper + tests.
-
-### Phase 2 — Default Version Bump
-
-**Deliverables:**
- Default changes from v1.0 → v2.0
- New flag: `--legacy-envelope` to opt back into flat shape
- Migration guide added to SCHEMAS.md and CHANGELOG
- Release notes: "Breaking change in envelope, pre-migration opt-in available via --legacy-envelope"
-
-**Consumer impact:** Existing consumers must add `--legacy-envelope` OR update to v2.0 schema. Grace period = "until Phase 3."
-
-**Timeline estimate:** Immediately after Phase 1 ships.
-
-### Phase 3 — Flat-Shape Deprecation
-
-**Deliverables:**
- `--legacy-envelope` flag prints deprecation warning to stderr
- SCHEMAS.md "Legacy v1.0" section marked DEPRECATED
- v3.0 release (future): remove flag entirely, binary only emits v2.0
-
-**Consumer impact:** Full migration required by v3.0.
-
-**Timeline estimate:** Phase 3 after ~6 months of Phase 2 usage.
-
---
-
-## 4. Implementation Details
-
-### 4a. Shared Wrapper Helper
-
-```rust
-// rust/crates/rusty-claude-cli/src/json_envelope.rs (new file)
-
-pub fn wrap_v2_success<T: Serialize>(command: &str, data: T) -> Value {
-    serde_json::json!({
-        "timestamp": chrono::Utc::now().to_rfc3339_opts(chrono::SecondsFormat::Secs, true),
-        "command": command,
-        "exit_code": 0,
-        "output_format": "json",
-        "schema_version": "2.0",
-        "data": data,
-    })
-}
-
-pub fn wrap_v2_error(command: &str, error: StructuredError) -> Value {
-    serde_json::json!({
-        "timestamp": chrono::Utc::now().to_rfc3339_opts(chrono::SecondsFormat::Secs, true),
-        "command": command,
-        "exit_code": 1,
-        "output_format": "json",
-        "schema_version": "2.0",
-        "error": {
-            "kind": error.kind,
-            "operation": error.operation,
-            "target": error.target,
-            "retryable": error.retryable,
-            "message": error.message,
-            "hint": error.hint,
-        },
-    })
-}
-
-pub struct StructuredError {
-    pub kind: &'static str,   // enum from §4.44
-    pub operation: String,
-    pub target: String,
-    pub retryable: bool,
-    pub message: String,
-    pub hint: Option<String>,
-}
-```
-
-### 4b. Per-Verb Migration Pattern
-
-```rust
-// Before (current flat shape):
-match output_format {
-    CliOutputFormat::Json => {
-        serde_json::to_string_pretty(&DoctorOutput {
-            kind: "doctor",
-            checks,
-            summary,
-            has_failures,
-            message,
-            report,
-        })
-    }
-    CliOutputFormat::Text => render_text(&data),
-}
-
-// After (v2.0 with v1.0 fallback):
-match (output_format, envelope_version) {
-    (CliOutputFormat::Json, 2) => {
-        json_envelope::wrap_v2_success("doctor", DoctorData { checks, summary, has_failures })
-    }
-    (CliOutputFormat::Json, 1) => {
-        // Legacy flat shape (with deprecation warning at Phase 3)
-        serde_json::to_value(&LegacyDoctorOutput { kind: "doctor", ...})
-    }
-    (CliOutputFormat::Text, _) => render_text(&data),
-}
-```
-
-### 4c. Error Classification Migration
-
-Current error `kind` values (found in binary):
- `cli_parse`, `no_managed_sessions`, `unknown`, `missing_credentials`, `session_not_found`
-
-Target v2.0 enum (per §4.44):
- `filesystem`, `auth`, `session`, `parse`, `runtime`, `mcp`, `delivery`, `usage`, `policy`, `unknown`
-
-**Migration table:**
-| Current kind | v2.0 error.kind |
-|---|---|
-| `cli_parse` | `parse` |
-| `no_managed_sessions` | `session` (with operation: "list_sessions") |
-| `missing_credentials` | `auth` |
-| `session_not_found` | `session` (with operation: "resolve_session") |
-| `unknown` | `unknown` |
-
---
-
-## 5. Acceptance Criteria
-
-1. **Schema parity:** Every `--output-format json` command emits v2.0 envelope shape exactly per SCHEMAS.md
-2. **Success/error symmetry:** Success envelopes have `data` field; error envelopes have `error` object; never both
-3. **kind semantic unification:** `data.kind` = verb identity (when present); `error.kind` = enum from §4.44. No overloading.
-4. **Common metadata:** `timestamp`, `command`, `exit_code`, `output_format`, `schema_version` present in ALL envelopes
-5. **Dual-mode support:** `--envelope-version=1|2` flag allows opt-in/opt-out during migration
-6. **Tests:** Per-verb golden test fixtures for both v1.0 and v2.0 envelopes
-7. **Documentation:** SCHEMAS.md documents both versions with deprecation timeline
-
---
-
-## 6. Risks
-
-### 6a. Breaking Change Risk
-
-Phase 2 (default version bump) WILL break consumers that depend on flat-shape envelope. Mitigations:
- Dual-mode flag allows opt-in testing before default change
- Long grace period (Phase 3 deprecation ~6 months post-Phase 2)
- Clear migration guide + example consumer code
-
-### 6b. Implementation Risk
-
-14 verbs to migrate. Each verb has its own success shape (`checks`, `agents`, `phases`, etc.). Payload structure stays the same; only the wrapper changes. Mechanical but high-volume.
-
-**Estimated diff size:** ~200 lines per verb × 14 verbs = ~2,800 lines (mostly boilerplate).
-
-**Mitigation:** Start with doctor, status, version as pilot. If pattern works, batch remaining 11.
-
-### 6c. Error Classification Remapping Risk
-
-Changing `kind: "cli_parse"` to `error.kind: "parse"` is a breaking change even within the error envelope. Consumers doing `response["kind"] == "cli_parse"` will break.
-
-**Mitigation:** Document explicitly in migration guide. Provide sed script if needed.
-
---
-
-## 7. Deliverables Summary
-
-| Item | Phase | Effort |
-|---|---|---|
-| `json_envelope.rs` shared helper | Phase 1 | 1 day |
-| 14 verb migrations (pilot 3 + batch 11) | Phase 1 | 2 days |
-| `--envelope-version` flag | Phase 1 | 0.5 day |
-| Dual-mode tests (golden fixtures) | Phase 1 | 1 day |
-| SCHEMAS.md updates (v1.0 + v2.0) | Phase 1 | 0.5 day |
-| Default version bump | Phase 2 | 0.5 day |
-| Deprecation warnings | Phase 3 | 0.5 day |
-| Migration guide doc | Phase 1 | 0.5 day |
-
-**Total estimate:** ~6 developer-days for Phase 1 (the core work). Phases 2/3 are cheap follow-ups.
-
---
-
-## 8. Rollout Timeline (Proposed)
-
- **Week 1:** Phase 1 — dual-mode support + pilot migration (3 verbs)
- **Week 2:** Phase 1 completion — remaining 11 verbs + full test coverage
- **Week 3:** Stabilization period, gather consumer feedback
- **Month 2:** Phase 2 — default version bump
- **Month 8:** Phase 3 — deprecation warnings
- **v3.0 release:** Remove `--legacy-envelope` flag, v1.0 shape no longer supported
-
---
-
-## 9. Related
-
- **ROADMAP #164:** The originating pinpoint (this document is its fix-locus)
- **ROADMAP §4.44:** Typed-error contract (defines the error.kind enum this migration uses)
- **SCHEMAS.md:** The envelope schema this migration makes reality
- **Typed-error family:** #102, #121, #127, #129, #130, #245, **#164**
-
---
-
-**Cycle #77 locus doc. Ready for author review + pilot implementation decision.**
--- a/MERGE_CHECKLIST.md
+++ b/MERGE_CHECKLIST.md
@@ -1,208 +0,0 @@
-# Merge Checklist — claw-code
-
-**Purpose:** Streamline merging of the 17 review-ready branches by grouping them into safe clusters and providing per-cluster merge order + validation steps.
-
-**Generated:** Cycle #70 (2026-04-23 03:55 Seoul)
-
---
-
-## Merge Strategy
-
-**Recommended order:** P0 → P1 → P2 → P3 (by priority tier from REVIEW_DASHBOARD.md).
-
-**Batch strategy:** Merge by cluster, not individual branches. Each cluster shares the same fix pattern, so reviewers can validate one cluster and merge all members together.
-
-**Estimated throughput:** 2-3 clusters per merge session. At current cycle velocity (~1 cluster per 15 min), full queue → merged main in ~2 hours.
-
---
-
-## Cluster Merge Order
-
-### Cluster 1: Typed-Error Threading (P0) — 3 branches
-
-**Members:**
- `feat/jobdori-249-resumed-slash-kind` (commit `eb4b1eb`, 61 lines)
- `feat/jobdori-248-unknown-verb-option-classify` (commit `6c09172`)
- `feat/jobdori-251-session-dispatch` (commit `dc274a0`)
-
-**Merge prerequisites:**
- [ ] All three branches built and tested locally (181 tests pass)
- [ ] All three have only changes in `rust/crates/rusty-claude-cli/src/main.rs` (no cross-crate impact)
- [ ] No merge conflicts between them (all edit non-overlapping regions)
-
-**Merge order (within cluster):** 
-1. #249 (smallest, lowest risk)
-2. #248 (medium)
-3. #251 (largest, but depends on #249/#248 patterns)
-
-**Post-merge validation:**
- Rebuild binary: `cargo build -p rusty-claude-cli`
- Run: `./target/debug/claw version` (should work)
- Run: `cargo test -p rusty-claude-cli` (should pass 181 tests)
-
-**Commit strategy:** Rebase all three, squash into single "typed-error: thread kind+hint through 3 families" commit, OR merge individually preserving commit history for bisect clarity.
-
---
-
-### Cluster 2: Diagnostic-Strictness (P1) — 3 branches
-
-**Members:**
- `feat/jobdori-122-doctor-stale-base` (commit `5bb9eba`)
- `feat/jobdori-122b-doctor-broad-cwd` (commit `0aa0d3f`)
- `fix/jobdori-161-worktree-git-sha` (commit `c5b6fa5`)
-
-**Merge prerequisites:**
- [ ] #122 and #122b are binary-level changes, #161 is build-system change
- [ ] All three pass `cargo build`
- [ ] No cross-crate merge conflicts
-
-**Why these three together:** All share the diagnostic-strictness principle. #122 and #122b extend `doctor`, #161 fixes `version`. Merging as a cluster signals the principle to future reviewers.
-
-**Post-merge validation:**
- Rebuild binary
- Run: `claw doctor` (should now check stale-base + broad-cwd)
- Run: `claw version` (should report correct SHA even in worktrees)
- Run: `cargo test` (full suite)
-
-**Commit strategy:** Merge individually preserving history, then add ROADMAP commit explaining the cluster principle. This makes the doctrine visible in git log.
-
---
-
-### Cluster 3: Help-Parity (P1) — 4 branches
-
-**Members:**
- `feat/jobdori-130b-filesystem-context` (commit `d49a75c`)
- `feat/jobdori-130c-diff-help` (commit `83f744a`)
- `feat/jobdori-130d-config-help` (commit `19638a0`)
- `feat/jobdori-130e-dispatch-help` + `feat/jobdori-130e-surface-help` (commits `0ca0344`, `9dd7e79`)
-
-**Merge prerequisites:**
- [ ] All four branches edit help-topic routing in the same regions
- [ ] Verify no merge conflicts (should be sequential, non-overlapping edits)
- [ ] `cargo build` passes
-
-**Why these four together:** All address help-parity (verbs in `--help` → correct help topics). This cluster is the most "batch-like" — identical fix pattern repeated.
-
-**Post-merge validation:**
- Rebuild binary
- Run: `claw diff --help` (should route to help topic, not crash)
- Run: `claw config --help` (ditto)
- Run: `claw --help` (should list all verbs)
-
-**Merge strategy:** Can be fast-forwarded or squashed as a unit since they're all the same pattern.
-
---
-
-### Cluster 4: Suffix-Guard (P2) — 2 branches
-
-**Members:**
- `feat/jobdori-152-init-suffix-guard` (commit `860f285`)
- `feat/jobdori-152-bootstrap-plan-suffix-guard` (commit `3a533ce`)
-
-**Merge prerequisites:**
- [ ] Both branches add `rest.len() > 1` check to no-arg verbs
- [ ] No conflicts
-
-**Post-merge validation:**
- `claw init extra-arg` (should reject)
- `claw bootstrap-plan extra-arg` (should reject)
-
-**Merge strategy:** Merge together.
-
---
-
-### Cluster 5: Verb-Classification (P2) — 1 branch
-
-**Member:**
- `feat/jobdori-160-verb-classification` (commit `5538934`)
-
-**Merge prerequisites:**
- [ ] Binary tested (23-line change to parser)
- [ ] `cargo test` passes 181 tests
-
-**Post-merge validation:**
- `claw resume bogus-id` (should emit slash-command guidance, not missing_credentials)
- `claw explain this` (should still route to Prompt)
-
-**Note:** Can merge solo or batch with #4. No dependencies.
-
---
-
-### Cluster 6: Doc-Truthfulness (P3) — 2 branches
-
-**Members:**
- `docs/parity-update-2026-04-23` (commit `92a79b5`)
- `docs/jobdori-162-usage-verb-parity` (commit `48da190`)
-
-**Merge prerequisites:**
- [ ] Both are doc-only (no code risk)
- [ ] USAGE.md sections match verbs in `--help`
- [ ] PARITY.md stats are current
-
-**Post-merge validation:**
- `claw --help` (all verbs listed)
- `grep "dump-manifests\|bootstrap-plan" USAGE.md` (should find sections)
- Read PARITY.md (should cite current date + stats)
-
-**Merge strategy:** Can merge in any order.
-
---
-
-## Merge Conflict Risk Assessment
-
-**High-risk clusters (potential conflicts):**
- Cluster 1 (Typed-error) — all edit `main.rs` dispatch/error arms, but in different methods (likely non-overlapping)
- Cluster 3 (Help-parity) — all edit help-routing, but different verbs (should sequence cleanly)
-
-**Low-risk clusters (isolated changes):**
- Cluster 2 (Diagnostic-strictness) — #122 and #122b both edit `check_workspace_health()`, could conflict. #161 edits `build.rs` (no overlap).
- Cluster 4 (Suffix-guard) — two independent verbs, no conflict
- Cluster 5 (Verb-classification) — solo, no conflict
- Cluster 6 (Doc-truthfulness) — doc-only, no conflict
-
-**Conflict mitigation:** Merge Cluster 2 sub-groups: (#122 → #122b → #161) to avoid simultaneous edits to `check_workspace_health()`.
-
---
-
-## Post-Merge Validation Checklist
-
-**After all clusters are merged to main:**
-
- [ ] `cargo build --all` (full workspace build)
- [ ] `cargo test -p rusty-claude-cli` (181 tests pass)
- [ ] `cargo fmt --all --check` (no formatting regressions)
- [ ] `./target/debug/claw version` (correct SHA, not stale)
- [ ] `./target/debug/claw doctor` (stale-base + broad-cwd warnings work)
- [ ] `./target/debug/claw --help` (all verbs listed)
- [ ] `grep -c "### \`" USAGE.md` (all 12 verbs documented, not 8)
- [ ] Fresh dogfood run: `./target/debug/claw prompt "test"` (works)
-
---
-
-## Timeline Estimate
-
-| Phase | Time | Action |
-|---|---|---|
-| Merge Cluster 1 (P0 typed-error) | ~15 min | Merge 3 branches, test, validate |
-| Merge Cluster 2 (P1 diagnostic-strictness) | ~15 min | Merge 3 branches (mind #122/#122b conflict) |
-| Merge Cluster 3 (P1 help-parity) | ~20 min | Merge 4 branches (batch-friendly) |
-| Merge Cluster 4–6 (P2–P3, low-risk) | ~10 min | Fast merges |
-| **Total** | **~60 min** | **All 17 branches → main** |
-
---
-
-## Notes for Reviewer
-
-**Branch-last protocol validation:** All 17 branches here represent work that was:
-1. Pinpoint filed (with repro + fix shape)
-2. Implemented in scratch/worktree (not directly on main)
-3. Verified to build + pass tests
-4. Only then branched for review
-
-This artifact provides the final step: **validated merge order + per-cluster risks.**
-
-**Integration-support artifact:** This checklist reduces reviewer cognitive load by pre-answering "which merge order is safest?" and "what could go wrong?" questions.
-
---
-
-**Checklist source:** Cycle #70 (2026-04-23 03:55 Seoul)
--- a/PARITY.md
+++ b/PARITY.md
@@ -1,14 +1,13 @@
 # Parity Status — claw-code Rust Port

-Last updated: 2026-04-23
+Last updated: 2026-04-03

 ## Summary

 - Canonical document: this top-level `PARITY.md` is the file consumed by `rust/scripts/run_mock_parity_diff.py`.
 - Requested 9-lane checkpoint: **All 9 lanes merged on `main`.**
- Current `main` HEAD: `ad1cf92` (doctrine loop canonical example).
- Repository stats at this checkpoint: **979 commits on `main`**, **9 crates**, **80,789 tracked Rust LOC**, **4,533 test LOC**, **3 authors**, date **2026-04-23**.
- **Growth since last PARITY update (2026-04-03):** Rust LOC +66% (48,599 → 80,789), Test LOC +76% (2,568 → 4,533), Commits +235% (292 → 979). Current phase: 13 branches awaiting review/integration.
+- Current `main` HEAD: `ee31e00` (stub implementations replaced with real AskUserQuestion + RemoteTrigger).
+- Repository stats at this checkpoint: **292 commits on `main` / 293 across all branches**, **9 crates**, **48,599 tracked Rust LOC**, **2,568 test LOC**, **3 authors**, date range **2026-03-31 → 2026-04-03**.
 - Mock parity harness stats: **10 scripted scenarios**, **19 captured `/v1/messages` requests** in `rust/crates/rusty-claude-cli/tests/mock_parity_harness.rs`.

 ## Mock parity harness — milestone 1
--- a/PHASE_1_KICKOFF.md
+++ b/PHASE_1_KICKOFF.md
@@ -1,192 +0,0 @@
-# Phase 1 Kickoff — Classifier Sweeps + Doc-Truth + Design Decisions
-
-**Status:** Ready for execution once Phase 0 (`feat/jobdori-168c-emission-routing`) merges.
-
-**Date prepared:** 2026-04-23 11:47 Seoul (cycles #104–#108 complete, all unaudited surfaces probed)
-
---
-
-## What Got Done (Phase 0)
-
- ✅ JSON output shape routing (no-silent test, SCHEMAS baseline, parity guard)
- ✅ 7 dogfood filings (#155, #169, #170, #171, #172, #153, checkpoint)
- ✅ 9 probe cycles (plugins, agents, init, bootstrap-plan, system-prompt, export, sandbox, dump-manifests, skills)
- ✅ 82 pinpoints filed, 67 genuinely open
- ✅ 227/227 tests pass, 0 regressions
- ✅ Review guide + priority queue locked
- ✅ Doctrine: 28 principles accumulated
-
---
-
-## What Phase 1 Will Do (Confirmed via Gaebal-Gajae)
-
-Execute priority-ordered fixes in 6 bundles + independents:
-
-### Priority 1: Error Envelope Contract Drift
-
-**Bundle:** `feat/jobdori-181-error-envelope-contract-drift` (#181 + #183)
-
-**What it fixes:**
- #181: `plugins bogus-subcommand` returns success-shaped envelope (no `type: "error"`, error buried in message)
- #183: `plugins` and `mcp` emit different shapes on unknown subcommand
-
-**Why it's Priority 1:** Foundation layer. Error envelope is the root contract. All downstream fixes assume correct envelope shape.
-
-**Implementation:** Align `plugins` unknown-subcommand handler to `agents` canonical reference. Ensure both emit `type: "error"` + correct `kind`.
-
-**Risk profile:** HIGH (touches error routing, breaks if consumers depend on old shape) → but gated by Phase 0 freeze + comprehensive tests
-
---
-
-### Priority 2: CLI Contract Hygiene Sweep
-
-**Bundle:** `feat/jobdori-184-cli-contract-hygiene-sweep` (#184 + #185)
-
-**What it fixes:**
- #184: `claw init` silently accepts unknown positional arguments (should reject)
- #185: `claw bootstrap-plan` silently accepts unknown flags (should reject)
-
-**Why it's Priority 2:** Extensions. Guard clauses on existing envelope shape. Uses envelope from Priority 1.
-
-**Implementation:** Add trailing-args rejection to `init` and unknown-flag rejection to `bootstrap-plan`. Pattern: match existing guard in #171 (extra-args classifier).
-
-**Risk profile:** MEDIUM (adds guards, no shape changes)
-
---
-
-### Priority 3: Classifier Sweep (4 Verbs)
-
-**Bundle:** `feat/jobdori-186-192-classifier-sweep` (#186 + #187 + #189 + #192)
-
-**What it fixes:**
- #186: `system-prompt --<unknown>` classified as `unknown` → should be `cli_parse`
- #187: `export --<unknown>` classified as `unknown` → should be `cli_parse`
- #189: `dump-manifests --<unknown>` classified as `unknown` → should be `cli_parse`
- #192: `skills install --<unknown>` classified as `unknown` → should be `cli_parse`
-
-**Why it's Priority 3:** Cleanup. Classifier additions, same envelope, one unified pattern across 4 verbs.
-
-**Implementation:** Add 4 classifier branches (one per verb) to the unknown-option handler. Same test pattern for all.
-
-**Risk profile:** LOW (classifier-only, no routing changes)
-
---
-
-### Priority 4: USAGE.md Standalone Surface Audit
-
-**Bundle:** `feat/jobdori-180-usage-standalone-surface` (#180)
-
-**What it fixes:**
- #180: USAGE.md incomplete verb coverage (doc-truthfulness audit-flow)
-
-**Why it's Priority 4:** Doc audit. Prerequisite for #188 (help-text gaps).
-
-**Implementation:** Audit USAGE.md against all verbs (compare against `claw --help` verb list). Add missing verb documentation.
-
-**Risk profile:** LOW (docs-only)
-
---
-
-### Priority 5: Dump-Manifests Help-Text Fix
-
-**Bundle:** `feat/jobdori-188-dump-manifests-help-prerequisite` (#188)
-
-**What it fixes:**
- #188: `dump-manifests --help` omits prerequisite (env var or flag required)
-
-**Why it's Priority 5:** Doc-truth probe-flow. Comes after audit-flow (#180).
-
-**Implementation:** Update help text to show required alternatives and environment variable.
-
-**Risk profile:** LOW (help-text only)
-
---
-
-### Priority 6+: Independent Fixes
-
- #190: Design decision (help-routing for no-args install) — needs architecture review
- #191: `skills install` filesystem classifier gap — can bundle with #177/#178/#179 or standalone
- #182: Plugin classifier alignment (unknown → filesystem/runtime) — depends on #181 resolution
- #177/#178/#179: Install-surface taxonomy (possible 4-verb bundle)
- #173: Config hint field (consumer-parity)
- #174: Resume trailing classifier (closed? verify)
- #175: CI fmt/test decoupling (gaebal-gajae owned)
-
---
-
-## Concrete Next Steps (Once Phase 0 Merges)
-
-1. **Create branch 1:** `feat/jobdori-181-error-envelope-contract-drift`
-   - Files: error router, tests for #181 + #183
-   - PR against main
-   - Expected: 2 commits, 5 new tests, 0 regressions
-
-2. **Create branch 2:** `feat/jobdori-184-cli-contract-hygiene-sweep`
-   - Files: init guard, bootstrap-plan guard
-   - PR against main
-   - Expected: 2 commits, 3 new tests
-
-3. **Create branch 3:** `feat/jobdori-186-192-classifier-sweep`
-   - Files: unknown-option handler (4 verbs)
-   - PR against main
-   - Expected: 1 commit, 4 new tests
-
-4. **Create branch 4:** `feat/jobdori-180-usage-standalone-surface`
-   - Files: USAGE.md additions
-   - PR against main
-   - Expected: 1 commit, 0 tests
-
-5. **Create branch 5:** `feat/jobdori-188-dump-manifests-help-prerequisite`
-   - Files: help text update (string change)
-   - PR against main
-   - Expected: 1 commit, 0 tests
-
-6. **Triage independents:** #190 requires architecture discussion; others can follow once above merges.
-
---
-
-## Hypothesis Validation (Codified for Future Probes)
-
-**Multi-flag verbs (install, enable, init, bootstrap-plan, system-prompt, export, dump-manifests):** 3–4 classifier gaps each.
-
-**Single-issue verbs (list, show, sandbox, agents):** 0–1 gaps.
-
-**Future probe strategy:** Prioritize multi-flag verbs; single-issue verbs are mostly clean.
-
---
-
-## Doctrine Points Relevant to Phase 1 Execution
-
- **Doctrine #22:** Schema baseline check before enum proposal
- **Doctrine #25:** Contract-surface-first ordering (foundation → extensions → cleanup)
- **Doctrine #27:** Same-pattern pinpoints should bundle into one classifier sweep PR
- **Doctrine #28:** First observation is hypothesis, not filing (verify before classifying)
-
---
-
-## Known Blockers & Risks
-
-1. **Phase 0 merge gating:** Can't create Phase 1 branches until Phase 0 lands (28 base + 37 new = 65 total pending)
-2. **#190 design decision:** help-routing behavior needs architectural consensus (intentional vs inconsistency)
-3. **Cross-family dependencies:** #182 depends on #181 (plugin error envelope must be correct first)
-
---
-
-## Testing Strategy for Phase 1
-
- **Priority 1–3 bundles:** Existing test framework (`output_format_contract.rs`, classifier tests). Comprehensive coverage per bundle.
- **Priority 4–5 bundles:** Light doc verification (grep USAGE.md, spot-check help text).
- **Independent fixes:** Case-by-case once prioritized.
-
---
-
-## Success Criteria
-
- ✅ All Priority 1–5 bundles merge to main
- ✅ 0 regressions (227+ tests pass across all merges)
- ✅ CI green on all PRs
- ✅ Reviewer sign-offs on all bundles
-
---
-
-**Phase 1 is ready to execute. Awaiting Phase 0 merge approval.**
--- a/REVIEW_DASHBOARD.md
+++ b/REVIEW_DASHBOARD.md
@@ -1,191 +0,0 @@
-# Review Dashboard — claw-code
-
-**Last updated:** 2026-04-23 03:34 Seoul
-**Queue state:** 14 review-ready branches
-**Main HEAD:** `f18f45c` (ROADMAP #161 filed)
-
-This is an integration support artifact (per cycle #64 doctrine). Its purpose: let reviewers see all queued branches, cluster membership, and merge priorities without re-deriving from git log.
-
---
-
-## At-A-Glance
-
-| Priority | Cluster | Branches | Complexity | Status |
-|---|---|---|---|---|
-| P0 | Typed-error threading | #248, #249, #251 | S–M | Merge-ready |
-| P1 | Diagnostic-strictness | #122, #122b | S | Merge-ready |
-| P1 | Help-parity | #130b-#130e | S each | Merge-ready (batch) |
-| P2 | Suffix-guard | #152-init, #152-bootstrap-plan | XS each | Merge-ready (batch) |
-| P2 | Verb-classification | #160 | S | Merge-ready (just shipped) |
-| P3 | Doc truthfulness | docs/parity-update | XS | Merge-ready |
-
-**Suggested merge order:** P0 → P1 → P2 → P3. Within P0, start with #249 (smallest diff).
-
---
-
-## Detailed Branch Inventory
-
-### P0: Typed-Error Threading (3 branches)
-
-#### `feat/jobdori-249-resumed-slash-kind` — **SMALLEST. START HERE.**
- **Commit:** `eb4b1eb`
- **Diff:** 61 lines in `rust/crates/rusty-claude-cli/src/main.rs`
- **Scope:** Two Err arms in `resume_session()` at lines 2745, 2782 now emit `kind` + `hint`
- **Cluster:** Completes #247 parent's typed-error family
- **Tests:** 181 binary tests pass (no regressions)
- **Reviewer checklist:** see `/tmp/pr-summary-249.md`
- **Expected merge time:** ~5 minutes
-
-#### `feat/jobdori-248-unknown-verb-option-classify`
- **Commit:** `6c09172`
- **Scope:** Unknown verb + option classifier family
- **Cluster:** #247 parent's typed-error family (sibling of #249)
-
-#### `feat/jobdori-251-session-dispatch`
- **Commit:** `dc274a0`
- **Scope:** Intercepts session-management verbs (`list-sessions`, `load-session`, `delete-session`, `flush-transcript`) at top-level parser
- **Cluster:** #247 parent's typed-error family
- **Note:** Larger change than #248/#249 — prefer merging those first
-
-### P1: Diagnostic-Strictness (2 branches)
-
-#### `feat/jobdori-122-doctor-stale-base`
- **Commit:** `5bb9eba`
- **Scope:** `claw doctor` now warns on stale-base (same check as prompt preflight)
- **Cluster:** Diagnostic surfaces reflect runtime reality (cycle #57 principle)
-
-#### `feat/jobdori-122b-doctor-broad-cwd`
- **Commit:** `0aa0d3f`
- **Scope:** `claw doctor` now warns when cwd is broad path (home/root)
- **Cluster:** Same as #122 (direct sibling)
- **Batch suggestion:** Review together with #122
-
-### P1: Help-Parity (4 branches, batch-reviewable)
-
-All four implement uniform `--help` flag handling. Related by fix locus (help-topic routing).
-
-#### `feat/jobdori-130b-filesystem-context`
- **Commit:** `d49a75c`
- **Scope:** Filesystem I/O errors enriched with operation + path context
-
-#### `feat/jobdori-130c-diff-help`
- **Commit:** `83f744a`
- **Scope:** `claw diff --help` routes to help topic
-
-#### `feat/jobdori-130d-config-help`
- **Commit:** `19638a0`
- **Scope:** `claw config --help` routes to help topic
-
-#### `feat/jobdori-130e-dispatch-help` + `feat/jobdori-130e-surface-help`
- **Commits:** `0ca0344`, `9dd7e79`
- **Scope:** Category A (dispatch-order) + Category B (surface) help-anomaly fixes from systematic sweep
- **Batch suggestion:** Review #130c, #130d, #130e-dispatch, #130e-surface as one unit — all use same pattern (add help flag guard before action)
-
-### P2: Suffix-Guard (2 branches, batch-reviewable)
-
-#### `feat/jobdori-152-init-suffix-guard`
- **Commit:** `860f285`
- **Scope:** `claw init` rejects trailing args
- **Cluster:** Uniform no-arg verb suffix guards
-
-#### `feat/jobdori-152-bootstrap-plan-suffix-guard`
- **Commit:** `3a533ce`
- **Scope:** `claw bootstrap-plan` rejects trailing args
- **Cluster:** Same as above (direct sibling)
- **Batch suggestion:** Review together
-
-### P2: Verb-Classification (1 branch, just shipped cycle #63)
-
-#### `feat/jobdori-160-verb-classification`
- **Commit:** `5538934`
- **Scope:** Reserved-semantic verbs (resume, compact, memory, commit, pr, issue, bughunter) with positional args now emit slash-command guidance
- **Cluster:** Sibling of #251 (dispatch leak family), applied to promptable/reserved split
- **Design closure note:** Investigation in cycle #61 revealed verb-classification was the actual need; cycle #63 implemented the class table
-
-### P3: Doc Truthfulness (1 branch, just shipped cycle #64)
-
-#### `docs/parity-update-2026-04-23`
- **Commit:** `92a79b5`
- **Scope:** PARITY.md stats refreshed (Rust LOC +66%, Test LOC +76%, Commits +235% since 2026-04-03)
- **Risk:** Near-zero (4-line diff, doc-only)
- **Merge time:** ~1 minute
-
---
-
-## Batch Review Patterns
-
-For reviewer efficiency, these groups share the same fix-locus or pattern:
-
-| Batch | Branches | Shared pattern |
-|---|---|---|
-| Help-parity bundle | #130c, #130d, #130e-dispatch, #130e-surface | All add help-flag guard before action in dispatch |
-| Suffix-guard bundle | #152-init, #152-bootstrap-plan | Both add `rest.len() > 1` check to no-arg verbs |
-| Diagnostic-strictness bundle | #122, #122b | Both extend `check_workspace_health()` with new preflights |
-| Typed-error bundle | #248, #249, #251 | All thread `classify_error_kind` + `split_error_hint` into specific Err arms |
-
-If reviewer has limited time, batch review saves context switches.
-
---
-
-## Review Friction Map
-
-**Lowest friction (safe start):**
- docs/parity-update (4 lines, doc-only)
- #249 (61 lines, 2 Err arms, 181 tests pass)
- #160 (23 lines, new helper + pre-check)
-
-**Medium friction:**
- #122, #122b (each ~100 lines, diagnostic extensions)
- #248 (classifier family)
- #152-* branches (XS each)
-
-**Highest friction:**
- #251 (broader parser changes, multi-verb coverage)
- #130e bundle (help-parity systematic sweep)
-
---
-
-## Open Pinpoints Awaiting Implementation
-
-| # | Title | Priority | Est. diff | Notes |
-|---|---|---|---|---|
-| #157 | Auth remediation registry | S-M | 50-80 lines | Cycle #59 audit pre-fill |
-| #158 | Hook validation at worker boot | S | 30-50 lines | Cycle #59 audit pre-fill |
-| #159 | Plugin manifest validation at worker boot | S | 30-50 lines | Cycle #59 audit pre-fill |
-| #161 | Stale Git SHA in worktree builds | S | ~15 lines in build.rs | Cycle #65 just filed |
-
-None of these should be implemented while current queue is 14. Prioritize merging queue first.
-
---
-
-## Merge Throughput Notes
-
-**Target throughput:** 2-3 branches per review session. At current cycle velocity (cycles #39–#65 = 27 cycles in ~3 hours), 2-3 merges unblock:
- 3+ cluster closures (typed-error, diagnostic-strictness, help-parity)
- 1 doctrine loop closure (verb-classification → #160)
- 1 doc freshness (PARITY.md)
-
-**Post-merge expected state:** ~10 branches remaining, queue shifts from saturated (14) to manageable (10), velocity cycles can resume in safe zone.
-
---
-
-## For The Reviewer
-
-**Reviewing checklist (per-branch):**
- [ ] Diff matches pinpoint description
- [ ] Tests pass (cite count: should be 181+ for branches that touched main.rs)
- [ ] Backward compatibility verified (check-list in commit message)
- [ ] No related cluster branches yet to land (check cluster column above)
-
-**Reviewer shortcut for #249** (recommended first-merge):
-```bash
-cd /tmp/jobdori-249
-git log --oneline -1  # eb4b1eb
-git diff main..HEAD -- rust/crates/rusty-claude-cli/src/main.rs | head -50
-```
-
-Or skip straight to: `/tmp/pr-summary-249.md` (pre-prepared PR-ready artifact).
-
---
-
-**Dashboard source:** Cycle #66 (2026-04-23 03:34 Seoul). Updates should be re-run when branches merge or new pinpoints land.
--- a/ROADMAP.md
+++ b/ROADMAP.md
--- a/SCHEMAS.md
+++ b/SCHEMAS.md
@@ -1,20 +1,14 @@
 # JSON Envelope Schemas — Clawable CLI Contract

-> **⚠️ CRITICAL: This document describes the TARGET v2.0 envelope schema, not the current v1.0 binary behavior.** The Rust binary currently emits a **flat v1.0 envelope** that does NOT include `timestamp`, `command`, `exit_code`, `output_format`, or `schema_version` fields. See [`FIX_LOCUS_164.md`](./FIX_LOCUS_164.md) for the full migration plan and timeline. **Do not build automation against the field shapes below without first testing against the actual binary output.** Use `claw <command> --output-format json` to inspect what your binary version actually emits.
+This document locks the field-level contract for all clawable-surface commands. Every command accepting `--output-format json` must conform to the envelope shapes below.

-This document locks the **target** field-level contract for all clawable-surface commands. After the v1.0→v2.0 migration (FIX_LOCUS_164 Phase 2), every command accepting `--output-format json` will conform to the envelope shapes documented here.
-
-**Target audience:** Claws planning v2.0 migration, reference implementers, contract validators.
-
-**Current v1.0 reality:** See [`ERROR_HANDLING.md`](./ERROR_HANDLING.md) Appendix A for the flat envelope shape the binary actually emits today.
+**Target audience:** Claws building orchestrators, automation, or monitoring against claw-code's JSON output.

 ---

-## Common Fields (All Envelopes) — TARGET v2.0 SCHEMA
+## Common Fields (All Envelopes)

-**This section describes the v2.0 target schema. The current v1.0 binary does NOT emit these fields.** See FIX_LOCUS_164.md for the migration timeline.
-
-After v2.0 migration, every command response, success or error, will carry:
+Every command response, success or error, carries:

 ```json
 {
@@ -22,7 +16,7 @@ After v2.0 migration, every command response, success or error, will carry:
  "command": "list-sessions",
  "exit_code": 0,
  "output_format": "json",
-  "schema_version": "2.0"
+  "schema_version": "1.0"
 }
 ```

@@ -113,24 +107,6 @@ When an entity does not exist (exit code 1, but not a failure):

 ### `list-sessions`

-**Status**: ✅ Implemented (closed #251 cycle #45, 2026-04-23).
-
-**Actual binary envelope** (as of #251 fix):
-```json
-{
-  "command": "list-sessions",
-  "sessions": [
-    {
-      "id": "session-1775777421902-1",
-      "path": "/path/to/.claw/sessions/session-1775777421902-1.jsonl",
-      "updated_at_ms": 1775777421902,
-      "message_count": 0
-    }
-  ]
-}
-```
-
-**Aspirational (future) shape**:
 ```json
 {
  "timestamp": "2026-04-22T10:10:00Z",
@@ -152,25 +128,8 @@ When an entity does not exist (exit code 1, but not a failure):
 }
 ```

-**Gap**: Current impl lacks `timestamp`, `exit_code`, `output_format`, `schema_version`, `directory`, `sessions_count` (derivable), and the session object uses `id`/`updated_at_ms`/`message_count` instead of `session_id`/`last_modified`/`prompt_count`. Follow-up #250 Option B to align field names and add common-envelope fields.
-
 ### `delete-session`

-**Status**: ⚠️ Stub only (closed #251 dispatch-order fix; full impl deferred).
-
-**Actual binary envelope** (as of #251 fix):
-```json
-{
-  "type": "error",
-  "command": "delete-session",
-  "error": "not_yet_implemented",
-  "kind": "not_yet_implemented"
-}
-```
-
-Exit code: 1. No credentials required. The stub ensures the verb does NOT fall through to Prompt/auth (the #251 fix), but the actual delete operation is not yet wired.
-
-**Aspirational (future) shape**:
 ```json
 {
  "timestamp": "2026-04-22T10:10:00Z",
@@ -184,31 +143,6 @@ Exit code: 1. No credentials required. The stub ensures the verb does NOT fall t

 ### `load-session`

-**Status**: ✅ Implemented (closed #251 cycle #45, 2026-04-23).
-
-**Actual binary envelope** (as of #251 fix):
-```json
-{
-  "command": "load-session",
-  "session": {
-    "id": "session-abc123",
-    "path": "/path/to/.claw/sessions/session-abc123.jsonl",
-    "messages": 5
-  }
-}
-```
-
-For nonexistent sessions, emits a local `session_not_found` error (NOT `missing_credentials`):
-```json
-{
-  "error": "session not found: nonexistent",
-  "kind": "session_not_found",
-  "type": "error",
-  "hint": "Hint: managed sessions live in .claw/sessions/<hash>/ ..."
-}
-```
-
-**Aspirational (future) shape**:
 ```json
 {
  "timestamp": "2026-04-22T10:10:00Z",
@@ -221,25 +155,8 @@ For nonexistent sessions, emits a local `session_not_found` error (NOT `missing_
 }
 ```

-**Gap**: Current impl uses nested `session: {...}` instead of flat fields, and omits common-envelope fields. Follow-up #250 Option B to align.
-
 ### `flush-transcript`

-**Status**: ⚠️ Stub only (closed #251 dispatch-order fix; full impl deferred).
-
-**Actual binary envelope** (as of #251 fix):
-```json
-{
-  "type": "error",
-  "command": "flush-transcript",
-  "error": "not_yet_implemented",
-  "kind": "not_yet_implemented"
-}
-```
-
-Exit code: 1. No credentials required. Like `delete-session`, this stub resolves the #251 dispatch-order bug but the actual flush operation is not yet wired.
-
-**Aspirational (future) shape**:
 ```json
 {
  "timestamp": "2026-04-22T10:10:00Z",
@@ -458,251 +375,3 @@ cargo test --release test_json_envelope_field_consistency
 - `show-command` reports `found: bool` (inventory signal: "does this exist?")
 - `exec-command` reports `handled: bool` (operational signal: "was this work performed?")
 - The names matter: a command can be found but not handled (e.g. too large for context window), or handled silently (no output message)
-
---
-
-## Appendix: Current v1.0 vs. Target v2.0 Envelope Shapes
-
-### ⚠️ IMPORTANT: Binary Reality vs. This Document
-
-**This entire SCHEMAS.md document describes the TARGET v2.0 schema.** The actual Rust binary currently emits v1.0 (flat) envelopes.
-
-**Do not assume the fields documented above are in the binary right now.** They are not.
-
-### Current v1.0 Envelope (What the Rust Binary Actually Emits)
-
-The Rust binary in `rust/` currently emits a **flat v1.0 envelope** without common metadata wrapper:
-
-#### v1.0 Success Envelope Example
-
-```json
-{
-  "kind": "list-sessions",
-  "sessions": [
-    {"id": "abc123", "created": "2026-04-22T10:00:00Z", "turns": 5}
-  ],
-  "type": "success"
-}
-```
-
-**Key differences from v2.0 above:**
- NO `timestamp`, `command`, `exit_code`, `output_format`, `schema_version` fields
- `kind` field contains the verb name (or is entirely absent for success)
- `type: "success"` flag at top level
- Verb-specific fields (`sessions`, `turn`, etc.) at top level
-
-#### v1.0 Error Envelope Example
-
-```json
-{
-  "error": "session 'xyz789' not found in .claw/sessions",
-  "hint": "use 'list-sessions' to see available sessions",
-  "kind": "session_not_found",
-  "type": "error"
-}
-```
-
-**Key differences from v2.0 error above:**
- `error` field is a **STRING**, not a nested object
- NO `error.operation`, `error.target`, `error.retryable` structured fields
- `kind` is at top-level, not nested
- NO `timestamp`, `command`, `exit_code`, `output_format`, `schema_version`
- Extra `type: "error"` flag
-
-### Migration Timeline (FIX_LOCUS_164)
-
-See [`FIX_LOCUS_164.md`](./FIX_LOCUS_164.md) for the full phased migration:
-
- **Phase 1 (Opt-in):** `claw <cmd> --output-format json --envelope-version=2.0` emits v2.0 shape
- **Phase 2 (Default):** v2.0 becomes default; `--legacy-envelope` flag opts into v1.0
- **Phase 3 (Deprecation):** v1.0 warnings, then removal
-
-### Building Automation Against v1.0 (Current)
-
-**For claws building automation today** (against the real binary, not this schema):
-
-1. **Check `type` field first** (string: "success" or "error")
-2. **For success:** verb-specific fields are at top level. Use `jq .kind` for verb ID (if present)
-3. **For error:** access `error` (string), `hint` (string), `kind` (string) all at top level
-4. **Do not expect:** `timestamp`, `command`, `exit_code`, `output_format`, `schema_version` — they don't exist yet
-5. **Test your code** against `claw <cmd> --output-format json` output to verify assumptions before deploying
-
-### Example: Python Consumer Code (v1.0)
-
-**Correct pattern for v1.0 (current binary):**
-
-```python
-import json
-import subprocess
-
-result = subprocess.run(
-    ["claw", "list-sessions", "--output-format", "json"],
-    capture_output=True,
-    text=True
-)
-envelope = json.loads(result.stdout)
-
-# v1.0: type is at top level
-if envelope.get("type") == "error":
-    error_msg = envelope.get("error", "unknown error")  # error is a STRING
-    error_kind = envelope.get("kind")  # kind is at TOP LEVEL
-    print(f"Error: {error_kind} — {error_msg}")
-else:
-    # Success path: verb-specific fields at top level
-    sessions = envelope.get("sessions", [])
-    for session in sessions:
-        print(f"Session: {session['id']}")
-```
-
-**After v2.0 migration, this code will break.** Claws building for v2.0 compatibility should:
-
-1. Check `schema_version` field
-2. Parse differently based on version
-3. Or wait until Phase 2 default bump is announced, then migrate
-
-### Why This Mismatch Exists
-
-SCHEMAS.md was written as the **target design** for v2.0. The Rust binary is still on v1.0. The migration (FIX_LOCUS_164) will bring the binary in line with this schema, but it hasn't happened yet.
-
-**This mismatch is the root cause of doc-truthfulness issues #78, #79, #165.** All three docs were documenting the v2.0 target as if it were current reality.
-
-### Questions?
-
- **"Is v2.0 implemented?"** No. The binary is v1.0. See FIX_LOCUS_164.md for the implementation roadmap.
- **"Should I build against v2.0 schema?"** No. Build against v1.0 (current). Test your code with `claw` to verify.
- **"When does v2.0 ship?"** See FIX_LOCUS_164.md Phase 1 estimate: ~6 dev-days. Not scheduled yet.
- **"Can I use v2.0 now?"** Only if you explicitly pass `--envelope-version=2.0` (which doesn't exist yet in v1.0 binary).
-
---
-
-## v1.5 Emission Baseline — Per-Verb Shape Catalog (Cycle #91, Phase 0 Task 3)
-
-**Status:** 📸 Snapshot of actual binary behavior as of cycle #91 (2026-04-23). Anchored by controlled matrix `/tmp/cycle87-audit/matrix.json` + Phase 0 tests in `output_format_contract.rs`.
-
-### Purpose
-
-This section documents **what each verb actually emits under `--output-format json`** as of the v1.5 emission baseline (post-cycle #89 emission routing fix, pre-Phase 1 shape normalization).
-
-This is a **reference artifact**, not a target schema. It describes the reality that:
-
-1. `--output-format json` exists and emits JSON (enforced by Phase 0 Task 2)
-2. All output goes to stdout (enforced by #168c fix, cycle #89)
-3. Each verb has a bespoke top-level shape (documented below; to be normalized in Phase 1)
-
-### Emission Contract (v1.5 Baseline)
-
-| Property | Rule | Enforced By |
-|---|---|---|
-| Exit 0 + stdout empty (silent success) | **Forbidden** | Test: `emission_contract_no_silent_success_under_output_format_json_168c_task2` |
-| Exit 0 + stdout contains valid JSON | Required | Test: same (parses each safe-success verb) |
-| Exit != 0 + JSON envelope on stdout | Required | Test: same + `error_envelope_emitted_to_stdout_under_output_format_json_168c` |
-| Error envelope on stderr under `--output-format json` | **Forbidden** | Test: #168c regression test |
-| Text mode routes errors to stderr | Preserved | Backward compat; not changed by cycle #89 |
-
-### Per-Verb Shape Catalog
-
-Captured from controlled matrix (cycle #87) and verified against post-#168c binary (cycle #91).
-
-#### Verbs with `kind` top-level field (12/13)
-
-| Verb | Top-level keys | Notes |
-|---|---|---|
-| `help` | `kind, message` | Minimal shape |
-| `version` | `git_sha, kind, message, target, version` | Build metadata |
-| `doctor` | `checks, has_failures, kind, message, report, summary` | Diagnostic results |
-| `mcp` | `action, config_load_error, configured_servers, kind, servers, status, working_directory` | MCP state |
-| `skills` | `action, kind, skills, summary` | Skills inventory |
-| `agents` | `action, agents, count, kind, summary, working_directory` | Agent inventory |
-| `sandbox` | `active, active_namespace, active_network, allowed_mounts, enabled, fallback_reason, filesystem_active, filesystem_mode, in_container, kind, markers, requested_namespace, requested_network, supported` | Sandbox state (14 keys) |
-| `status` | `config_load_error, kind, model, model_raw, model_source, permission_mode, sandbox, status, usage, workspace` | Runtime status |
-| `system-prompt` | `kind, message, sections` | Prompt sections |
-| `bootstrap-plan` | `kind, phases` | Bootstrap phases |
-| `export` | `file, kind, message, messages, session_id` | Export metadata |
-| `acp` | `aliases, discoverability_tracking, kind, launch_command, message, recommended_workflows, serve_alias_only, status, supported, tracking` | ACP discoverability |
-
-#### Verb with `command` top-level field (1/13) — Phase 1 normalization target
-
-| Verb | Top-level keys | Notes |
-|---|---|---|
-| `list-sessions` | `command, sessions` | **Deviation:** uses `command` instead of `kind`. Target Phase 1 fix. |
-
-#### Verbs with error-only emission in test env (exit != 0)
-
-These verbs require external state (credentials, session fixtures, manifests) and return error envelopes in clean test environments:
-
-| Verb | Error envelope keys | Notes |
-|---|---|---|
-| `bootstrap` | `error, hint, kind, type` | Requires `ANTHROPIC_AUTH_TOKEN` for success path |
-| `dump-manifests` | `error, hint, kind, type` | Requires upstream manifest source |
-| `state` | `error, hint, kind, type` | Requires worker state file |
-
-**Common error envelope shape (all verbs):** `{error, hint, kind, type}` — this is the one consistently-shaped part of v1.5.
-
-### Standard Error Envelope (v1.5)
-
-Error envelopes are the **only** part of v1.5 with a guaranteed consistent shape across all verbs:
-
-```json
-{
-  "type": "error",
-  "error": "short human-readable reason",
-  "kind": "snake_case_machine_readable_classification",
-  "hint": "optional remediation hint (may be null)"
-}
-```
-
-**Classification kinds** (from `classify_error_kind` in `main.rs`):
- `cli_parse` — argument parsing error
- `missing_credentials` — auth token/key missing
- `session_not_found` — load-session target missing
- `session_load_failed` — persisted session unreadable
- `no_managed_sessions` — no sessions exist to list
- `missing_manifests` — upstream manifest sources absent
- `filesystem_io_error` — file operation failure
- `api_http_error` — upstream API returned non-2xx
- `unknown` — classifier fallthrough
-
-### How This Differs from v2.0 Target
-
-| Aspect | v1.5 (this doc) | v2.0 Target (SCHEMAS.md top) |
-|---|---|---|
-| Top-level verb ID | 12 use `kind`, 1 uses `command` | Common `command` field |
-| Common metadata | None (no `timestamp`, `exit_code`, etc.) | `timestamp`, `command`, `exit_code`, `output_format`, `schema_version` |
-| Error envelope | `{error, hint, kind, type}` flat | `{error: {message, kind, operation, target, retryable}, ...}` nested |
-| Success shape | Verb-specific (13 bespoke) | Common wrapper with `data` field |
-
-### Consumer Guidance (Against v1.5 Baseline)
-
-**For claws consuming v1.5 today:**
-
-1. **Always use `--output-format json`** — text format has no stability contract (#167)
-2. **Check `type` field first** — "error" or absent/other (treat as success)
-3. **For errors:** access `error` (string), `kind` (string), `hint` (nullable string)
-4. **For success:** use verb-specific keys per catalog above
-5. **Do NOT assume** `kind` field exists on success path — `list-sessions` uses `command` instead
-6. **Do NOT assume** metadata fields (`timestamp`, `exit_code`, etc.) — they are v2.0 target only
-7. **Check exit code** for pass/fail; don't infer from payload alone
-
-### Phase 1 Normalization Targets (After This Baseline Locks)
-
-Phase 1 (shape stabilization) will normalize these divergences:
-
- `list-sessions`: `command` → `kind` (align with 12/13 convention)
- Potentially: unify where `message` field appears (9/13 have it, inconsistently populated)
- Potentially: unify where `action` field appears (only in 3 inventory verbs: `mcp`, `skills`, `agents`)
-
-Phase 1 does **not** add common metadata (`timestamp`, `exit_code`) — that's Phase 2 (v2.0 wrapper).
-
-### Regenerating This Catalog
-
-The catalog is derived from running the controlled matrix. Phase 0 Task 4 will add a deterministic script; for now, reproduce with:
-
-```
-for verb in help version list-sessions doctor mcp skills agents sandbox status system-prompt bootstrap-plan export acp; do
-  echo "=== $verb ==="
-  claw $verb --output-format json | jq 'keys'
-done
-```
-
-This matches what the Phase 0 Task 2 test enforces programmatically.
-
--- a/USAGE.md
+++ b/USAGE.md
@@ -36,60 +36,6 @@ cargo build --workspace

 The CLI binary is available at `rust/target/debug/claw` after a debug build. Make the doctor check above your first post-build step.

-### Add binary to PATH
-
-To run `claw` from anywhere without typing the full path:
-
-**Option 1: Symlink to a directory already in your PATH**
-
-```bash
-# Find a PATH directory (usually ~/.local/bin or /usr/local/bin)
-echo $PATH
-
-# Create symlink (adjust path and PATH-dir as needed)
-ln -s /Users/yeongyu/clawd/claw-code/rust/target/debug/claw ~/.local/bin/claw
-
-# Verify it's in PATH
-which claw
-```
-
-**Option 2: Add the binary directory to PATH directly**
-
-Add this to your shell rc file (`~/.bashrc`, `~/.zshrc`, etc.):
-
-```bash
-export PATH="$PATH:/Users/yeongyu/clawd/claw-code/rust/target/debug"
-```
-
-Then reload:
-
-```bash
-source ~/.zshrc  # or ~/.bashrc
-```
-
-### Verify install
-
-After adding to PATH, verify the binary works:
-
-```bash
-# Should print version and exit successfully
-claw version
-
-# Should run health check (shows which components are initialized)
-claw doctor
-
-# Should show available commands
-claw --help
-```
-
-If `claw: command not found`, the PATH addition didn't take. Re-check:
-
-```bash
-echo $PATH                    # verify your PATH directory is listed
-which claw                    # should show full path to binary
-ls -la ~/.local/bin/claw      # if using symlink, verify it exists and points to target/debug/claw
-```
-
 ## Quick start

 ### First-run doctor check
@@ -152,57 +98,7 @@ cd rust

 ### JSON output for scripting

-All clawable commands support `--output-format json` for machine-readable output.
-
-**IMPORTANT SCHEMA VERSION NOTICE:**
-
-The JSON envelope is currently in **v1.0 (flat shape)** and is scheduled to migrate to **v2.0 (nested schema)** in a future release. See [`FIX_LOCUS_164.md`](./FIX_LOCUS_164.md) for the full migration plan.
-
-#### Current (v1.0) envelope shape
-
-**Success envelope** — verb-specific fields + `kind: "<verb-name>"`:
-```json
-{
-  "kind": "doctor",
-  "checks": [...],
-  "summary": {...},
-  "has_failures": false,
-  "report": "...",
-  "message": "..."
-}
-```
-
-**Error envelope** — flat error fields at top level:
-```json
-{
-  "error": "unrecognized argument `foo`",
-  "hint": "Run `claw --help` for usage.",
-  "kind": "cli_parse",
-  "type": "error"
-}
-```
-
-**Known issues with v1.0:**
- Missing `exit_code`, `command`, `timestamp`, `output_format`, `schema_version` fields
- `error` is a string, not a structured object with operation/target/retryable/message/hint
- `kind` field is semantically overloaded (verb identity in success, error classification in error)
- See [`SCHEMAS.md`](./SCHEMAS.md) for documented (v2.0 target) schema and [`FIX_LOCUS_164.md`](./FIX_LOCUS_164.md) for migration details
-
-#### Using v1.0 envelopes in your code
-
-**Success path:** Check for absence of `type: "error"`, then access verb-specific fields:
-```bash
-cd rust
-./target/debug/claw doctor --output-format json | jq '.kind, .has_failures'
-```
-
-**Error path:** Check for `type == "error"`, then access `error` (string) and `kind` (error classification):
-```bash
-cd rust
-./target/debug/claw doctor invalid-arg --output-format json | jq '.error, .kind'
-```
-
-**Do NOT rely on `kind` alone for dispatching** — it has different meanings in success vs. error. Always check `type == "error"` first.
+All clawable commands support `--output-format json` for machine-readable output. Every invocation returns a consistent JSON envelope with `exit_code`, `command`, `timestamp`, and either `{success fields}` or `{error: {kind, message, ...}}`.

 ```bash
 cd rust
@@ -213,8 +109,6 @@ cd rust

 **Building a dispatcher or orchestration script?** See [`ERROR_HANDLING.md`](./ERROR_HANDLING.md) for the unified error-handling pattern. One code example works for all 14 clawable commands: parse the exit code, classify by `error.kind`, apply recovery strategies (retry, timeout recovery, validation, logging). Use that pattern instead of reimplementing error handling per command.

-**Migrating to v2.0?** Check back after [`FIX_LOCUS_164`](./FIX_LOCUS_164.md) is implemented. Phase 1 will add a `--envelope-version=2.0` flag for opt-in access to the structured envelope schema. Phase 2 will make v2.0 the default. Phase 3 will deprecate v1.0.
-
 ### Inspect worker state

 The `claw state` command reads `.claw/worker-state.json`, which is written by the interactive REPL or a one-shot prompt when a worker executes a task. This file contains the worker ID, session reference, model, and permission mode.
@@ -528,93 +422,6 @@ cd rust
 ./target/debug/claw system-prompt --cwd .. --date 2026-04-04
 ```

-### `dump-manifests` — Export upstream plugin/MCP manifests
-
-**Purpose:** Dump built-in tool and plugin manifests to stdout as JSON, for parity comparison against the upstream Claude Code TypeScript implementation.
-
-**Prerequisite:** This command requires access to upstream source files (`src/commands.ts`, `src/tools.ts`, `src/entrypoints/cli.tsx`). Set `CLAUDE_CODE_UPSTREAM` env var or pass `--manifests-dir`.
-
-```bash
-# Via env var
-CLAUDE_CODE_UPSTREAM=/path/to/upstream claw dump-manifests
-
-# Via flag
-claw dump-manifests --manifests-dir /path/to/upstream
-```
-
-**When to use:** Parity work (comparing the Rust port's tool/plugin surface against the canonical TypeScript implementation). Not needed for normal operation.
-
-**Error mode:** If upstream sources are missing, exits with `error-kind: missing_manifests` and a hint about how to provide them.
-
-### `bootstrap-plan` — Show startup component graph
-
-**Purpose:** Print the ordered list of startup components that are initialized when `claw` begins a session. Useful for debugging startup issues or verifying that fast-path optimizations are in place.
-
-```bash
-claw bootstrap-plan
-```
-
-**Sample output:**
-```
- CliEntry
- FastPathVersion
- StartupProfiler
- SystemPromptFastPath
- ChromeMcpFastPath
-```
-
-**When to use:**
- Debugging why startup is slow (compare your plan to the expected one)
- Verifying that fast-path components are registered
- Understanding the load order before customizing hooks or plugins
-
-**Related:** See `claw doctor` for health checks against these startup components.
-
-### `acp` — Agent Context Protocol / Zed editor integration status
-
-**Purpose:** Report the current state of the ACP (Agent Context Protocol) / Zed editor integration. Currently **discoverability only** — no editor daemon is available yet.
-
-```bash
-claw acp
-claw acp serve   # same output; `serve` is accepted but not yet launchable
-claw --acp       # alias
-claw -acp        # alias
-```
-
-**Sample output:**
-```
-ACP / Zed
-  Status           discoverability only
-  Launch           `claw acp serve` / `claw --acp` / `claw -acp` report status only; no editor daemon is available yet
-  Today            use `claw prompt`, the REPL, or `claw doctor` for local verification
-  Tracking         ROADMAP #76
-```
-
-**When to use:** Check whether ACP/Zed integration is ready in your current build. Plan around its availability (track ROADMAP #76 for status).
-
-**Today's alternatives:** Use `claw prompt` for one-shot runs, the interactive REPL for iterative work, or `claw doctor` for local verification.
-
-### `export` — Export session transcript
-
-**Purpose:** Export a managed session's transcript to a file or stdout. Operates on the currently-resumed session (requires `--resume`).
-
-```bash
-# Export latest session
-claw --resume latest export
-
-# Export specific session
-claw --resume <session-id> export
-```
-
-**Prerequisite:** A managed session must exist under `.claw/sessions/<workspace-fingerprint>/`. If no sessions exist, the command exits with `error-kind: no_managed_sessions` and a hint to start a session first.
-
-**When to use:**
- Archive session transcripts for review
- Share session context with teammates
- Feed session history into downstream tooling
-
-**Related:** Inside the REPL, `/export` is also available as a slash command for the active session.
-
 ## Session management

 REPL turns are persisted under `.claw/sessions/` in the current workspace.
@@ -625,27 +432,7 @@ cd rust
 ./target/debug/claw --resume latest /status /diff
 ```

-### Interactive slash commands (inside the REPL)
-
-Useful interactive commands include:
-
- `/help` — Show help for all available commands
- `/status` — Display current session and workspace status
- `/cost` — Show token usage and cost estimates for the session
- `/config` — Display current configuration and environment state
- `/session` — Show session ID, creation time, and persisted metadata
- `/model` — Display or switch the active model
- `/permissions` — Check sandbox permissions and capability grants
- `/export [file]` — Export the current conversation to a file (or resume from backup)
- `/ultraplan [task]` — Run a deep planning prompt with multi-step reasoning (good for complex refactoring tasks)
- `/teleport <symbol-or-path>` — Jump to a file or symbol by searching the workspace (IDE-like navigation)
- `/bughunter [scope]` — Inspect the codebase for likely bugs in an optional scope (e.g., `src/runtime`)
- `/commit` — Generate a commit message and create a git commit from the conversation
- `/pr [context]` — Draft or create a pull request from the conversation
- `/issue [context]` — Draft or create a GitHub issue from the conversation
- `/diff` — Show unified diff of changes made in the current session
- `/plugin [list|install|enable|disable|uninstall|update]` — Manage Claw Code plugins
- `/agents [list|help]` — List configured agents or get help on agent commands
+Useful interactive commands include `/help`, `/status`, `/cost`, `/config`, `/session`, `/model`, `/permissions`, and `/export`.

 ## Config file resolution order

--- a/rust/crates/rusty-claude-cli/build.rs
+++ b/rust/crates/rusty-claude-cli/build.rs
@@ -1,24 +1,6 @@
 use std::env;
-use std::path::Path;
 use std::process::Command;

-fn resolve_git_head_path() -> Option<String> {
-    let git_path = Path::new(".git");
-    if git_path.is_file() {
-        // Worktree: .git is a pointer file containing "gitdir: /path/to/real/.git/worktrees/<name>"
-        if let Ok(content) = std::fs::read_to_string(git_path) {
-            if let Some(gitdir) = content.strip_prefix("gitdir:") {
-                let gitdir = gitdir.trim();
-                return Some(format!("{}/HEAD", gitdir));
-            }
-        }
-    } else if git_path.is_dir() {
-        // Regular repo: .git is a directory
-        return Some(".git/HEAD".to_string());
-    }
-    None
-}
-
 fn main() {
    // Get git SHA (short hash)
    let git_sha = Command::new("git")
@@ -70,12 +52,6 @@ fn main() {
    println!("cargo:rustc-env=BUILD_DATE={build_date}");

    // Rerun if git state changes
-    // In worktrees, .git is a pointer file, so watch the actual HEAD location
-    if let Some(head_path) = resolve_git_head_path() {
-        println!("cargo:rerun-if-changed={}", head_path);
-    } else {
-        // Fallback to .git/HEAD for regular repos (won't trigger in worktrees, but prevents silent failure)
-        println!("cargo:rerun-if-changed=.git/HEAD");
-    }
+    println!("cargo:rerun-if-changed=.git/HEAD");
    println!("cargo:rerun-if-changed=.git/refs");
 }
--- a/rust/crates/rusty-claude-cli/src/main.rs
+++ b/rust/crates/rusty-claude-cli/src/main.rs
--- a/rust/crates/rusty-claude-cli/tests/output_format_contract.rs
+++ b/rust/crates/rusty-claude-cli/tests/output_format_contract.rs
@@ -389,13 +389,8 @@ fn assert_json_command(current_dir: &Path, args: &[&str]) -> Value {
 }

 /// #247 regression helper: run claw expecting a non-zero exit and return
-/// the JSON error envelope parsed from stdout. Asserts exit != 0 and that
+/// the JSON error envelope parsed from stderr. Asserts exit != 0 and that
 /// the envelope includes `type: "error"` at the very least.
-///
-/// #168c: Error envelopes under --output-format json are now emitted to
-/// STDOUT (not stderr). This matches the emission contract that stdout
-/// carries the contractual envelope (success OR error) while stderr is
-/// reserved for non-contractual diagnostics.
 fn assert_json_error_envelope(current_dir: &Path, args: &[&str]) -> Value {
    let output = run_claw(current_dir, args, &[]);
    assert!(
@@ -404,12 +399,10 @@ fn assert_json_error_envelope(current_dir: &Path, args: &[&str]) -> Value {
        String::from_utf8_lossy(&output.stdout),
        String::from_utf8_lossy(&output.stderr)
    );
-    // #168c: The JSON envelope is written to STDOUT for error cases under
-    // --output-format json (see main.rs). Previously was stderr.
-    let envelope: Value = serde_json::from_slice(&output.stdout).unwrap_or_else(|err| {
+    // The JSON envelope is written to stderr for error cases (see main.rs).
+    let envelope: Value = serde_json::from_slice(&output.stderr).unwrap_or_else(|err| {
        panic!(
-            "stdout should be a JSON error envelope but failed to parse: {err}\nstdout bytes:\n{}\nstderr bytes:\n{}",
-            String::from_utf8_lossy(&output.stdout),
+            "stderr should be a JSON error envelope but failed to parse: {err}\nstderr bytes:\n{}",
            String::from_utf8_lossy(&output.stderr)
        )
    });
@@ -420,63 +413,6 @@ fn assert_json_error_envelope(current_dir: &Path, args: &[&str]) -> Value {
    envelope
 }

-/// #168c regression test: under `--output-format json`, error envelopes
-/// must be emitted to STDOUT (not stderr). This is the emission contract:
-/// stdout carries the JSON envelope regardless of success/error; stderr
-/// is reserved for non-contractual diagnostics.
-///
-/// Refutes cycle #84's "bootstrap silent failure" claim (cycle #87 controlled
-/// matrix showed errors were on stderr, not silent; cycle #88 locked the
-/// emission contract to require stdout).
-#[test]
-fn error_envelope_emitted_to_stdout_under_output_format_json_168c() {
-    let root = unique_temp_dir("168c-emission-stdout");
-    fs::create_dir_all(&root).expect("temp dir should exist");
-
-    // Trigger an error via `prompt` without arg (known cli_parse error).
-    let output = run_claw(&root, &["--output-format", "json", "prompt"], &[]);
-
-    // Exit code must be non-zero (error).
-    assert!(
-        !output.status.success(),
-        "prompt without arg must fail; stdout:\n{}\nstderr:\n{}",
-        String::from_utf8_lossy(&output.stdout),
-        String::from_utf8_lossy(&output.stderr)
-    );
-
-    // #168c primary assertion: stdout carries the JSON envelope.
-    let stdout_text = String::from_utf8_lossy(&output.stdout);
-    assert!(
-        !stdout_text.trim().is_empty(),
-        "stdout must contain JSON envelope under --output-format json (#168c emission contract). stderr was:\n{}",
-        String::from_utf8_lossy(&output.stderr)
-    );
-    let envelope: Value = serde_json::from_slice(&output.stdout).unwrap_or_else(|err| {
-        panic!(
-            "stdout should be valid JSON under --output-format json (#168c): {err}\nstdout bytes:\n{stdout_text}"
-        )
-    });
-    assert_eq!(envelope["type"], "error", "envelope must be typed error");
-    assert!(
-        envelope["kind"].as_str().is_some(),
-        "envelope must carry machine-readable kind"
-    );
-
-    // #168c secondary assertion: stderr should NOT carry the JSON envelope
-    // (it may be empty or contain non-JSON diagnostics, but the envelope
-    // belongs on stdout under --output-format json).
-    let stderr_text = String::from_utf8_lossy(&output.stderr);
-    let stderr_trimmed = stderr_text.trim();
-    if !stderr_trimmed.is_empty() {
-        // If stderr has content, it must NOT be the JSON envelope.
-        let stderr_is_json: Result<Value, _> = serde_json::from_slice(&output.stderr);
-        assert!(
-            stderr_is_json.is_err(),
-            "stderr must not duplicate the JSON envelope (#168c); stderr was:\n{stderr_trimmed}"
-        );
-    }
-}
-
 #[test]
 fn prompt_subcommand_without_arg_emits_cli_parse_envelope_with_hint_247() {
    // #247: `claw prompt` with no argument must classify as `cli_parse`
@@ -538,268 +474,6 @@ fn whitespace_only_positional_arg_emits_cli_parse_envelope_247() {
    );
 }

-/// #168c Phase 0 Task 2: No-silent guarantee.
-///
-/// Under `--output-format json`, every verb must satisfy the emission contract:
-/// either emit a valid JSON envelope to stdout (with exit 0 for success, or
-/// exit != 0 for error), OR exit with an error code. Silent success (exit 0
-/// with empty stdout) is forbidden under the JSON contract because consumers
-/// cannot distinguish success from broken emission.
-///
-/// This test iterates a catalog of clawable verbs and asserts:
-/// 1. Each verb produces stdout output when exit == 0 (no silent success)
-/// 2. The stdout output parses as JSON (emission contract integrity)
-/// 3. Error cases (exit != 0) produce JSON on stdout (#168c routing fix)
-///
-/// Phase 0 Task 2 deliverable: prevents regressions in the emission contract
-/// for the full set of discoverable verbs.
-#[test]
-fn emission_contract_no_silent_success_under_output_format_json_168c_task2() {
-    let root = unique_temp_dir("168c-task2-no-silent");
-    fs::create_dir_all(&root).expect("temp dir should exist");
-
-    // Verbs expected to succeed (exit 0) with non-empty JSON on stdout.
-    // Covers the discovery-safe subset — verbs that don't require external
-    // credentials or network and should be safely invokable in CI.
-    let safe_success_verbs: &[(&str, &[&str])] = &[
-        ("help", &["help"]),
-        ("version", &["version"]),
-        ("list-sessions", &["list-sessions"]),
-        ("doctor", &["doctor"]),
-        ("mcp", &["mcp"]),
-        ("skills", &["skills"]),
-        ("agents", &["agents"]),
-        ("sandbox", &["sandbox"]),
-        ("status", &["status"]),
-        ("system-prompt", &["system-prompt"]),
-        ("bootstrap-plan", &["bootstrap-plan", "test"]),
-        ("acp", &["acp"]),
-    ];
-
-    for (verb, args) in safe_success_verbs {
-        let mut full_args = vec!["--output-format", "json"];
-        full_args.extend_from_slice(args);
-        let output = run_claw(&root, &full_args, &[]);
-
-        // Emission contract clause 1: if exit == 0, stdout must be non-empty.
-        if output.status.success() {
-            let stdout_text = String::from_utf8_lossy(&output.stdout);
-            assert!(
-                !stdout_text.trim().is_empty(),
-                "#168c Task 2 emission contract violation: `{verb}` exit 0 with empty stdout (silent success). stderr was:\n{}",
-                String::from_utf8_lossy(&output.stderr)
-            );
-
-            // Emission contract clause 2: stdout must be valid JSON.
-            let envelope: Result<Value, _> = serde_json::from_slice(&output.stdout);
-            assert!(
-                envelope.is_ok(),
-                "#168c Task 2 emission contract violation: `{verb}` stdout is not valid JSON:\n{stdout_text}"
-            );
-        }
-        // If exit != 0, it's an error path; #168c primary test covers error routing.
-    }
-
-    // Verbs expected to fail (exit != 0) in test env (require external state).
-    // Emission contract clause 3: error paths must still emit JSON on stdout.
-    let safe_error_verbs: &[(&str, &[&str])] = &[
-        ("prompt-no-arg", &["prompt"]),
-        ("doctor-bad-arg", &["doctor", "--foo"]),
-    ];
-
-    for (label, args) in safe_error_verbs {
-        let mut full_args = vec!["--output-format", "json"];
-        full_args.extend_from_slice(args);
-        let output = run_claw(&root, &full_args, &[]);
-
-        assert!(
-            !output.status.success(),
-            "{label} was expected to fail but exited 0"
-        );
-
-        // #168c: error envelopes must be on stdout.
-        let stdout_text = String::from_utf8_lossy(&output.stdout);
-        assert!(
-            !stdout_text.trim().is_empty(),
-            "#168c Task 2 emission contract violation: {label} failed with empty stdout. stderr was:\n{}",
-            String::from_utf8_lossy(&output.stderr)
-        );
-
-        let envelope: Result<Value, _> = serde_json::from_slice(&output.stdout);
-        assert!(
-            envelope.is_ok(),
-            "#168c Task 2 emission contract violation: {label} stdout not valid JSON:\n{stdout_text}"
-        );
-        let envelope = envelope.unwrap();
-        assert_eq!(
-            envelope["type"], "error",
-            "{label} error envelope must carry type=error, got: {envelope}"
-        );
-    }
-}
-
-/// #168c Phase 0 Task 4: Shape parity / regression guard.
-///
-/// Locks the v1.5 emission baseline (documented in SCHEMAS.md § v1.5 Emission
-/// Baseline) so any future PR that introduces shape drift in a documented
-/// verb fails this test at PR time.
-///
-/// This complements Task 2 (no-silent guarantee) by asserting the SPECIFIC
-/// top-level key sets documented in the catalog. If a verb adds/removes a
-/// top-level field, this test fails — forcing the PR author to:
-/// (a) update SCHEMAS.md § v1.5 Emission Baseline with the new shape, and
-/// (b) acknowledge the v1.5 baseline is changing.
-///
-/// Phase 0 Task 4 deliverable: prevents undocumented shape drift in v1.5
-/// baseline before Phase 1 (shape normalization) begins.
-///
-/// Note: This test intentionally asserts the CURRENT (possibly imperfect)
-/// shape, NOT the target. Phase 1 will update these expectations as shapes
-/// normalize.
-#[test]
-fn v1_5_emission_baseline_shape_parity_168c_task4() {
-    let root = unique_temp_dir("168c-task4-shape-parity");
-    fs::create_dir_all(&root).expect("temp dir should exist");
-
-    // v1.5 baseline per-verb shape catalog (from SCHEMAS.md § v1.5 Emission Baseline).
-    // Each entry: (verb, args, expected_top_level_keys_sorted).
-    //
-    // This catalog was captured by the cycle #87 controlled matrix and is
-    // enforced by SCHEMAS.md § v1.5 Emission Baseline documentation.
-    let baseline: &[(&str, &[&str], &[&str])] = &[
-        // Verbs using `kind` field (12 of 13 success paths)
-        ("help", &["help"], &["kind", "message"]),
-        (
-            "version",
-            &["version"],
-            &["git_sha", "kind", "message", "target", "version"],
-        ),
-        (
-            "doctor",
-            &["doctor"],
-            &["checks", "has_failures", "kind", "message", "report", "summary"],
-        ),
-        (
-            "skills",
-            &["skills"],
-            &["action", "kind", "skills", "summary"],
-        ),
-        (
-            "agents",
-            &["agents"],
-            &["action", "agents", "count", "kind", "summary", "working_directory"],
-        ),
-        (
-            "system-prompt",
-            &["system-prompt"],
-            &["kind", "message", "sections"],
-        ),
-        (
-            "bootstrap-plan",
-            &["bootstrap-plan", "test"],
-            &["kind", "phases"],
-        ),
-        // Verb using `command` field (the 1-of-13 deviation — Phase 1 target)
-        (
-            "list-sessions",
-            &["list-sessions"],
-            &["command", "sessions"],
-        ),
-    ];
-
-    for (verb, args, expected_keys) in baseline {
-        let mut full_args = vec!["--output-format", "json"];
-        full_args.extend_from_slice(args);
-        let output = run_claw(&root, &full_args, &[]);
-
-        assert!(
-            output.status.success(),
-            "#168c Task 4: `{verb}` expected success path but exited with {:?}. stdout:\n{}\nstderr:\n{}",
-            output.status.code(),
-            String::from_utf8_lossy(&output.stdout),
-            String::from_utf8_lossy(&output.stderr)
-        );
-
-        let envelope: Value = serde_json::from_slice(&output.stdout).unwrap_or_else(|err| {
-            panic!(
-                "#168c Task 4: `{verb}` stdout not valid JSON: {err}\nstdout:\n{}",
-                String::from_utf8_lossy(&output.stdout)
-            )
-        });
-
-        let actual_keys: Vec<String> = envelope
-            .as_object()
-            .unwrap_or_else(|| panic!("#168c Task 4: `{verb}` envelope not a JSON object"))
-            .keys()
-            .cloned()
-            .collect();
-        let mut actual_sorted = actual_keys.clone();
-        actual_sorted.sort();
-
-        let mut expected_sorted: Vec<String> = expected_keys.iter().map(|s| s.to_string()).collect();
-        expected_sorted.sort();
-
-        assert_eq!(
-            actual_sorted, expected_sorted,
-            "#168c Task 4: shape drift detected in `{verb}`!\n\
-             Expected top-level keys (v1.5 baseline): {expected_sorted:?}\n\
-             Actual top-level keys: {actual_sorted:?}\n\
-             If this is intentional, update:\n\
-             1. SCHEMAS.md § v1.5 Emission Baseline catalog\n\
-             2. This test's `baseline` array\n\
-             Envelope: {envelope}"
-        );
-    }
-
-    // Error envelope shape parity (all error paths).
-    // Standard v1.5 error envelope: {error, hint, kind, type} (always 4 keys).
-    let error_cases: &[(&str, &[&str])] = &[
-        ("prompt-no-arg", &["prompt"]),
-        ("doctor-bad-arg", &["doctor", "--foo"]),
-    ];
-
-    let expected_error_keys = ["error", "hint", "kind", "type"];
-    let mut expected_error_sorted: Vec<String> =
-        expected_error_keys.iter().map(|s| s.to_string()).collect();
-    expected_error_sorted.sort();
-
-    for (label, args) in error_cases {
-        let mut full_args = vec!["--output-format", "json"];
-        full_args.extend_from_slice(args);
-        let output = run_claw(&root, &full_args, &[]);
-
-        assert!(
-            !output.status.success(),
-            "{label}: expected error exit, got success"
-        );
-
-        let envelope: Value = serde_json::from_slice(&output.stdout).unwrap_or_else(|err| {
-            panic!(
-                "#168c Task 4: {label} stdout not valid JSON: {err}\nstdout:\n{}",
-                String::from_utf8_lossy(&output.stdout)
-            )
-        });
-
-        let actual_keys: Vec<String> = envelope
-            .as_object()
-            .unwrap_or_else(|| panic!("#168c Task 4: {label} envelope not a JSON object"))
-            .keys()
-            .cloned()
-            .collect();
-        let mut actual_sorted = actual_keys.clone();
-        actual_sorted.sort();
-
-        assert_eq!(
-            actual_sorted, expected_error_sorted,
-            "#168c Task 4: error envelope shape drift detected in {label}!\n\
-             Expected v1.5 error envelope keys: {expected_error_sorted:?}\n\
-             Actual keys: {actual_sorted:?}\n\
-             If this is intentional, update SCHEMAS.md § Standard Error Envelope (v1.5).\n\
-             Envelope: {envelope}"
-        );
-    }
-}
-
 #[test]
 fn unrecognized_argument_still_classifies_as_cli_parse_247_regression_guard() {
    // #247 regression guard: the new empty-prompt / prompt-subcommand
@@ -822,50 +496,6 @@ fn unrecognized_argument_still_classifies_as_cli_parse_247_regression_guard() {
    );
 }

-#[test]
-fn v1_5_action_field_appears_only_in_3_inventory_verbs_172() {
-    // #172: SCHEMAS.md v1.5 Emission Baseline claims `action` field appears
-    // only in 3 inventory verbs: mcp, skills, agents. This test is a
-    // regression guard for that truthfulness claim. If a new verb adds
-    // `action`, or one of the 3 removes it, this test fails and forces
-    // the SCHEMAS.md documentation to stay in sync with reality.
-    //
-    // Discovered during cycle #98 probe: earlier SCHEMAS.md draft said
-    // "only in 4 inventory verbs" but reality was only 3 (list-sessions
-    // uses `command` instead of `action`). Doc was corrected; this test
-    // locks the 3-verb invariant.
-    let root = unique_temp_dir("172-action-inventory");
-    fs::create_dir_all(&root).expect("temp dir should exist");
-
-    let verbs_with_action: &[&str] = &["mcp", "skills", "agents"];
-    let verbs_without_action: &[&str] = &[
-        "help",
-        "version",
-        "doctor",
-        "status",
-        "sandbox",
-        "system-prompt",
-        "bootstrap-plan",
-        "list-sessions",
-    ];
-
-    for verb in verbs_with_action {
-        let envelope = assert_json_command(&root, &["--output-format", "json", verb]);
-        assert!(
-            envelope.get("action").is_some(),
-            "#172: `{verb}` should have `action` field per v1.5 baseline, but envelope: {envelope}"
-        );
-    }
-
-    for verb in verbs_without_action {
-        let envelope = assert_json_command(&root, &["--output-format", "json", verb]);
-        assert!(
-            envelope.get("action").is_none(),
-            "#172: `{verb}` should NOT have `action` field per v1.5 baseline (only 3 inventory verbs: mcp/skills/agents should have it), but envelope: {envelope}"
-        );
-    }
-}
-
 fn assert_json_command_with_env(current_dir: &Path, args: &[&str], envs: &[(&str, &str)]) -> Value {
    let output = run_claw(current_dir, args, envs);
    assert!(