@bhargavvc/sdd-cc 1.30.1 → 1.35.0

package/commands/sdd/reapply-patches.md

@@ -1,10 +1,13 @@
 ---
+name: sdd:reapply-patches
 description: Reapply local modifications after a SDD update
 allowed-tools: Read, Write, Edit, Bash, Glob, Grep, AskUserQuestion
 ---
 
 <purpose>
-After a SDD update wipes and reinstalls files, this command merges user's previously saved local modifications back into the new version. Uses intelligent comparison to handle cases where the upstream file also changed.
+After a SDD update wipes and reinstalls files, this command merges user's previously saved local modifications back into the new version. Uses three-way comparison (pristine baseline, user-modified backup, newly installed version) to reliably distinguish user customizations from version drift.
+
+**Critical invariant:** Every file in `sdd-local-patches/` was backed up because the installer's hash comparison detected it was modified. The workflow must NEVER conclude "no custom content" for any backed-up file — that is a logical contradiction. When in doubt, classify as CONFLICT requiring user review, not SKIP.
 </purpose>
 
 <process>
@@ -14,19 +17,90 @@ After a SDD update wipes and reinstalls files, this command merges user's previo
 Check for local patches directory:
 
 ```bash
-# Global install — detect runtime config directory
-if [ -d "$HOME/.config/opencode/sdd-local-patches" ]; then
-  PATCHES_DIR="$HOME/.config/opencode/sdd-local-patches"
-elif [ -d "$HOME/.opencode/sdd-local-patches" ]; then
-  PATCHES_DIR="$HOME/.opencode/sdd-local-patches"
-elif [ -d "$HOME/.gemini/sdd-local-patches" ]; then
-  PATCHES_DIR="$HOME/.gemini/sdd-local-patches"
-else
-  PATCHES_DIR="$HOME/.claude/sdd-local-patches"
+expand_home() {
+  case "$1" in
+    "~/"*) printf '%s/%s\n' "$HOME" "${1#~/}" ;;
+    *) printf '%s\n' "$1" ;;
+  esac
+}
+
+PATCHES_DIR=""
+
+# Env overrides first — covers custom config directories used with --config-dir
+if [ -n "$KILO_CONFIG_DIR" ]; then
+  candidate="$(expand_home "$KILO_CONFIG_DIR")/sdd-local-patches"
+  if [ -d "$candidate" ]; then
+    PATCHES_DIR="$candidate"
+  fi
+elif [ -n "$KILO_CONFIG" ]; then
+  candidate="$(dirname "$(expand_home "$KILO_CONFIG")")/sdd-local-patches"
+  if [ -d "$candidate" ]; then
+    PATCHES_DIR="$candidate"
+  fi
+elif [ -n "$XDG_CONFIG_HOME" ]; then
+  candidate="$(expand_home "$XDG_CONFIG_HOME")/kilo/sdd-local-patches"
+  if [ -d "$candidate" ]; then
+    PATCHES_DIR="$candidate"
+  fi
+fi
+
+if [ -z "$PATCHES_DIR" ] && [ -n "$OPENCODE_CONFIG_DIR" ]; then
+  candidate="$(expand_home "$OPENCODE_CONFIG_DIR")/sdd-local-patches"
+  if [ -d "$candidate" ]; then
+    PATCHES_DIR="$candidate"
+  fi
+elif [ -z "$PATCHES_DIR" ] && [ -n "$OPENCODE_CONFIG" ]; then
+  candidate="$(dirname "$(expand_home "$OPENCODE_CONFIG")")/sdd-local-patches"
+  if [ -d "$candidate" ]; then
+    PATCHES_DIR="$candidate"
+  fi
+elif [ -z "$PATCHES_DIR" ] && [ -n "$XDG_CONFIG_HOME" ]; then
+  candidate="$(expand_home "$XDG_CONFIG_HOME")/opencode/sdd-local-patches"
+  if [ -d "$candidate" ]; then
+    PATCHES_DIR="$candidate"
+  fi
+fi
+
+if [ -z "$PATCHES_DIR" ] && [ -n "$GEMINI_CONFIG_DIR" ]; then
+  candidate="$(expand_home "$GEMINI_CONFIG_DIR")/sdd-local-patches"
+  if [ -d "$candidate" ]; then
+    PATCHES_DIR="$candidate"
+  fi
+fi
+
+if [ -z "$PATCHES_DIR" ] && [ -n "$CODEX_HOME" ]; then
+  candidate="$(expand_home "$CODEX_HOME")/sdd-local-patches"
+  if [ -d "$candidate" ]; then
+    PATCHES_DIR="$candidate"
+  fi
+fi
+
+if [ -z "$PATCHES_DIR" ] && [ -n "$CLAUDE_CONFIG_DIR" ]; then
+  candidate="$(expand_home "$CLAUDE_CONFIG_DIR")/sdd-local-patches"
+  if [ -d "$candidate" ]; then
+    PATCHES_DIR="$candidate"
+  fi
+fi
+
+# Global install — detect runtime config directory defaults
+if [ -z "$PATCHES_DIR" ]; then
+  if [ -d "$HOME/.config/kilo/sdd-local-patches" ]; then
+    PATCHES_DIR="$HOME/.config/kilo/sdd-local-patches"
+  elif [ -d "$HOME/.config/opencode/sdd-local-patches" ]; then
+    PATCHES_DIR="$HOME/.config/opencode/sdd-local-patches"
+  elif [ -d "$HOME/.opencode/sdd-local-patches" ]; then
+    PATCHES_DIR="$HOME/.opencode/sdd-local-patches"
+  elif [ -d "$HOME/.gemini/sdd-local-patches" ]; then
+    PATCHES_DIR="$HOME/.gemini/sdd-local-patches"
+  elif [ -d "$HOME/.codex/sdd-local-patches" ]; then
+    PATCHES_DIR="$HOME/.codex/sdd-local-patches"
+  else
+    PATCHES_DIR="$HOME/.claude/sdd-local-patches"
+  fi
 fi
 # Local install fallback — check all runtime directories
 if [ ! -d "$PATCHES_DIR" ]; then
-  for dir in .config/opencode .opencode .gemini .claude; do
+  for dir in .config/kilo .kilo .config/opencode .opencode .gemini .codex .claude; do
     if [ -d "./$dir/sdd-local-patches" ]; then
       PATCHES_DIR="./$dir/sdd-local-patches"
       break
@@ -41,12 +115,48 @@ Read `backup-meta.json` from the patches directory.
 ```
 No local patches found. Nothing to reapply.
 
