@hanzlaa/rcode 3.6.8 → 3.6.15

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/autonomous.md

@@ -18,7 +18,7 @@ interpos audit (issue #221) — DO NOT regress.
 2. **NEVER skip the methodology chain on greenfield projects.** Before
    the phase loop runs, the prerequisite check (next step) MUST verify:
    - `.planning/prd.md` exists (else halt → /rihal-create-prd)
-   - ROADMAP.md has milestone structure (else halt → /rihal-create-milestone)
+   - ROADMAP.md has milestone structure (else halt → /rihal-new-milestone)
    - `.planning/epics.md` exists (else halt → /rihal-create-epics-and-stories)
    See issue #219 + #229.
 
@@ -68,7 +68,7 @@ If `SKIP_FLAG=false` AND any prerequisite is missing, HALT with a clear message:
 
 The autonomous flow assumes a project that has already gone through:
   1. /rihal-create-prd               → produces .planning/prd.md
-  2. /rihal-create-milestone         → produces ROADMAP.md with M1..Mn
+  2. /rihal-new-milestone         → produces ROADMAP.md with M1..Mn
   3. /rihal-create-epics-and-stories → produces .planning/epics.md
   4. THEN /rihal-autonomous           ← you are here
 

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/create-prd.md

@@ -21,5 +21,5 @@ Skill not installed — run: npx @hanzlaa/rcode install
 ## On Completion
 
 /rihal-validate-prd — validate the PRD for completeness
-/rihal-create-milestone — build the milestone roadmap from the PRD
+/rihal-new-milestone — build the milestone roadmap from the PRD
 /rihal-edit-prd — revise the PRD

package/rihal/workflows/diagnose-issues.md

@@ -1,34 +1,87 @@
-# Workflow: rihal-diagnose-issues
-
 <purpose>
-Reusable diagnosis subroutine called from /rihal-verify-work when
-verification fails. Walks symptom → hypothesis → evidence → minimal
-repro and returns a structured finding. Not a top-level command.
+Diagnose issues surfaced during /rihal:verify-work. For each failed acceptance criterion, identify root cause, classify severity, and decide whether to fix in-flight or file as follow-up.
+
+Spawned by /rihal:verify-work when verification fails. Not typically called directly by users.
 </purpose>
 
-## Step 1 — Symptom capture
+<required_reading>
+@.rihal/references/output-format.md
+@.rihal/references/common-bug-patterns.md
+@.rihal/references/verification-patterns.md
+</required_reading>
+
+<process>
+
+## 1. Receive failure list
+
+`/rihal:verify-work` passes a structured list of failures:
+
+```json
+[
+  {
+    "criterion": "Auth login completes in <2s",
+    "expected": "redirect to /dashboard within 2s of submit",
+    "actual": "redirected after 8s",
+    "evidence": "browser network log shows 6s spent on /api/me"
+  }
+]
+```
+
+## 2. For each failure — diagnose
+
+Parallel-spawn one investigator per failure. Each investigator:
+
+a. **Reproduce** locally using the verification steps from UAT.md.
+b. **Bisect** — narrow down which file/function/commit introduced the regression. Use `git log --since` + `git bisect` if needed.
+c. **Classify** — bug / config / docs / environment / spec.
+d. **Severity** — critical (blocks ship) / high (degrades core feature) / medium (workaround exists) / low (cosmetic).
+e. **Root cause** — one-sentence explanation.
+f. **Fix proposal** — one of:
+   - **In-flight** — small enough to fix in this phase before merging
+   - **Follow-up** — substantial; file an issue and proceed
+   - **Stop** — phase shouldn't ship; halt and re-plan
+
+## 3. Aggregate diagnosis
+
+Each investigator returns a structured diagnosis. The orchestrator collates:
+
+```
+Failed criteria: 3
+Diagnosis:
+  Critical: 1   (must fix before ship)
+  High:     1   (recommended fix in-flight)
+  Medium:   1   (file as follow-up, ship anyway)
+```
+
+## 4. Decide
+
+- All criticals fixable in-flight → loop into rihal-code-fixer with the diagnosis bundle.
+- Any critical not fixable in-flight → return STOP to verify-work; phase doesn't ship.
+- Otherwise → file follow-ups, return PROCEED to verify-work.
 
-Record:
-- failing assertion / log line / wrong output
-- file:line where divergence first appears
-- last commit before symptom appeared (`git log -S<token>`)
+## 5. Output
 
-## Step 2 — Hypotheses
+`DIAGNOSIS.md` per failure, written to `.planning/phases/<NN>/diagnosis/<criterion-slug>.md`. Each contains:
 
-List 2–3 plausible causes. For each:
-- a one-line predicted mechanism
-- the cheapest test that would falsify it
+- Reproduction steps
+- Bisect result
+- Root cause
+- Severity + classification
+- Fix proposal + estimated effort
 
-## Step 3 — Evidence
+Plus an aggregate `DIAGNOSIS-INDEX.md` summarizing all failures and the orchestrator's decision.
 
-Run the falsifying tests in cheapest-first order. Stop at the first
-hypothesis that matches all evidence.
+</process>
 
-## Step 4 — Minimal repro
+## Success Criteria
 
-Reduce to the smallest input that still triggers the bug. Save under
-`.planning/diagnostics/<slug>.md`.
+- [ ] Every failed criterion has a DIAGNOSIS.md file
+- [ ] Each DIAGNOSIS.md has reproduction + root cause + fix proposal
+- [ ] Critical failures either get in-flight fix or halt the phase
+- [ ] Follow-up issues filed for medium/low items proceed without blocking ship
 
-## Step 5 — Hand-off
+## On Error
 
-Return JSON: `{ root_cause, repro_path, suggested_fix }` to the caller.
+- **Cannot reproduce** — mark diagnosis status `cannot-reproduce`. Often signals environment drift between verifier and dev. File as follow-up; do not block ship if all other criticals pass.
+- **Bisect inconclusive** — fall back to a hypothesis-driven investigation (read recent commits in the affected file, look for likely causes).
+- **Repair budget exhausted** — STOP. Return control to user with the full diagnosis bundle.

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/discuss-phase.md

@@ -152,7 +152,7 @@ Phase number from argument (required).
 ```bash
 INIT=$(node ".rihal/bin/rihal-tools.cjs" init phase-op "${PHASE}")
 if [[ "$INIT" == @file:* ]]; then INIT=$(cat "${INIT#@file:}"); fi
-AGENT_SKILLS_ADVISOR=$(node ".rihal/bin/rihal-tools.cjs" agent-skills rihal-advisor 2>/dev/null)
+AGENT_SKILLS_ADVISOR=$(node ".rihal/bin/rihal-tools.cjs" agent-skills rihal-advisor-researcher 2>/dev/null)
 ```
 
 Parse JSON for: `commit_docs`, `phase_found`, `phase_dir`, `phase_number`, `phase_name`, `phase_slug`, `padded_phase`, `has_research`, `has_context`, `has_plans`, `has_verification`, `plan_count`, `roadmap_exists`, `planning_exists`, `response_language`.

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-new-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,6 +203,20 @@ 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
@@ -213,7 +227,7 @@ Total: `{N}/9 checks passed`
 
 If all 9 pass:
 ```
-✓ All systems nominal — rihal is healthy
+✓ All systems nominal — rihal is healthy (9/9)
 ```
 
 If fewer than 9 pass:
@@ -221,6 +235,7 @@ If fewer than 9 pass:
 ⚠ {N}/9 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
@@ -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

@@ -231,7 +231,6 @@ init → new-project → plan → execute → next → status → ship
 | `/rihal-dev-story <file>` | Execute an approved STORY by writing tests + code per AC. |
 | (internal) `check-implementation-readiness` | Guard called by `/rihal-plan` and `/rihal-execute` to verify PRD + architecture aligned before build. |
 | `/rihal-create-architecture` | Write an Architecture Decision Record (ADR). |
-| `/rihal-create-ux-design` | Realize a UX design that informs architecture and implementation. |
 | `/rihal-correct-course` | Course-correct mid-sprint when major change is discovered. |
 | `/rihal-sprint-planning` | Compute capacity, prioritize stories, create SPRINT.md. |
 | `/rihal-sprint-status` | Sprint progress — stories, points, velocity, burndown. |
@@ -269,7 +268,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/memory-audit.md

@@ -33,7 +33,7 @@ fi
 
 ## Halt conditions
 
-- Memory Bank not initialised → instruct to run `/rcode:memory-init` first
+- Memory Bank not initialised → instruct to run `/rihal-memory-init` first
 
 ---
 
@@ -77,7 +77,7 @@ For `change-records/`, `incidents/post-mortems/`, `milestones/archive/`:
 For each `distillates/*.distillate.md`:
 - Read frontmatter `source-digest`
 - Recompute digest of current source files (per `rcode-memory-distill` rules)
-- If mismatch, emit a `warn` finding suggesting `/rcode:memory-distill`
+- If mismatch, emit a `warn` finding suggesting `/rihal-memory-distill`
 
 ### Step 8 — Render report
 

package/rihal/workflows/memory-distill.md

@@ -20,7 +20,7 @@ Regenerate Memory Bank distillates with lossless compression. Idempotent.
 
 ## Halt conditions
 
-- `.rihal/memory/` missing → instruct to run `/rcode:memory-init` first
+- `.rihal/memory/` missing → instruct to run `/rihal-memory-init` first
 - All sources empty (only template placeholders) → warn and exit; no point distilling empty content
 
 ---
@@ -70,7 +70,7 @@ For each target distillate, write:
 ---
 generated: true
 do-not-edit: true
-regenerate-with: /rcode:memory-distill
+regenerate-with: /rihal-memory-distill
 source-digest: <hash>
 generated-at: <ISO datetime>
 source-files:

package/rihal/workflows/memory-init.md

@@ -41,7 +41,7 @@ If `INDEX.md` exists:
 - List every file under `.rihal/memory/`
 - For each, count non-template lines (lines that don't start with `<!--` or contain `_(...)_` placeholders)
 - Print which files are empty / template-only and which are populated
-- Suggest `/rcode:memory-update` for surgical edits and exit
+- Suggest `/rihal-memory-update` for surgical edits and exit
 
 ### Step 2 — Copy templates
 
@@ -90,7 +90,7 @@ Add or update the `memory_bank` block in `.rihal/state.json`:
 Show:
 - File tree of `.rihal/memory/`
 - Files seeded vs files still empty
-- Suggested next command: `/rcode:memory-distill`
+- Suggested next command: `/rihal-memory-distill`
 
 ---
 

package/rihal/workflows/memory-update.md

@@ -15,7 +15,7 @@ Append-only surgical update to a single Memory Bank file. Never rewrites, never
 
 ## Preconditions
 
-- `.rihal/memory/` exists (run `/rcode:memory-init` first)
+- `.rihal/memory/` exists (run `/rihal-memory-init` first)
 
 ## Halt conditions
 
@@ -72,7 +72,7 @@ For `change-records/`:
 
 ### Step 5 — Suggest distillate refresh
 
-If the change was to `project/`, `milestones/current.md`, or `incidents/`, suggest `/rcode:memory-distill` to refresh distillates. Optional, not enforced.
+If the change was to `project/`, `milestones/current.md`, or `incidents/`, suggest `/rihal-memory-distill` to refresh distillates. Optional, not enforced.
 
 ---
 

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/research-phase.md

@@ -44,7 +44,7 @@ if [[ "$INIT" == @file:* ]]; then INIT=$(cat "${INIT#@file:}"); fi
 # If INIT is empty or INIT.ok is false: print "Error: rihal-tools init failed." and exit.
 # Extract: phase_dir, padded_phase, phase_number, state_path, requirements_path, context_path, response_language
 # If response_language is set, include "Respond in {value}." in all spawned subagent prompts.
-AGENT_SKILLS_RESEARCHER=$(node ".rihal/bin/rihal-tools.cjs" agent-skills rihal-researcher 2>/dev/null)
+AGENT_SKILLS_RESEARCHER=$(node ".rihal/bin/rihal-tools.cjs" agent-skills rihal-phase-researcher 2>/dev/null)
 ```
 
 ## Step 4: Spawn Researcher

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