@hanzlaa/rcode 3.6.7 → 3.6.14

package/rihal/workflows/audit-worktrees.md

@@ -0,0 +1,163 @@
+# Workflow: audit-worktrees
+
+<purpose>
+Scan for orphaned executor worktrees and branches left behind by rihal-execute.
+Reports each orphan with its age, merge status, and safe-to-delete verdict.
+With --prune, deletes confirmed-safe orphans automatically.
+</purpose>
+
+## Step 0 — Parse arguments
+
+- `--prune` → `PRUNE=true` — delete safe orphans after reporting
+- `--help` or `-h` → print usage and stop:
+  ```
+  /rihal-audit worktrees [--prune]
+  ```
+
+## Step 1 — Scan for orphaned worktrees
+
+Executor agents use branches prefixed `worktree-agent-`. Find all such branches
+and worktrees still present in the repo:
+
+```bash
+# Active worktrees with executor branches
+git worktree list --porcelain \
+  | awk 'BEGIN{p=""} /^worktree /{p=$2} /^branch /{if($2~/refs\/heads\/worktree-agent-/) print p"\t"$2}' \
+  > /tmp/rihal-active-wts.txt
+
+# Local branches with executor prefix (includes detached/removed worktrees)
+git branch --list 'worktree-agent-*' --format='%(refname:short)' \
+  > /tmp/rihal-orphan-br.txt
+
+ACTIVE_WT_COUNT=$(wc -l < /tmp/rihal-active-wts.txt)
+ORPHAN_BR_COUNT=$(wc -l < /tmp/rihal-orphan-br.txt)
+TOTAL=$((ACTIVE_WT_COUNT + ORPHAN_BR_COUNT))
+```
+
+If `TOTAL` is 0:
+
+```
+✓ No orphaned executor worktrees or branches found.
+```
+
+Stop.
+
+## Step 2 — For each orphan, gather intelligence
+
+For each entry (worktree or branch), run:
+
+```bash
+# Is it merged into the current branch?
+MERGED=$(git branch --merged HEAD --list '<branch>' 2>/dev/null | grep -c '<branch>')
+
+# When was the last commit on this branch?
+LAST_COMMIT=$(git log -1 --format="%ar %s" '<branch>' 2>/dev/null || echo "unknown")
+
+# How many commits does it have that are NOT on HEAD?
+AHEAD=$(git rev-list HEAD..'<branch>' --count 2>/dev/null || echo "?")
+```
+
+Build a report table:
+
+```
+RIHAL ► WORKTREE AUDIT
+══════════════════════════════════════════════════════════
+
+Orphaned executor artifacts: {TOTAL}
+
+  Branch                          Merged  Ahead  Last commit
+  ──────────────────────────────  ──────  ─────  ──────────────────────
+  worktree-agent-abc123           YES     0      3 days ago  feat: add auth
+  worktree-agent-def456           NO      2      1 hour ago  wip: migrations
+  ...
+
+Active worktrees still pointing to executor branches:
+  .claude/worktrees/agent-abc123  →  worktree-agent-abc123
+  ...
+```
+
+## Step 3 — Classify each orphan
+
+For each branch/worktree:
+
+- **SAFE** → `MERGED=YES` AND `AHEAD=0` — all commits are on HEAD, nothing to lose
+- **STALE** → `MERGED=YES` AND `AHEAD>0` — commits are ahead but branch is in merged list (rebased/squash-merged); verify before deleting
+- **UNMERGED** → `MERGED=NO` — DO NOT auto-delete; show explicitly and warn
+
+Print classification next to each entry.
+
+## Step 4 — Report summary
+
+```
+Summary:
+  SAFE to delete:     {N}  (merged, 0 ahead)
+  STALE (check first): {N}  (merged but ahead — may be rebase/squash)
+  UNMERGED (keep):    {N}  (not merged — manual review required)
+
+  To prune SAFE orphans: /rihal-audit worktrees --prune
+  To inspect UNMERGED:   git log HEAD..<branch> --oneline
+```
+
+If `PRUNE=false`, stop here.
+
+## Step 5 — Prune (only when --prune passed)
+
+Delete SAFE entries only. Never touch STALE or UNMERGED.
+
+For each SAFE branch:
+
+```bash
+# Remove the worktree if it still exists
+WT_PATH=$(awk -F'\t' '$2=="refs/heads/<branch>"{print $1}' /tmp/rihal-active-wts.txt)
+if [ -n "$WT_PATH" ] && [ -d "$WT_PATH" ]; then
+  git worktree remove "$WT_PATH" --force 2>/dev/null \
+    && echo "  ✓ removed worktree: $WT_PATH" \
+    || echo "  ⚠ could not remove worktree: $WT_PATH"
+fi
+
+# Delete the branch
+git branch -D '<branch>' 2>/dev/null \
+  && echo "  ✓ deleted branch: <branch>" \
+  || echo "  ⚠ could not delete branch: <branch>"
+```
+
+After all deletes, re-run Step 1 scan and confirm `TOTAL=0` for SAFE entries.
+
+Print final report:
+
+```
+Pruned: {N} safe orphans removed
+Kept:   {N} unmerged branches (manual review required)
+
+✓ Worktree cleanup complete
+```
+
+## Step 6 — Post-audit health note
+
+If any UNMERGED branches remain, print:
+
+```
+⚠ {N} unmerged executor branch(es) still present.
+  These have commits NOT on your current branch.
+  Inspect before deleting:
+
+  git log HEAD..worktree-agent-<id> --oneline
+  git show worktree-agent-<id>:<file>   # inspect specific file
+
+  To delete after manual review:
+  git worktree remove .claude/worktrees/<id> --force
+  git branch -D worktree-agent-<id>
+```
+
+## Success Criteria
+
+- [ ] All `worktree-agent-*` branches and worktrees found and reported
+- [ ] Each classified as SAFE / STALE / UNMERGED based on actual merge status
+- [ ] `--prune` deletes only SAFE entries, never UNMERGED
+- [ ] Post-prune confirmation scan verifies cleanup succeeded
+- [ ] Non-executor worktrees (feature branches, manual worktrees) are never touched
+
+## On Error
+
+- `git worktree list` fails → print `git not available or not a repo` and stop
+- `git branch -D` fails on a branch → skip it, note it in the report, continue