-Local patches are automatically saved when you run /sdd:update
+Local patches are automatically saved when you run /sdd-update
 after modifying any SDD workflow, command, or agent files.
 ```
 Exit.
 
-## Step 2: Show patch summary
+## Step 2: Determine baseline for three-way comparison
+
+The quality of the merge depends on having a **pristine baseline** — the original unmodified version of each file from the pre-update SDD release. This enables three-way comparison:
+- **Pristine baseline** (original SDD file before any user edits)
+- **User's version** (backed up in `sdd-local-patches/`)
+- **New version** (freshly installed after update)
+
+Check for baseline sources in priority order:
+
+### Option A: Git history (most reliable)
+If the config directory is a git repository:
+```bash
+CONFIG_DIR=$(dirname "$PATCHES_DIR")
+if git -C "$CONFIG_DIR" rev-parse --git-dir >/dev/null 2>&1; then
+  HAS_GIT=true
+fi
+```
+When `HAS_GIT=true`, use `git log` to find the commit where SDD was originally installed (before user edits). For each file, the pristine baseline can be extracted with:
+```bash
+git -C "$CONFIG_DIR" log --diff-filter=A --format="%H" -- "{file_path}"
+```
+This gives the commit that first added the file (the install commit). Extract the pristine version:
+```bash
+git -C "$CONFIG_DIR" show {install_commit}:{file_path}
+```
+
+### Option B: Pristine snapshot directory
+Check if a `sdd-pristine/` directory exists alongside `sdd-local-patches/`:
+```bash
+PRISTINE_DIR="$CONFIG_DIR/sdd-pristine"
+```
+If it exists, the installer saved pristine copies at install time. Use these as the baseline.
+
+### Option C: No baseline available (two-way fallback)
+If neither git history nor pristine snapshots are available, fall back to two-way comparison — but with **strengthened heuristics** (see Step 3).
+
+## Step 3: Show patch summary
 
 ```
 ## Local Patches to Reapply
@@ -54,6 +164,7 @@ Exit.
 **Backed up from:** v{from_version}
 **Current version:** {read VERSION file}
 **Files modified:** {count}
+**Merge strategy:** {three-way (git) | three-way (pristine) | two-way (enhanced)}
 
 | # | File | Status |
 |---|------|--------|
@@ -61,54 +172,128 @@ Exit.
 | 2 | {file_path} | Pending |
 ```
 
-## Step 3: Merge each file
+## Step 4: Merge each file
 
 For each file in `backup-meta.json`:
 
 1. **Read the backed-up version** (user's modified copy from `sdd-local-patches/`)
 2. **Read the newly installed version** (current file after update)
-3. **Compare and merge:**
+3. **If available, read the pristine baseline** (from git history or `sdd-pristine/`)
 
-   - If the new file is identical to the backed-up file: skip (modification was incorporated upstream)
-   - If the new file differs: identify the user's modifications and apply them to the new version
+### Three-way merge (when baseline is available)
 
-   **Merge strategy:**
-   - Read both versions fully
-   - Identify sections the user added or modified (look for additions, not just differences from path replacement)
-   - Apply user's additions/modifications to the new version
-   - If a section the user modified was also changed upstream: flag as conflict, show both versions, ask user which to keep
+Compare the three versions to isolate changes:
+- **User changes** = diff(pristine → user's version) — these are the customizations to preserve
+- **Upstream changes** = diff(pristine → new version) — these are version updates to accept
 
-4. **Write merged result** to the installed location
-5. **Report status:**
-   - `Merged` — user modifications applied cleanly
-   - `Skipped` — modification already in upstream
-   - `Conflict` — user chose resolution
+**Merge rules:**
+- Sections changed only by user → apply user's version
+- Sections changed only by upstream → accept upstream version
+- Sections changed by both → flag as CONFLICT, show both, ask user
+- Sections unchanged by either → use new version (identical to all three)
 
-## Step 4: Update manifest
+### Two-way merge (fallback when no baseline)
 
-After reapplying, regenerate the file manifest so future updates correctly detect these as user modifications:
+When no pristine baseline is available, use these **strengthened heuristics**:
 
+**CRITICAL RULE: Every file in this backup directory was explicitly detected as modified by the installer's SHA-256 hash comparison. "No custom content" is never a valid conclusion.**
+
+For each file:
+a. Read both versions completely
+b. Identify ALL differences, then classify each as:
+   - **Mechanical drift** — path substitutions (e.g. `/Users/xxx/.claude/` → `$HOME/.claude/`), variable additions (`${SDD_WS}`, `${AGENT_SKILLS_*}`), error handling additions (`|| true`)
+   - **User customization** — added steps/sections, removed sections, reordered content, changed behavior, added frontmatter fields, modified instructions
+
+c. **If ANY differences remain after filtering out mechanical drift → those are user customizations. Merge them.**
+d. **If ALL differences appear to be mechanical drift → still flag as CONFLICT.** The installer's hash check already proved this file was modified. Ask the user: "This file appears to only have path/variable differences. Were there intentional customizations?" Do NOT silently skip.
+
+### Git-enhanced two-way merge
+
+When the config directory is a git repo but the pristine install commit can't be found, use commit history to identify user changes:
 ```bash