package/rihal/workflows/audit.md

@@ -26,6 +26,7 @@ If `$ARGUMENTS` contains `--help` or `-h`:
 /rihal-audit fix                       # → /rihal-audit-fix
 /rihal-audit work                      # → /rihal-verify-work
 /rihal-audit lens [<1-15> | all]       # → /rihal-lens-audit (15-lens methodology)
+/rihal-audit worktrees [--prune]       # → scan + report orphaned executor worktrees/branches
 ```
 
 **Examples:**
@@ -48,7 +49,7 @@ DISCUSS=$($TOOL config-get workflow.discuss_mode 2>/dev/null || echo "adaptive")
 ```
 
 Parse `$ARGUMENTS`:
-- First word ∈ {plans, phase, milestone, uat, code, fix, work, lens} → set `$TARGET`, drop it from args, jump to Step 4.
+- First word ∈ {plans, phase, milestone, uat, code, fix, work, lens, worktrees} → set `$TARGET`, drop it from args, jump to Step 4.
 - Empty or unrecognised → continue to Step 2.
 
 ## Step 2 — Detect project state
@@ -70,9 +71,20 @@ as `(no data — skip)`.
 
 ## Step 3 — Ask user (guided mode only)
 
+Also probe for orphaned executor worktrees (add to context for Step 3 menu):
+
+```bash
+ORPHAN_WTS=$(git worktree list --porcelain \
+  | awk '/^branch /{if($2 ~ /refs\/heads\/worktree-agent-/) print $2}' \
+  | wc -l)
+ORPHAN_BR=$(git branch --list 'worktree-agent-*' 2>/dev/null | wc -l)
+ORPHANS=$((ORPHAN_WTS + ORPHAN_BR))
+```
+
 If `$MODE` is `yolo`, skip this step and pick the most relevant target