-# The manifest will be regenerated on next /sdd:update
-# For now, just note which files were modified
+# Find non-update commits that touched this file
+git -C "$CONFIG_DIR" log --oneline --no-merges -- "{file_path}" | grep -v "sdd:update\|SDD update\|sdd-install"
+```
+Each matching commit represents an intentional user modification. Use the commit messages and diffs to understand what was changed and why.
+
+4. **Write merged result** to the installed location
+
+### Post-merge verification
+
+After writing each merged file, verify that user modifications survived the merge:
+
+1. **Line-count check:** Count lines in the backup and the merged result. If the merged result has fewer lines than the backup minus the expected upstream removals, flag for review.
+2. **Hunk presence check:** For each user-added section identified during diff analysis, search the merged output for at least the first significant line (non-blank, non-comment) of each addition. Missing signature lines indicate a dropped hunk.
+3. **Report warnings inline** (do not block):
+   ```
+   ⚠ Potential dropped content in {file_path}:
+     - Missing hunk near line {N}: "{first_line_preview}..." ({line_count} lines)
+     - Backup available: {patches_dir}/{file_path}
+   ```
+4. **Produce a Hunk Verification Table** — one row per hunk per file. This table is **mandatory output** and must be produced before Step 5 can proceed. Format:
+
+   | file | hunk_id | signature_line | line_count | verified |
+   |------|---------|----------------|------------|----------|
+   | {file_path} | {N} | {first_significant_line} | {count} | yes |
+   | {file_path} | {N} | {first_significant_line} | {count} | no |
+
+   - `hunk_id` — sequential integer per file (1, 2, 3…)
+   - `signature_line` — first non-blank, non-comment line of the user-added section
+   - `line_count` — total lines in the hunk
+   - `verified` — `yes` if the signature_line is present in the merged output, `no` otherwise
+
+5. **Track verification status** — add to per-file report: `Merged (verified)` vs `Merged (⚠ {N} hunks may be missing)`
+
+6. **Report status per file:**
+   - `Merged` — user modifications applied cleanly (show summary of what was preserved)
+   - `Conflict` — user reviewed and chose resolution
+   - `Incorporated` — user's modification was already adopted upstream (only valid when pristine baseline confirms this)
+
+**Never report `Skipped — no custom content`.** If a file is in the backup, it has custom content.
+
+## Step 5: Hunk Verification Gate
+
+Before proceeding to cleanup, evaluate the Hunk Verification Table produced in Step 4.
+
+**If the Hunk Verification Table is absent** (Step 4 did not produce it), STOP immediately and report to the user:
+```
+ERROR: Hunk Verification Table is missing. Post-merge verification was not completed.
+Rerun /sdd-reapply-patches to retry with full verification.
+```
+
+**If any row in the Hunk Verification Table shows `verified: no`**, STOP and report to the user:
 ```
+ERROR: {N} hunk(s) failed verification — content may have been dropped during merge.
 
-## Step 5: Cleanup option
+Unverified hunks:
+  {file} hunk {hunk_id}: signature line "{signature_line}" not found in merged output
+
+The backup is preserved at: {patches_dir}/{file}
+Review the merged file manually, then either:
+  (a) Re-merge the missing content by hand, or
+  (b) Restore from backup: cp {patches_dir}/{file} {installed_path}
+```
+
+Do not proceed to cleanup until the user confirms they have resolved all unverified hunks.
+
+**Only when all rows show `verified: yes`** (or when all files had zero user-added hunks) may execution continue to Step 6.
+
+## Step 6: Cleanup option
 
 Ask user:
 - "Keep patch backups for reference?" → preserve `sdd-local-patches/`
 - "Clean up patch backups?" → remove `sdd-local-patches/` directory
 
-## Step 6: Report
+## Step 7: Report
 
 ```
 ## Patches Reapplied
 
-| # | File | Status |
-|---|------|--------|
-| 1 | {file_path} | ✓ Merged |
-| 2 | {file_path} | ○ Skipped (already upstream) |
-| 3 | {file_path} | ⚠ Conflict resolved |
+| # | File | Result | User Changes Preserved |
+|---|------|--------|----------------------|
+| 1 | {file_path} | Merged | Added step X, modified section Y |
+| 2 | {file_path} | Incorporated | Already in upstream v{version} |
+| 3 | {file_path} | Conflict resolved | User chose: keep custom section |
 
 {count} file(s) updated. Your local modifications are active again.
 ```
@@ -116,8 +301,11 @@ Ask user:
 </process>
 
 <success_criteria>
-- [ ] All backed-up patches processed
-- [ ] User modifications merged into new version
-- [ ] Conflicts resolved with user input
-- [ ] Status reported for each file
+- [ ] All backed-up patches processed — zero files left unhandled
+- [ ] No file classified as "no custom content" or "SKIP" — every backed-up file is definitionally modified
+- [ ] Three-way merge used when pristine baseline available (git history or sdd-pristine/)
+- [ ] User modifications identified and merged into new version
+- [ ] Conflicts surfaced to user with both versions shown
+- [ ] Status reported for each file with summary of what was preserved
+- [ ] Post-merge verification checks each file for dropped hunks and warns if content appears missing
 </success_criteria>

package/commands/sdd/research-phase.md

@@ -1,6 +1,6 @@
 ---
 name: sdd:research-phase
-description: Research how to implement a phase (standalone - usually use /sdd:plan-phase instead)
+description: Research how to implement a phase (standalone - usually use /sdd-plan-phase instead)
 argument-hint: "[phase]"
 allowed-tools:
   - Read
@@ -11,7 +11,7 @@ allowed-tools:
 <objective>
 Research how to implement a phase. Spawns sdd-phase-researcher agent with phase context.
 
-**Note:** This is a standalone research command. For most workflows, use `/sdd:plan-phase` which integrates research automatically.
+**Note:** This is a standalone research command. For most workflows, use `/sdd-plan-phase` which integrates research automatically.
 
 **Use this command when:**
 - You want to research without planning yet
@@ -115,7 +115,7 @@ Mode: ecosystem
 </additional_context>
 
 <downstream_consumer>
-Your RESEARCH.md will be loaded by `/sdd:plan-phase` which uses specific sections:
+Your RESEARCH.md will be loaded by `/sdd-plan-phase` which uses specific sections:
 - `## Standard Stack` → Plans use these libraries
 - `## Architecture Patterns` → Task structure follows these
 - `## Don't Hand-Roll` → Tasks NEVER build custom solutions for listed problems

package/commands/sdd/review-backlog.md

@@ -5,6 +5,7 @@ allowed-tools:
   - Read
   - Write
   - Bash
+  - AskUserQuestion
 ---
 
 <objective>

package/commands/sdd/review.md

@@ -1,7 +1,7 @@
 ---
 name: sdd:review
 description: Request cross-AI peer review of phase plans from external AI CLIs
-argument-hint: "--phase N [--gemini] [--claude] [--codex] [--all]"
+argument-hint: "--phase N [--gemini] [--claude] [--codex] [--opencode] [--qwen] [--cursor] [--all]"
 allowed-tools:
   - Read
   - Write
@@ -11,9 +11,9 @@ allowed-tools:
 ---
 
 <objective>
-Invoke external AI CLIs (Gemini, Claude, Codex) to independently review phase plans.
+Invoke external AI CLIs (Gemini, Claude, Codex, OpenCode, Qwen Code, Cursor) to independently review phase plans.
 Produces a structured REVIEWS.md with per-reviewer feedback that can be fed back into
-planning via /sdd:plan-phase --reviews.
+planning via /sdd-plan-phase --reviews.
 
 **Flow:** Detect CLIs → Build review prompt → Invoke each CLI → Collect responses → Write REVIEWS.md
 </objective>
@@ -29,6 +29,9 @@ Phase number: extracted from $ARGUMENTS (required)
 - `--gemini` — Include Gemini CLI review
 - `--claude` — Include Claude CLI review (uses separate session)
 - `--codex` — Include Codex CLI review