-automatically (priority: `work` if dirty branch, else `plans` if PLANS>0
-and SUMMARIES<PLANS, else `milestone` if SUMMARIES>0, else `code`).
+automatically (priority: `worktrees` if ORPHANS>0, else `work` if dirty
+branch, else `plans` if PLANS>0 and SUMMARIES<PLANS, else `milestone` if
+SUMMARIES>0, else `code`).
 
 Otherwise call AskUserQuestion:
 
@@ -89,6 +101,7 @@ Options:
   6. auto-fix        — audit then auto-fix findings                    (uses #1–5 output)
   7. work            — verify current branch / WIP                     ({ON_BRANCH}, dirty={DIRTY})
   8. lens            — 15-lens methodology audit                       (security, perf, tests…)
+  9. worktrees       — orphaned executor worktrees/branches            ({ORPHANS} found)
   0. cancel
 ```
 
@@ -110,6 +123,7 @@ sub-workflow.
 | fix | a prior audit report exists OR a prior `--report` artefact | `No audit findings yet. Run /rihal-audit first.` |
 | work | inside a git worktree | `Not in a git repo.` |
 | lens | `rihal/` or `.rihal/` directory exists | `No rihal source found. Run: npx @hanzlaa/rcode install .` |
+| worktrees | git repo exists | `Not in a git repo.` |
 
 For `milestone` specifically, check the **graceful-degrade** condition
 (closes #234 audit-milestone halt):
@@ -153,6 +167,7 @@ Run the target's slash command, forwarding remaining args:
 | lens | `/rihal-lens-audit $REST_ARGS` |
 | fix | `/rihal-audit-fix $REST_ARGS` |
 | work | `/rihal-verify-work $REST_ARGS` |
+| worktrees | execute `@.rihal/workflows/audit-worktrees.md` inline |
 
 ## Step 6 — Closing summary
 

package/rihal/workflows/correct-course.md

@@ -191,6 +191,6 @@ Run remediation with:
 
 ## ▶ Next Up
 
-- **Course corrected:** `/rihal-execute {phase}` — resume execution with updated direction
-- **Plan needs updating:** `/rihal-plan {phase}` — re-plan affected phase
-- **Check project state:** `/rihal-progress` — verify deviation was contained
+- /rihal-execute {phase}
+- /rihal-plan {phase}
+- /rihal-progress

package/rihal/workflows/create-architecture.md

@@ -26,6 +26,6 @@ Skill not installed — run: npx @hanzlaa/rcode install
 
 ## ▶ Next Up
 
-- **Architecture created:** `/rihal-plan {phase}` — break it into executable plans
-- **Review with team:** `/rihal-council {architecture-question}` — debate the design
-- **PRD needed first:** `/rihal-create-prd` — define requirements before architecture
+- /rihal-plan {phase}
+- /rihal-council {architecture-question}
+- /rihal-create-prd

package/rihal/workflows/create-epics-and-stories.md

@@ -374,6 +374,6 @@ If arguments are invalid, missing files, or subagent fails:
 
 ## ▶ Next Up
 
-- **Stories created:** `/rihal-sprint-planning` — schedule capacity-gated sprint
-- **Review stories:** `/rihal-dev-story {story-id}` — implement a specific story
-- **Back to PRD:** `/rihal-edit-prd` — revise if epics revealed scope gaps
+- /rihal-sprint-planning
+- /rihal-dev-story {story-id}
+- /rihal-edit-prd

package/rihal/workflows/discuss-phase-power.md

@@ -294,7 +294,7 @@ CONTEXT.md written: {phase_dir}/{padded_phase}-CONTEXT.md
   Decisions captured: {answered}
   Deferred:          {remaining}
 
-Next step: /rihal-plan-phase {N}
+Next step: /rihal-plan {N}
 ```
 </step>
 

package/rihal/workflows/document-project.md

@@ -181,6 +181,6 @@ If .rihal/DOCS-AUDIT.md exists, check for missing/stale docs:
 
 ## ▶ Next Up
 
-- **Documentation updated:** `/rihal-progress` — see current project state
-- **Proceed to planning:** `/rihal-plan {phase}` — create executable plans
-- **Review with council:** `/rihal-council {question}` — debate approach
+- /rihal-progress
+- /rihal-plan {phase}
+- /rihal-council {question}

package/rihal/workflows/edit-prd.md

@@ -26,6 +26,6 @@ Skill not installed — run: npx @hanzlaa/rcode install
 
 ## ▶ Next Up
 
-- **PRD updated:** `/rihal-validate-prd` — check completeness after changes
-- **Ready to plan:** `/rihal-create-milestone` — build milestone roadmap from PRD
-- **Review epics:** `/rihal-create-epics-and-stories` — update stories if scope changed
+- /rihal-validate-prd
+- /rihal-create-milestone
+- /rihal-create-epics-and-stories

package/rihal/workflows/execute-milestone.md

@@ -1,6 +1,6 @@
 <purpose>
 Execute all phases in the current milestone in dependency order, with verify gates between waves. Closes #738.
-Reads the ROADMAP.md to determine phase ordering, executes each phase via /rihal-execute, runs /rihal-verify after each, and surfaces blockers before advancing.
+Reads the ROADMAP.md to determine phase ordering, executes each phase via /rihal-execute, runs /rihal-verify-phase after each, and surfaces blockers before advancing.
 </purpose>
 
 <required_reading>
@@ -89,10 +89,10 @@ Spawn `rihal-verifier` for the phase. On `FAIL` or `PARTIAL`:
 ⚠ Verify gate: Phase {N} — {FAIL|PARTIAL}
 
 Gap count: {N}
-Recommendation: Run /rihal-sprint-plan {N} --gaps to close before advancing.
+Recommendation: Run /rihal-plan {N} --gaps to close before advancing.
 
 Options:
-  1. Close gaps now (spawn /rihal-sprint-plan --gaps)  [Recommended]
+  1. Close gaps now (spawn /rihal-plan --gaps)  [Recommended]
   2. Advance anyway (log gap, continue to next phase)
   3. Abort milestone execution
 ```

package/rihal/workflows/execute-sprint.md

@@ -582,7 +582,7 @@ If `USER_SETUP_CREATED=true`: display `⚠️ USER SETUP REQUIRED` with path + e
 | Condition | Route | Action |
 |-----------|-------|--------|
 | summaries < plans | **A: More plans** | Find next PLAN without SUMMARY. Yolo: auto-continue. Interactive: show next plan, suggest `/rihal-execute {phase}` + `/rihal-verify-work`. STOP here. |
-| summaries = plans, current < highest phase | **B: Phase done** | Show completion, suggest `/rihal-plan-phase {Z+1}` + `/rihal-verify-work {Z}` + `/rihal-discuss-phase {Z+1}` |
+| summaries = plans, current < highest phase | **B: Phase done** | Show completion, suggest `/rihal-plan {Z+1}` + `/rihal-verify-work {Z}` + `/rihal-discuss-phase {Z+1}` |
 | summaries = plans, current = highest phase | **C: Milestone done** | Show banner, suggest `/rihal-complete-milestone` + `/rihal-verify-work` + `/rihal-add-phase` |
 
 All routes: `/clear` first for fresh context.

package/rihal/workflows/execute-waves.md

@@ -280,8 +280,13 @@ Execute each selected wave in sequence. Within a wave: parallel if `PARALLELIZAT
    When executor agents ran in worktree isolation, their commits land on temporary branches in separate working trees. After the wave completes, merge these changes back and clean up:
 
    ```bash
-   # List worktrees created by this wave's agents
-   WORKTREES=$(git worktree list --porcelain | grep "^worktree " | grep -v "$(pwd)$" | sed 's/^worktree //')
+   # IMPORTANT: only touch worktrees whose branch starts with "worktree-agent-".
+   # Claude Code's EnterWorktree names all auto-created branches with this prefix.
+   # A broad "all non-primary worktrees" grep is dangerous — it would also pick up
+   # manually-created worktrees (feature branches, other milestone workspaces, etc.)
+   # and either corrupt or delete work that wasn't part of this execution.
+   WORKTREES=$(git worktree list --porcelain \
+     | awk '/^worktree /{path=$2} /^branch /{if($2 ~ /refs\/heads\/worktree-agent-/) print path}')
 
    for WT in $WORKTREES; do
      # Get the branch name for this worktree
@@ -358,6 +363,26 @@ Execute each selected wave in sequence. Within a wave: parallel if `PARALLELIZAT
 
    **If no worktrees found:** Skip silently — agents may have been spawned without worktree isolation.
 
+   **Post-cleanup verification (mandatory):** After the loop, confirm no `worktree-agent-*` worktrees or branches remain:
+
+   ```bash
+   LEFTOVER_WT=$(git worktree list --porcelain \
+     | awk '/^branch /{if($2 ~ /refs\/heads\/worktree-agent-/) print $2}')
+   LEFTOVER_BR=$(git branch --list 'worktree-agent-*' 2>/dev/null)
+
+   if [ -n "$LEFTOVER_WT" ] || [ -n "$LEFTOVER_BR" ]; then
+     echo "⚠ WORKTREE LEAK: leftover executor artifacts detected after cleanup:"
+     [ -n "$LEFTOVER_WT" ] && echo "  Worktrees: $LEFTOVER_WT"
+     [ -n "$LEFTOVER_BR" ] && echo "  Branches:  $LEFTOVER_BR"
+     echo "  Run: /rihal-audit worktrees  to inspect and prune"
+   else
+     echo "✓ Worktree cleanup verified — no executor artifacts remain"
+   fi
+   ```
+
+   Do NOT silently skip this check. If leaks are found, surface them — the user's next
+   `/rihal-status` should not show surprise worktrees from a previous execution.
+
 5.6. **Post-wave shared artifact update (worktree mode only):**
 
    When executor agents ran with `isolation="worktree"`, they skipped STATE.md and ROADMAP.md updates to avoid last-merge-wins overwrites. The orchestrator is the single writer for these files. After worktrees are merged back, update shared artifacts once:

package/rihal/workflows/forensics.md

@@ -204,6 +204,6 @@ If arguments are invalid, missing files, or subagent fails:
 
 After reviewing the diagnostic report, pick your recovery path:
 
-- **Phase stuck mid-execution:** `/rihal-resume-work`
-- **Phase planned but not executed:** `/rihal-execute {phase-number}`
-- **No incomplete work found:** `/rihal-progress` — view current state
+- /rihal-resume-work
+- /rihal-execute {phase-number}
+- /rihal-progress

package/rihal/workflows/health.md

@@ -203,29 +203,44 @@ print(len(phantom))
 If 0 phantoms: `✓ PASS — no phantom-complete phases detected`
 If any: `⚠ WARN — {N} phantom-complete phase(s) detected. Run: /rihal-audit to inspect`
 
+**Check 10 — no orphaned executor worktrees or branches**
+
+```bash
+ORPHAN_WTS=$(git worktree list --porcelain \
+  | awk '/^branch /{if($2 ~ /refs\/heads\/worktree-agent-/) print $2}' \
+  | wc -l 2>/dev/null || echo 0)
+ORPHAN_BR=$(git branch --list 'worktree-agent-*' 2>/dev/null | wc -l || echo 0)
+ORPHANS=$((ORPHAN_WTS + ORPHAN_BR))
+echo "$ORPHANS"
+```
+
+If `ORPHANS` is 0: `✓ PASS — no orphaned executor worktrees or branches`
+If `ORPHANS > 0`: `⚠ WARN — ${ORPHANS} orphaned worktree-agent-* artifact(s) from a previous /rihal-execute. Run: /rihal-audit worktrees --prune`
+
 ---
 
 ## Step 7 — Count results and print final summary
 
 **Action:** Count all pass/fail/warn results and display overall status.
 
-Total: `{N}/9 checks passed`
+Total: `{N}/10 checks passed`
 
-If all 9 pass:
+If all 10 pass:
 ```
 ✓ All systems nominal — rihal is healthy
 ```
 
-If fewer than 9 pass:
+If fewer than 10 pass:
 ```
-⚠ {N}/9 checks passed — {M} issue(s) found
+⚠ {N}/10 checks passed — {M} issue(s) found
 Run: /rihal-update to repair installation issues
 Run: /rihal-status for project-state issues
+Run: /rihal-audit worktrees --prune to clean orphaned executor artifacts
 ```
 
 ## Success Criteria
 
-- [ ] All 9 checks executed (skip state checks if no state.json)
+- [ ] All 10 checks executed (skip state checks if no state.json)
 - [ ] Each check result printed clearly
 - [ ] Final summary shows pass/fail count
 - [ ] Repair instructions shown if any checks fail
@@ -238,6 +253,6 @@ Run: /rihal-status for project-state issues
 
 ## ▶ Next Up
 
-- **Issues found:** `/rihal-forensics` — deep diagnostic on specific failures
-- **Ready to continue:** `/rihal-do` — interactive router guides next step
-- **Fix specific phase:** `/rihal-correct-course {phase}` — targeted correction
+- /rihal-forensics
+- /rihal-do
+- /rihal-correct-course {phase}

package/rihal/workflows/help.md

@@ -269,7 +269,6 @@ init → new-project → plan → execute → next → status → ship
 | `/rihal-autonomous` | Run remaining phases autonomously — plan → execute → verify cycles. |
 | `/rihal-research-phase <n>` | Standalone research (usually use `/rihal-plan` instead). |
 | `/rihal-analyze-dependencies` | Suggest "Depends on" entries for ROADMAP.md. |
-| `/rihal-list-phase-assumptions <n>` | Surface agent's intended approach before planning. |
 | `/rihal-profile-user` | Classify developer on 4 dimensions, produce profile artifact. |
 | `/rihal-dashboard` | Start the Diwan view-only dashboard (port 7717). |
 | `/rihal-health` | 6-point health check of the Rihal installation. |

package/rihal/workflows/new-project-roadmap.md

@@ -367,7 +367,7 @@ PHASE1_HAS_UI=$(echo "$PHASE1_SECTION" | grep -qi "UI hint.*yes" && echo "true"
 
 **Also available:**
 - /rihal-ui-phase 1 — generate UI design contract (recommended for frontend phases)
-- /rihal-plan-phase 1 — skip discussion, plan directly
+- /rihal-plan 1 — skip discussion, plan directly
 
 ───────────────────────────────────────────────────────────────
 ```
@@ -388,7 +388,7 @@ PHASE1_HAS_UI=$(echo "$PHASE1_SECTION" | grep -qi "UI hint.*yes" && echo "true"
 ---
 
 **Also available:**
-- /rihal-plan-phase 1 — skip discussion, plan directly
+- /rihal-plan 1 — skip discussion, plan directly
 
 ───────────────────────────────────────────────────────────────
 ```

package/rihal/workflows/plan-research-validation.md

@@ -232,7 +232,7 @@ If `TEXT_MODE` is true, present as a plain-text numbered list:
 ```
 Phase {N} has frontend indicators but no UI-SPEC.md. Generate a design contract before planning?
 
-1. Generate UI-SPEC first — Run /rihal-ui-phase {N} then re-run /rihal-sprint-plan {N}
+1. Generate UI-SPEC first — Run /rihal-ui-phase {N} then re-run /rihal-plan {N}
 2. Continue without UI-SPEC
 3. Not a frontend phase
 
@@ -243,7 +243,7 @@ Otherwise use AskUserQuestion:
 - header: "UI Design Contract"
 - question: "Phase {N} has frontend indicators but no UI-SPEC.md. Generate a design contract before planning?"
 - options:
-  - "Generate UI-SPEC first" → Display: "Run `/rihal-ui-phase {N} ${Rihal_WS}` then re-run `/rihal-sprint-plan {N} ${Rihal_WS}`". Exit workflow.
+  - "Generate UI-SPEC first" → Display: "Run `/rihal-ui-phase {N} ${Rihal_WS}` then re-run `/rihal-plan {N} ${Rihal_WS}`". Exit workflow.
   - "Continue without UI-SPEC" → Continue to step 6.
   - "Not a frontend phase" → Continue to step 6.
 

package/rihal/workflows/plan.md

@@ -174,7 +174,7 @@ No REVIEWS.md found for Phase {N}. Run reviews first:
 
 /rihal-review --phase {N}
 
-Then re-run /rihal-sprint-plan {N} --reviews
+Then re-run /rihal-plan {N} --reviews
 ```
 Exit workflow.
 
@@ -322,7 +322,7 @@ If "Run discuss-phase first":
   does not work correctly in nested subcontexts (#1009). Instead, display the command
   and exit so the user runs it as a top-level command:
   ```
-  Run this command first, then re-run /rihal-sprint-plan {X} ${Rihal_WS}:
+  Run this command first, then re-run /rihal-plan {X} ${Rihal_WS}:
 
   /rihal-discuss-phase {X} ${Rihal_WS}
   ```
@@ -443,7 +443,7 @@ VALIDATION_EXISTS=$(ls "${PHASE_DIR}"/*-VALIDATION.md 2>/dev/null | head -1)
 ```
 
 If missing and Nyquist is still enabled/applicable — ask user:
-1. Re-run: `/rihal-sprint-plan {PHASE} --research ${Rihal_WS}`
+1. Re-run: `/rihal-plan {PHASE} --research ${Rihal_WS}`
 2. Disable Nyquist with the exact command:
    `node ".rihal/bin/rihal-tools.cjs" config-set workflow.nyquist_validation false`
 3. Continue anyway (plans fail Dimension 8)
@@ -935,9 +935,9 @@ Verification: {Passed | Passed with override | Skipped}
 
 **Also available:**
 - cat .planning/phases/{phase-dir}/*-SPRINT.md — review plans
-- /rihal-sprint-plan {X} --research — re-research first
+- /rihal-plan {X} --research — re-research first
 - /rihal-review --phase {X} --all — peer review plans with external AIs
-- /rihal-sprint-plan {X} --reviews — replan incorporating review feedback
+- /rihal-plan {X} --reviews — replan incorporating review feedback
 
 ───────────────────────────────────────────────────────────────
 </offer_next>
@@ -958,11 +958,11 @@ stdio deadlocks with MCP servers — see Claude Code issue anthropics/claude-cod
    Remove-Item -Recurse -Force "$env:USERPROFILE\.claude\tasks\*" -ErrorAction SilentlyContinue
    ```
 4. **Reduce MCP server count:** Temporarily disable non-essential MCP servers in settings.json
-5. **Retry:** Restart Claude Code and run `/rihal-sprint-plan` again
+5. **Retry:** Restart Claude Code and run `/rihal-plan` again
 
 If freezes persist, try `--skip-research` to reduce the agent chain from 3 to 2 agents:
 ```
-/rihal-sprint-plan N --skip-research
+/rihal-plan N --skip-research
 ```
 </windows_troubleshooting>
 

package/rihal/workflows/retrospective.md

@@ -26,6 +26,6 @@ Skill not installed — run: npx @hanzlaa/rcode install
 
 ## ▶ Next Up
 
-- **Retrospective complete:** `/rihal-new-milestone` — start the next milestone
-- **Review project state:** `/rihal-progress` — see current roadmap position
-- **Archive milestone:** `/rihal-complete-milestone` — if not already done
+- /rihal-new-milestone
+- /rihal-progress
+- /rihal-complete-milestone

package/rihal/workflows/review-adversarial.md

@@ -10,15 +10,17 @@ Assume an adversarial/hostile perspective and audit code for weaknesses: SQL inj
 If `$ARGUMENTS` is empty or contains only `--help` or `-h`:
 
 ```
-/rihal-review-adversarial <argument-here>
+/rihal-code-review --attack
 ```
 
 **Examples:**
 ```
-/rihal-review-adversarial example 1
-/rihal-review-adversarial example 2
+/rihal-code-review --attack
+/rihal-code-review --attack --scope auth/
 ```
 
+Note: This workflow is invoked internally by `/rihal-code-review --attack`. There is no standalone `/rihal-review-adversarial` command.
+
 STOP — do not proceed.
 
 <available_agent_types>
@@ -187,6 +189,6 @@ Critical findings filed as blocking AC. High findings as optional tasks.
 
 ## ▶ Next Up
 
-- **Vulnerabilities found:** Address security findings, re-run `/rihal-review-adversarial`
-- **Clean report:** `/rihal-verify-phase {phase}` — full verification
-- **Ship:** `/rihal-ship {phase}` — package the phase
+- **Vulnerabilities found:** Address security findings, re-run `/rihal-code-review --attack`
+- /rihal-verify-phase {phase}
+- /rihal-ship {phase}

package/rihal/workflows/review.md

@@ -283,5 +283,5 @@ Clean up temp files.
 ## ▶ Next Up
 
 - **Issues found:** Fix identified problems, then re-run `/rihal-review`
-- **Review passed:** `/rihal-ship {phase}` — package phase for shipping
-- **Security concern:** `/rihal-secure-phase {phase}` — targeted security review
+- /rihal-ship {phase}
+- /rihal-secure-phase {phase}

package/rihal/workflows/scaffold-project.md

@@ -26,6 +26,6 @@ Skill not installed — run: npx @hanzlaa/rcode install
 
 ## ▶ Next Up
 
-- **Project scaffolded:** `/rihal-create-prd` — define what you're building
-- **Already have requirements:** `/rihal-create-milestone` — jump straight to roadmap
-- **Quick start:** `/rihal-do` — interactive router shows your next best step
+- /rihal-create-prd
+- /rihal-create-milestone
+- /rihal-do

package/rihal/workflows/secure-phase.md

@@ -106,7 +106,7 @@ Call AskUserQuestion with threat table and options:
 
 ```
 Task(
-  prompt="Read .rihal/agents/rihal-security-auditor.md for instructions.\n\n" +
+  prompt="Read $HOME/.claude/agents/rihal-security-auditor.md for instructions.\n\n" +
     "<files_to_read>{PLAN, SUMMARY, impl files, SECURITY.md}</files_to_read>" +
     "<threat_register>{threat register}</threat_register>" +
     "<config>asvs_level: {SECURITY_ASVS}, block_on: {SECURITY_BLOCK_ON}</config>" +
@@ -165,7 +165,7 @@ node ".rihal/bin/rihal-tools.cjs" commit "docs(phase-${PHASE}): add/update secur
 ```
 Rihal > PHASE {N} THREAT-SECURE
 threats_open: 0 — all threats have dispositions.
-▶ /rihal-validate {N}    validate test coverage
+▶ /rihal-validate-phase {N}    validate test coverage
 ▶ /rihal-verify-work {N}       run UAT
 ```
 
@@ -205,5 +205,5 @@ If arguments are invalid, missing files, or subagent fails:
 ## ▶ Next Up
 
 - **Issues found:** Address security findings, then re-run `/rihal-secure-phase {phase}`
-- **Clean report:** `/rihal-verify-phase {phase}` — run full verification
-- **Continue execution:** `/rihal-execute {next-phase}` — proceed to next phase
+- /rihal-verify-phase {phase}
+- /rihal-execute {next-phase}

package/rihal/workflows/session-report.md

@@ -212,7 +212,7 @@ Write `.planning/SESSION-REPORT-{YYYY-MM-DD-HHmmss}.md` with this structure:
 ## Next Steps
 
 - Address {count} open blocker(s) before proceeding
-- Plan next phase with `/rihal-plan-phase {next_phase}`
+- Plan next phase with `/rihal-plan {next_phase}`
 ```
 
 ## Step 8 — Print confirmation