+- `--opencode` — Include OpenCode review (uses model from user's OpenCode config)
+- `--qwen` — Include Qwen Code review (Alibaba Qwen models)
+- `--cursor` — Include Cursor agent review
 - `--all` — Include all available CLIs
 </context>
 

package/commands/sdd/scan.md

@@ -0,0 +1,26 @@
+---
+name: sdd:scan
+description: Rapid codebase assessment — lightweight alternative to /sdd-map-codebase
+allowed-tools:
+  - Read
+  - Write
+  - Bash
+  - Grep
+  - Glob
+  - Agent
+  - AskUserQuestion
+---
+<objective>
+Run a focused codebase scan for a single area, producing targeted documents in `.planning/codebase/`.
+Accepts an optional `--focus` flag: `tech`, `arch`, `quality`, `concerns`, or `tech+arch` (default).
+
+Lightweight alternative to `/sdd-map-codebase` — spawns one mapper agent instead of four parallel ones.
+</objective>
+
+<execution_context>
+@~/.claude/sdd/workflows/scan.md
+</execution_context>
+
+<process>
+Execute the scan workflow from @~/.claude/sdd/workflows/scan.md end-to-end.
+</process>

package/commands/sdd/secure-phase.md

@@ -0,0 +1,35 @@
+---
+name: sdd:secure-phase
+description: Retroactively verify threat mitigations for a completed phase
+argument-hint: "[phase number]"
+allowed-tools:
+  - Read
+  - Write
+  - Edit
+  - Bash
+  - Glob
+  - Grep
+  - Task
+  - AskUserQuestion
+---
+<objective>
+Verify threat mitigations for a completed phase. Three states:
+- (A) SECURITY.md exists — audit and verify mitigations
+- (B) No SECURITY.md, PLAN.md with threat model exists — run from artifacts
+- (C) Phase not executed — exit with guidance
+
+Output: updated SECURITY.md.
+</objective>
+
+<execution_context>
+@~/.claude/sdd/workflows/secure-phase.md
+</execution_context>
+
+<context>
+Phase: $ARGUMENTS — optional, defaults to last completed phase.
+</context>
+
+<process>
+Execute @~/.claude/sdd/workflows/secure-phase.md.
+Preserve all workflow gates.
+</process>

package/commands/sdd/ship.md

@@ -11,7 +11,7 @@ allowed-tools:
   - AskUserQuestion
 ---
 <objective>
-Bridge local completion → merged PR. After /sdd:verify-work passes, ship the work: push branch, create PR with auto-generated body, optionally trigger review, and track the merge.
+Bridge local completion → merged PR. After /sdd-verify-work passes, ship the work: push branch, create PR with auto-generated body, optionally trigger review, and track the merge.
 
 Closes the plan → execute → verify → ship loop.
 </objective>

package/commands/sdd/thread.md

@@ -39,7 +39,7 @@ For each thread, read the first few lines to show title and status:
 
 If no threads exist, show:
 ```
-No threads found. Create one with: /sdd:thread <description>
+No threads found. Create one with: /sdd-thread <description>
 ```
 </mode_list>
 
@@ -62,7 +62,7 @@ Create a new thread:
 
 1. Generate slug from description:
    ```bash
-   SLUG=$(node "$HOME/.claude/sdd/bin/sdd-tools.cjs" generate-slug "$ARGUMENTS")
+   SLUG=$(node "$HOME/.claude/sdd/bin/sdd-tools.cjs" generate-slug "$ARGUMENTS" --raw)
    ```
 
 2. Create the threads directory if needed:
@@ -111,7 +111,7 @@ Create a new thread:
    Thread: {slug}
    File: .planning/threads/{slug}.md
 
-   Resume anytime with: /sdd:thread {slug}
+   Resume anytime with: /sdd-thread {slug}
    ```
 </mode_create>
 
@@ -119,9 +119,9 @@ Create a new thread:
 
 <notes>
 - Threads are NOT phase-scoped — they exist independently of the roadmap
-- Lighter weight than /sdd:pause-work — no phase state, no plan context
+- Lighter weight than /sdd-pause-work — no phase state, no plan context
 - The value is in Context and Next Steps — a cold-start session can pick up immediately
 - Threads can be promoted to phases or backlog items when they mature:
-  /sdd:add-phase or /sdd:add-backlog with context from the thread
+  /sdd-add-phase or /sdd-add-backlog with context from the thread
 - Thread files live in .planning/threads/ — no collision with phases or other SDD structures
 </notes>

package/commands/sdd/undo.md

@@ -0,0 +1,34 @@
+---
+name: sdd:undo
+description: "Safe git revert. Roll back phase or plan commits using the phase manifest with dependency checks."
+argument-hint: "--last N | --phase NN | --plan NN-MM"
+allowed-tools:
+  - Read
+  - Bash
+  - Glob
+  - Grep
+  - AskUserQuestion
+---
+
+<objective>
+Safe git revert — roll back SDD phase or plan commits using the phase manifest, with dependency checks and a confirmation gate before execution.
+
+Three modes:
+- **--last N**: Show recent SDD commits for interactive selection
+- **--phase NN**: Revert all commits for a phase (manifest + git log fallback)
+- **--plan NN-MM**: Revert all commits for a specific plan
+</objective>
+
+<execution_context>
+@~/.claude/sdd/workflows/undo.md
+@~/.claude/sdd/references/ui-brand.md
+@~/.claude/sdd/references/gate-prompts.md
+</execution_context>
+
+<context>
+$ARGUMENTS
+</context>
+
+<process>
+Execute the undo workflow from @~/.claude/sdd/workflows/undo.md end-to-end.
+</process>

package/commands/sdd/verify-work.md

@@ -16,7 +16,7 @@ Validate built features through conversational testing with persistent state.
 
 Purpose: Confirm what Claude built actually works from user's perspective. One test at a time, plain text responses, no interrogation. When issues are found, automatically diagnose, plan fixes, and prepare for execution.
 
-Output: {phase_num}-UAT.md tracking all test results. If issues found: diagnosed gaps, verified fix plans ready for /sdd:execute-phase
+Output: {phase_num}-UAT.md tracking all test results. If issues found: diagnosed gaps, verified fix plans ready for /sdd-execute-phase
 </objective>
 
 <execution_context>

package/commands/sdd/workstreams.md

@@ -1,14 +1,18 @@
 ---
+name: sdd:workstreams
 description: Manage parallel workstreams — list, create, switch, status, progress, complete, and resume
+allowed-tools:
+  - Read
+  - Bash
 ---
 
-# /sdd:workstreams
+# /sdd-workstreams
 
 Manage parallel workstreams for concurrent milestone work.
 
 ## Usage
 
-`/sdd:workstreams [subcommand] [args]`
+`/sdd-workstreams [subcommand] [args]`
 
 ### Subcommands
 
@@ -30,32 +34,34 @@ If no subcommand given, default to `list`.
 ## Step 2: Execute Operation
 
 ### list
-Run: `node "$SDD_TOOLS" workstream list --raw --cwd "$CWD"`
+Run: `node "$HOME/.claude/sdd/bin/sdd-tools.cjs" workstream list --raw --cwd "$CWD"`
 Display the workstreams in a table format showing name, status, current phase, and progress.
 
 ### create
-Run: `node "$SDD_TOOLS" workstream create <name> --raw --cwd "$CWD"`
+Run: `node "$HOME/.claude/sdd/bin/sdd-tools.cjs" workstream create <name> --raw --cwd "$CWD"`
 After creation, display the new workstream path and suggest next steps:
-- `/sdd:new-milestone --ws <name>` to set up the milestone
+- `/sdd-new-milestone --ws <name>` to set up the milestone
 
 ### status
-Run: `node "$SDD_TOOLS" workstream status <name> --raw --cwd "$CWD"`
+Run: `node "$HOME/.claude/sdd/bin/sdd-tools.cjs" workstream status <name> --raw --cwd "$CWD"`
 Display detailed phase breakdown and state information.
 
 ### switch
-Run: `node "$SDD_TOOLS" workstream set <name> --raw --cwd "$CWD"`
-Also set `SDD_WORKSTREAM` env var for the current session.
+Run: `node "$HOME/.claude/sdd/bin/sdd-tools.cjs" workstream set <name> --raw --cwd "$CWD"`
+Also set `SDD_WORKSTREAM` for the current session when the runtime supports it.
+If the runtime exposes a session identifier, SDD also stores the active workstream
+session-locally so concurrent sessions do not overwrite each other.
 
 ### progress
-Run: `node "$SDD_TOOLS" workstream progress --raw --cwd "$CWD"`
+Run: `node "$HOME/.claude/sdd/bin/sdd-tools.cjs" workstream progress --raw --cwd "$CWD"`
 Display a progress overview across all workstreams.
 
 ### complete
-Run: `node "$SDD_TOOLS" workstream complete <name> --raw --cwd "$CWD"`
+Run: `node "$HOME/.claude/sdd/bin/sdd-tools.cjs" workstream complete <name> --raw --cwd "$CWD"`
 Archive the workstream to milestones/.
 
 ### resume
-Set the workstream as active and suggest `/sdd:resume-work --ws <name>`.
+Set the workstream as active and suggest `/sdd-resume-work --ws <name>`.
 
 ## Step 3: Display Results