chore: release v7.2.4

- Added detailed constraints for the Coordinator role in the team UX improvement skill, emphasizing orchestration responsibilities and workflow management.
- Updated test cases in DashboardToolbar, useIssues, and useWebSocket to improve reliability and clarity.
- Introduced new tests for configStore and ignore patterns in Codex Lens to ensure proper functionality and configuration handling.
- Enhanced smart search functionality with improved embedding selection logic and added tests for various scenarios.
- Updated installation and usage documentation to reflect changes in directory structure and role specifications.

.ccw/personal/coding-style.md

@@ -1,27 +0,0 @@
----
-title: "Personal Coding Style"
-dimension: personal
-category: general
-keywords:
-  - style
-  - preference
-readMode: optional
-priority: medium
----
-
-# Personal Coding Style
-
-## Preferences
-
-- Describe your preferred coding style here
-- Example: verbose variable names vs terse, functional vs imperative
-
-## Patterns I Prefer
-
-- List patterns you reach for most often
-- Example: builder pattern, factory functions, tagged unions
-
-## Things I Avoid
-
-- List anti-patterns or approaches you dislike
-- Example: deep inheritance hierarchies, magic strings

.ccw/personal/tool-preferences.md

@@ -1,25 +0,0 @@
----
-title: "Tool Preferences"
-dimension: personal
-category: general
-keywords:
-  - tool
-  - cli
-  - editor
-readMode: optional
-priority: low
----
-
-# Tool Preferences
-
-## Editor
-
-- Preferred editor and key extensions/plugins
-
-## CLI Tools
-
-- Preferred shell, package manager, build tools
-
-## Debugging
-
-- Preferred debugging approach and tools

.ccw/specs/architecture-constraints.md

@@ -1,33 +1,6 @@
----
-title: "Architecture Constraints"
-dimension: specs
-category: planning
-keywords:
-  - architecture
-  - module
-  - layer
-  - pattern
-readMode: required
-priority: high
-scope: project
----
-
 # Architecture Constraints
 
-## Module Boundaries
+## Schema Evolution
 
-- Each module owns its data and exposes a public API
-- No circular dependencies between modules
-- Shared utilities live in a dedicated shared layer
-
-## Layer Separation
-
-- Presentation layer must not import data layer directly
-- Business logic must be independent of framework specifics
-- Configuration must be externalized, not hardcoded
-
-## Dependency Rules
-
-- External dependencies require justification
-- Prefer standard library when available
-- Pin dependency versions for reproducibility
+- [compatibility] When enhancing existing schemas, use optional fields and additionalProperties rather than creating new schemas. Avoid breaking changes.
+- [portability] Use relative paths for cross-artifact navigation to ensure portability across different environments and installations.

.ccw/specs/coding-conventions.md

@@ -1,39 +1,17 @@
----
-title: "Coding Conventions"
-dimension: specs
-category: general
-keywords:
-  - typescript
-  - naming
-  - style
-  - convention
-readMode: required
-priority: high
-scope: project
----
-
 # Coding Conventions
 
-## Naming
+## Navigation & Path Handling
 
-- Use camelCase for variables and functions
-- Use PascalCase for classes and interfaces
-- Use UPPER_SNAKE_CASE for constants
+- [navigation] When creating navigation links between artifacts, always compute relative paths from the artifact's actual location, not from an assumed location. Test path resolution before committing. (learned: 2026-03-07)
+- [schema] Always include schema_version field in index/registry files to enable safe evolution and migration detection. (learned: 2026-03-07)
+- [error-handling] When adding version checks or validation, always continue with degraded functionality rather than failing hard. Log warnings but don't block execution. (learned: 2026-03-07)
 
-## Formatting
+## Document Generation
 
-- 2-space indentation
-- Single quotes for strings
-- Trailing commas in multi-line constructs
+- [architecture] For document generation systems, adopt Layer 3→2→1 pattern (components → features → indexes) for efficient incremental updates. (learned: 2026-03-07)
 
-## Patterns
+## Implementation Quality
 
-- Prefer composition over inheritance
-- Use early returns to reduce nesting
-- Keep functions under 30 lines when practical
-
-## Error Handling
-
-- Always handle errors explicitly
-- Prefer typed errors over generic catch-all
-- Log errors with sufficient context
+- [validation] Path calculation errors are subtle and hard to spot in static review. Always verify path resolution from the actual file location, not from documentation. (learned: 2026-03-07)
+- [implementation] Declaring "add X to Y" in documentation is not enough - the actual logic must be implemented in the target files. (learned: 2026-03-07)
+- [clarity] Explicit instructions are better than implicit ones. Vague instructions like "Update _index.md files" should be made explicit (e.g., "Update sessions/_index.md"). (learned: 2026-03-07)

.ccw/workflows/cli-templates/schemas/project-tech-schema.json

@@ -155,7 +155,7 @@
     },
     "development_index": {
       "type": "object",
-      "description": "Categorized development history (lite-plan/lite-execute)",
+      "description": "Categorized development history (lite-planex sessions)",
       "properties": {
         "feature": { "type": "array", "items": { "$ref": "#/$defs/devIndexEntry" } },
         "enhancement": { "type": "array", "items": { "$ref": "#/$defs/devIndexEntry" } },

.ccw/workflows/cli-tools-usage.md

@@ -85,13 +85,14 @@ Tools are selected based on **tags** defined in the configuration. Use tags to m
 
 ```bash
 # Explicit tool selection
-ccw cli -p "<PROMPT>" --tool <tool-id> --mode <analysis|write|review>
+ccw cli -p "<PROMPT>" --tool <tool-id> --mode <analysis|write>
 
 # Model override
 ccw cli -p "<PROMPT>" --tool <tool-id> --model <model-id> --mode <analysis|write>
 
-# Code review (codex only)
+# Code review (codex only - review mode and target flags are invalid for other tools)
 ccw cli -p "<PROMPT>" --tool codex --mode review
+ccw cli --tool codex --mode review --commit <hash>
 
 # Tag-based auto-selection (future)
 ccw cli -p "<PROMPT>" --tags <tag1,tag2> --mode <analysis|write>
@@ -215,7 +216,7 @@ rg "export.*Component" --files-with-matches --type ts
 CONTEXT: @components/Auth.tsx @types/auth.d.ts | Memory: Previous type refactoring
 
 # Step 3: Execute CLI
-ccw cli -p "..." --tool <tool-id> --mode analysis --cd src
+ccw cli -p "..." --tool <tool-id> --mode analysis --cd "src"
 ```
 
 ### --rule Configuration
@@ -292,11 +293,8 @@ ccw cli -p "..." --tool gemini --mode analysis --rule analysis-review-architectu
 - **`review`**
   - Permission: Read-only (code review output)
   - Use For: Git-aware code review of uncommitted changes, branch diffs, specific commits
-  - Specification: **codex only** - uses `codex review` subcommand
-  - Tool Behavior:
-    - `codex`: Executes `codex review` for structured code review
-    - Other tools (gemini/qwen/claude): Accept mode but no operation change (treated as analysis)
-  - **Constraint**: Target flags (`--uncommitted`, `--base`, `--commit`) and prompt are mutually exclusive
+  - Specification: **codex only** - uses `codex review` subcommand. Other tools MUST NOT use this mode
+  - **Constraint**: Target flags (`--uncommitted`, `--base`, `--commit`) are **codex-only** and mutually exclusive with prompt
     - With prompt only: `ccw cli -p "Focus on security" --tool codex --mode review` (reviews uncommitted by default)
     - With target flag only: `ccw cli --tool codex --mode review --commit abc123` (no prompt allowed)
 
@@ -309,20 +307,26 @@ ccw cli -p "..." --tool gemini --mode analysis --rule analysis-review-architectu
 - **`--mode <mode>`**
   - Description: **REQUIRED**: analysis, write, review
   - Default: **NONE** (must specify)
-  - Note: `review` mode triggers `codex review` subcommand for codex tool only
+  - Note: `review` mode is **codex-only**. Using `--mode review` with other tools (gemini/qwen/claude) is invalid and should be rejected
 
 - **`--model <model>`**
   - Description: Model override
   - Default: Tool's primaryModel from config
 
-- **`--cd <path>`**
-  - Description: Working directory
+- **`--cd "<path>"`**
+  - Description: Working directory (quote if path contains spaces)
   - Default: current
 
-- **`--includeDirs <dirs>`**
-  - Description: Additional directories (comma-separated)
+- **`--includeDirs "<dirs>"`**
+  - Description: Additional directories (comma-separated, quote if paths contain spaces)
   - Default: none
 
+- **`--id <id>`**
+  - Description: Execution ID (recommended, auto-generated if omitted)
+  - Default: Auto-generated in format `{prefix}-{HHmmss}-{rand4}` (e.g., `gem-143022-x7k2`)
+  - Prefix mapping: gemini→gem, qwen→qwn, codex→cdx, claude→cld, opencode→opc
+  - Note: ID is always output to stderr as `[CCW_EXEC_ID=<id>]` for programmatic capture
+
 - **`--resume [id]`**
   - Description: Resume previous session
   - Default: -
@@ -349,10 +353,10 @@ When using `--cd`:
 
 ```bash
 # Single directory
-ccw cli -p "CONTEXT: @**/* @../shared/**/*" --tool <tool-id> --mode analysis --cd src/auth --includeDirs ../shared
+ccw cli -p "CONTEXT: @**/* @../shared/**/*" --tool <tool-id> --mode analysis --cd "src/auth" --includeDirs "../shared"
 
 # Multiple directories
-ccw cli -p "..." --tool <tool-id> --mode analysis --cd src/auth --includeDirs ../shared,../types,../utils
+ccw cli -p "..." --tool <tool-id> --mode analysis --cd "src/auth" --includeDirs "../shared,../types,../utils"
 ```
 
 **Rule**: If CONTEXT contains `@../dir/**/*`, MUST include `--includeDirs ../dir`
@@ -387,6 +391,65 @@ ASSISTANT RESPONSE: [Previous output]
 [Your new prompt]
 ```
 
+### Subcommands
+
+#### `show` — List All Executions
+
+```bash
+ccw cli show                     # Active + recent completed executions
+ccw cli show --all               # Include full history
+```
+
+Displays a unified table of running and recent executions with: ID, Tool, Mode, Status, Duration, Prompt Preview.
+
+#### `watch <id>` — Stream Execution Output
+
+```bash
+ccw cli watch <id>               # Stream until completion (output to stderr)
+ccw cli watch <id> --timeout 120 # Auto-exit after 120 seconds
+```
+
+Behavior:
+- Output written to **stderr** (does not pollute stdout)
+- Exit code: 0 = success, 1 = error, 2 = timeout
+- Callers can `ccw cli watch <id> 2>/dev/null` to silently wait
+
+#### `output <id>` — Get Execution Output
+
+```bash
+ccw cli output <id>              # Final result only (default)
+ccw cli output <id> --verbose    # Full metadata + raw output
+ccw cli output <id> --raw        # Raw stdout (for piping)
+```
+
+Default returns `finalOutput > parsedOutput > stdout` — agent's final response text only.
+`--verbose` shows full metadata (ID, turn, status, project) plus raw stdout/stderr.
+
+#### ID Workflow Example
+
+```bash
+# Execute with auto-generated ID
+ccw cli -p "analyze code" --tool gemini --mode analysis
+# stderr outputs: [CCW_EXEC_ID=gem-143022-x7k2]
+
+# Execute with custom ID
+ccw cli -p "implement feature" --tool gemini --mode write --id my-task-1
+# stderr outputs: [CCW_EXEC_ID=my-task-1]
+
+# Check status
+ccw cli show
+
+# Watch running execution
+ccw cli watch gem-143022-x7k2
+
+# Get final result
+ccw cli output gem-143022-x7k2
+
+# Capture ID programmatically
+EXEC_ID=$(ccw cli -p "test" --tool gemini --mode analysis 2>&1 | grep -oP 'CCW_EXEC_ID=\K[^\]]+')
+ccw cli output $EXEC_ID
+```
+
 ### Command Examples
 
 #### Task-Type Specific Templates
@@ -399,7 +462,7 @@ MODE: analysis
 CONTEXT: @src/auth/**/* @src/middleware/auth.ts | Memory: Using bcrypt for passwords, JWT for sessions
 EXPECTED: Security report with: severity matrix, file:line references, CVE mappings where applicable, remediation code snippets prioritized by risk
 CONSTRAINTS: Focus on authentication | Ignore test files
-" --tool gemini --mode analysis --rule analysis-assess-security-risks --cd src/auth
+" --tool gemini --mode analysis --rule analysis-assess-security-risks --cd "src/auth"
 ```
 
 **Implementation Task** (New Feature):
@@ -421,7 +484,7 @@ MODE: analysis
 CONTEXT: @src/websocket/**/* @src/services/connection-manager.ts | Memory: Using ws library, ~5000 concurrent connections in production
 EXPECTED: Root cause analysis with: memory profile, leak source (file:line), fix recommendation with code, verification steps
 CONSTRAINTS: Focus on resource cleanup
-" --tool gemini --mode analysis --rule analysis-diagnose-bug-root-cause --cd src
+" --tool gemini --mode analysis --rule analysis-diagnose-bug-root-cause --cd "src"
 ```
 
 **Refactoring Task**:
@@ -446,7 +509,7 @@ ccw cli --tool codex --mode review --base main
 ccw cli --tool codex --mode review --commit abc123
 ```
 
-> **Note**: `--mode review` only triggers special behavior for `codex` tool. Target flags (`--uncommitted`, `--base`, `--commit`) and prompt are **mutually exclusive** - use one or the other, not both.
+> **Note**: `--mode review` and target flags (`--uncommitted`, `--base`, `--commit`) are **codex-only**. Using them with other tools is invalid. When using codex, target flags and prompt are **mutually exclusive** - use one or the other, not both.
 
 ---
 
@@ -455,9 +518,9 @@ ccw cli --tool codex --mode review --commit abc123
 **Single-Use Authorization**: Each execution requires explicit user instruction. Previous authorization does NOT carry over.
 
 **Mode Hierarchy**:
-- `analysis`: Read-only, safe for auto-execution
-- `write`: Create/Modify/Delete files, full operations - requires explicit `--mode write`
-- `review`: Git-aware code review (codex only), read-only output - requires explicit `--mode review`
+- `analysis`: Read-only, safe for auto-execution. Available for all tools
+- `write`: Create/Modify/Delete files, full operations - requires explicit `--mode write`. Available for all tools
+- `review`: **codex-only**. Git-aware code review, read-only output. Invalid for other tools (gemini/qwen/claude)
 - **Exception**: User provides clear instructions like "modify", "create", "implement"
 
 ---

.claude/CLAUDE.md

@@ -16,18 +16,19 @@ Available CLI endpoints are dynamically defined by the config file
 - **File Modification**: @~/.ccw/workflows/file-modification.md
 
 ### Agent Calls
-- **Always use `run_in_background: false`** for Task tool agent calls: `Task({ subagent_type: "xxx", prompt: "...", run_in_background: false })` to ensure synchronous execution and immediate result visibility
-- **TaskOutput usage**: Only use `TaskOutput({ task_id: "xxx", block: false })` + sleep loop to poll completion status. NEVER read intermediate output during agent/CLI execution - wait for final result only
+- **Always use `run_in_background: false`** for Agent tool calls: `Agent({ subagent_type: "xxx", prompt: "...", run_in_background: false })` to ensure synchronous execution and immediate result visibility
+
 
 ### CLI Tool Calls (ccw cli)
-- **Default: Use Bash `run_in_background: true`** - Unless otherwise specified, always execute CLI calls in background using Bash tool's background mode:
+- **Default**: CLI calls (`ccw cli`) default to background execution (`run_in_background: true`):
   ```
   Bash({
     command: "ccw cli -p '...' --tool gemini",
     run_in_background: true  // Bash tool parameter, not ccw cli parameter
   })
   ```
-- **After CLI call**: Stop output immediately - let CLI execute in background. **DO NOT use TaskOutput polling** - wait for hook callback to receive results
+- **CRITICAL — Agent-specific instructions ALWAYS override this default.** If an agent's definition file (`.claude/agents/*.md`) specifies `run_in_background: false`, that instruction takes highest priority. Subagents (Agent tool agents) CANNOT receive hook callbacks, so they MUST use `run_in_background: false` for CLI calls that produce required results.
+- **After CLI call (main conversation only)**: Stop output immediately - let CLI execute in background. **DO NOT use TaskOutput polling** - wait for hook callback to receive results
 
 ### CLI Analysis Calls
 - **Wait for results**: MUST wait for CLI analysis to complete before taking any write action. Do NOT proceed with fixes while analysis is running

.claude/agents/cli-lite-planning-agent.md

@@ -126,10 +126,11 @@ const planObject = generatePlanFromSchema(schema, context)
 Phase 1: Schema & Context Loading
 ├─ Read schema reference (plan-overview-base-schema or plan-overview-fix-schema)
 ├─ Aggregate multi-angle context (explorations or diagnoses)
+├─ If no explorations: use "## Prior Analysis" block from task description as primary context
 └─ Determine output structure from schema
 
 Phase 2: CLI Execution
-├─ Construct CLI command with planning template
+├─ Construct CLI command with planning template (include Prior Analysis context when no explorations)
 ├─ Execute Gemini (fallback: Qwen → degraded mode)
 └─ Timeout: 60 minutes
 
@@ -173,7 +174,7 @@ TASK:
 • Identify dependencies and execution phases
 • Generate complexity-appropriate fields (rationale, verification, risks, code_skeleton, data_flow)
 MODE: analysis
-CONTEXT: @**/* | Memory: {context_summary}
+CONTEXT: @**/* | Memory: {context_summary}. If task description contains '## Prior Analysis', treat it as primary planning context with pre-analyzed files, findings, and recommendations.
 EXPECTED:
 ## Summary
 [overview]
@@ -229,9 +230,9 @@ EXPECTED:
 **Total**: [time]
 
 CONSTRAINTS:
-- Follow schema structure from {schema_path}
+- Output as structured markdown text following the EXPECTED format above
 - Task IDs use format TASK-001, TASK-002, etc. (FIX-001 for fix-plan)
-- Complexity determines required fields:
+- Complexity determines required sections:
   * Low: base fields only
   * Medium: + rationale + verification + design_decisions
   * High: + risks + code_skeleton + data_flow
@@ -256,8 +257,8 @@ function extractSection(cliOutput, header) {
 // Parse structured tasks from CLI output
 function extractStructuredTasks(cliOutput, complexity) {
   const tasks = []
-  // Split by task headers (supports both TASK-NNN and T\d+ formats)
-  const taskBlocks = cliOutput.split(/### (TASK-\d+|T\d+):/).slice(1)
+  // Split by task headers (flexible: 1-3 #, optional colon, supports TASK-NNN and T\d+)
+  const taskBlocks = cliOutput.split(/#{1,3}\s*(TASK-\d+|T\d+):?\s*/).slice(1)
 
   for (let i = 0; i < taskBlocks.length; i += 2) {
     const rawId = taskBlocks[i].trim()
@@ -820,8 +821,8 @@ function validateTask(task) {
 - **Write BOTH plan.json AND .task/*.json files** (two-layer output)
 - Handle CLI errors with fallback chain
 
-**Bash Tool**:
-- Use `run_in_background=false` for all Bash/CLI calls to ensure foreground execution
+**Bash Tool (OVERRIDE global CLAUDE.md default)**:
+- **MUST use `run_in_background: false`** for ALL Bash/CLI calls — results are required before proceeding. This overrides any global `run_in_background: true` default.
 
 **NEVER**:
 - Execute implementation (return plan only)

.claude/agents/team-supervisor.md

@@ -0,0 +1,293 @@
+---
+name: team-supervisor
+description: |
+  Message-driven resident agent for pipeline supervision. Spawned once per session,
+  stays alive across checkpoint tasks, woken by coordinator via SendMessage.
+
+  Unlike team-worker (task-discovery lifecycle), team-supervisor uses a message-driven
+  lifecycle: Init → idle → wake → execute → idle → ... → shutdown.
+
+  Reads message bus + artifacts (read-only), produces supervision reports.
+
+  Examples:
+  - Context: Coordinator spawns supervisor at session start
+    user: "role: supervisor\nrole_spec: .../supervisor/role.md\nsession: .workflow/.team/TLV4-xxx"
+    assistant: "Loading role spec, initializing baseline context, reporting ready, going idle"
+    commentary: Agent initializes once, then waits for checkpoint assignments via SendMessage
+
+  - Context: Coordinator wakes supervisor for checkpoint
+    user: (SendMessage) "## Checkpoint Request\ntask_id: CHECKPOINT-001\nscope: [DRAFT-001, DRAFT-002]"
+    assistant: "Claiming task, loading incremental context, executing checks, reporting verdict"
+    commentary: Agent wakes, executes one checkpoint, reports, goes idle again
+color: cyan
+---
+
+You are a **resident pipeline supervisor**. You observe the pipeline's health across checkpoint boundaries, maintaining context continuity in-memory.
+
+**You are NOT a team-worker.** Your lifecycle is fundamentally different:
+- team-worker: discover task → execute → report → STOP
+- team-supervisor: init → idle → [wake → execute → idle]* → shutdown
+
+---
+
+## Prompt Input Parsing
+
+Parse the following fields from your prompt:
+
+| Field | Required | Description |
+|-------|----------|-------------|
+| `role` | Yes | Always `supervisor` |
+| `role_spec` | Yes | Path to supervisor role.md |
+| `session` | Yes | Session folder path |
+| `session_id` | Yes | Session ID for message bus operations |
+| `team_name` | Yes | Team name for SendMessage |
+| `requirement` | Yes | Original task/requirement description |
+| `recovery` | No | `true` if respawned after crash — triggers recovery protocol |
+
+---
+
+## Lifecycle
+
+```
+Entry:
+  Parse prompt → extract fields
+  Read role_spec → load checkpoint definitions (Phase 2-4 instructions)
+
+  Init Phase:
+    Load baseline context (all role states, wisdom, session state)
+    context_accumulator = []
+    SendMessage(coordinator, "ready")
+    → idle
+
+  Wake Cycle (coordinator sends checkpoint request):
+    Parse message → task_id, scope
+    TaskUpdate(task_id, in_progress)
+    Incremental context load (only new data since last wake)
+    Execute checkpoint checks (from role_spec)
+    Write report artifact
+    TaskUpdate(task_id, completed)
+    team_msg state_update
+    Accumulate to context_accumulator
+    SendMessage(coordinator, checkpoint report)
+    → idle
+
+  Shutdown (coordinator sends shutdown_request):
+    shutdown_response(approve: true)
+    → die
+```
+
+---
+
+## Init Phase
+
+Run once at spawn. Build baseline understanding of the pipeline.
+
+### Step 1: Load Role Spec
+```
+Read role_spec path → parse frontmatter + body
+```
+Body contains checkpoint-specific check definitions (CHECKPOINT-001, 002, 003).
+
+### Step 2: Load Baseline Context
+```
+team_msg(operation="get_state", session_id=<session_id>)  // all roles
+```
+- Record which roles have completed, their key_findings, decisions
+- Read `<session>/wisdom/*.md` — absorb accumulated team knowledge
+- Read `<session>/team-session.json` — understand pipeline mode, stages
+
+### Step 3: Report Ready
+```javascript
+SendMessage({
+  type: "message",
+  recipient: "coordinator",
+  content: "[supervisor] Resident supervisor ready. Baseline loaded for session <session_id>. Awaiting checkpoint assignments.",
+  summary: "[supervisor] Ready, awaiting checkpoints"
+})
+```
+
+### Step 4: Go Idle
+Turn ends. Agent sleeps until coordinator sends a message.
+
+---
+
+## Wake Cycle
+
+Triggered when coordinator sends a message. Parse and execute.
+
+### Step 1: Parse Checkpoint Request
+
+Coordinator message format:
+```markdown
+## Checkpoint Request
+task_id: CHECKPOINT-NNN
+scope: [TASK-A, TASK-B, ...]
+pipeline_progress: M/N tasks completed
+```
+
+Extract `task_id` and `scope` from the message content.
+
+### Step 2: Claim Task
+```javascript
+TaskUpdate({ taskId: "<task_id>", status: "in_progress" })
+```
+
+### Step 3: Incremental Context Load
+
+Only load data that's NEW since last wake (or since init if first wake):
+
+| Source | Method | What's New |
+|--------|--------|------------|
+| Role states | `team_msg(operation="get_state")` | Roles completed since last wake |
+| Message bus | `team_msg(operation="list", session_id, last=30)` | Recent messages (errors, progress) |
+| Artifacts | Read files in scope that aren't in context_accumulator yet | New upstream deliverables |
+| Wisdom | Read `<session>/wisdom/*.md` | New entries appended since last wake |
+
+**Efficiency rule**: Skip re-reading artifacts already in context_accumulator. Only read artifacts for tasks listed in `scope` that haven't been processed before.
+
+### Step 4: Execute Checks
+
+Follow the checkpoint-specific instructions in role_spec body (Phase 3 section). Each checkpoint type defines its own check matrix.
+
+### Step 5: Write Report
+
+Write to `<session>/artifacts/CHECKPOINT-NNN-report.md` (format defined in role_spec Phase 4).
+
+### Step 6: Complete Task
+```javascript
+TaskUpdate({ taskId: "<task_id>", status: "completed" })
+```
+
+### Step 7: Publish State
+```javascript
+mcp__ccw-tools__team_msg({
+  operation: "log",
+  session_id: "<session_id>",
+  from: "supervisor",
+  type: "state_update",
+  data: {
+    status: "task_complete",
+    task_id: "<CHECKPOINT-NNN>",
+    ref: "<session>/artifacts/CHECKPOINT-NNN-report.md",
+    key_findings: ["..."],
+    decisions: ["Proceed" or "Block: <reason>"],
+    verification: "self-validated",
+    supervision_verdict: "pass|warn|block",
+    supervision_score: 0.85
+  }
+})
+```
+
+### Step 8: Accumulate Context
+```
+context_accumulator.append({
+  task: "<CHECKPOINT-NNN>",
+  artifact: "<report-path>",
+  verdict: "<pass|warn|block>",
+  score: <0.0-1.0>,
+  key_findings: [...],
+  artifacts_read: [<list of artifact paths read this cycle>],
+  quality_trend: "<stable|improving|degrading>"
+})
+```
+
+### Step 9: Report to Coordinator
+```javascript
+SendMessage({
+  type: "message",
+  recipient: "coordinator",
+  content: "[supervisor] CHECKPOINT-NNN complete.\nVerdict: <verdict> (score: <score>)\nFindings: <top-3>\nRisks: <count> logged\nQuality trend: <trend>\nArtifact: <path>",
+  summary: "[supervisor] CHECKPOINT-NNN: <verdict>"
+})
+```
+
+### Step 10: Go Idle
+Turn ends. Wait for next checkpoint request or shutdown.
+
+---
+
+## Crash Recovery
+
+If spawned with `recovery: true` in prompt:
+
+1. Scan `<session>/artifacts/CHECKPOINT-*-report.md` for existing reports
+2. Read each report → rebuild context_accumulator entries
+3. Check TaskList for any in_progress CHECKPOINT task (coordinator resets it to pending before respawn)
+4. SendMessage to coordinator: "[supervisor] Recovered. Rebuilt context from N previous checkpoint reports."
+5. Go idle — resume normal wake cycle
+
+---
+
+## Shutdown Protocol
+
+When receiving a `shutdown_request` message:
+
+```javascript
+SendMessage({
+  type: "shutdown_response",
+  request_id: "<from message>",
+  approve: true
+})
+```
+
+Agent terminates.
+
+---
+
+## Message Protocol Reference
+
+### Coordinator → Supervisor (wake)
+
+```markdown
+## Checkpoint Request
+task_id: CHECKPOINT-001
+scope: [DRAFT-001, DRAFT-002]
+pipeline_progress: 3/10 tasks completed
+```
+
+### Supervisor → Coordinator (report)
+
+```
+[supervisor] CHECKPOINT-001 complete.
+Verdict: pass (score: 0.90)
+Findings: Terminology aligned, decision chain consistent, all artifacts present
+Risks: 0 logged
+Quality trend: stable
+Artifact: <session>/artifacts/CHECKPOINT-001-report.md
+```
+
+### Coordinator → Supervisor (shutdown)
+
+Standard `shutdown_request` via SendMessage tool.
+
+---
+
+## Role Isolation Rules
+
+| Allowed | Prohibited |
+|---------|-----------|
+| Read ALL role states (cross-role visibility) | Modify any upstream artifacts |
+| Read ALL message bus entries | Create or reassign tasks |
+| Read ALL artifacts in session | SendMessage to other workers directly |
+| Write CHECKPOINT report artifacts | Spawn agents |
+| Append to wisdom files | Process non-CHECKPOINT work |
+| SendMessage to coordinator only | Make implementation decisions |
+
+---
+
+## Error Handling
+
+| Scenario | Resolution |
+|----------|------------|
+| Artifact file not found | Score check as warn (not fail), log missing path |
+| Message bus empty/unavailable | Score as warn, note "no messages to analyze" |
+| Role state missing for upstream | Fall back to reading artifact files directly |
+| Coordinator message unparseable | SendMessage error to coordinator, stay idle |
+| Cumulative errors >= 3 across wakes | SendMessage alert to coordinator, stay idle (don't die) |
+| No checkpoint request for extended time | Stay idle — resident agents don't self-terminate |
+
+---
+
+## Output Tag
+
+All output lines must be prefixed with `[supervisor]` tag.

.claude/agents/team-worker.md

@@ -1,25 +1,25 @@
 ---
 name: team-worker
 description: |
-  Unified worker agent for team-lifecycle-v5. Contains all shared team behavior
+  Unified worker agent for team-lifecycle. Contains all shared team behavior
   (Phase 1 Task Discovery, Phase 5 Report + Fast-Advance, Message Bus, Consensus
   Handling, Inner Loop lifecycle). Loads role-specific Phase 2-4 logic from a
   role_spec markdown file passed in the prompt.
 
   Examples:
   - Context: Coordinator spawns analyst worker
-    user: "role: analyst\nrole_spec: .claude/skills/team-lifecycle-v5/role-specs/analyst.md\nsession: .workflow/.team/TLS-xxx"
+    user: "role: analyst\nrole_spec: ~  or <project>/.claude/skills/team-lifecycle/role-specs/analyst.md\nsession: .workflow/.team/TLS-xxx"
     assistant: "Loading role spec, discovering RESEARCH-* tasks, executing Phase 2-4 domain logic"
     commentary: Agent parses prompt, loads role spec, runs built-in Phase 1 then role-specific Phase 2-4 then built-in Phase 5
 
   - Context: Coordinator spawns writer worker with inner loop
-    user: "role: writer\nrole_spec: .claude/skills/team-lifecycle-v5/role-specs/writer.md\ninner_loop: true"
+    user: "role: writer\nrole_spec: ~  or <project>/.claude/skills/team-lifecycle/role-specs/writer.md\ninner_loop: true"
     assistant: "Loading role spec, processing all DRAFT-* tasks in inner loop"
     commentary: Agent detects inner_loop=true, loops Phase 1-5 for each same-prefix task
 color: green
 ---
 
-You are a **team-lifecycle-v5 worker agent**. You execute a specific role within a team pipeline. Your behavior is split into:
+You are a **team-lifecycle worker agent**. You execute a specific role within a team pipeline. Your behavior is split into:
 
 - **Built-in phases** (Phase 1, Phase 5): Task discovery, reporting, fast-advance, inner loop — defined below.
 - **Role-specific phases** (Phase 2-4): Loaded from a role_spec markdown file.
@@ -35,7 +35,7 @@ Parse the following fields from your prompt:
 | `role` | Yes | Role name (analyst, writer, planner, executor, tester, reviewer, architect, fe-developer, fe-qa) |
 | `role_spec` | Yes | Path to role-spec .md file containing Phase 2-4 instructions |
 | `session` | Yes | Session folder path (e.g., `.workflow/.team/TLS-xxx-2026-02-27`) |
-| `session_id` | Yes | Session ID (folder name, e.g., `TLS-xxx-2026-02-27`) |
+| `session_id` | Yes | Session ID (folder name, e.g., `TLS-xxx-2026-02-27`). Used directly as `session_id` param for all message bus operations |
 | `team_name` | Yes | Team name for SendMessage |
 | `requirement` | Yes | Original task/requirement description |
 | `inner_loop` | Yes | `true` or `false` — whether to loop through same-prefix tasks |
@@ -49,30 +49,45 @@ Parse the following fields from your prompt:
    - `prefix`: Task prefix to filter (e.g., `RESEARCH`, `DRAFT`, `IMPL`)
    - `inner_loop`: Override from frontmatter if present
    - `discuss_rounds`: Array of discuss round IDs this role handles
-   - `subagents`: Array of subagent types this role may call
+   - `delegates_to`: (DEPRECATED - team workers cannot delegate to other agents) Array for documentation only
    - `message_types`: Success/error/fix message type mappings
 3. Parse **body** (content after frontmatter) to get Phase 2-4 execution instructions
 4. Store parsed metadata and instructions for use in execution phases
 
 ---
 
-## Main Execution Loop
+## Execution Flow
 
 ```
 Entry:
   Parse prompt → extract role, role_spec, session, session_id, team_name, inner_loop
-  Read role_spec → parse frontmatter (prefix, discuss_rounds, etc.)
-  Read role_spec body → store Phase 2-4 instructions
+  Read role_spec → parse frontmatter + body (Phase 2-4 instructions)
   Load wisdom files from <session>/wisdom/ (if exist)
 
+  context_accumulator = []   ← inner_loop only, in-memory across iterations
+
   Main Loop:
     Phase 1: Task Discovery [built-in]
     Phase 2-4: Execute Role Spec [from .md]
     Phase 5: Report [built-in]
-      inner_loop AND more same-prefix tasks? → Phase 5-L → back to Phase 1
-      no more tasks? → Phase 5-F → STOP
+      inner_loop=true AND more same-prefix tasks? → Phase 5-L → back to Phase 1
+      inner_loop=false OR no more tasks? → Phase 5-F → STOP
 ```
 
+**Inner loop** (`inner_loop=true`): Processes ALL same-prefix tasks sequentially in a single agent instance. `context_accumulator` maintains context across task iterations for knowledge continuity.
+
+| Step | Phase 5-L (loop) | Phase 5-F (final) |
+|------|-----------------|------------------|
+| TaskUpdate completed | YES | YES |
+| team_msg state_update | YES | YES |
+| Accumulate summary | YES | - |
+| SendMessage to coordinator | NO | YES (all tasks) |
+| Fast-Advance check | - | YES |
+
+**Interrupt conditions** (break inner loop immediately):
+- consensus_blocked HIGH → SendMessage → STOP
+- Cumulative errors >= 3 → SendMessage → STOP
+
 ---
 
 ## Phase 1: Task Discovery (Built-in)
@@ -90,7 +105,7 @@ Execute on every loop iteration:
    - If inner loop continuation → proceed to Phase 5-F (all done)
 4. **Has matching tasks** → pick first by ID order
 5. `TaskGet(taskId)` → read full task details
-6. `TaskUpdate(taskId, status="in_progress")` → claim the task
+6. `TaskUpdate({ taskId: taskId, status: "in_progress" })` → claim the task
 
 ### Resume Artifact Check
 
@@ -108,107 +123,42 @@ After claiming a task, check if output artifacts already exist (indicates resume
 
 The role_spec contains Phase 2, Phase 3, and Phase 4 sections with domain-specific logic. Follow those instructions exactly. Key integration points with built-in infrastructure:
 
-### Subagent Delegation
+## CRITICAL LIMITATION: No Agent Delegation
 
-When role_spec instructs to call a subagent, use these templates:
+**Team workers CANNOT call the Agent() tool to spawn other agents.**
 
-**Discuss subagent** (for inline discuss rounds):
+Test evidence shows that team members spawned via Agent tool do not have access to the Agent tool themselves. Only the coordinator (main conversation context) can spawn agents.
 
+### Alternatives for Team Workers
+
+When role-spec instructions require analysis or exploration:
+
+**Option A: CLI Tools** (Recommended)
+```javascript
+Bash(`ccw cli -p "..." --tool gemini --mode analysis`, { run_in_background: false })
 ```
-Task({
-  subagent_type: "cli-discuss-agent",
-  run_in_background: false,
-  description: "Discuss <round-id>",
-  prompt: `## Multi-Perspective Critique: <round-id>
 
-### Input
-- Artifact: <artifact-path>
-- Round: <round-id>
-- Perspectives: <perspective-list-from-role-spec>
-- Session: <session-folder>
-- Discovery Context: <session-folder>/spec/discovery-context.json
+**Option B: Direct Tools**
+Use Read, Grep, Glob, mcp__ace-tool__search_context directly.
 
-### Perspective Routing
-
-| Perspective | CLI Tool | Role | Focus Areas |
-|-------------|----------|------|-------------|
-| Product | gemini | Product Manager | Market fit, user value, business viability |
-| Technical | codex | Tech Lead | Feasibility, tech debt, performance, security |
-| Quality | claude | QA Lead | Completeness, testability, consistency |
-| Risk | gemini | Risk Analyst | Risk identification, dependencies, failure modes |
-| Coverage | gemini | Requirements Analyst | Requirement completeness vs discovery-context |
-
-### Execution Steps
-1. Read artifact from <artifact-path>
-2. For each perspective, launch CLI analysis in background
-3. Wait for all CLI results
-4. Divergence detection + consensus determination
-5. Synthesize convergent/divergent themes + action items
-6. Write discussion record to: <session-folder>/discussions/<round-id>-discussion.md
-
-### Return Value
-JSON with: verdict (consensus_reached|consensus_blocked), severity (HIGH|MEDIUM|LOW), average_rating, divergences, action_items, recommendation, discussion_path`
-})
-```
-
-**Explore subagent** (for codebase exploration):
-
-```
-Task({
-  subagent_type: "cli-explore-agent",
-  run_in_background: false,
-  description: "Explore <angle>",
-  prompt: `Explore codebase for: <query>
-
-Focus angle: <angle>
-Keywords: <keyword-list>
-Session folder: <session-folder>
-
-## Cache Check
-1. Read <session-folder>/explorations/cache-index.json (if exists)
-2. Look for entry with matching angle
-3. If found AND file exists -> read cached result, return summary
-4. If not found -> proceed to exploration
-
-## Output
-Write JSON to: <session-folder>/explorations/explore-<angle>.json
-Update cache-index.json with new entry
-
-Return summary: file count, pattern count, top 5 files, output path`
-})
-```
-
-**Doc-generation subagent** (for writer document generation):
-
-```
-Task({
-  subagent_type: "universal-executor",
-  run_in_background: false,
-  description: "Generate <doc-type>",
-  prompt: `## Document Generation: <doc-type>
-
-### Session
-- Folder: <session-folder>
-- Spec config: <spec-config-path>
-
-### Document Config
-- Type: <doc-type>
-- Template: <template-path>
-- Output: <output-path>
-- Prior discussion: <discussion-file or "none">
-
-### Writer Accumulator (prior decisions)
-<JSON array of prior task summaries from context_accumulator>
-
-### Output Requirements
-1. Write document to <output-path>
-2. Return JSON: { artifact_path, summary, key_decisions[], sections_generated[], warnings[] }`
+**Option C: Request Coordinator Help**
+Send message to coordinator requesting agent delegation:
+```javascript
+mcp__ccw-tools__team_msg({
+  operation: "log",
+  session_id: sessionId,
+  from: role,
+  to: "coordinator",
+  type: "agent_request",
+  summary: "Request exploration agent for X",
+  data: { reason: "...", scope: "..." }
 })
+SendMessage({ recipient: "coordinator", content: "..." })
 ```
 
 ### Consensus Handling
 
-After a discuss subagent returns, handle the verdict:
+When role-spec instructions require consensus/discussion, handle the verdict:
 
 | Verdict | Severity | Action |
 |---------|----------|--------|
@@ -232,25 +182,32 @@ Discussion: <session-folder>/discussions/<round-id>-discussion.md
 
 ## Phase 5: Report + Fast-Advance (Built-in)
 
-After Phase 4 completes, determine Phase 5 variant:
+After Phase 4 completes, determine Phase 5 variant (see Execution Flow for decision table).
 
-### Phase 5-L: Loop Completion (when inner_loop=true AND more same-prefix tasks pending)
+### Phase 5-L: Loop Completion (inner_loop=true AND more same-prefix tasks pending)
 
 1. **TaskUpdate**: Mark current task `completed`
-2. **Message Bus**: Log completion with verification evidence
+2. **Message Bus**: Log state_update (combines state publish + audit log)
    ```
    mcp__ccw-tools__team_msg(
      operation="log",
-     team=<session_id>,
+     session_id=<session_id>,
      from=<role>,
-     to="coordinator",
-     type=<message_types.success>,
-     summary="[<role>] <task-id> complete. <brief-summary>. Verified: <verification_method>",
-     ref=<artifact-path>
+     type="state_update",
+     data={
+       status: "task_complete",
+       task_id: "<task-id>",
+       ref: "<artifact-path>",
+       key_findings: <from Phase 4>,
+       decisions: <from Phase 4>,
+       files_modified: <from Phase 4>,
+       artifact_path: "<artifact-path>",
+       verification: "<verification_method>"
+     }
    )
    ```
-   **CLI fallback**: `ccw team log --team <session_id> --from <role> --to coordinator --type <type> --summary "[<role>] ..." --json`
-3. **Accumulate summary** to context_accumulator (in-memory):
+   > `to` defaults to "coordinator", `summary` auto-generated. `type="state_update"` auto-syncs data to `meta.json.role_state[<role>]`.
+3. **Accumulate** to `context_accumulator` (in-memory):
    ```
    context_accumulator.append({
      task: "<task-id>",
@@ -258,43 +215,46 @@ After Phase 4 completes, determine Phase 5 variant:
      key_decisions: <from Phase 4>,
      discuss_verdict: <from Phase 4 or "none">,
      discuss_rating: <from Phase 4 or null>,
-     summary: "<brief summary>"
+     summary: "<brief summary>",
+     files_modified: <from Phase 4>
    })
    ```
-4. **Interrupt check**:
-   - consensus_blocked HIGH → SendMessage to coordinator → STOP
-   - Cumulative errors >= 3 → SendMessage to coordinator → STOP
-5. **Loop**: Return to Phase 1 to find next same-prefix task
+4. **Interrupt check**: consensus_blocked HIGH or errors >= 3 → SendMessage → STOP
+5. **Loop**: Return to Phase 1
 
 **Phase 5-L does NOT**: SendMessage to coordinator, Fast-Advance, spawn successors.
 
-### Phase 5-F: Final Report (when no more same-prefix tasks OR inner_loop=false)
+### Phase 5-F: Final Report (no more same-prefix tasks OR inner_loop=false)
 
 1. **TaskUpdate**: Mark current task `completed`
-2. **Message Bus**: Log completion (same as Phase 5-L step 2)
-3. **Compile final report**: All task summaries + discuss results + artifact paths
-4. **Fast-Advance Check**:
-   - Call `TaskList()`, find pending tasks whose blockedBy are ALL completed
-   - Apply fast-advance rules (see table below)
-5. **SendMessage** to coordinator OR **spawn successor** directly
-
-### Fast-Advance Rules
+2. **Message Bus**: Log state_update (same call as Phase 5-L step 2)
+3. **Compile final report** and **SendMessage** to coordinator:
+   ```javascript
+   SendMessage({
+     type: "message",
+     recipient: "coordinator",
+     content: "[<role>] <final-report>",
+     summary: "[<role>] Final report delivered"
+   })
+   ```
+   Report contents: tasks completed (count + list), artifacts produced (paths), files modified (with evidence), discuss results (verdicts + ratings), key decisions (from context_accumulator), verification summary, warnings/issues.
+4. **Fast-Advance Check**: Call `TaskList()`, find pending tasks whose blockedBy are ALL completed, apply rules:
 
 | Condition | Action |
 |-----------|--------|
 | Same-prefix successor (inner loop role) | Do NOT spawn — main agent handles via inner loop |
-| 1 ready task, simple linear successor, different prefix | Spawn directly via `Task(run_in_background: true)` + log `fast_advance` to message bus |
+| 1 ready task, simple linear successor, different prefix | Spawn directly via `Agent(run_in_background: true)` + log `fast_advance` |
 | Multiple ready tasks (parallel window) | SendMessage to coordinator (needs orchestration) |
 | No ready tasks + others running | SendMessage to coordinator (status update) |
 | No ready tasks + nothing running | SendMessage to coordinator (pipeline may be complete) |
 | Checkpoint task (e.g., spec->impl transition) | SendMessage to coordinator (needs user confirmation) |
 
-### Fast-Advance Spawn Template
+### Fast-Advance Spawn
 
 When fast-advancing to a different-prefix successor:
 
 ```
-Task({
+Agent({
   subagent_type: "team-worker",
   description: "Spawn <successor-role> worker",
   team_name: <team_name>,
@@ -311,160 +271,104 @@ inner_loop: <true|false based on successor role>`
 })
 ```
 
-### Fast-Advance Notification
-
-After spawning a successor via fast-advance, MUST log to message bus:
+After spawning, MUST log to message bus (passive log, NOT a SendMessage):
 
 ```
 mcp__ccw-tools__team_msg(
   operation="log",
-  team=<session_id>,
+  session_id=<session_id>,
   from=<role>,
-  to="coordinator",
   type="fast_advance",
   summary="[<role>] fast-advanced <completed-task-id> → spawned <successor-role> for <successor-task-id>"
 )
 ```
 
-This is a passive log entry (NOT a SendMessage). Coordinator reads it on next callback to reconcile `active_workers`.
-
-### SendMessage Format
-
-```
-SendMessage(team_name=<team_name>, recipient="coordinator", message="[<role>] <final-report>")
-```
-
-**Final report contents**:
-- Tasks completed (count + list)
-- Artifacts produced (paths)
-- Files modified (paths + before/after evidence from Phase 4 verification)
-- Discuss results (verdicts + ratings)
-- Key decisions (from context_accumulator)
-- Verification summary (methods used, pass/fail status)
-- Any warnings or issues
+Coordinator reads this on next callback to reconcile `active_workers`.
 
 ---
 
-## Inner Loop Framework
-
-When `inner_loop=true`, the agent processes ALL same-prefix tasks sequentially in a single agent instance:
-
-```
-context_accumulator = []
-
-Phase 1: Find first <prefix>-* task
-  Phase 2-4: Execute role spec
-  Phase 5-L: Mark done, log, accumulate, check interrupts
-    More <prefix>-* tasks? → Phase 1 (loop)
-    No more? → Phase 5-F (final report)
-```
-
-**context_accumulator**: Maintained in-memory across loop iterations. Each entry contains task summary + key decisions + discuss results. Passed to subagents as context for knowledge continuity.
-
-**Phase 5-L vs Phase 5-F**:
-
-| Step | Phase 5-L (loop) | Phase 5-F (final) |
-|------|-----------------|------------------|
-| TaskUpdate completed | YES | YES |
-| team_msg log | YES | YES |
-| Accumulate summary | YES | - |
-| SendMessage to coordinator | NO | YES (all tasks) |
-| Fast-Advance check | - | YES |
-
-**Interrupt conditions** (break inner loop immediately):
-- consensus_blocked HIGH → SendMessage → STOP
-- Cumulative errors >= 3 → SendMessage → STOP
-
-**Crash recovery**: If agent crashes mid-loop, completed tasks are safe (TaskUpdate + artifacts on disk). Coordinator detects orphaned in_progress task on resume, resets to pending, re-spawns. New agent resumes from the interrupted task via Resume Artifact Check.
-
----
-
-## Wisdom Accumulation
-
-### Load (Phase 2)
-
-Extract session folder from prompt. Read wisdom files if they exist:
-
-```
-<session>/wisdom/learnings.md
-<session>/wisdom/decisions.md
-<session>/wisdom/conventions.md
-<session>/wisdom/issues.md
-```
-
-Use wisdom context to inform Phase 2-4 execution.
-
-### Contribute (Phase 4/5)
-
-Write discoveries to corresponding wisdom files:
-- New patterns → `learnings.md`
-- Architecture/design decisions → `decisions.md`
-- Codebase conventions → `conventions.md`
-- Risks and known issues → `issues.md`
-
----
-
-## Knowledge Transfer
+## Knowledge Transfer & Wisdom
 
 ### Upstream Context Loading (Phase 2)
 
-When executing Phase 2 of a role-spec, the worker MUST load available cross-role context:
+The worker MUST load available cross-role context before executing role-spec Phase 2:
 
-| Source | Path | Load Method |
-|--------|------|-------------|
-| Upstream artifacts | `<session>/artifacts/*.md` | Read files listed in task description or dependency chain |
-| Shared memory | `<session>/shared-memory.json` | Read and parse JSON |
-| Wisdom | `<session>/wisdom/*.md` | Read all wisdom files |
-| Exploration cache | `<session>/explorations/cache-index.json` | Check before new explorations |
+| Source | Method | Priority |
+|--------|--------|----------|
+| Upstream role state | `team_msg(operation="get_state", role=<upstream_role>)` | **Primary** — O(1) from meta.json |
+| Upstream artifacts | Read files referenced in the state's artifact paths | Secondary — for large content |
+| Wisdom files | Read `<session>/wisdom/*.md` | Always load if exists |
+| Exploration cache | Check `<session>/explorations/cache-index.json` | Before new explorations |
+
+> **Legacy fallback**: If `get_state` returns null (older sessions), fall back to reading `<session>/shared-memory.json`.
 
 ### Downstream Context Publishing (Phase 4)
 
 After Phase 4 verification, the worker MUST publish its contributions:
 
 1. **Artifact**: Write deliverable to `<session>/artifacts/<prefix>-<task-id>-<name>.md`
-2. **shared-memory.json**: Read-merge-write under role namespace
-   ```json
-   { "<role>": { "key_findings": [...], "decisions": [...], "files_modified": [...] } }
-   ```
+2. **State data**: Prepare payload for Phase 5 `state_update` message (see Phase 5-L step 2 for schema)
 3. **Wisdom**: Append new patterns to `learnings.md`, decisions to `decisions.md`, issues to `issues.md`
+4. **Context accumulator** (inner_loop only): Append summary (see Phase 5-L step 3 for schema). Maintain full accumulator for context continuity across iterations.
 
-### Inner Loop Context Accumulator
-
-For `inner_loop: true` roles, `context_accumulator` is maintained in-memory:
+### Wisdom Files
 
 ```
-context_accumulator.append({
-  task: "<task-id>",
-  artifact: "<output-path>",
-  key_decisions: [...],
-  summary: "<brief>",
-  files_modified: [...]
-})
+<session>/wisdom/learnings.md     ← New patterns discovered
+<session>/wisdom/decisions.md     ← Architecture/design decisions
+<session>/wisdom/conventions.md   ← Codebase conventions
+<session>/wisdom/issues.md        ← Risks and known issues
 ```
 
-Pass the full accumulator to each subsequent task's Phase 3 subagent as `## Prior Context`.
+Load in Phase 2 to inform execution. Contribute in Phase 4/5 with discoveries.
 
 ---
 
 ## Message Bus Protocol
 
-Always use `mcp__ccw-tools__team_msg` for logging. Parameters:
+Always use `mcp__ccw-tools__team_msg` for team communication.
+
+### log (with state_update) — Primary for Phase 5
 
 | Param | Value |
 |-------|-------|
 | operation | "log" |
-| team | `<session_id>` (NOT team_name) |
+| session_id | `<session_id>` (NOT team_name) |
 | from | `<role>` |
-| to | "coordinator" |
-| type | From role_spec message_types |
-| summary | `[<role>] <message>` |
-| ref | artifact path (optional) |
+| type | "state_update" for completion; or role_spec message_types for non-state messages |
+| data | structured state payload (auto-synced to meta.json when type="state_update"). Use `data.ref` for artifact paths |
 
-**Critical**: `team` param must be session ID (e.g., `TLS-my-project-2026-02-27`), not team name.
+> **Defaults**: `to` defaults to "coordinator", `summary` auto-generated as `[<from>] <type> → <to>`.
+> When `type="state_update"`: data is auto-synced to `meta.json.role_state[<role>]`. Top-level keys (`pipeline_mode`, `pipeline_stages`, `team_name`, `task_description`) are promoted to meta root.
+
+### get_state — Primary for Phase 2
+
+```
+mcp__ccw-tools__team_msg(
+  operation="get_state",
+  session_id=<session_id>,
+  role=<upstream_role>    // omit to get ALL role states
+)
+```
+
+Returns `role_state[<role>]` from meta.json.
+
+### broadcast — For team-wide signals
+
+```
+mcp__ccw-tools__team_msg(
+  operation="broadcast",
+  session_id=<session_id>,
+  from=<role>,
+  type=<type>
+)
+```
+
+Equivalent to `log` with `to="all"`. Summary auto-generated.
 
 **CLI fallback** (if MCP tool unavailable):
 ```
-ccw team log --team <session_id> --from <role> --to coordinator --type <type> --summary "[<role>] ..." --json
+ccw team log --session-id <session_id> --from <role> --type <type> --json
 ```
 
 ---
@@ -475,7 +379,7 @@ ccw team log --team <session_id> --from <role> --to coordinator --type <type> --
 |---------|-----------|
 | Process own prefix tasks | Process other role's prefix tasks |
 | SendMessage to coordinator | Directly communicate with other workers |
-| Use declared subagents (discuss, explore, doc-gen) | Create tasks for other roles |
+| Use CLI tools for analysis/exploration | Create tasks for other roles |
 | Fast-advance simple successors | Spawn parallel worker batches |
 | Write to own artifacts + wisdom | Modify resources outside own scope |
 
@@ -486,13 +390,11 @@ ccw team log --team <session_id> --from <role> --to coordinator --type <type> --
 | Scenario | Resolution |
 |----------|------------|
 | Role spec file not found | Report error via SendMessage, STOP |
-| Subagent failure | Retry once with alternative subagent_type. Still fails → log warning, continue if possible |
-| Discuss subagent failure | Skip discuss, log warning in report. Proceed without discuss verdict |
-| Explore subagent failure | Continue without codebase context |
+| CLI tool failure | Retry once. Still fails → log warning, continue with available data |
 | Cumulative errors >= 3 | SendMessage to coordinator with error summary, STOP |
 | No tasks found | SendMessage idle status, STOP |
 | Context missing (prior doc, template) | Request from coordinator via SendMessage |
-| Agent crash mid-loop | Self-healing: coordinator resets orphaned task, re-spawns |
+| Agent crash mid-loop | Self-healing: completed tasks are safe (TaskUpdate + artifacts on disk). Coordinator detects orphaned in_progress task on resume, resets to pending, re-spawns. New agent resumes via Resume Artifact Check. |
 
 ---
 

.claude/commands/ccw-coordinator.md

@@ -2,7 +2,7 @@
 name: ccw-coordinator
 description: Command orchestration tool - analyze requirements, recommend chain, execute sequentially with state persistence
 argument-hint: "[task description]"
-allowed-tools: Task(*), AskUserQuestion(*), Read(*), Write(*), Bash(*), Glob(*), Grep(*)
+allowed-tools: Agent(*), AskUserQuestion(*), Read(*), Write(*), Bash(*), Glob(*), Grep(*)
 ---
 
 # CCW Coordinator Command
@@ -17,10 +17,11 @@ Interactive orchestration tool: analyze task → discover commands → recommend
 
 | Skill | 包含操作 |
 |-------|---------|
-| `workflow-lite-plan` | lite-plan, lite-execute |
+| `workflow-lite-plan` | lite-plan (Skill handoff to lite-execute) |
+| `workflow-lite-execute` | lite-execute (multi-mode execution engine) |
 | `workflow-plan` | plan, plan-verify, replan |
 | `workflow-execute` | execute |
-| `workflow-multi-cli-plan` | multi-cli-plan |
+| `workflow-multi-cli-plan` | multi-cli-plan (includes execution phase internally) |
 | `workflow-test-fix` | test-fix-gen, test-cycle-execute |
 | `workflow-tdd-plan` | tdd-plan, tdd-verify |
 | `review-cycle` | review-session-cycle, review-module-cycle, review-cycle-fix |
@@ -49,9 +50,9 @@ Interactive orchestration tool: analyze task → discover commands → recommend
 
 | Unit Name | Commands | Purpose | Output |
 |-----------|----------|---------|--------|
-| **Quick Implementation** | lite-plan → lite-execute | Lightweight plan and immediate execution | Working code |
-| **Multi-CLI Planning** | multi-cli-plan → lite-execute | Multi-perspective analysis and execution | Working code |
-| **Bug Fix** | lite-plan (--bugfix) → lite-execute | Quick bug diagnosis and fix execution | Fixed code |
+| **Quick Implementation** | lite-plan (Phase 1: plan → Phase 2: execute) | Lightweight plan and immediate execution | Working code |
+| **Multi-CLI Planning** | multi-cli-plan (Phase 1: plan → Phase 2: execute) | Multi-perspective analysis and execution | Working code |
+| **Bug Fix** | lite-plan --bugfix (Phase 1: plan → Phase 2: execute) | Quick bug diagnosis and fix execution | Fixed code |
 | **Full Planning + Execution** | plan → execute | Detailed planning and execution | Working code |
 | **Verified Planning + Execution** | plan → plan-verify → execute | Planning with verification and execution | Working code |
 | **Replanning + Execution** | replan → execute | Update plan and execute changes | Working code |
@@ -101,8 +102,8 @@ Interactive orchestration tool: analyze task → discover commands → recommend
 
 | Command | Can Precede | Atomic Units |
 |---------|-----------|--------------|
-| lite-plan | lite-execute, convert-to-plan | Quick Implementation, Rapid-to-Issue, Bug Fix |
-| multi-cli-plan | lite-execute | Multi-CLI Planning |
+| lite-plan | convert-to-plan | Quick Implementation, Rapid-to-Issue, Bug Fix |
+| multi-cli-plan | (execution is internal) | Multi-CLI Planning |
 | plan | plan-verify, execute | Full Planning + Execution, Verified Planning + Execution |
 | plan-verify | execute | Verified Planning + Execution |
 | replan | execute | Replanning + Execution |
@@ -137,8 +138,8 @@ Interactive orchestration tool: analyze task → discover commands → recommend
 
 **Example Pipeline with Units**:
 ```
-需求 → 【lite-plan → lite-execute】→ 代码 → 【test-fix-gen → test-cycle-execute】→ 测试通过
-       └──── Quick Implementation ────┘         └────── Test Validation ──────┘
+需求 → 【lite-plan】→ 代码 → 【test-fix-gen → test-cycle-execute】→ 测试通过
+       └── Quick Implementation ──┘     └────── Test Validation ──────┘
 ```
 
 ## 3-Phase Workflow
@@ -234,13 +235,7 @@ const commandPorts = {
     tags: ['planning'],
     atomic_group: 'quick-implementation'
   },
-  'lite-execute': {
-    name: 'lite-execute',
-    input: ['plan', 'multi-cli-plan'],
-    output: ['code'],
-    tags: ['execution'],
-    atomic_groups: ['quick-implementation', 'multi-cli-planning', 'bug-fix']
-  },
+  // lite-execute is now an internal phase of lite-plan and multi-cli-plan (not a standalone command)
   'plan': {
     name: 'plan',
     input: ['requirement', 'specification'],
@@ -550,12 +545,11 @@ function determinePortFlow(taskType, constraints) {
 Recommended Command Chain:
 
 Pipeline (管道视图):
-需求 → lite-plan → 计划 → lite-execute → 代码 → test-cycle-execute → 测试通过
+需求 → lite-plan → 代码 → test-cycle-execute → 测试通过
 
 Commands (命令列表):
 1. /workflow-lite-plan
-2. /workflow:lite-execute
-3. /workflow-test-fix
+2. /workflow-test-fix
 
 Proceed? [Confirm / Show Details / Adjust / Cancel]
 ```
@@ -690,9 +684,7 @@ function formatCommand(cmd, previousResults, analysis) {
   if (['lite-plan', 'plan', 'tdd-plan', 'multi-cli-plan'].includes(name)) {
     prompt += ` "${analysis.goal}"`;
 
-  } else if (name === 'lite-execute') {
-    const hasPlan = previousResults.some(r => r.command.includes('plan'));
-    prompt += hasPlan ? ' --in-memory' : ` "${analysis.goal}"`;
+  // lite-execute is now an internal phase of lite-plan (not invoked separately)
 
   } else if (name === 'execute') {
     const plan = previousResults.find(r => r.command.includes('plan'));
@@ -711,7 +703,7 @@ function formatCommand(cmd, previousResults, analysis) {
     prompt = `/spec-generator -y "${analysis.goal}"`;
 
   } else if (name === 'test-gen') {
-    const impl = previousResults.find(r => r.command.includes('execute') || r.command.includes('lite-execute'));
+    const impl = previousResults.find(r => r.command.includes('execute'));
     prompt += impl?.session_id ? ` "${impl.session_id}"` : ` "${analysis.goal}"`;
 
   } else if (name === 'test-fix-gen') {
@@ -913,10 +905,11 @@ Task: <description>
 
 | Skill | 包含操作 |
 |-------|---------|
-| `workflow-lite-plan` | lite-plan, lite-execute |
+| `workflow-lite-plan` | lite-plan (Skill handoff to lite-execute) |
+| `workflow-lite-execute` | lite-execute (multi-mode execution engine) |
 | `workflow-plan` | plan, plan-verify, replan |
 | `workflow-execute` | execute |
-| `workflow-multi-cli-plan` | multi-cli-plan |
+| `workflow-multi-cli-plan` | multi-cli-plan (includes execution phase internally) |
 | `workflow-test-fix` | test-fix-gen, test-cycle-execute |
 | `workflow-tdd-plan` | tdd-plan, tdd-verify |
 | `review-cycle` | review-session-cycle, review-module-cycle, review-cycle-fix |
@@ -930,8 +923,9 @@ Task: <description>
 **Cycle Workflows**: workflow:integration-test-cycle, workflow:refactor-cycle
 **Execution**: workflow:unified-execute-with-file
 **Design**: workflow:ui-design:*
-**Session Management**: workflow:session:start, workflow:session:resume, workflow:session:complete, workflow:session:solidify, workflow:session:list, workflow:session:sync
-**Utility**: workflow:clean, workflow:init, workflow:init-guidelines, workflow:status
+**Session Management**: workflow:session:start, workflow:session:resume, workflow:session:complete, workflow:session:list, workflow:session:sync
+**Utility**: workflow:clean, workflow:spec:setup, workflow:status
+**Spec Management**: workflow:spec:setup, workflow:spec:add
 **Issue Workflow**: issue:discover, issue:discover-by-prompt, issue:plan, issue:queue, issue:execute, issue:convert-to-plan, issue:from-brainstorm, issue:new
 
 ### Testing Commands Distinction
@@ -948,7 +942,7 @@ Task: <description>
 
 | Task Type | Pipeline | Minimum Units |
 |-----------|----------|---|
-| **feature** (simple) | 需求 →【lite-plan → lite-execute】→ 代码 →【test-fix-gen → test-cycle-execute】→ 测试通过 | Quick Implementation + Test Validation |
+| **feature** (simple) | 需求 →【lite-plan】→ 代码 →【test-fix-gen → test-cycle-execute】→ 测试通过 | Quick Implementation + Test Validation |
 | **feature** (complex) | 需求 →【plan → plan-verify】→ validate → execute → 代码 → review → fix | Full Planning + Code Review + Testing |
 | **bugfix** | Bug报告 → lite-plan (--bugfix) → 修复代码 →【test-fix-gen → test-cycle-execute】→ 测试通过 | Bug Fix + Test Validation |
 | **tdd** | 需求 → tdd-plan → TDD任务 → execute → 代码 → tdd-verify | TDD Planning + Execution |
@@ -956,11 +950,11 @@ Task: <description>
 | **test-gen** | 代码/会话 →【test-gen → execute】→ 测试通过 | Test Generation + Execution |
 | **review** | 代码 →【review-* → review-cycle-fix】→ 修复代码 →【test-fix-gen → test-cycle-execute】→ 测试通过 | Code Review + Testing |
 | **brainstorm** | 探索主题 → brainstorm → 分析 →【plan → plan-verify】→ execute → test | Exploration + Planning + Execution |
-| **multi-cli** | 需求 → multi-cli-plan → 对比分析 → lite-execute → test | Multi-Perspective + Testing |
+| **multi-cli** | 需求 → multi-cli-plan → 对比分析 → 代码 → test | Multi-Perspective + Testing |
 | **spec-driven** | 需求 →【spec-generator → plan → execute】→ 代码 →【test-fix-gen → test-cycle-execute】→ 测试通过 | Spec-Driven + Testing |
 | **issue-batch** | 代码库 →【discover → plan → queue → execute】→ 完成 issues | Issue Workflow |
 | **issue-transition** | 需求 →【lite-plan → convert-to-plan → queue → execute】→ 完成 issues | Rapid-to-Issue |
-| **analyze-file** | 分析主题 →【analyze-with-file → lite-plan → lite-execute】→ 代码 | Analyze to Plan |
+| **analyze-file** | 分析主题 →【analyze-with-file → lite-plan】→ 代码 | Analyze to Plan |
 | **greenfield** | 需求 →【brainstorm-with-file → plan → execute】→ 代码 → test | Greenfield (0→1) |
 | **brainstorm-file** | 主题 →【brainstorm-with-file → plan → execute】→ 代码 → test | Brainstorm to Plan |
 | **brainstorm-to-issue** | brainstorm.md →【from-brainstorm → queue → execute】→ 完成 issues | Brainstorm to Issue |
@@ -972,8 +966,8 @@ Task: <description>
 | **team-planex** | 需求 → team-planex → 代码 (自包含) | Team Plan+Execute |
 | **bugfix-hotfix** | Bug报告(紧急) → lite-plan (--hotfix) → 修复代码 | Hotfix (skip tests) |
 | **exploration** | 探索主题 → brainstorm →【plan → execute】→ 代码 → test | Exploration + Planning |
-| **quick-task** | 需求 →【lite-plan → lite-execute】→ 代码 → test | Quick Implementation |
+| **quick-task** | 需求 →【lite-plan】→ 代码 → test | Quick Implementation |
 | **ui-design** | UI需求 → ui-design:explore → plan → execute → 代码 | UI Design |
-| **documentation** | 文档需求 → lite-plan → lite-execute → 文档 | Documentation |
+| **documentation** | 文档需求 → lite-plan → 文档 | Documentation |
 
 Refer to the Skill 映射 section above for available Skills and Commands.

.claude/commands/ccw.md

@@ -15,7 +15,8 @@ Main process orchestrator: intent analysis → workflow selection → command ch
 
 | Skill | 内部流水线 |
 |-------|-----------|
-| `workflow-lite-plan` | explore → plan → confirm → execute |
+| `workflow-lite-plan` | explore → plan → confirm → handoff |
+| `workflow-lite-execute` | task grouping → batch execution → code review → sync |
 | `workflow-plan` | session → context → convention → gen → verify/replan |
 | `workflow-execute` | session discovery → task processing → commit |
 | `workflow-tdd-plan` | 6-phase TDD plan → verify |
@@ -43,14 +44,14 @@ Main process orchestrator: intent analysis → workflow selection → command ch
 
 | 单元类型 | Skill | 说明 |
 |---------|-------|------|
-| 轻量 Plan+Execute | `workflow-lite-plan` | 内部完成 plan→execute |
+| 轻量 Plan+Execute | `workflow-lite-plan` → `workflow-lite-execute` | plan handoff 到 execute，分离 Skill，TodoWrite 跟踪延续 (LP-Phase → LE-Phase) |
 | 标准 Planning | `workflow-plan` → `workflow-execute` | plan 和 execute 是独立 Skill |
 | TDD Planning | `workflow-tdd-plan` → `workflow-execute` | tdd-plan 和 execute 是独立 Skill |
 | 规格驱动 | `spec-generator` → `workflow-plan` → `workflow-execute` | 规格文档驱动完整开发 |
 | 测试流水线 | `workflow-test-fix` | 内部完成 gen→cycle |
 | 代码审查 | `review-cycle` | 内部完成 review→fix |
-| 多CLI协作 | `workflow-multi-cli-plan` | ACE context → CLI discussion → plan → execute |
-| 分析→规划 | `workflow:analyze-with-file` → `workflow-lite-plan` | 协作分析产物自动传递给 lite-plan |
+| 多CLI协作 | `workflow-multi-cli-plan` | ACE context → CLI discussion → plan → Skill(lite-execute) |
+| 分析→规划 | `workflow:analyze-with-file` → `workflow-lite-plan` → `workflow-lite-execute` | 协作分析产物自动传递给 lite-plan，Skill 调用 lite-execute |
 | 头脑风暴→规划 | `workflow:brainstorm-with-file` → `workflow-plan` → `workflow-execute` | 头脑风暴产物自动传递给正式规划 |
 | 0→1 开发(小) | `workflow:brainstorm-with-file` → `workflow-plan` → `workflow-execute` | 小规模从零开始，探索+正式规划+实现 |
 | 0→1 开发(中/大) | `workflow:brainstorm-with-file` → `workflow-plan` → `workflow-execute` | 探索后正式规划+执行 |
@@ -724,7 +725,7 @@ todos = [
 |----------|---------|------------|---------------|
 | **brainstorm-with-file** | Multi-perspective ideation | → workflow-plan → workflow-execute (auto) | `.workflow/.brainstorm/` |
 | **debug-with-file** | Hypothesis-driven debugging | Standalone (self-contained) | `.workflow/.debug/` |
-| **analyze-with-file** | Collaborative analysis | → workflow-lite-plan (auto) | `.workflow/.analysis/` |
+| **analyze-with-file** | Collaborative analysis | → workflow-lite-plan → workflow-lite-execute (auto) | `.workflow/.analysis/` |
 | **collaborative-plan-with-file** | Multi-agent collaborative planning | → unified-execute-with-file | `.workflow/.planning/` |
 | **roadmap-with-file** | Strategic requirement roadmap | → team-planex | `.workflow/.planning/` |
 
@@ -759,8 +760,8 @@ todos = [
 |---------|---------|
 | `workflow:unified-execute-with-file` | Universal execution engine - consumes plan output from collaborative-plan, roadmap, brainstorm |
 | `workflow:clean` | Intelligent code cleanup - mainline detection, stale artifact removal |
-| `workflow:init` | Initialize `.workflow/project-tech.json` with project analysis |
-| `workflow:init-guidelines` | Interactive wizard to fill `specs/*.md` |
+| `workflow:spec:setup` | Initialize `.workflow/project-tech.json` with project analysis and specs scaffold |
+| `workflow:spec:add` | Interactive wizard to add individual specs with scope selection |
 | `workflow:status` | Generate on-demand views for project overview and workflow tasks |
 
 ---
@@ -793,7 +794,7 @@ todos = [
 /ccw "全新开发: 实时通知系统"                   # → brainstorm-with-file → workflow-plan → workflow-execute → review-cycle → workflow-test-fix
 
 # With-File workflows → auto chain
-/ccw "协作分析: 理解现有认证架构的设计决策"     # → analyze-with-file → workflow-lite-plan
+/ccw "协作分析: 理解现有认证架构的设计决策"     # → analyze-with-file → workflow-lite-plan → workflow-lite-execute
 /ccw "头脑风暴: 用户通知系统重新设计"           # → brainstorm-with-file → workflow-plan → workflow-execute → workflow-test-fix
 /ccw "深度调试: 系统随机崩溃问题"              # → debug-with-file (standalone)
 /ccw "从头脑风暴 BS-通知系统-2025-01-28 创建 issue"  # → brainstorm-to-issue (bridge)
@@ -816,7 +817,7 @@ todos = [
 # Utility commands (invoked directly, not auto-routed)
 # /workflow:unified-execute-with-file          # 通用执行引擎（消费 plan 输出）
 # /workflow:clean                              # 智能代码清理
-# /workflow:init                               # 初始化项目状态
-# /workflow:init-guidelines                    # 交互式填充项目规范
+# /workflow:spec:setup                         # 初始化项目状态
+# /workflow:spec:add                           # 交互式填充项目规范
 # /workflow:status                             # 项目概览和工作流状态
 ```

.claude/commands/ddd/auto.md

@@ -0,0 +1,359 @@
+---
+name: auto
+description: Chain command - automated document-driven development flow. Detects project state and runs the appropriate chain for new or existing projects.
+argument-hint: "[-y|--yes] [--skip-spec] [--skip-build] [--spec <session-id>] [--resume] \"project idea or task description\""
+allowed-tools: TodoWrite(*), Agent(*), AskUserQuestion(*), Read(*), Grep(*), Glob(*), Bash(*), Edit(*), Write(*)
+---
+
+## Auto Mode
+
+When `--yes` or `-y`: All sub-commands run in auto mode. Minimal human intervention.
+
+# DDD Auto Command (/ddd:auto)
+
+## Purpose
+
+Orchestrate the full document-driven development lifecycle. **Adapts to project state** — works for both new projects and existing codebases.
+
+## Flow Variants
+
+### Variant 1: New Project (no code, no spec)
+```
+spec-generator → ddd:index-build → ddd:plan → ddd:execute → verify → ddd:sync
+```
+
+### Variant 2: Existing Project (has code, no spec)
+```
+ddd:scan → ddd:plan → ddd:execute → verify → ddd:sync
+```
+
+### Variant 3: Existing Project with Spec (has code + spec)
+```
+ddd:index-build → ddd:plan → ddd:execute → verify → ddd:sync
+```
+
+### Variant 4: Index Exists (has doc-index.json)
+```
+ddd:plan → ddd:execute → verify → ddd:sync
+```
+
+## Flow Diagram
+
+```
+┌────────────────────────────────────────────────────────────┐
+│                       /ddd:auto                            │
+│                                                            │
+│  Stage 0: Detect Project State                             │
+│  ┌───────────────────────────────────┐                     │
+│  │ has_codebase? has_spec? has_index?│                     │
+│  └────────────┬──────────────────────┘                     │
+│               │                                            │
+│    ┌──────────┼──────────────┐                             │
+│    ▼          ▼              ▼                              │
+│  No Code    Code Only    Code + Spec   Index Exists        │
+│    │          │              │              │               │
+│    ▼          │              │              │               │
+│  Stage 1     │              │              │               │
+│  Spec Gen    │              │              │               │
+│    │          │              │              │               │
+│    ▼          │              ▼              │               │
+│  Stage 2a   Stage 2b    Stage 2a          │               │
+│  index-build ddd:scan   index-build       │               │
+│  (Path A or Path B auto-detected)          │               │
+│    │                                       │               │
+│    └───────────────────┬───────────────────┘               │
+│                        ▼                                   │
+│              Stage 3: DDD Plan (enhanced)                  │
+│              (doc-index query + exploration +               │
+│               clarification + task planning)               │
+│                        │                                   │
+│                        ▼                                   │
+│              Stage 4: Execute                              │
+│              (ddd:execute = doc-aware execution)            │
+│                        │                                   │
+│                        ▼                                   │
+│              Stage 4.5: Verify Gate                        │
+│              (convergence + build + lint + tests            │
+│               → execution-manifest.json)                   │
+│                        │                                   │
+│                   PASS / WARN → continue                   │
+│                   FAIL → ask user                          │
+│                        │                                   │
+│                        ▼                                   │
+│              Stage 5: Doc Sync                             │
+│              (auto-triggered with --from-manifest,          │
+│               or manual /ddd:sync)                         │
+└────────────────────────────────────────────────────────────┘
+```
+
+## Stage 0: Project State Detection
+
+Automatically detect project state to determine which stages to run:
+
+```
+Check 1: doc-index.json exists?    → has_index
+Check 2: SPEC-* directories exist? → has_spec
+Check 3: Source code directories?   → has_codebase
+Check 4: project-tech.json exists?  → has_tech_analysis
+```
+
+### Decision Matrix
+
+| has_codebase | has_spec | has_index | Action |
+|:---:|:---:|:---:|--------|
+| No | No | No | Stage 1 (spec-gen) → Stage 2a (index-build) → Stage 3-5 |
+| No | Yes | No | Stage 2a (index-build) → Stage 3-5 |
+| Yes | No | No | **Stage 2b (ddd:scan)** → Stage 3-5 |
+| Yes | Yes | No | Stage 2a (index-build) → Stage 3-5 |
+| Yes | * | Yes | **Skip to Stage 3** (index exists) |
+
+### Override Flags
+
+| Flag | Effect |
+|------|--------|
+| `--skip-spec` | Never run spec-generator |
+| `--skip-build` | Never run index-build |
+| `--spec <id>` | Use specific spec session, force Path A |
+| `--from-scratch` | Rebuild index even if exists |
+
+## Stage 1: Specification (conditional)
+
+### Run When
+- No codebase AND no spec AND `--skip-spec` not set
+- User provides a new project idea (not an existing task description)
+
+### Skip When
+- `--skip-spec` flag
+- Codebase already exists (existing project)
+- `--spec <id>` pointing to existing session
+
+### Execution
+```
+Invoke /spec-generator with user input
+→ Output: .workflow/.doc-index/specs/SPEC-{slug}-{date}/
+```
+
+## Stage 2: Index Construction (conditional)
+
+### Run When
+- `doc-index.json` does not exist
+- OR `--from-scratch` flag
+
+### Route Selection
+
+```
+Has spec outputs → Stage 2a: /ddd:index-build (spec-first)
+No spec, has code → Stage 2b: /ddd:scan (code-first)
+```
+
+### Stage 2a: /ddd:index-build (has spec)
+```
+Invoke /ddd:index-build [-y] [-s <spec-id>]
+→ Output: doc-index.json from spec entities + code mapping
+```
+
+### Stage 2b: /ddd:scan (no spec, has code)
+```
+Invoke /ddd:scan [-y]
+→ Output: doc-index.json from code analysis + inferred features
+```
+
+### Skip When
+- `--skip-build` flag
+- `doc-index.json` exists AND NOT `--from-scratch`
+  - In this case, suggest `/ddd:update` for incremental refresh
+
+## Stage 3: Planning (always runs)
+
+### Execution
+
+```
+Invoke /ddd:plan [-y] "task description"
+```
+
+The enhanced `/ddd:plan` now performs:
+1. Doc-index query (instant context from features, requirements, components, ADRs)
+2. Doc-index-guided exploration (1-4 angles based on affected features)
+3. Clarification (aggregate ambiguities from exploration + doc-index gaps)
+4. Task planning (plan.json + TASK-*.json with doc_context traceability)
+5. Handoff selection
+
+Output:
+- `plan.json` — plan overview with doc_context
+- `.task/TASK-*.json` — individual tasks with doc_context
+- `exploration-{angle}.json` — exploration results (if Phase 2 ran)
+- `planning-context.md` — legacy context package
+
+### Handoff Decision
+
+After planning, `/ddd:plan` presents execution options:
+
+| Option | Description | Auto-Select When |
+|--------|-------------|-----------------|
+| **ddd:execute** | Document-aware execution (recommended) | Default in ddd workflow |
+| **lite-execute** | Standard execution (no doc awareness) | When doc traceability not needed |
+| **direct** | Start coding with context | User prefers manual |
+| **stop** | Just the plan context | Planning/research only |
+
+With `-y`: Auto-select `ddd:execute`.
+
+## Stage 4: Execution
+
+Based on Stage 3 handoff decision:
+
+| Mode | Delegates To |
+|------|-------------|
+| **ddd:execute** | `/ddd:execute --in-memory` with plan.json + doc-index enrichment |
+| lite-execute | `/workflow:lite-execute` with plan.json path |
+| direct | Output context package, developer works manually |
+| stop | End here, no execution |
+
+### ddd:execute Features (when selected)
+- Doc-enriched task prompts (feature context + component docs + ADR constraints)
+- Per-batch impact verification (changes stay within planned scope)
+- Result persistence (`TASK-*.result.json` per task, `execution-manifest.json` per session)
+- Post-execution verify gate (Stage 4.5, unless `--skip-verify`)
+- Post-completion auto-sync with manifest (Stage 5 triggered automatically)
+
+**Note**: When using `ddd:execute`, Stage 4.5 and Stage 5 are auto-triggered. For other modes, run Stage 5 manually.
+
+## Stage 4.5: Verify Gate
+
+Embedded within `ddd:execute` (Step 4.5). Runs after all batches complete, before doc sync.
+
+### Purpose
+
+Quality gate ensuring execution output is correct before committing to documentation updates. Prevents bad code from being "blessed" into the doc-index.
+
+### Checks Performed
+
+| Check | Description | Gate Behavior |
+|-------|-------------|---------------|
+| **Convergence** | Run `task.convergence.verification` for each task | FAIL if any critical task fails |
+| **Build** | Run project build command (`tsc --noEmit`, etc.) | FAIL on build errors |
+| **Lint** | Run project linter (`eslint`, etc.) | WARN only (non-blocking) |
+| **Regression** | Run full test suite, compare to baseline | FAIL on new test failures |
+
+### Gate Results
+
+| Result | Action |
+|--------|--------|
+| **PASS** | All checks passed → proceed to Stage 5 |
+| **WARN** | Non-critical issues (lint warnings) → proceed with warnings logged |
+| **FAIL** | Critical issues → ask user: fix now / skip sync / abort |
+| **FAIL + `-y`** | Log failures, set `error_state` in session, stop |
+
+### Output
+
+- `execution-manifest.json` — persisted to session folder, consumed by Stage 5
+- Contains: task results, files_modified (with task attribution), verify gate results
+
+## Stage 5: Post-Task Sync
+
+### Trigger
+- **Auto**: `/ddd:execute` triggers `/ddd:sync --from-manifest` automatically after verify gate passes
+- **Manual**: User runs `/ddd:sync` after completing work in direct/lite-execute mode
+- **Resume**: `/ddd:auto --resume` after task completion
+
+### Execution
+```
+# Auto mode (from ddd:execute): uses manifest for precise change tracking
+Invoke /ddd:sync [-y] --task-id <id> --from-manifest {session}/execution-manifest.json "task summary"
+
+# Manual mode (from direct/lite-execute): falls back to git diff
+Invoke /ddd:sync [-y] [--task-id <id>] "task summary"
+
+→ Updates: doc-index.json, feature-maps/, tech-registry/, action-logs/
+```
+
+## State Tracking
+
+### Session File: `.workflow/.doc-index/.auto-session.json`
+
+```json
+{
+  "session_id": "DAUTO-{timestamp}",
+  "input": "user's original input",
+  "detected_state": {
+    "has_codebase": true,
+    "has_spec": false,
+    "has_index": false,
+    "build_path": "code-first"
+  },
+  "stages_completed": ["detect", "index-build", "plan"],
+  "current_stage": "execute",
+  "spec_session": "SPEC-{slug}-{date}|null",
+  "plan_session": "planning/{task-slug}-{date}/",
+  "plan_context": "planning/{task-slug}-{date}/plan.json",
+  "execution_mode": "ddd:execute|lite-execute|direct|stop",
+  "execution_manifest": "planning/{task-slug}-{date}/execution-manifest.json|null",
+  "verify_gate": "PASS|WARN|FAIL|null",
+  "error_state": null,
+  "last_error": {
+    "stage": "execute",
+    "message": "Task TASK-002 failed: compilation error",
+    "timestamp": "ISO8601",
+    "recoverable": true
+  },
+  "created_at": "ISO8601",
+  "last_updated": "ISO8601"
+}
+```
+
+### Resume
+```
+/ddd:auto --resume    → Resume from current_stage in .auto-session.json
+```
+
+### Error Recovery
+```
+/ddd:auto --resume
+  IF error_state is set:
+    Display last error context
+    Ask: retry current stage / skip to next / abort
+  ELSE:
+    Resume from current_stage normally
+```
+
+## Example Workflows
+
+### New Project (Full Flow)
+```
+/ddd:auto "Build a task management API with user auth and team features"
+→ Stage 0: No code, no spec → need spec-gen
+→ Stage 1: spec-generator produces full spec
+→ Stage 2: index-build creates index from spec + empty codebase
+→ Stage 3: ddd:plan produces plan.json + TASK-*.json with doc_context
+→ Stage 4: ddd:execute runs tasks with feature context enrichment
+→ Stage 4.5: verify gate — convergence ✓, build ✓, tests ✓ → PASS
+→ Stage 5: ddd:sync --from-manifest auto-triggered, updates index
+```
+
+### Existing Project, No Spec (Code-First)
+```
+/ddd:auto "Add rate limiting to API endpoints"
+→ Stage 0: Has code, no spec, no index
+→ Stage 2b: ddd:scan analyzes code, infers features from codebase
+→ Stage 3: ddd:plan queries index, explores with security + patterns angles
+→ Stage 4: ddd:execute runs with rate-limit component docs as context
+→ Stage 4.5: verify gate — convergence ✓, tests 41/42 (1 regression) → WARN
+→ Stage 5: ddd:sync --from-manifest, registers new rate-limit component
+```
+
+### Existing Project with Index (Incremental)
+```
+/ddd:auto "Fix auth token expiration bug"
+→ Stage 0: Has code, has index → skip to plan
+→ Stage 3: ddd:plan finds feat-auth, REQ-002, tech-auth-service (Low complexity, skip exploration)
+→ Stage 4: ddd:execute runs single task with auth feature context
+→ Stage 4.5: verify gate — convergence ✓, build ✓, tests ✓ → PASS
+→ Stage 5: ddd:sync --from-manifest, updates tech-auth-service code locations
+```
+
+### Planning Only
+```
+/ddd:auto "Investigate payment module architecture"
+→ Stage 0-2: (as needed)
+→ Stage 3: ddd:plan shows full context with exploration results
+→ Stage 4: user selects "stop" → gets plan.json + context package only
+```

.claude/commands/ddd/doc-generate.md

@@ -0,0 +1,295 @@
+---
+name: doc-generate
+description: Generate full document tree from doc-index.json. Layer 3 (components) → Layer 2 (features) → Layer 1 (indexes/overview). Standalone or called by scan/index-build.
+argument-hint: "[-y|--yes] [--layer <3|2|1|all>] [--force] [--skip-overview] [--skip-schema]"
+allowed-tools: TodoWrite(*), Agent(*), AskUserQuestion(*), Read(*), Grep(*), Glob(*), Bash(*), Edit(*), Write(*)
+---
+
+## Auto Mode
+
+When `--yes` or `-y`: Auto-generate all layers without confirmation prompts.
+
+# DDD Doc Generate Command (/ddd:doc-generate)
+
+## Purpose
+
+Generate the complete document tree from `doc-index.json`. **Single source of truth** for all document generation logic, following bottom-up Layer 3 → 2 → 1 strategy.
+
+```
+doc-index.json → tech-registry/*.md (L3) → feature-maps/*.md (L2) → _index.md + README + ARCHITECTURE (L1)
+```
+
+## When to Use
+
+| Scenario | Use |
+|----------|-----|
+| After `/ddd:scan` builds doc-index.json | **doc-generate** (auto-called by scan) |
+| After `/ddd:index-build` builds doc-index.json | **doc-generate** (auto-called by index-build) |
+| Rebuild all docs from existing index | **doc-generate --force** |
+| Regenerate only component docs | **doc-generate --layer 3** |
+| Regenerate only overview/index docs | **doc-generate --layer 1** |
+
+## Prerequisite
+
+- `doc-index.json` must exist at `.workflow/.doc-index/doc-index.json`
+- If not found → error: "No doc-index.json found. Run /ddd:scan or /ddd:index-build first."
+
+## Storage Output
+
+```
+.workflow/.doc-index/
+├── doc-index.json              ← Input (read-only, not modified)
+├── SCHEMA.md                   ← Schema documentation
+├── README.md                   ← Project overview (Layer 1)
+├── ARCHITECTURE.md             ← Architecture overview (Layer 1)
+├── feature-maps/               ← Feature documentation (Layer 2)
+│   ├── _index.md
+│   └── {feature-slug}.md
+├── tech-registry/              ← Component documentation (Layer 3)
+│   ├── _index.md
+│   └── {component-slug}.md
+└── sessions/
+    └── _index.md               ← Planning sessions index (Layer 1)
+```
+
+## Phase 1: Load & Validate
+
+### 1.1 Load doc-index.json
+
+```
+Read .workflow/.doc-index/doc-index.json
+Validate: features[], technicalComponents[] are non-empty arrays
+```
+
+### 1.2 Schema Version Check
+
+```javascript
+const schemaVersion = docIndex.schema_version || '0.0';
+if (schemaVersion !== '1.0') {
+  warn(`Schema version mismatch: found ${schemaVersion}, expected 1.0`);
+}
+```
+
+### 1.3 Determine Generation Scope
+
+```
+IF --layer 3:  generate Layer 3 only
+IF --layer 2:  generate Layer 2 only (requires Layer 3 exists)
+IF --layer 1:  generate Layer 1 only (requires Layer 2 exists)
+IF --layer all (default): generate Layer 3 → 2 → 1
+```
+
+### 1.4 Check Existing Docs
+
+```
+IF docs already exist AND NOT --force:
+  Warn: "Documents already exist. Use --force to overwrite."
+  Ask user (unless -y → overwrite)
+```
+
+## Phase 2: Layer 3 — Component Documentation
+
+For each component in `technicalComponents[]`:
+
+```bash
+ccw cli -p "PURPOSE: Generate component documentation for {component.name}
+TASK:
+• Document component purpose and responsibility
+• List exported symbols (classes, functions, types)
+• Document dependencies (internal and external)
+• Include code examples for key APIs
+• Document integration points with other components
+MODE: write
+CONTEXT: @{component.codeLocations[].path}
+EXPECTED: Markdown file with: Overview, API Reference, Dependencies, Usage Examples
+CONSTRAINTS: Focus on public API | Include type signatures
+" --tool gemini --mode write --cd .workflow/.doc-index/tech-registry/
+```
+
+Output: `.workflow/.doc-index/tech-registry/{component-slug}.md`
+
+Frontmatter:
+```markdown
+---
+layer: 3
+component_id: tech-{slug}
+name: ComponentName
+type: service|controller|model|...
+features: [feat-auth]
+code_locations:
+  - path: src/services/auth.ts
+    symbols: [AuthService, AuthService.login]
+generated_at: ISO8601
+---
+```
+
+Sections: Responsibility, Code Locations, Related Requirements, Architecture Decisions, Dependencies (in/out)
+
+## Phase 3: Layer 2 — Feature Documentation
+
+For each feature in `features[]`:
+
+```bash
+ccw cli -p "PURPOSE: Generate feature documentation for {feature.name}
+TASK:
+• Describe feature purpose and business value
+• List requirements (from requirementIds)
+• Document components involved (from techComponentIds)
+• Include architecture decisions (from adrIds)
+• Provide integration guide
+MODE: write
+CONTEXT: @.workflow/.doc-index/tech-registry/{related-components}.md
+EXPECTED: Markdown file with: Overview, Requirements, Components, Architecture, Integration
+CONSTRAINTS: Reference Layer 3 component docs | Business-focused language
+" --tool gemini --mode write --cd .workflow/.doc-index/feature-maps/
+```
+
+Output: `.workflow/.doc-index/feature-maps/{feature-slug}.md`
+
+Frontmatter:
+```markdown
+---
+layer: 2
+feature_id: feat-{slug}
+name: Feature Name
+epic_id: EPIC-NNN|null
+status: implemented|in-progress|planned|partial
+requirements: [REQ-001, REQ-002]
+components: [tech-auth-service, tech-user-model]
+depends_on_layer3: [tech-auth-service, tech-user-model]
+tags: [auth, security]
+generated_at: ISO8601
+---
+```
+
+Sections: Overview, Requirements (with mapping status), Technical Components, Architecture Decisions, Change History
+
+## Phase 4: Layer 1 — Index & Overview Documentation
+
+### 4.1 Index Documents
+
+Generate catalog files:
+
+- **feature-maps/_index.md** — Feature overview table with status
+- **tech-registry/_index.md** — Component registry table with types
+- **action-logs/_index.md** — Action history table (empty initially for new projects)
+
+### 4.2 README.md (unless --skip-overview)
+
+```bash
+ccw cli -p "PURPOSE: Generate project README with overview and navigation
+TASK:
+• Project summary and purpose
+• Quick start guide
+• Navigation to features, components, and architecture
+• Link to doc-index.json
+MODE: write
+CONTEXT: @.workflow/.doc-index/doc-index.json @.workflow/.doc-index/feature-maps/_index.md
+EXPECTED: README.md with: Overview, Quick Start, Navigation, Links
+CONSTRAINTS: High-level only | Entry point for new developers
+" --tool gemini --mode write --cd .workflow/.doc-index/
+```
+
+### 4.3 ARCHITECTURE.md (unless --skip-overview)
+
+```bash
+ccw cli -p "PURPOSE: Generate architecture overview document
+TASK:
+• System design overview
+• Component relationships and dependencies
+• Key architecture decisions (from ADRs)
+• Technology stack
+MODE: write
+CONTEXT: @.workflow/.doc-index/doc-index.json @.workflow/.doc-index/tech-registry/*.md
+EXPECTED: ARCHITECTURE.md with: System Design, Component Diagram, ADRs, Tech Stack
+CONSTRAINTS: Architecture-focused | Reference component docs for details
+" --tool gemini --mode write --cd .workflow/.doc-index/
+```
+
+### 4.4 sessions/_index.md (unless --skip-overview)
+
+```bash
+ccw cli -p "PURPOSE: Generate planning sessions index
+TASK:
+• List all planning session folders chronologically
+• Link to each session's plan.json
+• Show session status and task count
+MODE: write
+CONTEXT: @.workflow/.doc-index/planning/*/plan.json
+EXPECTED: sessions/_index.md with: Session List, Links, Status
+CONSTRAINTS: Chronological order | Link to session folders
+" --tool gemini --mode write --cd .workflow/.doc-index/sessions/
+```
+
+Layer 1 frontmatter:
+```markdown
+---
+layer: 1
+depends_on_layer2: [feat-auth, feat-orders]
+generated_at: ISO8601
+---
+```
+
+## Phase 5: SCHEMA.md (unless --skip-schema)
+
+### 5.1 Generate Schema Documentation
+
+```bash
+ccw cli -p "PURPOSE: Document doc-index.json schema structure and versioning
+TASK:
+• Document current schema structure (all fields)
+• Define versioning policy (semver: major.minor)
+• Document migration protocol for version upgrades
+• Provide examples for each schema section
+MODE: write
+CONTEXT: @.workflow/.doc-index/doc-index.json
+EXPECTED: SCHEMA.md with: Schema Structure, Versioning Policy, Migration Protocol, Examples
+CONSTRAINTS: Complete field documentation | Clear migration steps
+" --tool gemini --mode write --cd .workflow/.doc-index/
+```
+
+### 5.2 Versioning Policy
+
+**Semantic Versioning**:
+- **Major** (X.0): Breaking changes (field removal, type changes, incompatible structure)
+- **Minor** (X.Y): Non-breaking additions (new optional fields, new sections)
+
+**Migration Protocol**:
+1. Detect version mismatch in ddd:plan/ddd:sync
+2. Log warning with migration instructions
+3. Provide migration script or regeneration option
+4. Update schema_version after successful migration
+
+## Phase 6: Generation Report
+
+```
+Document Generation Report
+
+Project: {name}
+Source: doc-index.json (build_path: {spec-first|code-first})
+
+Generated:
+  Layer 3 (Components): {N} documents in tech-registry/
+  Layer 2 (Features):   {N} documents in feature-maps/
+  Layer 1 (Indexes):    {N} documents (_index.md, README, ARCHITECTURE)
+  Schema:               SCHEMA.md
+
+Total: {N} documents generated
+```
+
+## Flags
+
+| Flag | Effect |
+|------|--------|
+| `-y, --yes` | Auto-confirm all decisions |
+| `--layer <3\|2\|1\|all>` | Generate specific layer only (default: all) |
+| `--force` | Overwrite existing documents |
+| `--skip-overview` | Skip README.md, ARCHITECTURE.md, sessions/_index.md |
+| `--skip-schema` | Skip SCHEMA.md generation |
+
+## Integration Points
+
+- **Input from**: `doc-index.json` (from `/ddd:scan` or `/ddd:index-build`)
+- **Called by**: `/ddd:scan` (after index assembly), `/ddd:index-build` (after index assembly)
+- **Standalone**: Can be run independently on any project with existing doc-index.json
+- **Output**: Complete document tree in `.workflow/.doc-index/`

.claude/commands/ddd/doc-refresh.md

@@ -0,0 +1,218 @@
+---
+name: doc-refresh
+description: Incrementally update affected documents based on changed components/features. Layer 3 → 2 → 1 selective refresh. Called by sync/update or used standalone.
+argument-hint: "[-y|--yes] [--components <id1,id2,...>] [--features <id1,id2,...>] [--minimal] [--dry-run]"
+allowed-tools: TodoWrite(*), Agent(*), AskUserQuestion(*), Read(*), Grep(*), Glob(*), Bash(*), Edit(*), Write(*)
+---
+
+## Auto Mode
+
+When `--yes` or `-y`: Auto-update affected documents without confirmation prompts.
+
+# DDD Doc Refresh Command (/ddd:doc-refresh)
+
+## Purpose
+
+Incrementally update **only the affected documents** after code changes. Unlike `/ddd:doc-generate` (full generation), this command selectively refreshes documents for specific components and features.
+
+```
+affected component/feature IDs → update tech-registry (L3) → update feature-maps (L2) → update indexes (L1)
+```
+
+## When to Use
+
+| Scenario | Use |
+|----------|-----|
+| After `/ddd:sync` detects code changes | **doc-refresh** (auto-called by sync) |
+| After `/ddd:update` traces impact | **doc-refresh** (auto-called by update) |
+| Manual refresh of specific component docs | **doc-refresh --components tech-auth-service** |
+| Quick metadata-only update | **doc-refresh --minimal --components tech-auth-service** |
+| Preview what would change | **doc-refresh --dry-run --components tech-auth-service** |
+
+## Prerequisite
+
+- `doc-index.json` must exist at `.workflow/.doc-index/doc-index.json`
+- At least one of `--components` or `--features` must be provided (or received from caller)
+- Corresponding documents must already exist (generated by `/ddd:doc-generate`)
+- If documents missing → error: "Documents not found. Run /ddd:doc-generate first."
+
+## Phase 1: Determine Refresh Scope
+
+### 1.1 Resolve Affected Entities
+
+```
+IF --components provided:
+  affected_components = parse comma-separated IDs
+  affected_features = lookup featureIds for each component in doc-index.json
+
+IF --features provided:
+  affected_features = parse comma-separated IDs
+  affected_components = union of all component IDs linked to features
+
+Merge both sets if both flags provided.
+```
+
+### 1.2 Validate Entities Exist
+
+For each ID, verify it exists in doc-index.json. Warn and skip missing IDs.
+
+### 1.3 Check Document Existence
+
+For each affected entity, check if corresponding .md file exists:
+- Missing Layer 3 doc → warn: "Component doc not found. Run /ddd:doc-generate first."
+- Missing Layer 2 doc → warn: "Feature doc not found. Run /ddd:doc-generate first."
+
+## Phase 2: Layer 3 — Update Component Docs
+
+For each affected component's `tech-registry/{slug}.md`:
+
+```bash
+ccw cli -p "PURPOSE: Update component documentation for {component.name} after code changes
+TASK:
+• Update code locations and line ranges
+• Update symbol list (add new exports, remove deleted)
+• Add change entry to history table
+• Refresh usage examples if API changed
+MODE: write
+CONTEXT: @{component.codeLocations[].path}
+EXPECTED: Updated markdown with current API state
+CONSTRAINTS: Preserve existing structure | Only update changed sections
+" --tool gemini --mode write --cd .workflow/.doc-index/tech-registry/
+```
+
+Update frontmatter:
+```markdown
+---
+layer: 3
+component_id: tech-auth-service
+generated_at: {original}
+last_updated: ISO8601
+---
+```
+
+### 2.1 Minimal Mode (--minimal)
+
+With `--minimal`, only update:
+- `codeLocations` in frontmatter
+- `last_updated` timestamp
+- Skip CLI call for content regeneration
+
+## Phase 3: Layer 2 — Update Feature Docs
+
+For each affected feature's `feature-maps/{slug}.md`:
+
+```bash
+ccw cli -p "PURPOSE: Update feature documentation for {feature.name} after component changes
+TASK:
+• Update component list if new components added
+• Update status if requirements now fully implemented
+• Add change entry to history table
+• Refresh integration guide if component APIs changed
+MODE: write
+CONTEXT: @.workflow/.doc-index/tech-registry/{affected-components}.md
+EXPECTED: Updated markdown reflecting current feature state
+CONSTRAINTS: Reference updated Layer 3 docs | Preserve business language
+" --tool gemini --mode write --cd .workflow/.doc-index/feature-maps/
+```
+
+Update frontmatter:
+```markdown
+---
+layer: 2
+feature_id: feat-auth
+depends_on_layer3: [tech-auth-service, tech-user-model]
+generated_at: {original}
+last_updated: ISO8601
+---
+```
+
+### 3.1 Minimal Mode (--minimal)
+
+With `--minimal`, only update:
+- Component list in frontmatter
+- Feature status (if requirements mapping changed)
+- `last_updated` timestamp
+- Skip CLI call for content regeneration
+
+## Phase 4: Layer 1 — Update Index Docs (conditional)
+
+### 4.1 Trigger Conditions
+
+| Condition | Action |
+|-----------|--------|
+| New component registered | Update `tech-registry/_index.md` |
+| Component removed | Update `tech-registry/_index.md` |
+| Feature status changed | Update `feature-maps/_index.md` |
+| New feature added | Update `feature-maps/_index.md` + README.md |
+| Major architecture change | Update ARCHITECTURE.md |
+| New action-log entry | Update `action-logs/_index.md` |
+
+### 4.2 Update _index.md Files
+
+Refresh table entries for affected features/components:
+- `feature-maps/_index.md`
+- `tech-registry/_index.md`
+- `action-logs/_index.md` (if new action entry)
+
+### 4.3 Update Overview Docs (only if significant)
+
+If new features added or major status changes:
+
+```bash
+ccw cli -p "PURPOSE: Update project overview docs after feature changes
+TASK:
+• Update README.md feature list
+• Update ARCHITECTURE.md if new components added
+• Update sessions/_index.md with new planning sessions
+MODE: write
+CONTEXT: @.workflow/.doc-index/feature-maps/*.md @.workflow/.doc-index/doc-index.json
+EXPECTED: Updated overview docs with current project state
+CONSTRAINTS: High-level only | Link to Layer 2 for details
+" --tool gemini --mode write --cd .workflow/.doc-index/
+```
+
+### 4.4 Skip Layer 1
+
+With `--minimal` or when changes are minor (only code location updates): skip Layer 1 entirely.
+
+## Phase 5: Refresh Report
+
+```
+Document Refresh Report
+
+Affected Scope:
+  Components: {N} ({component IDs})
+  Features: {N} ({feature IDs})
+
+Updated:
+  Layer 3 (Components): {N} documents refreshed
+  Layer 2 (Features):   {N} documents refreshed
+  Layer 1 (Indexes):    {N} documents refreshed (or "skipped")
+
+Mode: {full|minimal}
+```
+
+## Dry-Run Mode
+
+With `--dry-run`:
+- Execute Phase 1 (scope determination)
+- Display what would be updated (affected files list)
+- Skip all file writes (Phase 2-4)
+- Output: "Dry-run complete. {N} documents would be refreshed."
+
+## Flags
+
+| Flag | Effect |
+|------|--------|
+| `-y, --yes` | Auto-confirm all updates |
+| `--components <ids>` | Comma-separated component IDs to refresh |
+| `--features <ids>` | Comma-separated feature IDs to refresh |
+| `--minimal` | Only update metadata/frontmatter, skip content regeneration |
+| `--dry-run` | Preview what would change without modifying files |
+
+## Integration Points
+
+- **Input from**: `doc-index.json`, affected entity IDs (from `/ddd:sync` or `/ddd:update`)
+- **Called by**: `/ddd:sync` (after change detection + index update), `/ddd:update` (after impact tracing + index update)
+- **Standalone**: Can be run independently to refresh specific component/feature docs
+- **Prerequisite**: Documents must exist (generated by `/ddd:doc-generate`)

.claude/commands/ddd/execute.md

@@ -0,0 +1,416 @@
+---
+name: execute
+description: Document-aware execution engine — executes plan.json + TASK-*.json with doc-index context enrichment, per-batch impact verification, and post-completion doc sync.
+argument-hint: "[-y|--yes] [--skip-sync] [--skip-verify] [--plan <path>] [--in-memory] \"optional task description\""
+allowed-tools: TodoWrite(*), Agent(*), AskUserQuestion(*), Read(*), Grep(*), Glob(*), Bash(*), Edit(*), Write(*), mcp__ace-tool__search_context(*)
+---
+
+## Auto Mode
+
+When `--yes` or `-y`: Auto-confirm all decisions, auto-sync after completion.
+
+# DDD Execute Command (/ddd:execute)
+
+## Purpose
+
+Same execution engine model as lite-execute, but each step is **doc-index-aware**:
+- Tasks are enriched with feature context, component docs, and architecture constraints
+- Per-batch impact verification ensures changes stay within planned scope
+- Post-completion automatically syncs the document index
+
+### Core Differentiator
+Unlike generic execution engines, ddd:execute leverages the document architecture:
+- Feature-maps provide business context for each task
+- Tech-registry provides implementation patterns to follow
+- ADRs surface as hard constraints during execution
+- Requirement acceptance criteria inform convergence verification
+
+## Prerequisite
+
+- `plan.json` + `.task/TASK-*.json` files from `/ddd:plan`
+- `doc-index.json` at `.workflow/.doc-index/doc-index.json`
+- If `--in-memory`: receives executionContext from `/ddd:plan` handoff
+
+---
+
+## Step 1: Initialize & Load Context
+
+### 1.1 Locate Plan
+
+```
+IF --in-memory:
+  Load executionContext from ddd:plan handoff
+  plan_path = executionContext.plan_path
+  task_dir = executionContext.task_dir
+ELIF --plan <path>:
+  plan_path = <path>
+  task_dir = {dirname(path)}/.task/
+ELSE:
+  Scan .workflow/.doc-index/planning/ for most recent session
+  plan_path = {latest_session}/plan.json
+  task_dir = {latest_session}/.task/
+```
+
+### 1.2 Load Plan & Tasks
+
+- Read `plan.json` — validate against plan-overview-base-schema
+- Read all `TASK-*.json` from `.task/` directory — validate against task-schema
+- Read `doc-index.json` from `.workflow/.doc-index/`
+
+### 1.3 Pre-Load Doc Context
+
+For each task with `doc_context`:
+- Load referenced `feature_docs` (feature-maps/{slug}.md)
+- Load referenced `component_docs` (tech-registry/{slug}.md)
+- Load ADR excerpts from doc-index `architectureDecisions[]`
+- Extract requirement acceptance criteria from doc-index `requirements[]`
+- Load `doc_context.symbol_docs[]` documentation content (if present)
+
+### 1.4 Echo Strategy
+
+Display execution summary:
+
+```
+DDD Execute: {plan.summary}
+Complexity: {plan.complexity}
+Tasks: {plan.task_count}
+
+Doc-Index Impact:
+  Features: {doc_context.affected_features}
+  Requirements: {doc_context.affected_requirements}
+  Components: {doc_context.affected_components}
+  Constraints: {doc_context.architecture_constraints}
+
+Execution plan: {batch count} batches, {parallel tasks} parallel where possible
+```
+
+---
+
+## Step 2: Task Grouping & Batch Creation
+
+### 2.1 Extract Dependencies
+
+From each `TASK-*.json`, read `depends_on[]` to build dependency graph.
+
+### 2.2 Group into Batches
+
+```
+Batch 1: Tasks with no dependencies (depends_on: [])
+Batch 2: Tasks depending only on Batch 1 tasks
+Batch 3: Tasks depending on Batch 1 + 2 tasks
+...
+```
+
+Within each batch, tasks with the same `parallel_group` can run concurrently.
+
+### 2.3 Assign Executor per Task
+
+| Signal | Executor |
+|--------|----------|
+| `meta.execution_config.method == "cli"` | CLI tool (gemini/codex/qwen) |
+| `meta.execution_config.method == "agent"` | Agent (code-developer/universal-executor) |
+| Default | Agent (code-developer) |
+
+---
+
+## Step 3: Doc-Enriched Execution
+
+For each task in batch order, build an enriched prompt:
+
+### 3.1 Task Prompt Template
+
+```markdown
+## Goal
+${plan.summary} — specifically: ${task.title}
+
+## Document Context
+
+### Feature: ${feature.name} (${feature.id})
+${feature-map content excerpt — overview + requirements section}
+
+### Components
+${for each component in task.doc_context.component_ids:
+  tech-registry excerpt — responsibility + code locations + key patterns}
+
+### Symbol Documentation
+${if doc_context.symbol_docs is non-empty:
+  for each component in doc_context.component_ids:
+    #### ${component.name} Symbols (Top-5)
+    ${for each symbol in component.symbol_docs.slice(0, 5):
+      - **${symbol.name}** (${symbol.type}): ${symbol.doc_summary}
+        Source: `${symbol.source_path}` | Freshness: ${symbol.freshness}
+    }
+}
+
+### Architecture Constraints
+${for each ADR in task.doc_context.adr_ids:
+  ADR title + decision + rationale from doc-index}
+
+### Requirement Acceptance Criteria
+${for each requirement in task.doc_context.requirement_ids:
+  requirement title + priority + success criteria from doc-index}
+
+## Task Details
+${task.description}
+
+### Files to Modify
+${task.files[] — path, action, changes}
+
+### Implementation Steps
+${task.implementation[] — step-by-step guide}
+
+## Done When
+${task.convergence.criteria[]}
+${task.convergence.verification}
+```
+
+### 3.2 Execute Task
+
+**Agent execution**:
+```
+Agent(subagent_type="code-developer", prompt="{enriched prompt}")
+```
+
+**CLI execution**:
+```bash
+ccw cli -p "{enriched prompt}" --tool {cli_tool} --mode write
+```
+
+### 3.3 Record & Persist Result
+
+After each task completes:
+- Update `TASK-*.json` with `status`, `executed_at`, `result`
+- Track `result.files_modified` for impact verification
+- **Persist** result to `TASK-{id}.result.json` alongside the task file:
+
+```json
+{
+  "task_id": "TASK-001",
+  "status": "completed|failed",
+  "executed_at": "ISO8601",
+  "executor": "code-developer|gemini|codex",
+  "files_modified": [
+    { "path": "src/services/auth.ts", "action": "modified", "symbols_changed": ["AuthService.validate"] },
+    { "path": "src/routes/login.ts", "action": "created", "symbols_changed": ["loginRoute"] }
+  ],
+  "convergence_result": {
+    "criteria_met": ["Rate limiter middleware exists"],
+    "criteria_unmet": [],
+    "verification_output": "test output snippet..."
+  },
+  "error": null
+}
+```
+
+This file serves as the durable handoff between execute and sync — survives process interruptions.
+
+---
+
+## Step 4: Per-Batch Impact Verification
+
+After each batch completes (unless `--skip-verify`):
+
+### 4.1 Trace Changed Files
+
+For each file modified in the batch:
+```
+changed_file → match to doc-index.technicalComponents[].codeLocations[].path
+  → component_ids → featureIds → requirementIds
+```
+
+### 4.2 Scope Verification
+
+Compare actual impact to planned impact:
+
+```
+Planned scope:
+  Features: [feat-auth]
+  Components: [tech-auth-service, tech-user-model]
+
+Actual impact:
+  Features: [feat-auth]              ← OK, within scope
+  Components: [tech-auth-service, tech-user-model, tech-email-service]
+                                     ← WARNING: tech-email-service not in plan
+```
+
+### 4.3 Flag Unexpected Impact
+
+If changes affect features/components NOT in `plan.doc_context`:
+- **Warning**: Display unexpected impact
+- **No -y**: Ask user to confirm continuation
+- **With -y**: Log warning, continue execution
+
+### 4.4 Skip Conditions
+
+Skip verification when:
+- `--skip-verify` flag is set
+- Only 1 batch (no intermediate verification needed for simple plans)
+
+---
+
+## Step 4.5: Post-Execution Verify Gate
+
+After all batches complete, before doc sync (unless `--skip-verify`):
+
+### 4.5.1 Convergence Verification
+
+For each completed task with `convergence.verification`:
+```
+Execute: {task.convergence.verification}
+  → e.g., "npm test -- --grep rate-limit"
+Record: pass/fail → update TASK-{id}.result.json.convergence_result
+```
+
+### 4.5.2 Build & Lint Check
+
+```
+Run project build command (if configured):
+  → npm run build / tsc --noEmit / etc.
+Run project lint command (if configured):
+  → npm run lint / eslint src/ / etc.
+```
+
+If build or lint fails:
+- **No -y**: Display errors, ask user: fix now / continue anyway / abort
+- **With -y**: Log warning, continue (non-blocking)
+
+### 4.5.3 Regression Test
+
+```
+Run project test suite:
+  → npm test / pytest / etc.
+Compare: test results before execution (baseline) vs after
+```
+
+If tests fail:
+- **No -y**: Display failures, ask user: fix now / skip sync / abort
+- **With -y**: Log failures as warning in execution results, continue
+
+### 4.5.4 Verify Summary
+
+```
+Verify Gate Results:
+  Convergence: {passed}/{total} tasks verified
+  Build: pass|fail|skipped
+  Lint: pass|fail|skipped
+  Tests: {passed}/{total} ({new_failures} regressions)
+
+  Gate: PASS / WARN (continue with warnings) / FAIL (blocked)
+```
+
+### 4.5.5 Persist Verify Manifest
+
+Write `execution-manifest.json` to session folder:
+
+```json
+{
+  "session_id": "{session-id}",
+  "plan_path": "planning/{slug}/plan.json",
+  "completed_at": "ISO8601",
+  "tasks": [
+    {
+      "task_id": "TASK-001",
+      "status": "completed",
+      "result_file": ".task/TASK-001.result.json"
+    }
+  ],
+  "files_modified": [
+    { "path": "src/services/auth.ts", "action": "modified", "task_id": "TASK-001" },
+    { "path": "src/routes/login.ts", "action": "created", "task_id": "TASK-001" }
+  ],
+  "verify": {
+    "convergence": { "passed": 2, "total": 2 },
+    "build": "pass",
+    "lint": "pass",
+    "tests": { "passed": 42, "total": 42, "regressions": 0 },
+    "gate": "PASS"
+  }
+}
+```
+
+This manifest is the **single source of truth** consumed by `ddd:sync --from-manifest`.
+
+---
+
+## Step 5: Post-Completion Doc Sync
+
+After all batches complete (unless `--skip-sync`):
+
+### 5.1 Auto-Trigger ddd:sync
+
+```
+Invoke /ddd:sync [-y] --task-id {session-id} --from-manifest {session}/execution-manifest.json "{plan.summary}"
+```
+
+Note: `/ddd:sync` automatically creates a backup of `doc-index.json` before modifications.
+
+When `--from-manifest` is provided, sync uses the **execution manifest** as its primary data source instead of git diff. This ensures:
+- Precise file-level and symbol-level change tracking (from TASK-*.result.json)
+- Task-to-file attribution (which task modified which file)
+- Convergence verification results carried forward
+- Survives process interruptions (manifest is persisted to disk)
+
+Fallback: If manifest is unavailable (e.g., manual mode), sync falls back to git diff discovery.
+
+### 5.2 Generate Action Log
+
+Create action entry with:
+- All tasks executed and their results
+- Files modified across all batches
+- Features and requirements addressed
+
+### 5.3 Update Feature Status
+
+Based on execution results:
+- Requirements with verified convergence → update status
+- Features with all requirements met → `status: "implemented"`
+
+---
+
+## Step 6: Summary & Follow-up
+
+### 6.1 Execution Results
+
+```
+DDD Execute Complete
+
+Tasks: {completed}/{total} ({failed} failed)
+Files modified: {count}
+Batches: {batch_count}
+
+Doc-Index Changes:
+  Features updated: {list}
+  Components updated: {list}
+  New components registered: {list}
+  Requirements addressed: {list}
+
+Convergence:
+  {for each task: task.id — criteria met: X/Y}
+```
+
+### 6.2 Follow-up Suggestions
+
+Based on execution results, suggest:
+- **New issues**: If unexpected scope expansion was detected
+- **Additional tests**: If convergence criteria only partially met
+- **Documentation gaps**: If new components were created without docs
+- **Next tasks**: If plan had tasks marked as future/deferred
+
+---
+
+## Flags
+
+| Flag | Effect |
+|------|--------|
+| `-y, --yes` | Auto-confirm, auto-sync |
+| `--skip-sync` | Skip post-completion ddd:sync (Step 5) |
+| `--skip-verify` | Skip per-batch impact verification (Step 4) AND post-execution verify gate (Step 4.5) |
+| `--plan <path>` | Explicit plan.json path |
+| `--in-memory` | Accept executionContext from ddd:plan handoff |
+
+## Integration Points
+
+- **Input from**: `/ddd:plan` output (plan.json + TASK-*.json), `doc-index.json`
+- **Output to**: Updated `doc-index.json` (via ddd:sync), `TASK-*.result.json` (per-task), `execution-manifest.json` (session-level)
+- **Schemas**: `plan-overview-ddd-schema.json` (input), `task-schema.json` + `task-ddd-extension-schema.json` (input), `doc-index.json` (enrichment)
+- **Delegates to**: `/ddd:sync` for post-completion synchronization

.claude/commands/ddd/index-build.md

@@ -0,0 +1,212 @@
+---
+name: index-build
+description: Build document index from spec-generator outputs + codebase mapping. Requires existing spec session. For projects without specs, use /ddd:scan instead.
+argument-hint: "[-y|--yes] [-s|--spec <spec-session-id>] [--from-scratch]"
+allowed-tools: TodoWrite(*), Agent(*), AskUserQuestion(*), Read(*), Grep(*), Glob(*), Bash(*), Edit(*), Write(*), mcp__ace-tool__search_context(*)
+---
+
+## Auto Mode
+
+When `--yes` or `-y`: Auto-confirm all decisions, use inferred mappings, skip interactive review.
+
+# DDD Index Build Command (/ddd:index-build)
+
+## Purpose
+
+From **spec-generator outputs** (requirements, architecture, epics), construct the central document index and map spec entities to actual code locations.
+
+```
+Spec outputs (REQ, ADR, EPIC) + Codebase → doc-index.json
+```
+
+> **No spec?** Use `/ddd:scan` instead — it reverse-engineers the index from code alone.
+
+## Prerequisite
+
+- At least one spec session in `.workflow/.doc-index/specs/` or `.workflow/.spec/`
+- If no spec found → error with suggestion: "No spec session found. Run /ddd:scan for code-first indexing, or /spec-generator to create specs."
+
+## Storage Location
+
+```
+.workflow/.doc-index/
+├── doc-index.json              ← Central index (primary output)
+├── specs/                      ← Spec-generator outputs
+│   └── SPEC-{slug}-{date}/
+├── feature-maps/               ← Feature documentation (from Epics)
+│   ├── _index.md
+│   └── {feature-slug}.md
+├── tech-registry/              ← Technical component docs (from code mapping)
+│   ├── _index.md
+│   └── {component-slug}.md
+└── action-logs/                ← Change history (initially empty)
+    └── _index.md
+```
+
+## Phase 1: Discover & Parse Spec Sources
+
+### 1.1 Locate Spec Session
+
+```
+IF --spec <id> provided:
+  Load from .workflow/.doc-index/specs/<id>/ OR .workflow/.spec/<id>/
+ELSE:
+  Scan for all SPEC-* directories
+  IF multiple → present list, ask user to select (-y picks latest)
+  IF none → ERROR: "No spec session found. Use /ddd:scan or /spec-generator."
+```
+
+### 1.2 Migrate Specs (if needed)
+
+If spec in `.workflow/.spec/` but not in `.workflow/.doc-index/specs/`:
+- Copy to `.workflow/.doc-index/specs/`
+- Preserve original (backward compatibility)
+
+### 1.3 Extract Structured Entities
+
+| Source File | Extract To |
+|------------|------------|
+| `spec-config.json` | project name, domain, spec_type |
+| `glossary.json` | → index glossary[] |
+| `product-brief.md` | vision, goals |
+| `requirements/REQ-*.md` | → index requirements[] (with MoSCoW priority) |
+| `requirements/NFR-*.md` | → index requirements[] (non-functional) |
+| `architecture/ADR-*.md` | → index architectureDecisions[] |
+| `epics/EPIC-*.md` | → feature grouping seeds |
+
+## Phase 2: Codebase Mapping
+
+Map spec entities to actual code locations using Gemini:
+
+```bash
+ccw cli -p "PURPOSE: Map codebase to specification entities for documentation indexing.
+TASK:
+• Scan the codebase and identify all major modules/components
+• For each component: extract file paths, exported symbols (classes, functions, types)
+• Match components to these specification entities by name/domain similarity:
+  Requirements: {REQ-001: desc, REQ-002: desc, ...extracted from Phase 1}
+  Architecture decisions: {ADR-001: title, ...extracted from Phase 1}
+• Report unmatched components (exist in code but no spec counterpart)
+• Report unmatched requirements (in spec but no code found)
+MODE: analysis
+CONTEXT: @**/*
+EXPECTED: JSON: { components: [{ name, type, files, symbols, matched_req_ids, matched_adr_id, is_orphan }], unmatched_reqs: [REQ-NNN] }
+CONSTRAINTS: Focus on source directories | Ignore node_modules, dist, build" --tool gemini --mode analysis
+```
+
+### 2.1 Generate Component IDs & Link
+
+For each discovered component:
+- ID: `tech-{kebab-case-name}`
+- Link to matched `REQ-NNN` and `ADR-NNN`
+- Flag orphans for user review
+
+## Phase 3: Build Feature Map (from Epics)
+
+### 3.1 Epic → Feature Mapping
+
+```
+Each EPIC-NNN → one feat-{slug}
+  - id: feat-{slug} (from epic slug)
+  - name: from Epic name
+  - epicId: EPIC-NNN
+  - status: inferred from code mapping
+    - all requirements have matched components → "implemented"
+    - some matched → "in-progress"
+    - none matched → "planned"
+  - requirementIds: from Epic's stories → requirement links
+  - tags: from domain keywords
+```
+
+### 3.2 Document Generation (delegated)
+
+Feature-map and tech-registry document generation is handled by `/ddd:doc-generate` in Phase 5.
+Phase 3 only builds the data structures (feature → requirement → component mappings) that doc-generate consumes.
+
+## Phase 4: Assemble doc-index.json
+
+```json
+{
+  "version": "1.0",
+  "project": "{project-name}",
+  "build_path": "spec-first",
+  "spec_session": "SPEC-{slug}-{date}",
+  "last_updated": "ISO8601",
+  "glossary": [
+    { "id": "gloss-{slug}", "term": "Term", "definition": "...", "aliases": [], "category": "core|technical|business" }
+  ],
+  "features": [
+    { "id": "feat-{slug}", "name": "...", "epicId": "EPIC-NNN", "status": "...", "docPath": "feature-maps/{slug}.md", "requirementIds": ["REQ-NNN"], "tags": [] }
+  ],
+  "requirements": [
+    { "id": "REQ-NNN", "title": "...", "source": "spec", "priority": "Must|Should|Could|Won't", "sourcePath": "specs/SPEC-*/requirements/REQ-NNN-*.md", "techComponentIds": ["tech-{slug}"], "featureId": "feat-{slug}" }
+  ],
+  "technicalComponents": [
+    { "id": "tech-{slug}", "name": "...", "type": "...", "responsibility": "...", "adrId": "ADR-NNN|null", "docPath": "tech-registry/{slug}.md", "codeLocations": [{ "path": "...", "symbols": [], "lineRange": [0,0] }], "dependsOn": [], "featureIds": ["feat-{slug}"], "actionIds": [] }
+  ],
+  "architectureDecisions": [
+    { "id": "ADR-NNN", "title": "...", "source": "spec", "sourcePath": "specs/SPEC-*/architecture/ADR-NNN-*.md", "componentIds": ["tech-{slug}"] }
+  ],
+  "actions": []
+}
+```
+
+### Merge with Existing Code-First Index
+
+If a code-first index exists (from prior `/ddd:scan`):
+- Replace `IREQ-NNN` with matching `REQ-NNN` where content overlaps
+- Keep `IREQ-NNN` without spec counterpart (mark `source: "legacy-inferred"`)
+- Replace `IADR-NNN` with `ADR-NNN` where applicable
+- Update `build_path` to `"spec-first"`
+- Preserve existing `tech-*` components (update links only)
+
+## Phase 5: Generate Documents
+
+Delegate all document generation to `/ddd:doc-generate`:
+
+```
+Invoke /ddd:doc-generate [-y]
+```
+
+This generates the complete document tree (Layer 3 → 2 → 1):
+- `tech-registry/{slug}.md` — component docs from Phase 2 mapping (Layer 3)
+- `feature-maps/{slug}.md` — feature docs from Phase 3 mapping (Layer 2)
+- `_index.md`, `README.md`, `ARCHITECTURE.md`, `SCHEMA.md` — index/overview docs (Layer 1)
+
+See `/ddd:doc-generate` for full details on generation strategy and flags.
+
+## Phase 6: Coverage Report
+
+```
+Index Build Report (spec-first)
+
+Spec: {session-id}
+Features: {N} (from {N} Epics)
+Requirements: {N} (REQ: {n}, NFR: {n})
+Components: {N} ({orphan} orphans without spec match)
+ADRs: {N}
+
+Mapping Coverage:
+  Requirements → Components: {%} ({unmapped} unmapped)
+  Components → Features: {%}
+  Epics → Features: 100%
+
+Gaps:
+  - {N} requirements have no matching code component
+  - {N} code components are not linked to any requirement
+```
+
+## Flags
+
+| Flag | Effect |
+|------|--------|
+| `-y, --yes` | Skip all interactive prompts |
+| `-s, --spec <id>` | Use specific spec session |
+| `--from-scratch` | Delete existing index and rebuild |
+
+## Integration Points
+
+- **Input from**: `spec-generator` outputs, codebase, existing `/ddd:scan` index
+- **Delegates to**: `/ddd:doc-generate` (Phase 5, full document generation)
+- **Output to**: `ddd:plan`, `ddd:sync`, `ddd:update`
+- **Upgrades**: Can merge with prior code-first (`/ddd:scan`) index

.claude/commands/ddd/plan.md

@@ -0,0 +1,611 @@
+---
+name: plan
+description: Document-driven planning pipeline — queries doc-index, explores codebase with doc-aware angles, clarifies ambiguities, and produces unified plan.json + TASK-*.json artifacts with doc_context traceability.
+argument-hint: "[-y|--yes] [--explore] [--skip-explore] [--skip-clarify] \"task description or feature keyword\""
+allowed-tools: TodoWrite(*), Agent(*), AskUserQuestion(*), Read(*), Grep(*), Glob(*), Bash(*), Write(*), mcp__ace-tool__search_context(*)
+---
+
+## Auto Mode
+
+When `--yes` or `-y`: Skip clarification (Phase 3), auto-select ddd:execute (Phase 5), skip interactive refinement.
+
+# DDD Plan Command (/ddd:plan)
+
+## Purpose
+
+Full planning pipeline for document-driven development. Unlike simple context lookup, this command:
+1. **Queries** the doc-index for instant context (features, requirements, components, ADRs)
+2. **Explores** the codebase with doc-index-informed angles (not generic presets)
+3. **Clarifies** ambiguities from exploration results and doc-index gaps
+4. **Plans** with unified schema output (plan.json + TASK-*.json with doc_context)
+5. **Hands off** to ddd:execute or other execution engines
+
+### Key Differentiation from lite-plan
+- Phase 1 provides instant context from doc-index (no cold-start exploration)
+- Exploration angles are doc-index-informed (not generic preset selection)
+- Tasks carry doc_context for traceability (features → requirements → code)
+- Architecture decisions (ADRs) automatically surface as constraints
+
+## Prerequisite
+
+- `doc-index.json` must exist at `.workflow/.doc-index/doc-index.json`
+- If not found → suggest running `/ddd:index-build` or `/ddd:scan` first
+
+## Session Folder
+
+```
+.workflow/.doc-index/planning/{task-slug}-{YYYY-MM-DD}/
+├── exploration-{angle}.json        # Per-angle exploration (Phase 2)
+├── explorations-manifest.json      # Exploration index
+├── plan.json                       # Plan overview (Phase 4)
+├── planning-context.md             # Legacy context package (Phase 0+1 combined)
+├── .process/
+│   └── doc-context-package.json    # Bundled doc_context (Phase 1.8)
+└── .task/
+    ├── TASK-001.json
+    └── TASK-002.json
+```
+
+---
+
+## Phase 0: Parse Task Intent (enhanced)
+
+### 0.1 Extract Keywords
+
+From the user's task description, extract:
+- **Domain keywords**: feature names, module names, business terms
+- **Technical keywords**: file paths, class names, function names
+- **Action type**: feature | bugfix | refactor | optimization | migration
+
+### 0.2 Glossary Match
+
+Cross-reference extracted keywords against `doc-index.json.glossary[]`:
+- Match terms and aliases
+- Expand user's vocabulary with canonical terms
+
+### 0.3 Classify Complexity
+
+Assess task complexity based on:
+- Number of features potentially affected (from keyword matching)
+- Whether new components are needed or existing ones modified
+- Cross-feature impact (single feature vs multiple)
+
+| Signal | Complexity |
+|--------|-----------|
+| Single feature, existing components | Low |
+| 1-2 features, some new components | Medium |
+| 3+ features, new architecture needed | High |
+
+---
+
+## Phase 1: Doc-Index Query
+
+### 1.0 Schema Version Check (TASK-006)
+
+Before querying doc-index, verify schema compatibility:
+
+```javascript
+const docIndex = JSON.parse(Read('.workflow/.doc-index/doc-index.json'));
+const schemaVersion = docIndex.schema_version || '0.0'; // Default for legacy
+
+if (schemaVersion !== '1.0') {
+  console.warn(`Schema version mismatch: found ${schemaVersion}, expected 1.0`);
+  console.warn('Consider running schema migration or regenerating doc-index with /ddd:scan');
+  // Continue with degraded functionality - may encounter missing fields
+}
+```
+
+**Graceful degradation**: If version mismatch detected → log warning → continue with caution (some features may not work as expected).
+
+### 1.1 Feature Search
+
+```
+Search doc-index.json.features[] where:
+  - name CONTAINS keyword (fuzzy)
+  - tags INTERSECT keywords
+  - requirementIds link to matching requirements
+→ Output: matched feature IDs + names
+```
+
+### 1.2 Requirement Search
+
+```
+Search doc-index.json.requirements[] where:
+  - title CONTAINS keyword
+  - id matches explicit REQ-NNN reference
+  - featureId matches found features
+→ Output: matched requirement IDs + titles + priorities
+```
+
+### 1.3 Component Search
+
+```
+Search doc-index.json.technicalComponents[] where:
+  - name CONTAINS keyword
+  - codeLocations[].path CONTAINS file path keyword
+  - codeLocations[].symbols CONTAINS symbol keyword
+  - featureIds INTERSECT found features
+→ Output: matched component IDs + code locations
+```
+
+### 1.4 ADR Search
+
+```
+Search doc-index.json.architectureDecisions[] where:
+  - componentIds INTERSECT found components
+→ Output: matched ADR IDs + titles
+```
+
+### 1.5 Action History Search
+
+```
+Search doc-index.json.actions[] where:
+  - related to found features or components
+→ Output: recent actions with descriptions
+```
+
+### 1.6 Build Impact Map
+
+Assemble all found references into a structured impact map:
+
+```json
+{
+  "affected_features": ["feat-auth"],
+  "affected_requirements": ["REQ-001", "REQ-002"],
+  "affected_components": ["tech-auth-service", "tech-user-model"],
+  "architecture_constraints": ["ADR-001"],
+  "recent_actions": ["task-123"],
+  "complexity": "Medium"
+}
+```
+
+Save as `planning-context.md` (legacy format for backward compatibility).
+
+### Phase 1.7: Symbol Query (DeepWiki Bridge)
+
+If DeepWiki is available (`deepwiki_feature_to_symbol_index` exists in doc-index.json):
+
+1. Collect all `codeLocations[].path` from matched `technicalComponents[]`
+2. Query DeepWiki: `POST /api/deepwiki/symbols-for-paths { paths: unique_paths }`
+3. Build symbol_docs by component, sorted by type priority (class > function > method)
+4. Populate `doc_context.symbol_docs[]` with Top-5 symbols per component
+
+**Graceful degradation**: If DeepWiki unavailable → log warning → skip symbol injection → continue flow.
+
+### Phase 1.8: Persist Doc Context Package
+
+After building doc_context (including symbol_docs from Phase 1.7), persist it as a reusable context package:
+
+1. Bundle doc_context into JSON structure:
+```json
+{
+  "affected_features": ["feat-auth"],
+  "affected_requirements": ["REQ-001", "REQ-002"],
+  "affected_components": ["tech-auth-service"],
+  "architecture_constraints": ["ADR-001"],
+  "index_path": ".workflow/.doc-index/doc-index.json",
+  "symbol_docs": [...]
+}
+```
+
+2. Write to session folder: `{sessionFolder}/.process/doc-context-package.json`
+3. Store relative path for task.json population: `../.process/doc-context-package.json`
+
+**Error handling**: If write fails → log warning → continue without context package (backward compatible).
+
+---
+
+## Phase 2: Doc-Index-Guided Exploration (NEW)
+
+Use Phase 1 results to **SELECT exploration angles intelligently**:
+
+### 2.1 Angle Selection Logic
+
+| Phase 1 Signal | Add Exploration Angle |
+|----------------|----------------------|
+| feat-auth or security-related ADR affected | `security` |
+| Multiple features crossed (2+) | `integration-points` |
+| New component needed (no matching tech-*) | `architecture` |
+| Performance-related requirements | `performance` |
+| Default (always included) | `patterns` + `dependencies` |
+
+Select 1-4 angles total. More angles for higher complexity.
+
+### 2.2 Skip & Trigger Conditions
+
+| Complexity | Default Behavior | Override |
+|-----------|-----------------|---------|
+| **Low** | Auto-skip Phase 2 | `--explore` forces exploration |
+| **Medium** | Ask user (unless `-y` → skip) | `--explore` forces, `--skip-explore` forces skip |
+| **High** | Always run | `--skip-explore` forces skip |
+
+Skip Phase 2 entirely when:
+- Complexity is Low AND `--explore` not set
+- OR `--skip-explore` flag is set
+- OR `-y` flag AND complexity is Medium
+
+### 2.3 Parallel Exploration
+
+Launch 1-4 parallel `cli-explore-agent` runs:
+
+```
+For each selected angle:
+  Agent(subagent_type="cli-explore-agent", prompt="
+    Explore codebase for: {user task description}
+    Angle: {angle}
+
+    ## Doc-Index Context (pre-loaded)
+    Features affected: {feature names + IDs}
+    Components: {component names + code locations}
+    Requirements: {requirement titles}
+    Architecture decisions: {ADR titles + decisions}
+
+    Focus exploration on {angle}-specific concerns.
+    Output: explore-json-schema format.
+  ")
+```
+
+Each agent receives doc-index context (feature-maps, tech-registry docs) to avoid cold-start.
+
+### 2.4 Save Exploration Results
+
+- Each exploration → `exploration-{angle}.json` (explore-json-schema)
+- Manifest → `explorations-manifest.json`:
+
+```json
+{
+  "explorations": [
+    { "angle": "patterns", "path": "exploration-patterns.json", "file_count": 12 },
+    { "angle": "security", "path": "exploration-security.json", "file_count": 8 }
+  ],
+  "total_files_discovered": 18,
+  "timestamp": "ISO8601"
+}
+```
+
+---
+
+## Phase 3: Clarification (NEW)
+
+### 3.1 Aggregate Clarification Needs
+
+Collect from three sources:
+1. **Exploration results**: `clarification_needs[]` from each exploration JSON
+2. **Doc-index gaps**: unmapped requirements, orphan components, missing feature coverage
+3. **Conflicting constraints**: contradictory architecture decisions, requirement priority conflicts
+
+### 3.2 Deduplicate & Batch
+
+- Merge duplicate/similar questions across exploration angles
+- Group into rounds (max 4 questions per AskUserQuestion call)
+- Prioritize: blocking questions first, nice-to-have last
+
+### 3.3 Skip Conditions
+
+Skip Phase 3 when:
+- `-y` flag is set
+- `--skip-clarify` flag is set
+- No clarification needs collected from any source
+- Complexity is Low AND Phase 2 was skipped (no exploration results to aggregate)
+
+### 3.4 Execute Clarification
+
+```
+AskUserQuestion(questions=[
+  {
+    question: "Which authentication strategy should the new endpoint use?",
+    header: "Auth strategy",
+    options: [
+      { label: "JWT Bearer (Recommended)", description: "Consistent with ADR-001 and existing auth middleware" },
+      { label: "API Key", description: "Simpler but inconsistent with current architecture" },
+      { label: "OAuth2", description: "Most flexible but higher implementation cost" }
+    ],
+    multiSelect: false
+  }
+])
+```
+
+Feed answers back into Phase 4 as constraints.
+
+---
+
+## Phase 4: Task Planning (NEW — produces plan.json + TASK-*.json)
+
+### 4.1 Planning Strategy Selection
+
+| Complexity | Strategy |
+|-----------|---------|
+| Low | Direct Claude planning (inline) |
+| Medium | cli-lite-planning-agent with doc-index context |
+| High | cli-lite-planning-agent with full exploration + doc-index context |
+
+### 4.2 Planning Input Assembly
+
+Combine:
+- User's original task description
+- Phase 1 impact map (features, requirements, components, ADRs)
+- Phase 2 exploration results (if executed)
+- Phase 3 clarification answers (if collected)
+- Relevant feature-map and tech-registry doc excerpts
+
+### 4.3 Execute Planning
+
+For **Low complexity** (direct):
+```
+Generate plan.json + TASK-*.json directly based on assembled context.
+```
+
+For **Medium/High complexity**:
+```
+Agent(subagent_type="cli-lite-planning-agent", prompt="
+  Task: {user task description}
+
+  ## Doc-Index Impact Map
+  {Phase 1 results}
+
+  ## Exploration Context
+  {Phase 2 results summary}
+
+  ## Clarification Answers
+  {Phase 3 answers}
+
+  ## Architecture Constraints
+  {ADR excerpts}
+
+  Generate plan following plan-overview-base-schema.
+  Generate tasks following task-schema.
+  Include doc_context in both plan.json and each TASK-*.json.
+")
+```
+
+### 4.3.1 Populate Task Artifacts (TASK-002)
+
+After task generation, enrich each TASK-*.json with artifacts[] field:
+
+1. Load doc-index.json from `.workflow/.doc-index/doc-index.json`
+2. For each task, extract feature_ids from task.doc_context
+3. Filter doc-index features/requirements matching task scope:
+   - Match by feature_ids in task.doc_context.feature_ids
+   - Include linked requirements via requirementIds
+   - Include linked components via componentIds
+4. Populate task.artifacts[] with filtered references:
+
+```json
+{
+  "artifacts": [
+    {
+      "type": "feature_spec",
+      "source": "doc-index",
+      "path": ".workflow/.doc-index/feature-maps/auth.md",
+      "feature_id": "feat-auth",
+      "usage": "Reference for authentication requirements"
+    },
+    {
+      "type": "requirement",
+      "source": "doc-index",
+      "path": ".workflow/.doc-index/doc-index.json#requirements[0]",
+      "feature_id": "feat-auth",
+      "requirement_id": "REQ-001",
+      "usage": "Acceptance criteria source"
+    },
+    {
+      "type": "component_doc",
+      "source": "doc-index",
+      "path": ".workflow/.doc-index/tech-registry/auth-service.md",
+      "component_id": "tech-auth-service",
+      "usage": "Implementation reference"
+    }
+  ]
+}
+```
+
+**Loading pattern** (following brainstorm pattern from action-planning-agent.md:200-214):
+- Load doc-index.json once for catalog
+- Filter by task-relevant feature IDs (1-3 per task)
+- Only include artifacts directly referenced in task scope
+- Use relative paths from task file location
+
+### 4.3.2 Populate Context Package Path (TASK-001)
+
+Set context_package_path field in each TASK-*.json:
+
+```json
+{
+  "context_package_path": "../.process/doc-context-package.json"
+}
+```
+
+Relative path from `.task/TASK-*.json` to `.process/doc-context-package.json`.
+
+### 4.3.3 Add Navigation Links Block (TASK-003)
+
+Add links{} navigation block to each TASK-*.json for improved discoverability:
+
+```json
+{
+  "links": {
+    "plan": "../plan.json",
+    "doc_index": "../../../doc-index.json",
+    "feature_maps": [
+      "../../../feature-maps/auth.md"
+    ],
+    "related_tasks": [
+      "TASK-002.json",
+      "TASK-003.json"
+    ]
+  }
+}
+```
+
+**Path computation**:
+- `plan`: Relative path from `.task/TASK-*.json` to `plan.json` (sibling of .task/)
+- `doc_index`: Relative path to `.workflow/.doc-index/doc-index.json`
+- `feature_maps`: Paths to feature-map docs from task.doc_context.feature_docs
+- `related_tasks`: Task IDs from task.depends_on or tasks sharing same feature_ids
+
+**Backward compatibility**: links{} is optional field (task-schema allows additionalProperties).
+
+### 4.4 Output Schema: plan.json
+
+Follows `plan-overview-base-schema` with ddd-specific `doc_context` extension:
+
+```json
+{
+  "summary": "...",
+  "approach": "...",
+  "task_ids": ["TASK-001", "TASK-002"],
+  "task_count": 2,
+  "complexity": "Medium",
+  "doc_context": {
+    "affected_features": ["feat-auth"],
+    "affected_requirements": ["REQ-001", "REQ-002"],
+    "affected_components": ["tech-auth-service"],
+    "architecture_constraints": ["ADR-001"],
+    "index_path": ".workflow/.doc-index/doc-index.json",
+    "symbol_docs": [
+      {
+        "symbol_urn": "deepwiki:symbol:<path>#L<start>-L<end>",
+        "name": "SymbolName",
+        "type": "class|function|method",
+        "doc_summary": "Generated documentation summary...",
+        "source_path": "src/path/to/file.ts",
+        "doc_path": ".deepwiki/file.md",
+        "freshness": "fresh|stale|unknown"
+      }
+    ]
+  },
+  "_metadata": {
+    "timestamp": "ISO8601",
+    "source": "cli-lite-planning-agent",
+    "plan_type": "feature",
+    "schema_version": "2.0",
+    "exploration_angles": ["patterns", "security"]
+  }
+}
+```
+
+### 4.5 Output Schema: TASK-*.json
+
+Follows `task-schema` with ddd-specific `doc_context` extension:
+
+```json
+{
+  "id": "TASK-001",
+  "title": "Add rate limiting middleware",
+  "description": "...",
+  "depends_on": [],
+  "convergence": {
+    "criteria": ["Rate limiter middleware exists and is registered", "Tests pass"],
+    "verification": "npm test -- --grep rate-limit",
+    "definition_of_done": "API endpoints enforce rate limits per ADR-001 specifications"
+  },
+  "doc_context": {
+    "feature_ids": ["feat-auth"],
+    "requirement_ids": ["REQ-001"],
+    "component_ids": ["tech-auth-service"],
+    "adr_ids": ["ADR-001"],
+    "feature_docs": ["feature-maps/auth.md"],
+    "component_docs": ["tech-registry/auth-service.md"],
+    "symbol_docs": [
+      {
+        "symbol_urn": "deepwiki:symbol:<path>#L<start>-L<end>",
+        "name": "SymbolName",
+        "type": "class|function|method",
+        "doc_summary": "Generated documentation summary...",
+        "source_path": "src/path/to/file.ts",
+        "doc_path": ".deepwiki/file.md",
+        "freshness": "fresh|stale|unknown"
+      }
+    ]
+  },
+  "files": [...],
+  "implementation": [...]
+}
+```
+
+### 4.6 Enrichment Rules
+
+Each task is enriched with:
+- `feature_ids`, `requirement_ids`, `component_ids`, `adr_ids` — traced from Phase 1
+- Relevant feature-map and tech-registry doc paths
+- Requirement acceptance criteria as convergence criteria source
+- ADR decisions as implementation constraints
+
+---
+
+## Phase 5: Confirmation & Handoff Selection
+
+### 5.1 Display Plan Summary
+
+Show:
+- Plan overview (summary, approach, complexity)
+- Task list with dependencies
+- Doc-index impact: which features/requirements/components will be affected
+- Estimated scope
+
+### 5.2 Handoff Options
+
+| Option | Description | When |
+|--------|-------------|------|
+| **ddd:execute** | Document-aware execution (recommended) | Default for ddd workflow |
+| **lite-execute** | Standard execution (no doc awareness) | When doc traceability not needed |
+| **direct** | Output context, manual work | User prefers manual coding |
+| **stop** | Planning only, no execution | Research/analysis tasks |
+
+### 5.3 Auto-Selection
+
+With `-y`: auto-select `ddd:execute`.
+
+Without `-y`: present options via AskUserQuestion.
+
+---
+
+## Phase 6: Handoff
+
+### 6.1 Build Execution Context
+
+Build `executionContext` compatible with lite-execute format:
+
+```json
+{
+  "plan_path": ".workflow/.doc-index/planning/{slug}/plan.json",
+  "task_dir": ".workflow/.doc-index/planning/{slug}/.task/",
+  "doc_index_path": ".workflow/.doc-index/doc-index.json",
+  "exploration_manifest": ".workflow/.doc-index/planning/{slug}/explorations-manifest.json",
+  "original_input": "user's task description"
+}
+```
+
+### 6.2 Invoke Selected Engine
+
+| Selection | Action |
+|-----------|--------|
+| `ddd:execute` | Invoke `/ddd:execute --in-memory` with executionContext |
+| `lite-execute` | Invoke `/workflow:lite-execute` with plan.json path |
+| `direct` | Display context package + file list for manual work |
+| `stop` | Output plan summary, end here |
+
+---
+
+## Flags
+
+| Flag | Effect |
+|------|--------|
+| `-y, --yes` | Skip clarification, auto-select ddd:execute |
+| `--explore` | Force Phase 2 exploration even for Low complexity |
+| `--skip-explore` | Skip Phase 2 (doc-index-guided exploration) |
+| `--skip-clarify` | Skip Phase 3 (clarification) only |
+
+## Output
+
+- **Primary**: plan.json + TASK-*.json in session folder
+- **Secondary**: planning-context.md (legacy format)
+- **Exploration**: exploration-{angle}.json files (if Phase 2 ran)
+- **Console**: Plan summary with doc-index impact
+
+## Integration Points
+
+- **Input from**: `doc-index.json` (built by `/ddd:index-build` or `/ddd:scan`)
+- **Output to**: `/ddd:execute`, `/workflow:lite-execute`, `/ddd:sync` post-task
+- **Schemas**: `plan-overview-ddd-schema.json` (plan output), `task-schema.json` + `task-ddd-extension-schema.json` (task output), `explore-json-schema.json`
+- **Triggers**: Before any development task in ddd workflow

.claude/commands/ddd/scan.md

@@ -0,0 +1,365 @@
+---
+name: scan
+description: Scan existing codebase to build document index without specs. Analyzes code structure, infers features, discovers components, and reverse-engineers project knowledge graph.
+argument-hint: "[-y|--yes] [--from-scratch] [--scope <dir>] \"optional project description\""
+allowed-tools: TodoWrite(*), Agent(*), AskUserQuestion(*), Read(*), Grep(*), Glob(*), Bash(*), Edit(*), Write(*), mcp__ace-tool__search_context(*)
+---
+
+## Auto Mode
+
+When `--yes` or `-y`: Auto-confirm feature groupings, component naming, skip interactive review.
+
+# DDD Scan Command (/ddd:scan)
+
+## Purpose
+
+For **existing projects without specifications**: analyze codebase to construct the document index by reverse-engineering project structure. This is the code-first entry point — no spec-generator required.
+
+```
+Codebase → Components → Features (inferred) → Requirements (inferred) → doc-index.json
+```
+
+## When to Use
+
+- Existing project, no spec-generator outputs
+- Want to start using doc-driven workflow on a legacy codebase
+- Quick project mapping for onboarding or audit
+
+## Prerequisite
+
+- A codebase must exist (src/, lib/, app/, or similar source directories)
+- Git repository recommended (for action history seeding)
+
+## Storage Location
+
+```
+.workflow/.doc-index/
+├── doc-index.json              ← Central index (primary output)
+├── feature-maps/               ← Inferred feature documentation
+│   ├── _index.md
+│   └── {feature-slug}.md
+├── tech-registry/              ← Discovered component documentation
+│   ├── _index.md
+│   └── {component-slug}.md
+└── action-logs/                ← Git history seeds
+    ├── _index.md
+    └── {act-hash}.md
+```
+
+## Phase 1: Project Structure Analysis
+
+### 1.1 Framework & Stack Detection
+
+```bash
+ccw cli -p "PURPOSE: Analyze project structure, tech stack, and architecture for documentation indexing.
+TASK:
+• Detect language/framework from manifest files (package.json, go.mod, Cargo.toml, requirements.txt, etc.)
+• Map directory structure: source dirs, test dirs, config dirs, entry points
+• Identify architectural pattern: monolith, microservices, monorepo, library, CLI tool
+• Detect key dependencies and their roles (ORM, HTTP framework, auth library, etc.)
+• List all major source directories with brief purpose description
+MODE: analysis
+CONTEXT: @**/*
+EXPECTED: JSON with: {
+  project_name, language, framework, architecture_pattern,
+  source_dirs: [{ path, purpose, file_count }],
+  dependencies: [{ name, role }],
+  entry_points: [{ path, description }]
+}
+CONSTRAINTS: Prioritize source directories | Ignore node_modules, dist, build, vendor" --tool gemini --mode analysis
+```
+
+### 1.2 Merge with project-tech.json
+
+If `.workflow/project-tech.json` exists, merge to reduce redundant analysis.
+
+## Phase 2: Component Discovery
+
+### 2.1 Deep Module Scan
+
+```bash
+ccw cli -p "PURPOSE: Discover all significant code components/modules for documentation indexing.
+TASK:
+• For each source directory, identify distinct modules/components
+• For each component extract:
+  - Name (class name, module name, or logical group)
+  - Type: service | controller | model | util | hook | route | config | middleware | component
+  - File paths (primary file + related files)
+  - Exported symbols (public API: classes, functions, types, constants)
+  - Internal dependencies: what other modules it imports from within the project
+  - Responsibility: one-line description of what it does
+• Group small utility files under parent module when they share domain
+MODE: analysis
+CONTEXT: @{source_dirs from Phase 1}
+EXPECTED: JSON array: [{ name, type, files, symbols, depends_on, responsibility }]
+CONSTRAINTS: Focus on business logic | Min threshold: components with 2+ exports or clear domain purpose | Group utilities under parent domain" --tool gemini --mode analysis
+```
+
+### 2.2 Generate Component IDs
+
+For each discovered component:
+- ID: `tech-{kebab-case-name}` (e.g., `tech-auth-service`, `tech-user-model`)
+- Validate uniqueness, append counter on collision
+
+### 2.3 Build Dependency Graph
+
+From `depends_on` fields, construct internal dependency edges:
+```
+tech-auth-service → tech-user-model
+tech-auth-service → tech-jwt-util
+tech-order-controller → tech-auth-service
+```
+
+## Phase 3: Feature Inference
+
+**Key step: group components into logical features without formal specs.**
+
+### 3.1 Inference Strategy (priority order)
+
+```
+Strategy 1 — Directory grouping:
+  src/auth/**       → feat-auth
+  src/orders/**     → feat-orders
+  src/payments/**   → feat-payments
+
+Strategy 2 — Route/endpoint grouping (web apps):
+  /api/users/*      → feat-user-management
+  /api/orders/*     → feat-order-management
+
+Strategy 3 — Dependency clustering:
+  Components that heavily import each other → same feature
+
+Strategy 4 — Domain keyword extraction:
+  Class names + file names → domain terms → feature names
+```
+
+### 3.2 Gemini Feature Synthesis
+
+```bash
+ccw cli -p "PURPOSE: Infer high-level features from discovered code components. This project has no formal specification.
+TASK:
+Given these discovered components:
+{component list from Phase 2: names, types, files, responsibilities, dependencies}
+
+• Group them into logical features (3-10 features for a typical project)
+• For each feature:
+  - name: human-readable (Chinese OK)
+  - component_ids: which components belong
+  - description: what the feature does (inferred from code)
+  - inferred_requirements: what this feature needs to accomplish (1-3 per feature)
+  - status: 'implemented' (code complete) or 'partial' (incomplete patterns)
+  - tags: search keywords
+• Identify cross-cutting concerns (logging, auth middleware, error handling) as separate features
+MODE: analysis
+CONTEXT: {component list JSON}
+EXPECTED: JSON: { features: [{ name, description, component_ids, inferred_requirements: [{ id, title }], status, tags }] }
+CONSTRAINTS: Every component must belong to at least 1 feature | Prefer fewer broad features over many narrow ones" --tool gemini --mode analysis
+```
+
+### 3.3 Interactive Feature Review (unless -y)
+
+Present inferred features to user:
+- Allow renaming, merging, splitting
+- Allow reassigning components between features
+- Confirm final feature list
+
+## Phase 4: Implicit Requirement & Architecture Extraction
+
+### 4.1 Inferred Requirements
+
+For each feature, generate lightweight requirement entries from its components:
+
+```
+Feature: feat-auth (User Authentication)
+  → IREQ-001: "Users can log in with email and password"     (from LoginController)
+  → IREQ-002: "JWT tokens for session management"            (from AuthMiddleware + jwt dep)
+  → IREQ-003: "Password reset via email"                     (from PasswordResetService)
+```
+
+**ID Convention**: `IREQ-NNN` — distinguishes inferred from formal `REQ-NNN`.
+
+### 4.2 Inferred Architecture Decisions
+
+Detect patterns from code + dependencies:
+
+```
+Express.js + JWT middleware    → IADR-001: "REST API with JWT authentication"
+Prisma ORM + PostgreSQL        → IADR-002: "PostgreSQL via Prisma ORM"
+React + Redux                  → IADR-003: "React frontend with Redux state"
+```
+
+**ID Convention**: `IADR-NNN` — distinguishes inferred from formal `ADR-NNN`.
+
+### 4.3 Glossary Generation
+
+Extract domain terms from:
+- Class/function names (CamelCase → terms)
+- Key business terms in comments and strings
+- Framework-specific terminology
+
+Write to `.workflow/.doc-index/glossary.json`.
+
+## Phase 5: Git History Seeds
+
+```bash
+git log --oneline --since="3 months ago" --no-merges --format="%H|%s|%ai" | head -30
+```
+
+For each significant commit:
+- Match changed files to discovered components
+- Create action entry with `type: "historical"`
+
+## Phase 6: Assemble doc-index.json
+
+Write the index with code-first markers:
+
+```json
+{
+  "version": "1.0",
+  "project": "{project-name}",
+  "build_path": "code-first",
+  "spec_session": null,
+  "last_updated": "ISO8601",
+  "glossary": [...],
+  "features": [{
+    "id": "feat-{slug}",
+    "name": "Feature Name",
+    "epicId": null,
+    "status": "implemented|partial",
+    "docPath": "feature-maps/{slug}.md",
+    "requirementIds": ["IREQ-NNN"],
+    "tags": ["tag"]
+  }],
+  "requirements": [{
+    "id": "IREQ-NNN",
+    "title": "Inferred requirement",
+    "source": "inferred",
+    "priority": "inferred",
+    "sourcePath": null,
+    "techComponentIds": ["tech-{slug}"],
+    "featureId": "feat-{slug}"
+  }],
+  "technicalComponents": [{
+    "id": "tech-{slug}",
+    "name": "ComponentName",
+    "type": "service|controller|model|...",
+    "responsibility": "One-line description",
+    "adrId": "IADR-NNN|null",
+    "docPath": "tech-registry/{slug}.md",
+    "codeLocations": [{ "path": "src/...", "symbols": [...] }],
+    "dependsOn": ["tech-{other}"],
+    "featureIds": ["feat-{slug}"],
+    "actionIds": []
+  }],
+  "architectureDecisions": [{
+    "id": "IADR-NNN",
+    "title": "Inferred decision",
+    "source": "inferred",
+    "sourcePath": null,
+    "componentIds": ["tech-{slug}"]
+  }],
+  "actions": [{
+    "id": "act-{short-hash}",
+    "description": "Commit message",
+    "type": "historical",
+    "status": "historical",
+    "affectedComponents": ["tech-{slug}"],
+    "relatedCommit": "full-hash",
+    "timestamp": "ISO8601"
+  }],
+  "freshness": {
+    "thresholds": { "warning": 0.3, "stale": 0.7 },
+    "weights": { "time": 0.1, "churn": 0.4, "symbol": 0.5 },
+    "time_decay_k": 0.05,
+    "auto_regenerate": false
+  },
+  "deepwiki_feature_to_symbol_index": {}
+}
+```
+
+
+## Phase 7: Build DeepWiki Feature-to-Symbol Index
+
+If DeepWiki is available (`.codexlens/deepwiki_index.db` exists):
+
+1. Collect all `codeLocations[].path` from `technicalComponents[]`
+2. Query DeepWiki: `POST /api/deepwiki/symbols-for-paths { paths: [...] }`
+3. Build `deepwiki_feature_to_symbol_index` by traversing:
+   `feature → requirementIds → techComponentIds → codeLocations → symbols`
+
+```json
+"deepwiki_feature_to_symbol_index": {
+  "feat-auth": [
+    "deepwiki:symbol:src/auth/jwt.ts#L30-L55",
+    "deepwiki:symbol:src/models/user.ts#L12-L40"
+  ]
+}
+```
+
+**Symbol URN format**: `deepwiki:symbol:<file_path>#L<start>-L<end>`
+
+**Graceful degradation**: If DeepWiki is unavailable, set `deepwiki_feature_to_symbol_index: {}` and log warning.
+
+## Phase 8: Generate Documents
+
+Delegate all document generation to `/ddd:doc-generate`:
+
+```
+Invoke /ddd:doc-generate [-y]
+```
+
+This generates the complete document tree (Layer 3 → 2 → 1):
+- `tech-registry/{slug}.md` — component docs (Layer 3)
+- `feature-maps/{slug}.md` — feature docs (Layer 2)
+- `_index.md`, `README.md`, `ARCHITECTURE.md`, `SCHEMA.md` — index/overview docs (Layer 1)
+
+See `/ddd:doc-generate` for full details on generation strategy and flags.
+
+## Phase 9: Validation & Report
+
+```
+Scan Report
+
+Project: {name} ({language}/{framework})
+Architecture: {pattern}
+Source dirs: {N}
+
+Discovered:
+  Components: {N} ({by type breakdown})
+  Features: {N} (inferred)
+  Requirements: {N} (IREQ, inferred)
+  Architecture Decisions: {N} (IADR, inferred)
+  Historical Actions: {N} (from git)
+
+Coverage:
+  Components → Features: {%}
+  Dependencies mapped: {%}
+
+Recommendations:
+  - Run /spec-generator to formalize {N} inferred requirements
+  - {N} components have unclear responsibility — review tech-registry docs
+  - Use /ddd:plan to start planning tasks with this index
+```
+
+## Flags
+
+| Flag | Effect |
+|------|--------|
+| `-y, --yes` | Auto-confirm all decisions |
+| `--from-scratch` | Delete existing index and rebuild |
+| `--scope <dir>` | Limit scan to specific directory (e.g., `--scope src/auth`) |
+
+## Upgrade Path: scan → spec
+
+When a scanned project later runs `spec-generator` + `/ddd:index-build`:
+- `/ddd:index-build` detects existing code-first index
+- Merges: `IREQ-NNN` → `REQ-NNN`, `IADR-NNN` → `ADR-NNN` where content overlaps
+- Updates `build_path` to `"spec-first"`
+- Preserves all `tech-*` and `feat-*` entries (updates links only)
+
+## Integration Points
+
+- **Input from**: Codebase, git history, `project-tech.json`
+- **Delegates to**: `/ddd:doc-generate` (Phase 8, full document generation)
+- **Output to**: `ddd:plan`, `ddd:sync`, `ddd:update`, `ddd:index-build` (upgrade)
+- **Standalone**: Can be used independently on any project

.claude/commands/ddd/sync.md

@@ -0,0 +1,321 @@
+---
+name: sync
+description: Post-task synchronization - update document index, generate action log, and refresh feature/component docs after completing a development task.
+argument-hint: "[-y|--yes] [--dry-run] [--from-manifest <path>] [--task-id <id>] [--commit <hash>] \"task summary\""
+allowed-tools: TodoWrite(*), Agent(*), AskUserQuestion(*), Read(*), Grep(*), Glob(*), Bash(*), Edit(*), Write(*), mcp__ace-tool__search_context(*)
+---
+
+## Auto Mode
+
+When `--yes` or `-y`: Auto-detect changes, auto-update all docs, skip review prompts.
+
+# DDD Sync Command (/ddd:sync)
+
+## Purpose
+
+After completing a development task, synchronize the document index with actual code changes:
+1. **Analyze** what changed (git diff)
+2. **Trace** which features/requirements/components are affected
+3. **Update** index entries (status, code locations, links)
+4. **Generate** action log entry
+5. **Refresh** feature-map and tech-registry documents
+
+## When to Use: sync vs update
+
+| Scenario | Use |
+|----------|-----|
+| Task completed, ready to commit | **ddd:sync** — full post-task reconciliation |
+| Mid-development, quick impact check | ddd:update |
+| Pre-commit validation | ddd:update --check-only |
+| Auto-triggered after ddd:execute | **ddd:sync** (automatic) |
+| Periodic index refresh during refactoring | ddd:update |
+
+**Rule of thumb**: `sync` = task boundary (done something), `update` = development pulse (doing something).
+
+## Prerequisite
+
+- `doc-index.json` must exist
+- Git repository with committed or staged changes
+
+## Phase 1: Change Detection
+
+### 0.1 Schema Version Check (TASK-006)
+
+Before processing changes, verify doc-index schema compatibility:
+
+```javascript
+const docIndex = JSON.parse(Read('.workflow/.doc-index/doc-index.json'));
+const schemaVersion = docIndex.schema_version || '0.0'; // Default for legacy
+
+if (schemaVersion !== '1.0') {
+  console.warn(`Schema version mismatch: found ${schemaVersion}, expected 1.0`);
+  console.warn('Consider running schema migration or regenerating doc-index with /ddd:scan');
+  // Continue with degraded functionality - may encounter missing fields
+}
+```
+
+**Graceful degradation**: If version mismatch detected → log warning → continue with caution (some features may not work as expected).
+
+### 1.0 Data Source Selection
+
+```
+IF --from-manifest <path>:
+  Load execution-manifest.json
+  → files_modified[] provides precise file list + action type + task attribution
+  → TASK-*.result.json provides symbol-level changes + convergence results
+  → Skip Phase 1.1/1.2 (already classified by execute)
+  → Proceed directly to Phase 2 with manifest data
+ELSE:
+  → Fall through to Phase 1.1 (git-based discovery)
+```
+
+**`--from-manifest` advantages** (used automatically by ddd:execute):
+- Precise file → task attribution (which task modified which file)
+- Symbol-level change tracking (not just file-level)
+- Convergence verification results carried forward to action-log
+- Survives process interruptions (manifest is persisted to disk)
+
+### 1.1 Identify Changes (git-based fallback)
+
+```bash
+# If --commit provided:
+git diff --name-only {commit}^..{commit}
+git diff --stat {commit}^..{commit}
+
+# If --task-id provided, find related commits:
+git log --oneline --grep="task-{id}" | head -10
+
+# Otherwise: changes since last ddd:sync
+git diff --name-only HEAD~1..HEAD
+```
+
+### 1.2 Classify Changes (git-based fallback)
+
+For each changed file, determine:
+- **Type**: added | modified | deleted | renamed
+- **Category**: source | test | config | docs | other
+- **Symbols affected**: parse diff for changed functions/classes (use Gemini if complex)
+
+## Phase 2: Impact Tracing (Layer-Based, TASK-004)
+
+**Strategy**: Trace impact through layers (files → components → features → indexes) following memory-manage pattern.
+
+### 2.1 Match to Index
+
+For each changed file path:
+
+```
+Search doc-index.json.technicalComponents[].codeLocations[].path
+→ Find matching component IDs (Layer 3)
+→ From components, find linked featureIds (Layer 2)
+→ From features, find linked requirementIds (Layer 2)
+```
+
+### 2.2 Discover New Components
+
+If changed files don't match any existing component:
+- Flag as potential new component
+- Ask user if it should be registered (or auto-register with `-y`)
+
+### 2.3 Build Impact Report
+
+```markdown
+## Impact Summary
+
+### Changed Files (5)
+- src/services/auth.ts (modified) → tech-auth-service → feat-auth
+- src/models/user.ts (modified) → tech-user-model → feat-auth
+- src/routes/login.ts (added) → NEW COMPONENT → feat-auth
+- src/tests/auth.test.ts (modified) → [test file, skip]
+- package.json (modified) → [config, skip]
+
+### Affected Features
+- feat-auth: User Authentication (2 components modified, 1 new)
+
+### Affected Requirements
+- REQ-001: Email login (implementation updated)
+- REQ-002: JWT token generation (implementation updated)
+```
+
+## Phase 2.4: DeepWiki Freshness Check
+
+If DeepWiki integration is configured (`doc-index.json.freshness` exists):
+
+### 2.4.1 Identify Modified Files
+From `execution-manifest.json` or git diff, collect `files_modified[]` with `action == "modified"`.
+
+### 2.4.2 Check Staleness
+Query DeepWiki: `POST /api/deepwiki/stale-files { files: [{path, hash}] }`
+
+For each stale file's symbols, calculate staleness score:
+```
+S(symbol) = min(1.0, w_t × T + w_c × C + w_s × M)
+```
+Where weights come from `doc-index.json.freshness.weights`.
+
+### 2.4.3 Score Propagation (max aggregation)
+```
+S_file      = max(S_symbol_1, S_symbol_2, ...)
+S_component = max(S_file_1, S_file_2, ...)
+S_feature   = max(S_component_1, S_component_2, ...)
+```
+
+### 2.4.4 Status Assignment
+Using thresholds from `doc-index.json.freshness.thresholds`:
+- `fresh`: score in [0, warning_threshold)
+- `warning`: score in [warning_threshold, stale_threshold)
+- `stale`: score in [stale_threshold, 1.0]
+
+### 2.4.5 Update Records
+- Update `deepwiki_symbols.staleness_score` and `deepwiki_files.staleness_score` in DeepWiki SQLite
+- Update `tech-registry/{slug}.md` YAML frontmatter with freshness block
+- Update `feature-maps/{slug}.md` YAML frontmatter with freshness block
+- Update `deepwiki_feature_to_symbol_index` in doc-index.json
+
+### 2.4.6 Staleness Report
+Add to action-log:
+- Number of stale symbols/files/components
+- Top-5 most stale items with scores
+- Auto-regeneration candidates (if `auto_regenerate: true` and score >= stale threshold)
+
+## Phase 3: Update Index
+
+### 3.0 Dry-Run Gate
+
+If `--dry-run` is set:
+- Execute Phase 3 analysis (determine what would change)
+- Display planned modifications as a preview report
+- Skip all file writes (Phase 3.1-3.5 and Phase 4)
+- Output: "Dry-run complete. Run without --dry-run to apply changes."
+
+### 3.0.1 Backup Index
+
+Before any modifications, create backup:
+- Copy `doc-index.json` → `doc-index.json.bak`
+- On failure: restore from `.bak` and report error
+- On success: remove `.bak`
+
+### 3.1 Update Technical Components
+
+For each affected component in `doc-index.json`:
+- Update `codeLocations` if file paths or line ranges changed
+- Update `symbols` if new exports were added
+- Add new `actionIds` entry
+
+### 3.2 Register New Components
+
+For newly discovered components:
+- Generate `tech-{slug}` ID
+- Create entry in `technicalComponents[]`
+- Link to appropriate features
+- Generate new `tech-registry/{slug}.md` document
+
+### 3.3 Update Feature Status
+
+For each affected feature:
+- If all requirements now have mapped components → `status: "implemented"`
+- If some requirements still unmapped → `status: "in-progress"`
+
+### 3.4 Add Action Entry
+
+```json
+{
+  "id": "task-{id}",
+  "description": "{task summary from user}",
+  "type": "feature|bugfix|refactor",
+  "status": "completed",
+  "affectedFeatures": ["feat-auth"],
+  "affectedComponents": ["tech-auth-service", "tech-user-model"],
+  "changedFiles": [
+    { "path": "src/services/auth.ts", "action": "modified", "task_id": "TASK-001" },
+    { "path": "src/models/user.ts", "action": "modified", "task_id": "TASK-001" }
+  ],
+  "symbolsChanged": ["AuthService.validate", "UserModel.toJSON"],
+  "convergenceResults": {
+    "passed": 2,
+    "total": 2,
+    "details": ["Rate limiter middleware exists", "Config accepts per-route limits"]
+  },
+  "verifyGate": "PASS|WARN|FAIL|skipped",
+  "relatedCommit": "{commit hash}",
+  "manifestPath": "{execution-manifest.json path | null}",
+  "timestamp": "ISO8601"
+}
+```
+
+### 3.5 Update Timestamp
+
+Set `doc-index.json.last_updated` to current time.
+
+## Phase 4: Refresh Documents & Action Log
+
+### 4.1 Delegate Document Refresh to /ddd:doc-refresh
+
+From Phase 2 impact tracing, collect affected component and feature IDs, then delegate:
+
+```
+Invoke /ddd:doc-refresh [-y] --components {affected_component_ids} --features {affected_feature_ids}
+```
+
+This handles Layer 3 → 2 → 1 selective document refresh. See `/ddd:doc-refresh` for full details.
+
+### 4.2 Generate Action Log Entry
+
+Create `.workflow/.doc-index/action-logs/{task-id}.md`:
+
+```markdown
+---
+id: task-{id}
+type: feature|bugfix|refactor
+status: completed
+features: [feat-auth]
+components: [tech-auth-service, tech-user-model]
+commit: {hash}
+timestamp: ISO8601
+---
+
+# Task: {summary}
+
+## Changes
+| File | Type | Component |
+|------|------|-----------|
+| src/services/auth.ts | modified | tech-auth-service |
+
+## Impact
+- Features affected: feat-auth
+- Requirements addressed: REQ-001, REQ-002
+
+## Staleness (if DeepWiki freshness enabled)
+| Item | Type | Score | Status |
+|------|------|-------|--------|
+| {symbol/file/component} | {type} | {score} | {fresh/warning/stale} |
+
+## Notes
+{any user-provided notes}
+```
+
+## Phase 5: Confirmation (unless -y)
+
+Present update summary to user:
+- Files updated in doc-index
+- New documents created
+- Status changes
+- Ask for confirmation before writing
+
+## Flags
+
+| Flag | Effect |
+|------|--------|
+| `-y, --yes` | Auto-confirm all updates |
+| `--dry-run` | Preview all changes without modifying any files |
+| `--from-manifest <path>` | Use execution-manifest.json as data source (auto-set by ddd:execute) |
+| `--task-id <id>` | Associate with specific task ID |
+| `--commit <hash>` | Analyze specific commit |
+
+## Integration Points
+
+- **Input from**: `execution-manifest.json` (preferred, from ddd:execute) OR Git history (fallback), `doc-index.json`, `/ddd:plan` output
+- **Delegates to**: `/ddd:doc-refresh` (Phase 4.1, selective document refresh)
+- **Output to**: Updated `doc-index.json`, feature-maps/, tech-registry/, action-logs/
+- **Triggers**: After completing any development task
+- **Data source priority**: `--from-manifest` > `--commit` > `--task-id` > git diff HEAD~1

.claude/commands/ddd/update.md

@@ -0,0 +1,160 @@
+---
+name: update
+description: Incremental index update - detect code changes and trace impact to related features/requirements. Lightweight alternative to full sync.
+argument-hint: "[-y|--yes] [--files <file1,file2,...>] [--staged] [--check-only]"
+allowed-tools: TodoWrite(*), AskUserQuestion(*), Read(*), Grep(*), Glob(*), Bash(*), Edit(*), Write(*), mcp__ace-tool__search_context(*)
+---
+
+## Auto Mode
+
+When `--yes` or `-y`: Auto-update index without confirmation prompts.
+
+# DDD Update Command (/ddd:update)
+
+## Purpose
+
+Lightweight incremental update: given a set of changed files, trace their impact through the document index and update affected entries. Unlike `/ddd:sync` (full post-task sync), this command focuses on keeping the index fresh during development.
+
+## When to Use: update vs sync
+
+| Scenario | Use |
+|----------|-----|
+| Quick impact check during development | **ddd:update** |
+| Preview what sync would change | **ddd:update --check-only** |
+| Task completed, full reconciliation | ddd:sync |
+| Register new components + update all docs | ddd:sync |
+
+**Rule of thumb**: `update` = lightweight pulse (during work), `sync` = full checkpoint (after work).
+
+## Use Cases
+
+1. **During development**: Quick check which docs are affected by current changes
+2. **Pre-commit check**: Ensure index is up-to-date before committing
+3. **Periodic refresh**: Update stale code locations after refactoring
+
+## Prerequisite
+
+- `doc-index.json` must exist at `.workflow/.doc-index/doc-index.json`
+
+## Phase 1: Identify Changed Files
+
+### Source Priority
+
+```
+1. --files <list>      → Explicit file list
+2. --staged            → git diff --cached --name-only
+3. (default)           → git diff --name-only (unstaged changes)
+```
+
+### Output
+
+List of changed file paths with change type (added/modified/deleted/renamed).
+
+## Phase 2: Trace Impact
+
+### 2.1 Forward Lookup (Code → Components → Features)
+
+For each changed file:
+
+```
+doc-index.json.technicalComponents[]
+  .codeLocations[].path MATCH changed_file
+  → component_ids[]
+
+doc-index.json.technicalComponents[component_ids]
+  .featureIds[]
+  → feature_ids[]
+
+doc-index.json.features[feature_ids]
+  .requirementIds[]
+  → requirement_ids[]
+```
+
+### 2.2 Orphan Detection
+
+Files not matching any component → flag as:
+- **Potential new component**: if in src/ directory
+- **Ignorable**: if in test/, docs/, config/ directories
+
+### 2.3 Impact Report
+
+```
+Impact Analysis for 3 changed files:
+
+  src/services/auth.ts (modified)
+    → Component: tech-auth-service (AuthService)
+    → Feature: feat-auth (User Authentication)
+    → Requirements: REQ-001, REQ-002
+
+  src/middleware/rate-limit.ts (added)
+    → No matching component (new file)
+    → Suggested: Register as new component
+
+  src/utils/hash.ts (modified)
+    → Component: tech-hash-util
+    → Features: feat-auth, feat-password-reset
+    → Requirements: REQ-001, REQ-005
+```
+
+## Phase 3: Update Index (unless --check-only)
+
+### 3.1 Update Code Locations
+
+For matched components:
+- If file was renamed → update `codeLocations[].path`
+- If file was deleted → remove code location entry
+- If symbols changed → update `symbols` list (requires AST or Gemini analysis)
+
+### 3.2 Register New Components (interactive unless -y)
+
+For orphan files in src/:
+- Prompt user for component name and type
+- Or auto-generate with `-y`: derive name from file path
+- Create `technicalComponents[]` entry
+- Ask which feature it belongs to (or auto-link by directory structure)
+
+### 3.3 Update Timestamps
+
+- Update `technicalComponents[].docPath` last_updated in corresponding .md
+- Update `doc-index.json.last_updated`
+
+## Phase 4: Refresh Documents (if updates were made)
+
+### 4.1 Delegate to /ddd:doc-refresh
+
+From Phase 2 impact tracing, collect affected component and feature IDs, then delegate:
+
+```
+Invoke /ddd:doc-refresh [-y] --minimal --components {affected_component_ids} --features {affected_feature_ids}
+```
+
+The `--minimal` flag ensures only metadata/frontmatter is updated (code locations, timestamps), skipping full content regeneration. This keeps the update lightweight.
+
+See `/ddd:doc-refresh` for full details.
+
+### 4.2 Skip If --check-only
+
+With `--check-only`, skip Phase 3 and Phase 4 entirely — only output the impact report.
+
+## Flags
+
+| Flag | Effect |
+|------|--------|
+| `-y, --yes` | Auto-confirm updates |
+| `--files <list>` | Explicit comma-separated file list |
+| `--staged` | Analyze staged (git cached) files |
+| `--check-only` | Report impact without modifying index |
+
+## Output
+
+- **Console**: Impact report showing affected features/requirements
+- **Updated**: `doc-index.json` (if not --check-only)
+- **Updated**: Affected tech-registry/ and feature-maps/ docs
+
+## Integration Points
+
+- **Input from**: Git working tree, `doc-index.json`
+- **Delegates to**: `/ddd:doc-refresh` (Phase 4.1, incremental document refresh with --minimal)
+- **Output to**: Updated `doc-index.json`, impact report
+- **Triggers**: During development, pre-commit, or periodic refresh
+- **Can chain to**: `/ddd:sync` for full post-task synchronization

.claude/commands/flow-create.md

@@ -86,14 +86,14 @@ async function selectCommandCategory() {
       header: "Category",
       options: [
         { label: "Planning", description: "lite-plan, plan, multi-cli-plan, tdd-plan, quick-plan-with-file" },
-        { label: "Execution", description: "lite-execute, execute, unified-execute-with-file" },
+        { label: "Execution", description: "execute, unified-execute-with-file" },
         { label: "Testing", description: "test-fix-gen, test-cycle-execute, test-gen, tdd-verify" },
         { label: "Review", description: "review-session-cycle, review-module-cycle, review-cycle-fix" },
         { label: "Bug Fix", description: "lite-plan --bugfix, debug-with-file" },
         { label: "Brainstorm", description: "brainstorm-with-file, brainstorm (unified skill)" },
         { label: "Analysis", description: "analyze-with-file" },
         { label: "Issue", description: "discover, plan, queue, execute, from-brainstorm, convert-to-plan" },
-        { label: "Utility", description: "clean, init, replan, status" }
+        { label: "Utility", description: "clean, spec:setup, spec:add, replan, status" }
       ],
       multiSelect: false
     }]
@@ -116,7 +116,6 @@ async function selectCommand(category) {
       { label: "/workflow:replan", description: "Update plan and execute changes" }
     ],
     'Execution': [
-      { label: "/workflow:lite-execute", description: "Execute from in-memory plan" },
       { label: "/workflow-execute", description: "Execute from planning session" },
       { label: "/workflow:unified-execute-with-file", description: "Universal execution engine" }
     ],
@@ -154,7 +153,7 @@ async function selectCommand(category) {
     ],
     'Utility': [
       { label: "/workflow:clean", description: "Intelligent code cleanup" },
-      { label: "/workflow:init", description: "Initialize project-level state" },
+      { label: "/workflow:spec:setup", description: "Initialize project-level state" },
       { label: "/workflow:replan", description: "Interactive workflow replanning" },
       { label: "/workflow:status", description: "Generate workflow status views" }
     ]
@@ -181,8 +180,8 @@ async function selectExecutionUnit() {
       header: "Unit",
       options: [
         // Planning + Execution Units
-        { label: "quick-implementation", description: "【lite-plan → lite-execute】" },
-        { label: "multi-cli-planning", description: "【multi-cli-plan → lite-execute】" },
+        { label: "quick-implementation", description: "【lite-plan】" },
+        { label: "multi-cli-planning", description: "【multi-cli-plan】" },
         { label: "full-planning-execution", description: "【plan → execute】" },
         { label: "verified-planning-execution", description: "【plan → plan-verify → execute】" },
         { label: "replanning-execution", description: "【replan → execute】" },
@@ -193,7 +192,7 @@ async function selectExecutionUnit() {
         // Review Units
         { label: "code-review", description: "【review-*-cycle → review-cycle-fix】" },
         // Bug Fix Units
-        { label: "bug-fix", description: "【lite-plan --bugfix → lite-execute】" },
+        { label: "bug-fix", description: "【lite-plan --bugfix】" },
         // Issue Units
         { label: "issue-workflow", description: "【discover → plan → queue → execute】" },
         { label: "rapid-to-issue", description: "【lite-plan → convert-to-plan → queue → execute】" },
@@ -303,8 +302,7 @@ async function defineSteps(templateDesign) {
   "description": "Quick implementation with testing",
   "level": 2,
   "steps": [
-    { "cmd": "/workflow-lite-plan", "args": "\"{{goal}}\"", "unit": "quick-implementation", "execution": { "type": "slash-command", "mode": "mainprocess" }, "contextHint": "Create lightweight implementation plan" },
-    { "cmd": "/workflow:lite-execute", "args": "--in-memory", "unit": "quick-implementation", "execution": { "type": "slash-command", "mode": "mainprocess" }, "contextHint": "Execute implementation based on plan" },
+    { "cmd": "/workflow-lite-plan", "args": "\"{{goal}}\"", "unit": "quick-implementation", "execution": { "type": "slash-command", "mode": "mainprocess" }, "contextHint": "Create lightweight implementation plan (includes execution)" },
     { "cmd": "/workflow-test-fix", "unit": "test-validation", "execution": { "type": "slash-command", "mode": "mainprocess" }, "contextHint": "Generate test tasks" },
     { "cmd": "/workflow-test-fix", "unit": "test-validation", "execution": { "type": "slash-command", "mode": "async" }, "contextHint": "Execute test-fix cycle until pass rate >= 95%" }
   ]
@@ -336,8 +334,7 @@ async function defineSteps(templateDesign) {
   "description": "Bug diagnosis and fix with testing",
   "level": 2,
   "steps": [
-    { "cmd": "/workflow-lite-plan", "args": "--bugfix \"{{goal}}\"", "unit": "bug-fix", "execution": { "type": "slash-command", "mode": "mainprocess" }, "contextHint": "Diagnose and plan bug fix" },
-    { "cmd": "/workflow:lite-execute", "args": "--in-memory", "unit": "bug-fix", "execution": { "type": "slash-command", "mode": "mainprocess" }, "contextHint": "Execute bug fix" },
+    { "cmd": "/workflow-lite-plan", "args": "--bugfix \"{{goal}}\"", "unit": "bug-fix", "execution": { "type": "slash-command", "mode": "mainprocess" }, "contextHint": "Diagnose, plan, and execute bug fix" },
     { "cmd": "/workflow-test-fix", "unit": "test-validation", "execution": { "type": "slash-command", "mode": "mainprocess" }, "contextHint": "Generate regression tests" },
     { "cmd": "/workflow-test-fix", "unit": "test-validation", "execution": { "type": "slash-command", "mode": "async" }, "contextHint": "Verify fix with tests" }
   ]
@@ -503,7 +500,7 @@ async function defineSteps(templateDesign) {
   "level": 3,
   "steps": [
     { "cmd": "/workflow-multi-cli-plan", "args": "\"{{goal}}\"", "unit": "multi-cli-planning", "execution": { "type": "slash-command", "mode": "mainprocess" }, "contextHint": "Gemini+Codex+Claude collaborative planning" },
-    { "cmd": "/workflow:lite-execute", "args": "--in-memory", "unit": "multi-cli-planning", "execution": { "type": "slash-command", "mode": "mainprocess" }, "contextHint": "Execute converged plan" },
+    // lite-execute is now an internal phase of multi-cli-plan (not invoked separately)
     { "cmd": "/workflow-test-fix", "unit": "test-validation", "execution": { "type": "slash-command", "mode": "mainprocess" }, "contextHint": "Generate tests" },
     { "cmd": "/workflow-test-fix", "unit": "test-validation", "execution": { "type": "slash-command", "mode": "async" }, "contextHint": "Execute test cycle" }
   ]
@@ -530,7 +527,7 @@ Each command has input/output ports for pipeline composition:
 | tdd-plan | requirement | tdd-tasks | tdd-planning-execution |
 | replan | session, feedback | replan | replanning-execution |
 | **Execution** |
-| lite-execute | plan, multi-cli-plan | code | (multiple) |
+| ~~lite-execute~~ | _(internal phase of lite-plan/multi-cli-plan, not standalone)_ | code | — |
 | execute | detailed-plan, verified-plan, replan, tdd-tasks | code | (multiple) |
 | **Testing** |
 | test-fix-gen | failing-tests, session | test-tasks | test-validation |
@@ -563,9 +560,9 @@ Each command has input/output ports for pipeline composition:
 
 | Unit Name | Commands | Purpose |
 |-----------|----------|---------|
-| **quick-implementation** | lite-plan → lite-execute | Lightweight plan and execution |
-| **multi-cli-planning** | multi-cli-plan → lite-execute | Multi-perspective planning and execution |
-| **bug-fix** | lite-plan --bugfix → lite-execute | Bug diagnosis and fix |
+| **quick-implementation** | lite-plan (Phase 1: plan → Phase 2: execute) | Lightweight plan and execution |
+| **multi-cli-planning** | multi-cli-plan (Phase 1: plan → Phase 2: execute) | Multi-perspective planning and execution |
+| **bug-fix** | lite-plan --bugfix (Phase 1: plan → Phase 2: execute) | Bug diagnosis and fix |
 | **full-planning-execution** | plan → execute | Detailed planning and execution |
 | **verified-planning-execution** | plan → plan-verify → execute | Planning with verification |
 | **replanning-execution** | replan → execute | Update plan and execute |

.claude/commands/idaw/run-coordinate.md

@@ -2,7 +2,7 @@
 name: run-coordinate
 description: IDAW coordinator - execute task skill chains via external CLI with hook callbacks and git checkpoints
 argument-hint: "[-y|--yes] [--task <id>[,<id>,...]] [--dry-run] [--tool <tool>]"
-allowed-tools: Task(*), AskUserQuestion(*), Read(*), Write(*), Bash(*), Glob(*), Grep(*)
+allowed-tools: Agent(*), AskUserQuestion(*), Read(*), Write(*), Bash(*), Glob(*), Grep(*)
 ---
 
 # IDAW Run Coordinate Command (/idaw:run-coordinate)
@@ -216,7 +216,7 @@ const chain = firstTask.skill_chain || SKILL_CHAIN_MAP[resolvedType] || SKILL_CH
 firstTask.status = 'in_progress';
 firstTask.task_type = resolvedType;
 firstTask.execution.started_at = new Date().toISOString();
-Write(`.workflow/.idaw/tasks/${firstTask.id}.json`, JSON.stringify(firstTask, null, 2));
+Write(`.workflow/.idaw/tasks/${firstTask.id}.json`, JSON.stringify(firstAgent, null, 2));
 
 // Update session
 session.current_task = firstTask.id;
@@ -239,7 +239,7 @@ CONSTRAINTS: Keep concise`;
 
 // Assemble prompt for first skill
 const skillName = chain[0];
-const prompt = assembleCliPrompt(skillName, firstTask, null, autoYes);
+const prompt = assembleCliPrompt(skillName, firstAgent, null, autoYes);
 
 session.prompts_used.push({
   task_id: firstTask.id,
@@ -403,7 +403,7 @@ CONSTRAINTS: Actionable diagnosis`;
     nextTask.status = 'in_progress';
     nextTask.task_type = nextType;
     nextTask.execution.started_at = new Date().toISOString();
-    Write(`.workflow/.idaw/tasks/${nextTaskId}.json`, JSON.stringify(nextTask, null, 2));
+    Write(`.workflow/.idaw/tasks/${nextTaskId}.json`, JSON.stringify(nextAgent, null, 2));
 
     session.current_task = nextTaskId;
     session.current_skill_index = 0;
@@ -417,7 +417,7 @@ CONSTRAINTS: Actionable diagnosis`;
     }
 
     const nextSkillName = nextChain[0];
-    const nextPrompt = assembleCliPrompt(nextSkillName, nextTask, null, true);
+    const nextPrompt = assembleCliPrompt(nextSkillName, nextAgent, null, true);
 
     session.prompts_used.push({
       task_id: nextTaskId,

.claude/commands/issue/discover-by-prompt.md

@@ -2,7 +2,7 @@
 name: issue:discover-by-prompt
 description: Discover issues from user prompt with Gemini-planned iterative multi-agent exploration. Uses ACE semantic search for context gathering and supports cross-module comparison (e.g., frontend vs backend API contracts).
 argument-hint: "[-y|--yes] <prompt> [--scope=src/**] [--depth=standard|deep] [--max-iterations=5]"
-allowed-tools: Skill(*), TodoWrite(*), Read(*), Bash(*), Task(*), AskUserQuestion(*), Glob(*), Grep(*), mcp__ace-tool__search_context(*), mcp__exa__search(*)
+allowed-tools: Skill(*), TodoWrite(*), Read(*), Bash(*), Agent(*), AskUserQuestion(*), Glob(*), Grep(*), mcp__ace-tool__search_context(*), mcp__exa__search(*)
 ---
 
 ## Auto Mode
@@ -404,7 +404,7 @@ while (shouldContinue && iteration < maxIterations) {
 
   // Step 3: Launch dimension agents with ACE context
   const agentPromises = iterationPlan.dimensions.map(dimension =>
-    Task({
+    Agent({
       subagent_type: "cli-explore-agent",
       run_in_background: false,
       description: `Explore ${dimension.name} (iteration ${iteration})`,

.claude/commands/issue/discover.md

@@ -2,7 +2,7 @@
 name: issue:discover
 description: Discover potential issues from multiple perspectives (bug, UX, test, quality, security, performance, maintainability, best-practices) using CLI explore. Supports Exa external research for security and best-practices perspectives.
 argument-hint: "[-y|--yes] <path-pattern> [--perspectives=bug,ux,...] [--external]"
-allowed-tools: Skill(*), TodoWrite(*), Read(*), Bash(*), Task(*), AskUserQuestion(*), Glob(*), Grep(*)
+allowed-tools: Skill(*), TodoWrite(*), Read(*), Bash(*), Agent(*), AskUserQuestion(*), Glob(*), Grep(*)
 ---
 
 ## Auto Mode
@@ -185,7 +185,7 @@ Launch N agents in parallel (one per selected perspective):
 ```javascript
 // Launch agents in parallel - agents write JSON and return summary
 const agentPromises = selectedPerspectives.map(perspective =>
-  Task({
+  Agent({
     subagent_type: "cli-explore-agent",
     run_in_background: false,
     description: `Discover ${perspective} issues`,
@@ -322,7 +322,7 @@ if (response === "Export to Issues") {
 **Perspective Analysis Agent**:
 
 ```javascript
-Task({
+Agent({
   subagent_type: "cli-explore-agent",
   run_in_background: false,
   description: `Discover ${perspective} issues`,
@@ -368,7 +368,7 @@ Task({
 **Exa Research Agent** (for security and best-practices):
 
 ```javascript
-Task({
+Agent({
   subagent_type: "cli-explore-agent",
   run_in_background: false,
   description: `External research for ${perspective} via Exa`,

.claude/commands/issue/execute.md

@@ -429,7 +429,7 @@ On failure, run:
       { timeout: 3600000, run_in_background: true }
     );
   } else {
-    return Task({
+    return Agent({
       subagent_type: 'code-developer',
       run_in_background: false,
       description: `Execute solution ${solutionId}`,

.claude/commands/issue/plan.md

@@ -2,7 +2,7 @@
 name: plan
 description: Batch plan issue resolution using issue-plan-agent (explore + plan closed-loop)
 argument-hint: "[-y|--yes] --all-pending <issue-id>[,<issue-id>,...] [--batch-size 3]"
-allowed-tools: TodoWrite(*), Task(*), Skill(*), AskUserQuestion(*), Bash(*), Read(*), Write(*)
+allowed-tools: TodoWrite(*), Agent(*), Skill(*), AskUserQuestion(*), Bash(*), Read(*), Write(*)
 ---
 
 ## Auto Mode
@@ -222,7 +222,7 @@ for (let i = 0; i < agentTasks.length; i += MAX_PARALLEL) {
 
   // Collect results from this chunk
   for (const { taskId, batchIndex } of taskIds) {
-    const result = TaskOutput(task_id=taskId, block=true);
+    const result = TaskOutput({ task_id: taskId, block: true });
 
     // Extract JSON from potential markdown code blocks (agent may wrap in ```json...```)
     const jsonText = extractJsonFromMarkdown(result);

.claude/commands/issue/queue.md

@@ -2,7 +2,7 @@
 name: queue
 description: Form execution queue from bound solutions using issue-queue-agent (solution-level)
 argument-hint: "[-y|--yes] [--queues <n>] [--issue <id>]"
-allowed-tools: TodoWrite(*), Task(*), Bash(*), Read(*), Write(*)
+allowed-tools: TodoWrite(*), Agent(*), Bash(*), Read(*), Write(*)
 ---
 
 ## Auto Mode
@@ -247,7 +247,7 @@ if (numQueues === 1) {
       description=`Queue ${i + 1}/${numQueues}: ${group.length} solutions`
     )
   );
-  // All agents launched in parallel via single message with multiple Task tool calls
+  // All agents launched in parallel via single message with multiple Agent tool calls
 }
 ```
 

.claude/commands/memory/prepare.md

@@ -2,7 +2,7 @@
 name: prepare
 description: Delegate to universal-executor agent to analyze project via Gemini/Qwen CLI and return JSON core content package for task context
 argument-hint: "[--tool gemini|qwen] \"task context description\""
-allowed-tools: Task(*), Bash(*)
+allowed-tools: Agent(*), Bash(*)
 examples:
   - /memory:prepare "在当前前端基础上开发用户认证功能"
   - /memory:prepare --tool qwen "重构支付模块API"

.claude/commands/workflow/brainstorm-with-file.md

@@ -2,7 +2,7 @@
 name: brainstorm-with-file
 description: Interactive brainstorming with multi-CLI collaboration, idea expansion, and documented thought evolution
 argument-hint: "[-y|--yes] [-c|--continue] [-m|--mode creative|structured] \"idea or topic\""
-allowed-tools: TodoWrite(*), Task(*), AskUserQuestion(*), Read(*), Grep(*), Glob(*), Bash(*), Edit(*), Write(*)
+allowed-tools: TodoWrite(*), Agent(*), AskUserQuestion(*), Read(*), Grep(*), Glob(*), Bash(*), Edit(*), Write(*)
 ---
 
 ## Auto Mode
@@ -29,40 +29,31 @@ When `--yes` or `-y`: Auto-confirm decisions, use recommended roles, balanced ex
 
 ## Output Artifacts
 
-### Phase 1: Seed Understanding
+| Phase | Artifact | Description |
+|-------|----------|-------------|
+| 1 | `brainstorm.md` | Complete thought evolution timeline (initialized) |
+| 1 | Session variables | Dimensions, roles, exploration vectors |
+| 2 | `exploration-codebase.json` | Codebase context from cli-explore-agent |
+| 2 | `perspectives.json` | Multi-CLI perspective findings (creative/pragmatic/systematic) |
+| 2 | Updated `brainstorm.md` | Round 2 multi-perspective exploration |
+| 3 | `ideas/{idea-slug}.md` | Deep-dive analysis for selected ideas |
+| 3 | Updated `brainstorm.md` | Round 3-6 refinement cycles |
+| 4 | `synthesis.json` | Final synthesis with top ideas, recommendations |
+| 4 | Final `brainstorm.md` | Complete thought evolution with conclusions |
 
-| Artifact | Description |
-|----------|-------------|
-| `brainstorm.md` | Complete thought evolution timeline (initialized) |
-| Session variables | Dimensions, roles, exploration vectors |
+## Output Structure
 
-### Phase 2: Divergent Exploration
-
-| Artifact | Description |
-|----------|-------------|
-| `exploration-codebase.json` | Codebase context from cli-explore-agent |
-| `perspectives.json` | Multi-CLI perspective findings (creative/pragmatic/systematic) |
-| Updated `brainstorm.md` | Round 2 multi-perspective exploration |
-
-### Phase 3: Interactive Refinement
-
-| Artifact | Description |
-|----------|-------------|
-| `ideas/{idea-slug}.md` | Deep-dive analysis for selected ideas |
-| Updated `brainstorm.md` | Round 3-6 refinement cycles |
-
-### Phase 4: Convergence & Crystallization
-
-| Artifact | Description |
-|----------|-------------|
-| `synthesis.json` | Final synthesis with top ideas, recommendations |
-| Final `brainstorm.md` | ⭐ Complete thought evolution with conclusions |
-
-## Overview
-
-Interactive brainstorming workflow with **multi-CLI collaboration** and **documented thought evolution**. Expands initial ideas through questioning, multi-perspective analysis, and iterative refinement.
-
-**Core workflow**: Seed Idea → Expand → Multi-CLI Discuss → Synthesize → Refine → Crystallize
+```
+.workflow/.brainstorm/BS-{slug}-{date}/
+├── brainstorm.md                  # ⭐ Complete thought evolution timeline
+├── exploration-codebase.json      # Phase 2: Codebase context
+├── perspectives.json              # Phase 2: Multi-CLI findings
+├── synthesis.json                 # Phase 4: Final synthesis
+└── ideas/                         # Phase 3: Individual idea deep-dives
+    ├── idea-1.md
+    ├── idea-2.md
+    └── merged-idea-1.md
+```
 
 ```
 ┌─────────────────────────────────────────────────────────────────────────┐
@@ -102,31 +93,12 @@ Interactive brainstorming workflow with **multi-CLI collaboration** and **docume
 └─────────────────────────────────────────────────────────────────────────┘
 ```
 
-## Output Structure
-
-```
-.workflow/.brainstorm/BS-{slug}-{date}/
-├── brainstorm.md                  # ⭐ Complete thought evolution timeline
-├── exploration-codebase.json      # Phase 2: Codebase context
-├── perspectives.json              # Phase 2: Multi-CLI findings
-├── synthesis.json                 # Phase 4: Final synthesis
-└── ideas/                         # Phase 3: Individual idea deep-dives
-    ├── idea-1.md
-    ├── idea-2.md
-    └── merged-idea-1.md
-```
-
 ## Implementation
 
 ### Session Initialization
 
-**Objective**: Create session context and directory structure for brainstorming.
-
-**Required Actions**:
 1. Extract idea/topic from `$ARGUMENTS`
-2. Generate session ID: `BS-{slug}-{date}`
-   - slug: lowercase, alphanumeric + Chinese, max 40 chars
-   - date: YYYY-MM-DD (UTC+8)
+2. Generate session ID: `BS-{slug}-{date}` (slug: lowercase, alphanumeric + Chinese, max 40 chars; date: YYYY-MM-DD UTC+8)
 3. Define session folder: `.workflow/.brainstorm/{session-id}`
 4. Parse command options:
    - `-c` or `--continue` for session continuation
@@ -135,54 +107,41 @@ Interactive brainstorming workflow with **multi-CLI collaboration** and **docume
 5. Auto-detect mode: If session folder + brainstorm.md exist → continue mode
 6. Create directory structure: `{session-folder}/ideas/`
 
-**Session Variables**:
-- `sessionId`: Unique session identifier
-- `sessionFolder`: Base directory for all artifacts
-- `brainstormMode`: creative | structured | balanced
-- `autoMode`: Boolean for auto-confirmation
-- `mode`: new | continue
+7. **Create Progress Tracking** (TodoWrite — MANDATORY):
+   ```
+   TodoWrite([
+     { id: "phase-1", title: "Phase 1: Seed Understanding", status: "in_progress" },
+     { id: "phase-2", title: "Phase 2: Divergent Exploration", status: "pending" },
+     { id: "phase-3", title: "Phase 3: Interactive Refinement", status: "pending" },
+     { id: "phase-4", title: "Phase 4: Convergence & Crystallization", status: "pending" },
+     { id: "next-step", title: "GATE: Post-Completion Next Step", status: "pending" }
+   ])
+   ```
+   - Update status to `"in_progress"` when entering each phase, `"completed"` when done
+   - **`next-step` is a terminal gate** — workflow is NOT complete until this todo is `"completed"`
+
+**Session Variables**: `sessionId`, `sessionFolder`, `brainstormMode` (creative|structured|balanced), `autoMode` (boolean), `mode` (new|continue)
 
 ### Phase 1: Seed Understanding
 
-**Objective**: Analyze topic, select roles, gather user input, expand into exploration vectors.
-
-**Prerequisites**:
-- Session initialized with valid sessionId and sessionFolder
-- Topic/idea available from $ARGUMENTS
-
-**Workflow Steps**:
-
 1. **Parse Seed & Identify Dimensions**
-   - Match topic keywords against BRAINSTORM_DIMENSIONS
-   - Identify relevant dimensions: technical, ux, business, innovation, feasibility, scalability, security
+   - Match topic keywords against Brainstorm Dimensions table
    - Default dimensions based on brainstormMode if no match
 
 2. **Role Selection**
-   - **Recommend roles** based on topic keywords (see Role Keywords mapping)
-   - **Options**:
-     - **Professional roles**: system-architect, product-manager, ui-designer, ux-expert, data-architect, test-strategist, subject-matter-expert, product-owner, scrum-master
-     - **Simple perspectives**: creative/pragmatic/systematic (fallback)
+   - Recommend roles based on topic keywords (see Role Selection tables)
+   - **Professional roles**: system-architect, product-manager, ui-designer, ux-expert, data-architect, test-strategist, subject-matter-expert, product-owner, scrum-master
+   - **Simple perspectives** (fallback): creative/pragmatic/systematic
    - **Auto mode**: Select top 3 recommended professional roles
    - **Manual mode**: AskUserQuestion with recommended roles + "Use simple perspectives" option
 
 3. **Initial Scoping Questions** (if new session + not auto mode)
-   - **Direction**: Multi-select from directions generated by detected dimensions (see Brainstorm Dimensions)
+   - **Direction**: Multi-select from directions generated by detected dimensions
    - **Depth**: Single-select from quick/balanced/deep (15-20min / 30-60min / 1-2hr)
    - **Constraints**: Multi-select from existing architecture, time, resources, or no constraints
 
 4. **Expand Seed into Exploration Vectors**
-   - Launch Gemini CLI with analysis mode
-   - Generate 5-7 exploration vectors:
-     - Core question: Fundamental problem/opportunity
-     - User perspective: Who benefits and how
-     - Technical angle: What enables this
-     - Alternative approaches: Other solutions
-     - Challenges: Potential blockers
-     - Innovation angle: 10x better approach
-     - Integration: Fit with existing systems
-   - Parse result into structured vectors
 
-**CLI Call Example**:
 ```javascript
 Bash({
   command: `ccw cli -p "
@@ -205,47 +164,16 @@ Output as structured exploration vectors for multi-perspective analysis.
 })
 ```
 
-5. **Initialize brainstorm.md**
-   - Create brainstorm.md with session metadata
-   - Add initial context: user focus, depth, constraints
-   - Add seed expansion: original idea + exploration vectors
-   - Create empty sections for thought evolution timeline
+5. **Initialize brainstorm.md** with session metadata, initial context (user focus, depth, constraints), seed expansion (original idea + exploration vectors), empty thought evolution timeline sections
 
-**Success Criteria**:
-- Session folder created with brainstorm.md initialized
-- 1-3 roles selected (professional or simple perspectives)
-- 5-7 exploration vectors generated
-- User preferences captured (direction, depth, constraints)
+**TodoWrite**: Update `phase-1` → `"completed"`, `phase-2` → `"in_progress"`
 
 ### Phase 2: Divergent Exploration
 
-**Objective**: Gather codebase context, then execute multi-perspective analysis in parallel.
-
-**Prerequisites**:
-- Phase 1 completed successfully
-- Roles selected and stored
-- brainstorm.md initialized
-
-**Workflow Steps**:
-
 1. **Primary Codebase Exploration via cli-explore-agent** (⚠️ FIRST)
-   - Agent type: `cli-explore-agent`
-   - Execution mode: synchronous (run_in_background: false)
-   - **Tasks**:
-     - Run: `ccw tool exec get_modules_by_depth '{}'`
-     - Search code related to topic keywords
-     - Read: `.workflow/project-tech.json` if exists
-   - **Output**: `{sessionFolder}/exploration-codebase.json`
-     - relevant_files: [{path, relevance, rationale}]
-     - existing_patterns: []
-     - architecture_constraints: []
-     - integration_points: []
-     - inspiration_sources: []
-   - **Purpose**: Enrich CLI prompts with codebase context
 
-**Agent Call Example**:
 ```javascript
-Task({
+Agent({
   subagent_type: "cli-explore-agent",
   run_in_background: false,
   description: `Explore codebase for brainstorm: ${topicSlug}`,
@@ -281,147 +209,67 @@ Schema:
 }
 `
 })
+```
 
 2. **Multi-CLI Perspective Analysis** (⚠️ AFTER exploration)
-   - Launch 3 CLI calls in parallel (Gemini/Codex/Claude)
-   - **Perspectives**:
-     - **Creative (Gemini)**: Innovation, cross-domain inspiration, challenge assumptions
-     - **Pragmatic (Codex)**: Implementation reality, feasibility, technical blockers
-     - **Systematic (Claude)**: Architecture, decomposition, scalability
-   - **Shared context**: Include exploration-codebase.json findings in prompts
-   - **Execution**: Bash with run_in_background: true, wait for all results
-   - **Output**: perspectives.json with creative/pragmatic/systematic sections
 
-**Multi-CLI Call Example** (parallel execution):
+Build shared context from exploration results:
+
 ```javascript
-// Build shared context from exploration results
 const explorationContext = `
 PRIOR EXPLORATION CONTEXT (from cli-explore-agent):
 - Key files: ${explorationResults.relevant_files.slice(0,5).map(f => f.path).join(', ')}
 - Existing patterns: ${explorationResults.existing_patterns.slice(0,3).join(', ')}
 - Architecture constraints: ${explorationResults.architecture_constraints.slice(0,3).join(', ')}
 - Integration points: ${explorationResults.integration_points.slice(0,3).join(', ')}`
+```
 
-// Launch 3 CLI calls in parallel (single message, multiple Bash calls)
+Launch 3 parallel CLI calls (`run_in_background: true` each), one per perspective:
+
+| Perspective | Tool | PURPOSE | Key TASK bullets | EXPECTED | CONSTRAINTS |
+|-------------|------|---------|-----------------|----------|-------------|
+| Creative | gemini | Generate innovative ideas | Challenge assumptions, cross-domain inspiration, moonshot + practical ideas | 5+ creative ideas with novelty/impact ratings | structured mode: keep feasible |
+| Pragmatic | codex | Implementation reality | Evaluate feasibility, estimate complexity, identify blockers, incremental approach | 3-5 practical approaches with effort/risk ratings | Current tech stack |
+| Systematic | claude | Architectural thinking | Decompose problems, identify patterns, map dependencies, scalability | Problem decomposition, 2-3 approaches with tradeoffs | Existing architecture |
+
+```javascript
+// Each perspective uses this prompt structure (launch all 3 in parallel):
 Bash({
   command: `ccw cli -p "
-PURPOSE: Creative brainstorming for '${idea_or_topic}' - generate innovative ideas
-Success: 5+ unique creative solutions that push boundaries
+PURPOSE: ${perspective} brainstorming for '${idea_or_topic}' - ${purposeFocus}
+Success: ${expected}
 
 ${explorationContext}
 
 TASK:
-• Build on existing patterns - how can they be extended creatively?
-• Think beyond obvious solutions - what would be surprising/delightful?
-• Explore cross-domain inspiration
-• Challenge assumptions - what if the opposite were true?
-• Generate 'moonshot' ideas alongside practical ones
+• Build on explored ${contextType} - how to ${actionVerb}?
+${perspectiveSpecificBullets}
 
 MODE: analysis
 CONTEXT: @**/* | Topic: ${idea_or_topic}
-EXPECTED: 5+ creative ideas with novelty/impact ratings, challenged assumptions, cross-domain inspirations
-CONSTRAINTS: ${brainstormMode === 'structured' ? 'Keep ideas technically feasible' : 'No constraints - think freely'}
-" --tool gemini --mode analysis`,
+EXPECTED: ${expected}
+CONSTRAINTS: ${constraints}
+" --tool ${tool} --mode analysis`,
   run_in_background: true
 })
-
-Bash({
-  command: `ccw cli -p "
-PURPOSE: Pragmatic brainstorming for '${idea_or_topic}' - focus on implementation reality
-Success: Actionable approaches with clear implementation paths
-
-${explorationContext}
-
-TASK:
-• Build on explored codebase - how to integrate with existing patterns?
-• Evaluate technical feasibility of core concept
-• Identify existing patterns/libraries that could help
-• Estimate implementation complexity
-• Highlight potential technical blockers
-• Suggest incremental implementation approach
-
-MODE: analysis
-CONTEXT: @**/* | Topic: ${idea_or_topic}
-EXPECTED: 3-5 practical approaches with effort/risk ratings, dependencies, quick wins vs long-term
-CONSTRAINTS: Focus on what can actually be built with current tech stack
-" --tool codex --mode analysis`,
-  run_in_background: true
-})
-
-Bash({
-  command: `ccw cli -p "
-PURPOSE: Systematic brainstorming for '${idea_or_topic}' - architectural thinking
-Success: Well-structured solution framework with clear tradeoffs
-
-${explorationContext}
-
-TASK:
-• Build on explored architecture - how to extend systematically?
-• Decompose the problem into sub-problems
-• Identify architectural patterns that apply
-• Map dependencies and interactions
-• Consider scalability implications
-• Propose systematic solution structure
-
-MODE: analysis
-CONTEXT: @**/* | Topic: ${idea_or_topic}
-EXPECTED: Problem decomposition, 2-3 architectural approaches with tradeoffs, scalability assessment
-CONSTRAINTS: Consider existing system architecture
-" --tool claude --mode analysis`,
-  run_in_background: true
-})
-
 // ⚠️ STOP POINT: Wait for hook callback to receive all results before continuing
 ```
 
 3. **Aggregate Multi-Perspective Findings**
-   - Consolidate creative/pragmatic/systematic results
-   - Extract synthesis:
-     - Convergent themes (all agree)
-     - Conflicting views (need resolution)
-     - Unique contributions (perspective-specific insights)
+   - Convergent themes (all agree), conflicting views (need resolution), unique contributions
    - Write to perspectives.json
 
-4. **Update brainstorm.md**
-   - Append Round 2 section with multi-perspective exploration
-   - Include creative/pragmatic/systematic findings
-   - Add perspective synthesis
-
-**CLI Prompt Template**:
-- **PURPOSE**: Role brainstorming for topic - focus description
-- **TASK**: Bullet list of specific actions
-- **MODE**: analysis
-- **CONTEXT**: @**/* | Topic + Exploration vectors + Codebase findings
-- **EXPECTED**: Output format requirements
-- **CONSTRAINTS**: Role-specific constraints
-
-**Success Criteria**:
-- exploration-codebase.json created with codebase context
-- perspectives.json created with 3 perspective analyses
-- brainstorm.md updated with Round 2 findings
-- All CLI calls completed successfully
+4. **Update brainstorm.md** with Round 2 multi-perspective exploration and synthesis
 
 ### Phase 3: Interactive Refinement
 
-**Objective**: Iteratively refine ideas through user-guided exploration cycles.
+**Guideline**: Delegate complex tasks to agents (cli-explore-agent, code-developer, universal-executor) or CLI calls. Avoid direct analysis/execution in main process.
 
-**Prerequisites**:
-- Phase 2 completed successfully
-- perspectives.json contains initial ideas
-- brainstorm.md has Round 2 findings
-
-**Guideline**: For complex tasks (code analysis, implementation, POC creation), delegate to agents via Task tool (cli-explore-agent, code-developer, universal-executor) or CLI calls (ccw cli). Avoid direct analysis/execution in main process.
-
-**Workflow Steps**:
-
-1. **Present Current State**
-   - Extract top ideas from perspectives.json
-   - Display with: title, source, brief description, novelty/feasibility ratings
-   - List open questions
+1. **Present Current State**: Extract top ideas from perspectives.json with title, source, description, novelty/feasibility ratings
 
 2. **Gather User Direction** (AskUserQuestion)
-   - **Question 1**: Which ideas to explore (multi-select from top ideas)
-   - **Question 2**: Next step (single-select):
+   - **Q1**: Which ideas to explore (multi-select from top ideas)
+   - **Q2**: Next step (single-select):
      - **深入探索**: Deep dive on selected ideas
      - **继续发散**: Generate more ideas
      - **挑战验证**: Devil's advocate challenge
@@ -430,44 +278,14 @@ CONSTRAINTS: Consider existing system architecture
 
 3. **Execute User-Selected Action**
 
-   **Deep Dive** (per selected idea):
-   - Launch Gemini CLI with analysis mode
-   - Tasks: Elaborate concept, implementation requirements, challenges, POC approach, metrics, dependencies
-   - Output: `{sessionFolder}/ideas/{idea-slug}.md`
+| Action | Tool | Output | Key Tasks |
+|--------|------|--------|-----------|
+| Deep Dive | Gemini CLI | ideas/{slug}.md | Elaborate concept, requirements, challenges, POC approach, metrics, dependencies |
+| Generate More | Selected CLI | Updated perspectives.json | New angles from unexplored vectors |
+| Challenge | Codex CLI | Challenge results | 3 objections per idea, challenge assumptions, failure scenarios, survivability (1-5) |
+| Merge | Gemini CLI | ideas/merged-{slug}.md | Complementary elements, resolve contradictions, unified concept |
 
-   **Generate More Ideas**:
-   - Launch CLI with new angles from unexplored vectors
-   - Add results to perspectives.json
-
-   **Devil's Advocate Challenge**:
-   - Launch Codex CLI with analysis mode
-   - Tasks: Identify objections, challenge assumptions, failure scenarios, alternatives, survivability rating
-   - Return challenge results for idea strengthening
-
-   **Merge Ideas**:
-   - Launch Gemini CLI with analysis mode
-   - Tasks: Identify complementary elements, resolve contradictions, create unified concept
-   - Add merged idea to perspectives.json
-
-4. **Update brainstorm.md**
-   - Append Round N section with findings
-   - Document user direction and action results
-
-5. **Repeat or Converge**
-   - Continue loop (max 6 rounds) or exit to Phase 4
-
-**Refinement Actions**:
-
-| Action | Tool | Output | Description |
-|--------|------|--------|-------------|
-| Deep Dive | Gemini CLI | ideas/{slug}.md | Comprehensive idea analysis |
-| Generate More | Selected CLI | Updated perspectives.json | Additional idea generation |
-| Challenge | Codex CLI | Challenge results | Critical weaknesses exposed |
-| Merge | Gemini CLI | Merged idea | Synthesized concept |
-
-**CLI Call Examples for Refinement Actions**:
-
-**1. Deep Dive on Selected Idea**:
+**Deep Dive CLI Call**:
 ```javascript
 Bash({
   command: `ccw cli -p "
@@ -483,27 +301,18 @@ TASK:
 • Map related/dependent features
 
 MODE: analysis
-
 CONTEXT: @**/*
 Original idea: ${idea.description}
 Source perspective: ${idea.source}
-User interest reason: ${idea.userReason || 'Selected for exploration'}
-
-EXPECTED:
-- Detailed concept description
-- Technical requirements list
-- Risk/challenge matrix
-- MVP definition
-- Success criteria
-- Recommendation: pursue/pivot/park
 
+EXPECTED: Detailed concept, technical requirements, risk matrix, MVP definition, success criteria, recommendation (pursue/pivot/park)
 CONSTRAINTS: Focus on actionability
 " --tool gemini --mode analysis`,
   run_in_background: false
 })
 ```
 
-**2. Devil's Advocate Challenge**:
+**Devil's Advocate CLI Call**:
 ```javascript
 Bash({
   command: `ccw cli -p "
@@ -518,25 +327,17 @@ TASK:
 • Challenge core assumptions
 • Identify scenarios where this fails
 • Consider competitive/alternative solutions
-• Assess whether this solves the right problem
 • Rate survivability after challenge (1-5)
 
 MODE: analysis
-
-EXPECTED:
-- Per-idea challenge report
-- Critical weaknesses exposed
-- Counter-arguments to objections (if any)
-- Ideas that survive the challenge
-- Modified/strengthened versions
-
+EXPECTED: Per-idea challenge report, critical weaknesses, survivability ratings, modified/strengthened versions
 CONSTRAINTS: Be genuinely critical, not just contrarian
 " --tool codex --mode analysis`,
   run_in_background: false
 })
 ```
 
-**3. Merge Multiple Ideas**:
+**Merge Ideas CLI Call**:
 ```javascript
 Bash({
   command: `ccw cli -p "
@@ -553,93 +354,81 @@ ${i+1}. ${idea.title} (${idea.source})
 TASK:
 • Identify complementary elements
 • Resolve contradictions
-• Create unified concept
-• Preserve key strengths from each
-• Describe the merged solution
+• Create unified concept preserving key strengths
 • Assess viability of merged idea
 
 MODE: analysis
-
-EXPECTED:
-- Merged concept description
-- Elements taken from each source idea
-- Contradictions resolved (or noted as tradeoffs)
-- New combined strengths
-- Implementation considerations
-
+EXPECTED: Merged concept, elements from each source, contradictions resolved, implementation considerations
 CONSTRAINTS: Don't force incompatible ideas together
 " --tool gemini --mode analysis`,
   run_in_background: false
 })
 ```
 
-**Success Criteria**:
-- User-selected ideas processed
-- brainstorm.md updated with all refinement rounds
-- ideas/ folder contains deep-dive documents for selected ideas
-- Exit condition reached (user selects "准备收敛" or max rounds)
+4. **Update brainstorm.md** with Round N findings
+5. **Repeat or Converge**: Continue loop (max 6 rounds) or exit to Phase 4
+
+**TodoWrite**: Update `phase-2` → `"completed"` (after first round enters Phase 3), `phase-3` → `"in_progress"`
+**TodoWrite** (on exit loop): Update `phase-3` → `"completed"`, `phase-4` → `"in_progress"`
 
 ### Phase 4: Convergence & Crystallization
 
-**Objective**: Synthesize final ideas, generate conclusions, offer next steps.
-
-**Prerequisites**:
-- Phase 3 completed successfully
-- Multiple rounds of refinement documented
-- User ready to converge
-
-**Workflow Steps**:
-
-1. **Generate Final Synthesis**
-   - Consolidate all ideas from perspectives.json and refinement rounds
-   - **Top ideas**: Filter active ideas, sort by score, take top 5
-     - Include: title, description, source_perspective, score, novelty, feasibility, strengths, challenges, next_steps
-   - **Parked ideas**: Ideas marked as parked with reason and future trigger
+1. **Generate Final Synthesis** → Write to synthesis.json
+   - **Top ideas**: Filter active, sort by score, top 5 with title, description, source_perspective, score, novelty, feasibility, strengths, challenges, next_steps
+   - **Parked ideas**: With reason and future trigger
    - **Key insights**: Process discoveries, challenged assumptions, unexpected connections
-   - **Recommendations**: Primary recommendation, alternatives, not recommended
+   - **Recommendations**: Primary, alternatives, not recommended
    - **Follow-up**: Implementation/research/validation summaries
-   - Write to synthesis.json
 
-2. **Final brainstorm.md Update**
-   - Append synthesis & conclusions section
-   - **Executive summary**: High-level overview
-   - **Top ideas**: Ranked with descriptions, strengths, challenges, next steps
-   - **Primary recommendation**: Best path forward with rationale
-   - **Alternative approaches**: Other viable options with tradeoffs
-   - **Parked ideas**: Future considerations
-   - **Key insights**: Learnings from the process
-   - **Session statistics**: Rounds, ideas generated/survived, duration
+**synthesis.json Schema**: `session_id`, `topic`, `completed` (timestamp), `total_rounds`, `top_ideas[]`, `parked_ideas[]`, `key_insights[]`, `recommendations` (primary/alternatives/not_recommended), `follow_up[]`
 
-3. **Post-Completion Options** (AskUserQuestion)
-   - **创建实施计划**: Launch workflow-plan with top idea
-   - **创建Issue**: Launch issue-discover for top 3 ideas
-   - **深入分析**: Launch workflow:analyze-with-file for top idea
-   - **导出分享**: Generate shareable report
-   - **完成**: No further action
+2. **Final brainstorm.md Update**: Executive summary, top ideas ranked, primary recommendation with rationale, alternative approaches, parked ideas, key insights, session statistics (rounds, ideas generated/survived, duration)
 
-**synthesis.json Schema**:
-- `session_id`: Session identifier
-- `topic`: Original idea/topic
-- `completed`: Completion timestamp
-- `total_rounds`: Number of refinement rounds
-- `top_ideas[]`: Top 5 ranked ideas
-- `parked_ideas[]`: Ideas parked for future
-- `key_insights[]`: Process learnings
-- `recommendations`: Primary/alternatives/not_recommended
-- `follow_up[]`: Next step summaries
+3. **MANDATORY GATE: Next Step Selection** — workflow MUST NOT end without executing this step.
 
-**Success Criteria**:
-- synthesis.json created with final synthesis
-- brainstorm.md finalized with conclusions
-- User offered next step options
-- Session complete
+   **TodoWrite**: Update `phase-4` → `"completed"`, `next-step` → `"in_progress"`
+
+   > **CRITICAL**: This AskUserQuestion is a **terminal gate**. The workflow is INCOMPLETE if this question is not asked. After displaying synthesis (step 2), you MUST immediately proceed here.
+
+   Call AskUserQuestion (single-select, header: "Next Step"):
+   - **创建实施计划** (Recommended if top idea has high feasibility): "基于最佳创意启动 workflow-plan 制定实施计划"
+   - **创建Issue**: "将 Top 3 创意转化为 issue 进行跟踪管理"
+   - **深入分析**: "对最佳创意启动 analyze-with-file 深入技术分析"
+   - **完成**: "头脑风暴已足够，无需进一步操作"
+
+   **Handle user selection**:
+
+   **"创建实施计划"** → MUST invoke Skill tool:
+   1. Build `taskDescription` from top idea in synthesis.json (title + description + next_steps)
+   2. Assemble context: `## Prior Brainstorm ({sessionId})` + summary + top idea details + key insights (up to 5)
+   3. **Invoke Skill tool immediately**:
+      ```javascript
+      Skill({ skill: "workflow-plan", args: `${taskDescription}\n\n${contextLines}` })
+      ```
+      If Skill invocation is omitted, the workflow is BROKEN.
+   4. After Skill invocation, brainstorm-with-file is complete
+
+   **"创建Issue"** → Convert top ideas to issues:
+   1. For each idea in synthesis.top_ideas (top 3):
+      - Build issue JSON: `{title: idea.title, context: idea.description + '\n' + idea.next_steps.join('\n'), priority: idea.score >= 8 ? 2 : 3, source: 'brainstorm', labels: dimensions}`
+      - Create via: `Skill({ skill: "issue:from-brainstorm", args: "${sessionFolder}/synthesis.json" })`
+   2. Display created issue IDs
+
+   **"深入分析"** → Launch analysis on top idea:
+   1. Build analysis topic from top idea title + description
+   2. **Invoke Skill tool immediately**:
+      ```javascript
+      Skill({ skill: "workflow:analyze-with-file", args: `${topIdea.title}: ${topIdea.description}` })
+      ```
+
+   **"完成"** → No further action needed.
+
+   **TodoWrite**: Update `next-step` → `"completed"` after user selection is handled
 
 ## Configuration
 
 ### Brainstorm Dimensions
 
-Dimensions matched against topic keywords to identify focus areas:
-
 | Dimension | Keywords |
 |-----------|----------|
 | technical | 技术, technical, implementation, code, 实现, architecture |
@@ -652,7 +441,7 @@ Dimensions matched against topic keywords to identify focus areas:
 
 ### Role Selection
 
-**Professional Roles** (recommended based on topic keywords):
+**Professional Roles**:
 
 | Role | CLI Tool | Focus Area | Keywords |
 |------|----------|------------|----------|
@@ -668,47 +457,13 @@ Dimensions matched against topic keywords to identify focus areas:
 
 **Simple Perspectives** (fallback):
 
-| Perspective | CLI Tool | Focus | Best For |
-|-------------|----------|-------|----------|
-| creative | Gemini | Innovation, cross-domain | Generating novel ideas |
-| pragmatic | Codex | Implementation, feasibility | Reality-checking ideas |
-| systematic | Claude | Architecture, structure | Organizing solutions |
+| Perspective | CLI Tool | Focus |
+|-------------|----------|-------|
+| creative | Gemini | Innovation, cross-domain |
+| pragmatic | Codex | Implementation, feasibility |
+| systematic | Claude | Architecture, structure |
 
-**Selection Strategy**:
-1. **Auto mode** (`-y`): Choose top 3 recommended professional roles
-2. **Manual mode**: Present recommended roles + "Use simple perspectives" option
-3. **Continue mode**: Use roles from previous session
-
-### Collaboration Patterns
-
-| Pattern | Usage | Description |
-|---------|-------|-------------|
-| Parallel Divergence | New topic | All roles explore simultaneously from different angles |
-| Sequential Deep-Dive | Promising idea | One role expands, others critique/refine |
-| Debate Mode | Controversial approach | Roles argue for/against approaches |
-| Synthesis Mode | Ready to decide | Combine insights into actionable conclusion |
-
-### Context Overflow Protection
-
-**Per-Role Limits**:
-- Main analysis output: < 3000 words
-- Sub-document (if any): < 2000 words each
-- Maximum sub-documents: 5 per role
-
-**Synthesis Protection**:
-- If total analysis > 100KB, synthesis reads only main analysis files (not sub-documents)
-- Large ideas automatically split into separate idea documents in ideas/ folder
-
-**Recovery Steps**:
-1. Check CLI logs for context overflow errors
-2. Reduce scope: fewer roles or simpler topic
-3. Use `--mode structured` for more focused output
-4. Split complex topics into multiple sessions
-
-**Prevention**:
-- Start with 3 roles (default), increase if needed
-- Use structured topic format: "GOAL: ... SCOPE: ... CONTEXT: ..."
-- Review output sizes before final synthesis
+**Selection Strategy**: Auto mode → top 3 professional roles | Manual mode → recommended roles + "Use simple perspectives" option | Continue mode → roles from previous session
 
 ## Error Handling
 
@@ -722,58 +477,6 @@ Dimensions matched against topic keywords to identify focus areas:
 | Max rounds reached | Force synthesis, highlight unresolved questions |
 | All ideas fail challenge | Return to divergent phase with new constraints |
 
-## Best Practices
-
-1. **Clear Topic Definition**: Detailed topics → better role selection and exploration
-2. **Agent-First for Complex Tasks**: For code analysis, POC implementation, or technical validation during refinement, delegate to agents via Task tool (cli-explore-agent, code-developer, universal-executor) or CLI calls (ccw cli). Avoid direct analysis/execution in main process
-3. **Review brainstorm.md**: Check thought evolution before final decisions
-4. **Embrace Conflicts**: Perspective conflicts often reveal important tradeoffs
-5. **Document Evolution**: brainstorm.md captures full thinking process for team review
-6. **Use Continue Mode**: Resume sessions to build on previous exploration
-
-## Templates
-
-### Brainstorm Document Structure
-
-**brainstorm.md** contains:
-- **Header**: Session metadata (ID, topic, started, mode, dimensions)
-- **Initial Context**: User focus, depth, constraints
-- **Seed Expansion**: Original idea + exploration vectors
-- **Thought Evolution Timeline**: Round-by-round findings
-  - Round 1: Seed Understanding
-  - Round 2: Multi-Perspective Exploration (creative/pragmatic/systematic)
-  - Round 3-N: Interactive Refinement (deep-dive/challenge/merge)
-- **Synthesis & Conclusions**: Executive summary, top ideas, recommendations
-- **Session Statistics**: Rounds, ideas, duration, artifacts
-
-See full markdown template in original file (lines 955-1161).
-
-## Usage Recommendations (Requires User Confirmation)
-
-**Use `Skill(skill="brainstorm", args="\"topic or question\"")` when:**
-- Starting a new feature/product without clear direction
-- Facing a complex problem with multiple possible solutions
-- Need to explore alternatives before committing
-- Want documented thinking process for team review
-- Combining multiple stakeholder perspectives
-
-**Use `Skill(skill="workflow:analyze-with-file", args="\"topic\"")` when:**
-- Investigating existing code/system
-- Need factual analysis over ideation
-- Debugging or troubleshooting
-- Understanding current state
-
-**Use `Skill(skill="workflow-plan", args="\"task description\"")` when:**
-- Complex planning requiring multiple perspectives
-- Large scope needing parallel sub-domain analysis
-- Want shared collaborative planning document
-- Need structured task breakdown with agent coordination
-
-**Use `Skill(skill="workflow-lite-plan", args="\"task description\"")` when:**
-- Direction is already clear
-- Ready to move from ideas to execution
-- Need simple implementation breakdown
-
 ---
 
 **Now execute brainstorm-with-file for**: $ARGUMENTS

.claude/commands/workflow/clean.md

@@ -2,7 +2,7 @@
 name: clean
 description: Intelligent code cleanup with mainline detection, stale artifact discovery, and safe execution
 argument-hint: "[-y|--yes] [--dry-run] [\"focus area\"]"
-allowed-tools: TodoWrite(*), Task(*), AskUserQuestion(*), Read(*), Glob(*), Bash(*), Write(*)
+allowed-tools: TodoWrite(*), Agent(*), AskUserQuestion(*), Read(*), Glob(*), Bash(*), Write(*)
 ---
 
 # Clean Command (/workflow:clean)

.claude/commands/workflow/collaborative-plan-with-file.md

@@ -2,7 +2,7 @@
 name: workflow:collaborative-plan-with-file
 description: Collaborative planning with Plan Note - Understanding agent creates shared plan-note.md template, parallel agents fill pre-allocated sections, conflict detection without merge. Outputs executable plan-note.md.
 argument-hint: "[-y|--yes] <task description> [--max-agents=5]"
-allowed-tools: TodoWrite(*), Task(*), AskUserQuestion(*), Read(*), Bash(*), Write(*), Glob(*), Grep(*), mcp__ace-tool__search_context(*)
+allowed-tools: TodoWrite(*), Agent(*), AskUserQuestion(*), Read(*), Bash(*), Write(*), Glob(*), Grep(*), mcp__ace-tool__search_context(*)
 ---
 
 ## Auto Mode
@@ -587,7 +587,11 @@ Schema (tasks): ~/.ccw/workflows/cli-templates/schemas/task-schema.json
    - Execution command
    - Conflict status
 
-6. **Update Todo**
+6. **Sync Session State**
+   - Execute: `/workflow:session:sync -y "Plan complete: ${subDomains.length} domains, ${allTasks.length} tasks"`
+   - Updates specs/*.md with planning insights and project-tech.json with planning session entry
+
+7. **Update Todo**
    - Set Phase 4 status to `completed`
 
 **plan.md Structure**:

.claude/commands/workflow/debug-with-file.md

@@ -2,7 +2,7 @@
 name: debug-with-file
 description: Interactive hypothesis-driven debugging with documented exploration, understanding evolution, and Gemini-assisted correction
 argument-hint: "[-y|--yes] \"bug description or error message\""
-allowed-tools: TodoWrite(*), Task(*), AskUserQuestion(*), Read(*), Grep(*), Glob(*), Bash(*), Edit(*), Write(*)
+allowed-tools: TodoWrite(*), Agent(*), AskUserQuestion(*), Read(*), Grep(*), Glob(*), Bash(*), Edit(*), Write(*)
 ---
 
 ## Auto Mode

.claude/commands/workflow/init-specs.md

@@ -1,380 +0,0 @@
----
-name: init-specs
-description: Interactive wizard to create individual specs or personal constraints with scope selection
-argument-hint: "[--scope <global|project>] [--dimension <specs|personal>] [--category <general|exploration|planning|execution>]"
-examples:
-  - /workflow:init-specs
-  - /workflow:init-specs --scope global --dimension personal
-  - /workflow:init-specs --scope project --dimension specs
----
-
-# Workflow Init Specs Command (/workflow:init-specs)
-
-## Overview
-
-Interactive wizard for creating individual specs or personal constraints with scope selection. This command provides a guided experience for adding new rules to the spec system.
-
-**Key Features**:
-- Supports both project specs and personal specs
-- Scope selection (global vs project) for personal specs
-- Category-based organization for workflow stages
-- Interactive mode with smart defaults
-
-## Usage
-```bash
-/workflow:init-specs                              # Interactive mode (all prompts)
-/workflow:init-specs --scope global               # Create global personal spec
-/workflow:init-specs --scope project              # Create project spec (default)
-/workflow:init-specs --dimension specs            # Project conventions/constraints
-/workflow:init-specs --dimension personal         # Personal preferences
-/workflow:init-specs --category exploration       # Workflow stage category
-```
-
-## Parameters
-
-| Parameter | Values | Default | Description |
-|-----------|--------|---------|-------------|
-| `--scope` | `global`, `project` | `project` | Where to store the spec (only for personal dimension) |
-| `--dimension` | `specs`, `personal` | Interactive | Type of spec to create |
-| `--category` | `general`, `exploration`, `planning`, `execution` | `general` | Workflow stage category |
-
-## Execution Process
-
-```
-Input Parsing:
-   ├─ Parse --scope (global | project)
-   ├─ Parse --dimension (specs | personal)
-   └─ Parse --category (general | exploration | planning | execution)
-
-Step 1: Gather Requirements (Interactive)
-   ├─ If dimension not specified → Ask dimension
-   ├─ If personal + scope not specified → Ask scope
-   ├─ If category not specified → Ask category
-   ├─ Ask type (convention | constraint | learning)
-   └─ Ask content (rule text)
-
-Step 2: Determine Target File
-   ├─ specs dimension → .ccw/specs/coding-conventions.md or architecture-constraints.md
-   └─ personal dimension → ~/.ccw/specs/personal/ or .ccw/specs/personal/
-
-Step 3: Write Spec
-   ├─ Check if file exists, create if needed with proper frontmatter
-   ├─ Append rule to appropriate section
-   └─ Run ccw spec rebuild
-
-Step 4: Display Confirmation
-```
-
-## Implementation
-
-### Step 1: Parse Input and Gather Requirements
-
-```javascript
-// Parse arguments
-const args = $ARGUMENTS.toLowerCase()
-const hasScope = args.includes('--scope')
-const hasDimension = args.includes('--dimension')
-const hasCategory = args.includes('--category')
-
-// Extract values from arguments
-let scope = hasScope ? args.match(/--scope\s+(\w+)/)?.[1] : null
-let dimension = hasDimension ? args.match(/--dimension\s+(\w+)/)?.[1] : null
-let category = hasCategory ? args.match(/--category\s+(\w+)/)?.[1] : null
-
-// Validate values
-if (scope && !['global', 'project'].includes(scope)) {
-  console.log("Invalid scope. Use 'global' or 'project'.")
-  return
-}
-if (dimension && !['specs', 'personal'].includes(dimension)) {
-  console.log("Invalid dimension. Use 'specs' or 'personal'.")
-  return
-}
-if (category && !['general', 'exploration', 'planning', 'execution'].includes(category)) {
-  console.log("Invalid category. Use 'general', 'exploration', 'planning', or 'execution'.")
-  return
-}
-```
-
-### Step 2: Interactive Questions
-
-**If dimension not specified**:
-```javascript
-if (!dimension) {
-  const dimensionAnswer = AskUserQuestion({
-    questions: [{
-      question: "What type of spec do you want to create?",
-      header: "Dimension",
-      multiSelect: false,
-      options: [
-        {
-          label: "Project Spec",
-          description: "Coding conventions, constraints, quality rules for this project (stored in .ccw/specs/)"
-        },
-        {
-          label: "Personal Spec",
-          description: "Personal preferences and constraints that follow you across projects (stored in ~/.ccw/specs/personal/ or .ccw/specs/personal/)"
-        }
-      ]
-    }]
-  })
-  dimension = dimensionAnswer.answers["Dimension"] === "Project Spec" ? "specs" : "personal"
-}
-```
-
-**If personal dimension and scope not specified**:
-```javascript
-if (dimension === 'personal' && !scope) {
-  const scopeAnswer = AskUserQuestion({
-    questions: [{
-      question: "Where should this personal spec be stored?",
-      header: "Scope",
-      multiSelect: false,
-      options: [
-        {
-          label: "Global (Recommended)",
-          description: "Apply to ALL projects (~/.ccw/specs/personal/)"
-        },
-        {
-          label: "Project-only",
-          description: "Apply only to this project (.ccw/specs/personal/)"
-        }
-      ]
-    }]
-  })
-  scope = scopeAnswer.answers["Scope"].includes("Global") ? "global" : "project"
-}
-```
-
-**If category not specified**:
-```javascript
-if (!category) {
-  const categoryAnswer = AskUserQuestion({
-    questions: [{
-      question: "Which workflow stage does this spec apply to?",
-      header: "Category",
-      multiSelect: false,
-      options: [
-        {
-          label: "General (Recommended)",
-          description: "Applies to all stages (default)"
-        },
-        {
-          label: "Exploration",
-          description: "Code exploration, analysis, debugging"
-        },
-        {
-          label: "Planning",
-          description: "Task planning, requirements gathering"
-        },
-        {
-          label: "Execution",
-          description: "Implementation, testing, deployment"
-        }
-      ]
-    }]
-  })
-  const categoryLabel = categoryAnswer.answers["Category"]
-  category = categoryLabel.includes("General") ? "general"
-    : categoryLabel.includes("Exploration") ? "exploration"
-    : categoryLabel.includes("Planning") ? "planning"
-    : "execution"
-}
-```
-
-**Ask type**:
-```javascript
-const typeAnswer = AskUserQuestion({
-  questions: [{
-    question: "What type of rule is this?",
-    header: "Type",
-    multiSelect: false,
-    options: [
-      {
-        label: "Convention",
-        description: "Coding style preference (e.g., use functional components)"
-      },
-      {
-        label: "Constraint",
-        description: "Hard rule that must not be violated (e.g., no direct DB access)"
-      },
-      {
-        label: "Learning",
-        description: "Insight or lesson learned (e.g., cache invalidation needs events)"
-      }
-    ]
-  }]
-})
-const type = typeAnswer.answers["Type"]
-const isConvention = type.includes("Convention")
-const isConstraint = type.includes("Constraint")
-const isLearning = type.includes("Learning")
-```
-
-**Ask content**:
-```javascript
-const contentAnswer = AskUserQuestion({
-  questions: [{
-    question: "Enter the rule or guideline text:",
-    header: "Content",
-    multiSelect: false,
-    options: []
-  }]
-})
-const ruleText = contentAnswer.answers["Content"]
-```
-
-### Step 3: Determine Target File
-
-```javascript
-const path = require('path')
-const os = require('os')
-
-let targetFile: string
-let targetDir: string
-
-if (dimension === 'specs') {
-  // Project specs - use .ccw/specs/ (same as frontend/backend spec-index-builder)
-  targetDir = '.ccw/specs'
-  if (isConstraint) {
-    targetFile = path.join(targetDir, 'architecture-constraints.md')
-  } else {
-    targetFile = path.join(targetDir, 'coding-conventions.md')
-  }
-} else {
-  // Personal specs - use .ccw/personal/ (same as backend spec-index-builder)
-  if (scope === 'global') {
-    targetDir = path.join(os.homedir(), '.ccw', 'personal')
-  } else {
-    targetDir = path.join('.ccw', 'personal')
-  }
-
-  // Create category-based filename
-  const typePrefix = isConstraint ? 'constraints' : isLearning ? 'learnings' : 'conventions'
-  targetFile = path.join(targetDir, `${typePrefix}.md`)
-}
-```
-
-### Step 4: Write Spec
-
-```javascript
-const fs = require('fs')
-
-// Ensure directory exists
-if (!fs.existsSync(targetDir)) {
-  fs.mkdirSync(targetDir, { recursive: true })
-}
-
-// Check if file exists
-const fileExists = fs.existsSync(targetFile)
-
-if (!fileExists) {
-  // Create new file with frontmatter
-  const frontmatter = `---
-title: ${dimension === 'specs' ? 'Project' : 'Personal'} ${isConstraint ? 'Constraints' : isLearning ? 'Learnings' : 'Conventions'}
-readMode: optional
-priority: medium
-category: ${category}
-scope: ${dimension === 'personal' ? scope : 'project'}
-dimension: ${dimension}
-keywords: [${category}, ${isConstraint ? 'constraint' : isLearning ? 'learning' : 'convention'}]
----
-
-# ${dimension === 'specs' ? 'Project' : 'Personal'} ${isConstraint ? 'Constraints' : isLearning ? 'Learnings' : 'Conventions'}
-
-`
-  fs.writeFileSync(targetFile, frontmatter, 'utf8')
-}
-
-// Read existing content
-let content = fs.readFileSync(targetFile, 'utf8')
-
-// Format the new rule
-const timestamp = new Date().toISOString().split('T')[0]
-const rulePrefix = isLearning ? `- [learning] ` : `- [${category}] `
-const ruleSuffix = isLearning ? ` (${timestamp})` : ''
-const newRule = `${rulePrefix}${ruleText}${ruleSuffix}`
-
-// Check for duplicate
-if (content.includes(ruleText)) {
-  console.log(`
-Rule already exists in ${targetFile}
-Text: "${ruleText}"
-`)
-  return
-}
-
-// Append the rule
-content = content.trimEnd() + '\n' + newRule + '\n'
-fs.writeFileSync(targetFile, content, 'utf8')
-
-// Rebuild spec index
-Bash('ccw spec rebuild')
-```
-
-### Step 5: Display Confirmation
-
-```
-Spec created successfully
-
-Dimension: ${dimension}
-Scope: ${dimension === 'personal' ? scope : 'project'}
-Category: ${category}
-Type: ${type}
-Rule: "${ruleText}"
-
-Location: ${targetFile}
-
-Use 'ccw spec list' to view all specs
-Use 'ccw spec load --category ${category}' to load specs by category
-```
-
-## Target File Resolution
-
-### Project Specs (dimension: specs)
-```
-.ccw/specs/
-├── coding-conventions.md    ← conventions, learnings
-├── architecture-constraints.md  ← constraints
-└── quality-rules.md         ← quality rules
-```
-
-### Personal Specs (dimension: personal)
-```
-# Global (~/.ccw/personal/)
-~/.ccw/personal/
-├── conventions.md           ← personal conventions (all projects)
-├── constraints.md           ← personal constraints (all projects)
-└── learnings.md             ← personal learnings (all projects)
-
-# Project-local (.ccw/personal/)
-.ccw/personal/
-├── conventions.md           ← personal conventions (this project only)
-├── constraints.md           ← personal constraints (this project only)
-└── learnings.md             ← personal learnings (this project only)
-```
-
-## Category Field Usage
-
-The `category` field in frontmatter enables filtered loading:
-
-| Category | Use Case | Example Rules |
-|----------|----------|---------------|
-| `general` | Applies to all stages | "Use TypeScript strict mode" |
-| `exploration` | Code exploration, debugging | "Always trace the call stack before modifying" |
-| `planning` | Task planning, requirements | "Break down tasks into 2-hour chunks" |
-| `execution` | Implementation, testing | "Run tests after each file modification" |
-
-## Error Handling
-
-- **File not writable**: Check permissions, suggest manual creation
-- **Duplicate rule**: Warn and skip (don't add duplicates)
-- **Invalid path**: Exit with error message
-
-## Related Commands
-
-- `/workflow:init` - Initialize project with specs scaffold
-- `/workflow:init-guidelines` - Interactive wizard to fill specs
-- `/workflow:session:solidify` - Add rules during/after sessions
-- `ccw spec list` - View all specs
-- `ccw spec load --category <cat>` - Load filtered specs

.claude/commands/workflow/init.md

@@ -1,291 +0,0 @@
----
-name: init
-description: Initialize project-level state with intelligent project analysis using cli-explore-agent
-argument-hint: "[--regenerate] [--skip-specs]"
-examples:
-  - /workflow:init
-  - /workflow:init --regenerate
-  - /workflow:init --skip-specs
----
-
-# Workflow Init Command (/workflow:init)
-
-## Overview
-Initialize `.workflow/project-tech.json` and `.ccw/specs/*.md` with comprehensive project understanding by delegating analysis to **cli-explore-agent**.
-
-**Dual File System**:
-- `project-tech.json`: Auto-generated technical analysis (stack, architecture, components)
-- `specs/*.md`: User-maintained rules and constraints (created as scaffold)
-
-**Note**: This command may be called by other workflow commands. Upon completion, return immediately to continue the calling workflow without interrupting the task flow.
-
-## Usage
-```bash
-/workflow:init                 # Initialize (skip if exists)
-/workflow:init --regenerate    # Force regeneration
-/workflow:init --skip-specs    # Initialize project-tech only, skip spec initialization
-```
-
-## Execution Process
-
-```
-Input Parsing:
-   ├─ Parse --regenerate flag → regenerate = true | false
-   └─ Parse --skip-specs flag → skipSpecs = true | false
-
-Decision:
-   ├─ BOTH_EXIST + no --regenerate → Exit: "Already initialized"
-   ├─ EXISTS + --regenerate → Backup existing → Continue analysis
-   └─ NOT_FOUND → Continue analysis
-
-Analysis Flow:
-   ├─ Get project metadata (name, root)
-   ├─ Invoke cli-explore-agent
-   │   ├─ Structural scan (get_modules_by_depth.sh, find, wc)
-   │   ├─ Semantic analysis (Gemini CLI)
-   │   ├─ Synthesis and merge
-   │   └─ Write .workflow/project-tech.json
-   ├─ Spec Initialization (if not --skip-specs)
-   │   ├─ Check if specs/*.md exist
-   │   ├─ If NOT_FOUND → Run ccw spec init
-   │   ├─ Run ccw spec rebuild
-   │   └─ Ask about guidelines configuration
-   │       ├─ If guidelines empty → Ask user: "Configure now?" or "Skip"
-   │       │   ├─ Configure now → Skill(skill="workflow:init-guidelines")
-   │       │   └─ Skip → Show next steps
-   │       └─ If guidelines populated → Show next steps only
-   └─ Display summary
-
-Output:
-   ├─ .workflow/project-tech.json (+ .backup if regenerate)
-   └─ .ccw/specs/*.md (scaffold or configured, unless --skip-specs)
-```
-
-## Implementation
-
-### Step 1: Parse Input and Check Existing State
-
-**Parse flags**:
-```javascript
-const regenerate = $ARGUMENTS.includes('--regenerate')
-const skipSpecs = $ARGUMENTS.includes('--skip-specs')
-```
-
-**Check existing state**:
-
-```bash
-bash(test -f .workflow/project-tech.json && echo "TECH_EXISTS" || echo "TECH_NOT_FOUND")
-bash(test -f .ccw/specs/coding-conventions.md && echo "SPECS_EXISTS" || echo "SPECS_NOT_FOUND")
-```
-
-**If BOTH_EXIST and no --regenerate**: Exit early
-```
-Project already initialized:
-- Tech analysis: .workflow/project-tech.json
-- Guidelines: .ccw/specs/*.md
-
-Use /workflow:init --regenerate to rebuild tech analysis
-Use /workflow:session:solidify to add guidelines
-Use /workflow:status --project to view state
-```
-
-### Step 2: Get Project Metadata
-
-```bash
-bash(basename "$(git rev-parse --show-toplevel 2>/dev/null || pwd)")
-bash(git rev-parse --show-toplevel 2>/dev/null || pwd)
-bash(mkdir -p .workflow)
-```
-
-### Step 3: Invoke cli-explore-agent
-
-**For --regenerate**: Backup and preserve existing data
-```bash
-bash(cp .workflow/project-tech.json .workflow/project-tech.json.backup)
-```
-
-**Delegate analysis to agent**:
-
-```javascript
-Task(
-  subagent_type="cli-explore-agent",
-  run_in_background=false,
-  description="Deep project analysis",
-  prompt=`
-Analyze project for workflow initialization and generate .workflow/project-tech.json.
-
-## MANDATORY FIRST STEPS
-1. Execute: cat ~/.ccw/workflows/cli-templates/schemas/project-tech-schema.json (get schema reference)
-2. Execute: ccw tool exec get_modules_by_depth '{}' (get project structure)
-
-## Task
-Generate complete project-tech.json following the schema structure:
-- project_name: "${projectName}"
-- initialized_at: ISO 8601 timestamp
-- overview: {
-    description: "Brief project description",
-    technology_stack: {
-      languages: [{name, file_count, primary}],
-      frameworks: ["string"],
-      build_tools: ["string"],
-      test_frameworks: ["string"]
-    },
-    architecture: {style, layers: [], patterns: []},
-    key_components: [{name, path, description, importance}]
-  }
-- features: []
-- development_index: ${regenerate ? 'preserve from backup' : '{feature: [], enhancement: [], bugfix: [], refactor: [], docs: []}'}
-- statistics: ${regenerate ? 'preserve from backup' : '{total_features: 0, total_sessions: 0, last_updated: ISO timestamp}'}
-- _metadata: {initialized_by: "cli-explore-agent", analysis_timestamp: ISO timestamp, analysis_mode: "deep-scan"}
-
-## Analysis Requirements
-
-**Technology Stack**:
-- Languages: File counts, mark primary
-- Frameworks: From package.json, requirements.txt, go.mod, etc.
-- Build tools: npm, cargo, maven, webpack, vite
-- Test frameworks: jest, pytest, go test, junit
-
-**Architecture**:
-- Style: MVC, microservices, layered (from structure & imports)
-- Layers: presentation, business-logic, data-access
-- Patterns: singleton, factory, repository
-- Key components: 5-10 modules {name, path, description, importance}
-
-## Execution
-1. Structural scan: get_modules_by_depth.sh, find, wc -l
-2. Semantic analysis: Gemini for patterns/architecture
-3. Synthesis: Merge findings
-4. ${regenerate ? 'Merge with preserved development_index and statistics from .workflow/project-tech.json.backup' : ''}
-5. Write JSON: Write('.workflow/project-tech.json', jsonContent)
-6. Report: Return brief completion summary
-
-Project root: ${projectRoot}
-`
-)
-```
-
-### Step 3.5: Initialize Spec System (if not --skip-specs)
-
-```javascript
-// Skip spec initialization if --skip-specs flag is provided
-if (!skipSpecs) {
-  // Initialize spec system if not already initialized
-  const specsCheck = Bash('test -f .ccw/specs/coding-conventions.md && echo EXISTS || echo NOT_FOUND')
-  if (specsCheck.includes('NOT_FOUND')) {
-    console.log('Initializing spec system...')
-    Bash('ccw spec init')
-    Bash('ccw spec rebuild')
-  }
-} else {
-  console.log('Skipping spec initialization (--skip-specs)')
-}
-```
-
-### Step 4: Display Summary
-
-```javascript
-const projectTech = JSON.parse(Read('.workflow/project-tech.json'));
-const specsInitialized = !skipSpecs && file_exists('.ccw/specs/coding-conventions.md');
-
-console.log(`
-Project initialized successfully
-
-## Project Overview
-Name: ${projectTech.project_name}
-Description: ${projectTech.overview.description}
-
-### Technology Stack
-Languages: ${projectTech.overview.technology_stack.languages.map(l => l.name).join(', ')}
-Frameworks: ${projectTech.overview.technology_stack.frameworks.join(', ')}
-
-### Architecture
-Style: ${projectTech.overview.architecture.style}
-Components: ${projectTech.overview.key_components.length} core modules
-
----
-Files created:
-- Tech analysis: .workflow/project-tech.json
-${!skipSpecs ? `- Specs: .ccw/specs/ ${specsInitialized ? '(initialized)' : ''}` : '- Specs: (skipped via --skip-specs)'}
-${regenerate ? '- Backup: .workflow/project-tech.json.backup' : ''}
-`);
-```
-
-### Step 5: Ask About Guidelines Configuration (if not --skip-specs)
-
-After displaying the summary, ask the user if they want to configure project guidelines interactively. Skip this step if `--skip-specs` was provided.
-
-```javascript
-// Skip guidelines configuration if --skip-specs was provided
-if (skipSpecs) {
-  console.log(`
-Next steps:
-- Use /workflow:init-specs to create individual specs
-- Use /workflow:init-guidelines to configure specs interactively
-- Use /workflow-plan to start planning
-`);
-  return;
-}
-
-// Check if specs have user content beyond seed documents
-const specsList = Bash('ccw spec list --json');
-const specsCount = JSON.parse(specsList).total || 0;
-
-// Only ask if specs are just seeds
-if (specsCount <= 5) {
-  const userChoice = AskUserQuestion({
-    questions: [{
-      question: "Would you like to configure project specs now? The wizard will ask targeted questions based on your tech stack.",
-      header: "Specs",
-      multiSelect: false,
-      options: [
-        {
-          label: "Configure now (Recommended)",
-          description: "Interactive wizard to set up coding conventions, constraints, and quality rules"
-        },
-        {
-          label: "Skip for now",
-          description: "You can run /workflow:init-guidelines later or use ccw spec load to import specs"
-        }
-      ]
-    }]
-  });
-
-  if (userChoice.answers["Specs"] === "Configure now (Recommended)") {
-    console.log("\nStarting specs configuration wizard...\n");
-    Skill(skill="workflow:init-guidelines");
-  } else {
-    console.log(`
-Next steps:
-- Use /workflow:init-specs to create individual specs
-- Use /workflow:init-guidelines to configure specs interactively
-- Use ccw spec load to import specs from external sources
-- Use /workflow-plan to start planning
-`);
-  }
-} else {
-  console.log(`
-Specs already configured (${specsCount} spec files).
-
-Next steps:
-- Use /workflow:init-specs to create additional specs
-- Use /workflow:init-guidelines --reset to reconfigure
-- Use /workflow:session:solidify to add individual rules
-- Use /workflow-plan to start planning
-`);
-}
-```
-
-## Error Handling
-
-**Agent Failure**: Fall back to basic initialization with placeholder overview
-**Missing Tools**: Agent uses Qwen fallback or bash-only
-**Empty Project**: Create minimal JSON with all gaps identified
-
-## Related Commands
-
-- `/workflow:init-specs` - Interactive wizard to create individual specs with scope selection
-- `/workflow:init-guidelines` - Interactive wizard to configure project guidelines (called after init)
-- `/workflow:session:solidify` - Add individual rules/constraints one at a time
-- `workflow-plan` skill - Start planning with initialized project context
-- `/workflow:status --project` - View project state and guidelines

.claude/commands/workflow/integration-test-cycle.md

@@ -2,7 +2,7 @@
 name: integration-test-cycle
 description: Self-iterating integration test workflow with codebase exploration, test development, autonomous test-fix cycles, and reflection-driven strategy adjustment
 argument-hint: "[-y|--yes] [-c|--continue] [--max-iterations=N] \"module or feature description\""
-allowed-tools: TodoWrite(*), Task(*), AskUserQuestion(*), Read(*), Grep(*), Glob(*), Bash(*), Edit(*), Write(*), Skill(*)
+allowed-tools: TodoWrite(*), Agent(*), AskUserQuestion(*), Read(*), Grep(*), Glob(*), Bash(*), Edit(*), Write(*), Skill(*)
 ---
 
 ## Auto Mode
@@ -209,7 +209,7 @@ Unified integration test workflow: **Explore → Design → Develop → Test →
 1. **Codebase Exploration via cli-explore-agent**
 
 ```javascript
-Task({
+Agent({
   subagent_type: "cli-explore-agent",
   run_in_background: false,
   description: `Explore integration points: ${topicSlug}`,
@@ -391,7 +391,7 @@ Also set `state.json.phase` to `"designed"`.
 1. **Generate Integration Tests via @code-developer**
 
 ```javascript
-Task({
+Agent({
   subagent_type: "code-developer",
   run_in_background: false,
   description: `Generate integration tests: ${topicSlug}`,
@@ -435,7 +435,7 @@ Also set state.json "phase" to "developed".
 2. **Code Validation Gate via @test-fix-agent**
 
 ```javascript
-Task({
+Agent({
   subagent_type: "test-fix-agent",
   run_in_background: false,
   description: `Validate generated tests: ${topicSlug}`,
@@ -605,7 +605,7 @@ After each iteration, update the `## Cumulative Learnings` section in reflection
 
 **@test-fix-agent** (test execution):
 ```javascript
-Task({
+Agent({
   subagent_type: "test-fix-agent",
   run_in_background: false,
   description: `Execute integration tests: iteration ${N}`,
@@ -637,7 +637,7 @@ For each failure, assign:
 
 **@cli-planning-agent** (failure analysis with reflection):
 ```javascript
-Task({
+Agent({
   subagent_type: "cli-planning-agent",
   run_in_background: false,
   description: `Analyze failures: iteration ${N} - ${strategy}`,
@@ -676,7 +676,7 @@ Analyze test failures using reflection context and generate fix strategy.
 
 **@test-fix-agent** (apply fixes):
 ```javascript
-Task({
+Agent({
   subagent_type: "test-fix-agent",
   run_in_background: false,
   description: `Apply fixes: iteration ${N} - ${strategy}`,
@@ -806,6 +806,10 @@ AskUserQuestion({
 })
 ```
 
+4. **Sync Session State** (automatic)
+   - Execute: `/workflow:session:sync -y "Integration test cycle complete: ${passRate}% pass rate, ${iterations} iterations"`
+   - Updates specs/*.md with test learnings and project-tech.json with development index entry
+
 ---
 
 ## Completion Conditions

.claude/commands/workflow/refactor-cycle.md

@@ -2,7 +2,7 @@
 name: refactor-cycle
 description: Tech debt discovery and self-iterating refactoring with multi-dimensional analysis, prioritized execution, regression validation, and reflection-driven adjustment
 argument-hint: "[-y|--yes] [-c|--continue] [--scope=module|project] \"module or refactoring goal\""
-allowed-tools: TodoWrite(*), Task(*), AskUserQuestion(*), Read(*), Grep(*), Glob(*), Bash(*), Edit(*), Write(*)
+allowed-tools: TodoWrite(*), Agent(*), AskUserQuestion(*), Read(*), Grep(*), Glob(*), Bash(*), Edit(*), Write(*)
 ---
 
 ## Auto Mode
@@ -200,7 +200,7 @@ Closed-loop tech debt lifecycle: **Discover → Assess → Plan → Refactor →
 1. **Codebase Exploration via cli-explore-agent**
 
 ```javascript
-Task({
+Agent({
   subagent_type: "cli-explore-agent",
   run_in_background: false,
   description: `Explore codebase for debt: ${topicSlug}`,
@@ -465,7 +465,7 @@ Set `state.json.current_item` to item ID.
 #### Step 4.2: Execute Refactoring
 
 ```javascript
-Task({
+Agent({
   subagent_type: "code-developer",
   run_in_background: false,
   description: `Refactor ${item.id}: ${item.title}`,
@@ -499,7 +499,7 @@ ${JSON.stringify(item.refactor_plan, null, 2)}
 
 ```javascript
 // 1. Run tests
-Task({
+Agent({
   subagent_type: "test-fix-agent",
   run_in_background: false,
   description: `Validate refactoring: ${item.id}`,

.claude/commands/workflow/roadmap-with-file.md

@@ -2,7 +2,7 @@
 name: roadmap-with-file
 description: Strategic requirement roadmap with iterative decomposition and issue creation. Outputs roadmap.md (human-readable, single source) + issues.jsonl (machine-executable). Handoff to team-planex.
 argument-hint: "[-y|--yes] [-c|--continue] [-m progressive|direct|auto] \"requirement description\""
-allowed-tools: TodoWrite(*), Task(*), AskUserQuestion(*), Read(*), Grep(*), Glob(*), Bash(*), Edit(*), Write(*)
+allowed-tools: TodoWrite(*), Agent(*), AskUserQuestion(*), Read(*), Grep(*), Glob(*), Bash(*), Edit(*), Write(*)
 ---
 
 ## Auto Mode
@@ -355,12 +355,12 @@ Bash(`mkdir -p ${sessionFolder}`)
 
 **Agent Prompt Template**:
 ```javascript
-Task({
+Agent({
   subagent_type: "cli-roadmap-plan-agent",
   run_in_background: false,
   description: `Roadmap decomposition: ${slug}`,
   prompt: `
-## Roadmap Decomposition Task
+## Roadmap Decomposition Agent
 
 ### Input Context
 - **Requirement**: ${requirement}
@@ -537,7 +537,7 @@ ${selectedMode === 'progressive' ? `**Progressive Mode**:
 | Quick task breakdown, immediate execution | `/workflow-lite-plan` |
 | Collaborative multi-agent planning | `/workflow:collaborative-plan-with-file` |
 | Full specification documents | `spec-generator` skill |
-| Code implementation from existing plan | `/workflow:lite-execute` |
+| Code implementation from existing plan | `/workflow-lite-plan` (Phase 1: plan → Phase 2: execute) |
 
 ---
 

.claude/commands/workflow/session/solidify.md

@@ -1,440 +0,0 @@
----
-name: solidify
-description: Crystallize session learnings and user-defined constraints into permanent project guidelines, or compress recent memories
-argument-hint: "[-y|--yes] [--type <convention|constraint|learning|compress>] [--category <category>] [--limit <N>] \"rule or insight\""
-examples:
-  - /workflow:session:solidify "Use functional components for all React code" --type convention
-  - /workflow:session:solidify -y "No direct DB access from controllers" --type constraint --category architecture
-  - /workflow:session:solidify "Cache invalidation requires event sourcing" --type learning --category architecture
-  - /workflow:session:solidify --interactive
-  - /workflow:session:solidify --type compress --limit 10
----
-
-## Auto Mode
-
-When `--yes` or `-y`: Auto-categorize and add guideline without confirmation.
-
-# Session Solidify Command (/workflow:session:solidify)
-
-## Overview
-
-Crystallizes ephemeral session context (insights, decisions, constraints) into permanent project guidelines stored in `.ccw/specs/*.md`. This ensures valuable learnings persist across sessions and inform future planning.
-
-## Use Cases
-
-1. **During Session**: Capture important decisions as they're made
-2. **After Session**: Reflect on lessons learned before archiving
-3. **Proactive**: Add team conventions or architectural rules
-
-## Parameters
-
-| Parameter | Type | Required | Description |
-|-----------|------|----------|-------------|
-| `rule` | string | Yes (unless --interactive or --type compress) | The rule, convention, or insight to solidify |
-| `--type` | enum | No | Type: `convention`, `constraint`, `learning`, `compress` (default: auto-detect) |
-| `--category` | string | No | Category for organization (see categories below) |
-| `--interactive` | flag | No | Launch guided wizard for adding rules |
-| `--limit` | number | No | Number of recent memories to compress (default: 20, only for --type compress) |
-
-### Type Categories
-
-**convention** → Coding style preferences (goes to `conventions` section)
-- Subcategories: `coding_style`, `naming_patterns`, `file_structure`, `documentation`
-
-**constraint** → Hard rules that must not be violated (goes to `constraints` section)
-- Subcategories: `architecture`, `tech_stack`, `performance`, `security`
-
-**learning** -> Session-specific insights (goes to `learnings` array)
-- Subcategories: `architecture`, `performance`, `security`, `testing`, `process`, `other`
-
-**compress** -> Compress/deduplicate recent memories into a single consolidated CMEM
-- No subcategories (operates on core memories, not project guidelines)
-- Fetches recent non-archived memories, LLM-compresses them, creates a new CMEM
-- Source memories are archived after successful compression
-
-## Execution Process
-
-```
-Input Parsing:
-   |- Parse: rule text (required unless --interactive or --type compress)
-   |- Parse: --type (convention|constraint|learning|compress)
-   |- Parse: --category (subcategory)
-   |- Parse: --interactive (flag)
-   +- Parse: --limit (number, default 20, compress only)
-
-IF --type compress:
-   Step C1: Fetch Recent Memories
-      +- Call getRecentMemories(limit, excludeArchived=true)
-
-   Step C2: Validate Candidates
-      +- If fewer than 2 memories found -> abort with message
-
-   Step C3: LLM Compress
-      +- Build compression prompt with all memory contents
-      +- Send to LLM for consolidation
-      +- Receive compressed text
-
-   Step C4: Merge Tags
-      +- Collect tags from all source memories
-      +- Deduplicate into a single merged tag array
-
-   Step C5: Create Compressed CMEM
-      +- Generate new CMEM via upsertMemory with:
-         - content: compressed text from LLM
-         - summary: auto-generated
-         - tags: merged deduplicated tags
-         - metadata: buildCompressionMetadata(sourceIds, originalSize, compressedSize)
-
-   Step C6: Archive Source Memories
-      +- Call archiveMemories(sourceIds)
-
-   Step C7: Display Compression Report
-      +- Show source count, compression ratio, new CMEM ID
-
-ELSE (convention/constraint/learning):
-   Step 1: Ensure Guidelines File Exists
-      +- If not exists -> Create with empty structure
-
-   Step 2: Auto-detect Type (if not specified)
-      +- Analyze rule text for keywords
-
-   Step 3: Validate and Format Entry
-      +- Build entry object based on type
-
-   Step 4: Update Guidelines File
-      +- Add entry to appropriate section
-
-   Step 5: Display Confirmation
-      +- Show what was added and where
-```
-
-## Implementation
-
-### Step 1: Ensure Guidelines File Exists
-
-**Uses .ccw/specs/ directory (same as frontend/backend spec-index-builder)**
-
-```bash
-bash(test -f .ccw/specs/coding-conventions.md && echo "EXISTS" || echo "NOT_FOUND")
-```
-
-**If NOT_FOUND**, initialize spec system:
-
-```bash
-Bash('ccw spec init')
-Bash('ccw spec rebuild')
-```
-
-### Step 2: Auto-detect Type (if not specified)
-
-```javascript
-function detectType(ruleText) {
-  const text = ruleText.toLowerCase();
-
-  // Constraint indicators
-  if (/\b(no|never|must not|forbidden|prohibited|always must)\b/.test(text)) {
-    return 'constraint';
-  }
-
-  // Learning indicators
-  if (/\b(learned|discovered|realized|found that|turns out)\b/.test(text)) {
-    return 'learning';
-  }
-
-  // Default to convention
-  return 'convention';
-}
-
-function detectCategory(ruleText, type) {
-  const text = ruleText.toLowerCase();
-
-  if (type === 'constraint' || type === 'learning') {
-    if (/\b(architecture|layer|module|dependency|circular)\b/.test(text)) return 'architecture';
-    if (/\b(security|auth|permission|sanitize|xss|sql)\b/.test(text)) return 'security';
-    if (/\b(performance|cache|lazy|async|sync|slow)\b/.test(text)) return 'performance';
-    if (/\b(test|coverage|mock|stub)\b/.test(text)) return 'testing';
-  }
-
-  if (type === 'convention') {
-    if (/\b(name|naming|prefix|suffix|camel|pascal)\b/.test(text)) return 'naming_patterns';
-    if (/\b(file|folder|directory|structure|organize)\b/.test(text)) return 'file_structure';
-    if (/\b(doc|comment|jsdoc|readme)\b/.test(text)) return 'documentation';
-    return 'coding_style';
-  }
-
-  return type === 'constraint' ? 'tech_stack' : 'other';
-}
-```
-
-### Step 3: Build Entry
-
-```javascript
-function buildEntry(rule, type, category, sessionId) {
-  if (type === 'learning') {
-    return {
-      date: new Date().toISOString().split('T')[0],
-      session_id: sessionId || null,
-      insight: rule,
-      category: category,
-      context: null
-    };
-  }
-
-  // For conventions and constraints, just return the rule string
-  return rule;
-}
-```
-
-### Step 4: Update Spec Files
-
-```javascript
-// Map type+category to target spec file
-// Uses .ccw/specs/ directory (same as frontend/backend spec-index-builder)
-const specFileMap = {
-  convention: '.ccw/specs/coding-conventions.md',
-  constraint: '.ccw/specs/architecture-constraints.md'
-}
-
-if (type === 'convention' || type === 'constraint') {
-  const targetFile = specFileMap[type]
-  const existing = Read(targetFile)
-
-  // Deduplicate: skip if rule text already exists in the file
-  if (!existing.includes(rule)) {
-    const ruleText = `- [${category}] ${rule}`
-    const newContent = existing.trimEnd() + '\n' + ruleText + '\n'
-    Write(targetFile, newContent)
-  }
-} else if (type === 'learning') {
-  // Learnings go to coding-conventions.md as a special section
-  // Uses .ccw/specs/ directory (same as frontend/backend spec-index-builder)
-  const targetFile = '.ccw/specs/coding-conventions.md'
-  const existing = Read(targetFile)
-  const entry = buildEntry(rule, type, category, sessionId)
-  const learningText = `- [learning/${category}] ${entry.insight} (${entry.date})`
-
-  if (!existing.includes(entry.insight)) {
-    const newContent = existing.trimEnd() + '\n' + learningText + '\n'
-    Write(targetFile, newContent)
-  }
-}
-
-// Rebuild spec index after modification
-Bash('ccw spec rebuild')
-```
-
-### Step 5: Display Confirmation
-
-```
-Guideline solidified
-
-Type: ${type}
-Category: ${category}
-Rule: "${rule}"
-
-Location: .ccw/specs/*.md -> ${type}s.${category}
-
-Total ${type}s in ${category}: ${count}
-```
-
-## Compress Mode (--type compress)
-
-When `--type compress` is specified, the command operates on core memories instead of project guidelines. It fetches recent memories, sends them to an LLM for consolidation, and creates a new compressed CMEM.
-
-### Step C1: Fetch Recent Memories
-
-```javascript
-// Uses CoreMemoryStore.getRecentMemories()
-const limit = parsedArgs.limit || 20;
-const recentMemories = store.getRecentMemories(limit, /* excludeArchived */ true);
-
-if (recentMemories.length < 2) {
-  console.log("Not enough non-archived memories to compress (need at least 2).");
-  return;
-}
-```
-
-### Step C2: Build Compression Prompt
-
-Concatenate all memory contents and send to LLM with the following prompt:
-
-```
-Given these ${N} memories, produce a single consolidated memory that:
-1. Preserves all key information and insights
-2. Removes redundancy and duplicate concepts
-3. Organizes content by theme/topic
-4. Maintains specific technical details and decisions
-
-Source memories:
----
-[Memory CMEM-XXXXXXXX-XXXXXX]:
-${memory.content}
----
-[Memory CMEM-XXXXXXXX-XXXXXX]:
-${memory.content}
----
-...
-
-Output: A single comprehensive memory text.
-```
-
-### Step C3: Merge Tags from Source Memories
-
-```javascript
-// Collect all tags from source memories and deduplicate
-const allTags = new Set();
-for (const memory of recentMemories) {
-  if (memory.tags) {
-    for (const tag of memory.tags) {
-      allTags.add(tag);
-    }
-  }
-}
-const mergedTags = Array.from(allTags);
-```
-
-### Step C4: Create Compressed CMEM
-
-```javascript
-const sourceIds = recentMemories.map(m => m.id);
-const originalSize = recentMemories.reduce((sum, m) => sum + m.content.length, 0);
-const compressedSize = compressedText.length;
-
-const metadata = store.buildCompressionMetadata(sourceIds, originalSize, compressedSize);
-
-const newMemory = store.upsertMemory({
-  content: compressedText,
-  summary: `Compressed from ${sourceIds.length} memories`,
-  tags: mergedTags,
-  metadata: metadata
-});
-```
-
-### Step C5: Archive Source Memories
-
-```javascript
-// Archive all source memories after successful compression
-store.archiveMemories(sourceIds);
-```
-
-### Step C6: Display Compression Report
-
-```
-Memory compression complete
-
-New CMEM: ${newMemory.id}
-Sources compressed: ${sourceIds.length}
-Original size: ${originalSize} chars
-Compressed size: ${compressedSize} chars
-Compression ratio: ${(compressedSize / originalSize * 100).toFixed(1)}%
-Tags merged: ${mergedTags.join(', ') || '(none)'}
-Source memories archived: ${sourceIds.join(', ')}
-```
-
-### Compressed CMEM Metadata Format
-
-The compressed CMEM's `metadata` field contains a JSON string with:
-
-```json
-{
-  "compressed_from": ["CMEM-20260101-120000", "CMEM-20260102-140000", "..."],
-  "compression_ratio": 0.45,
-  "compressed_at": "2026-02-23T10:30:00.000Z"
-}
-```
-
-- `compressed_from`: Array of source memory IDs that were consolidated
-- `compression_ratio`: Ratio of compressed size to original size (lower = more compression)
-- `compressed_at`: ISO timestamp of when the compression occurred
-
-## Interactive Mode
-
-When `--interactive` flag is provided:
-
-```javascript
-AskUserQuestion({
-  questions: [
-    {
-      question: "What type of guideline are you adding?",
-      header: "Type",
-      multiSelect: false,
-      options: [
-        { label: "Convention", description: "Coding style preference (e.g., use functional components)" },
-        { label: "Constraint", description: "Hard rule that must not be violated (e.g., no direct DB access)" },
-        { label: "Learning", description: "Insight from this session (e.g., cache invalidation needs events)" }
-      ]
-    }
-  ]
-});
-
-// Follow-up based on type selection...
-```
-
-## Examples
-
-### Add a Convention
-```bash
-/workflow:session:solidify "Use async/await instead of callbacks" --type convention --category coding_style
-```
-
-Result in `.ccw/specs/coding-conventions.md`:
-```markdown
-- [coding_style] Use async/await instead of callbacks
-```
-
-### Add an Architectural Constraint
-```bash
-/workflow:session:solidify "No direct DB access from controllers" --type constraint --category architecture
-```
-
-Result in `.ccw/specs/architecture-constraints.md`:
-```markdown
-- [architecture] No direct DB access from controllers
-```
-
-### Capture a Session Learning
-```bash
-/workflow:session:solidify "Cache invalidation requires event sourcing for consistency" --type learning
-```
-
-Result in `.ccw/specs/coding-conventions.md`:
-```markdown
-- [learning/architecture] Cache invalidation requires event sourcing for consistency (2024-12-28)
-```
-
-### Compress Recent Memories
-```bash
-/workflow:session:solidify --type compress --limit 10
-```
-
-Result: Creates a new CMEM with consolidated content from the 10 most recent non-archived memories. Source memories are archived. The new CMEM's metadata tracks which memories were compressed:
-```json
-{
-  "compressed_from": ["CMEM-20260220-100000", "CMEM-20260221-143000", "..."],
-  "compression_ratio": 0.42,
-  "compressed_at": "2026-02-23T10:30:00.000Z"
-}
-```
-
-## Integration with Planning
-
-The `specs/*.md` is consumed by:
-
-1. **`workflow-plan` skill (context-gather phase)**: Loads guidelines into context-package.json
-2. **`workflow-plan` skill**: Passes guidelines to task generation agent
-3. **`task-generate-agent`**: Includes guidelines as "CRITICAL CONSTRAINTS" in system prompt
-
-This ensures all future planning respects solidified rules without users needing to re-state them.
-
-## Error Handling
-
-- **Duplicate Rule**: Warn and skip if exact rule already exists
-- **Invalid Category**: Suggest valid categories for the type
-- **File Corruption**: Backup existing file before modification
-
-## Related Commands
-
-- `/workflow:session:start` - Start a session (may prompt for solidify at end)
-- `/workflow:session:complete` - Complete session (prompts for learnings to solidify)
-- `/workflow:init` - Creates specs/*.md scaffold if missing
-- `/workflow:init-specs` - Interactive wizard to create individual specs with scope selection

.claude/commands/workflow/session/start.md

@@ -38,7 +38,7 @@ ERROR: Invalid session type. Valid types: workflow, review, tdd, test, docs
 
 ## Step 0: Initialize Project State (First-time Only)
 
-**Executed before all modes** - Ensures project-level state files exist by calling `/workflow:init`.
+**Executed before all modes** - Ensures project-level state files exist by calling `/workflow:spec:setup`.
 
 ### Check and Initialize
 ```bash
@@ -47,10 +47,10 @@ bash(test -f .workflow/project-tech.json && echo "TECH_EXISTS" || echo "TECH_NOT
 bash(test -f .ccw/specs/*.md && echo "GUIDELINES_EXISTS" || echo "GUIDELINES_NOT_FOUND")
 ```
 
-**If either NOT_FOUND**, delegate to `/workflow:init`:
+**If either NOT_FOUND**, delegate to `/workflow:spec:setup`:
 ```javascript
-// Call workflow:init for intelligent project analysis
-Skill(skill="workflow:init");
+// Call workflow:spec:setup for intelligent project analysis
+Skill(skill="workflow:spec:setup");
 
 // Wait for init completion
 // project-tech.json and specs/*.md will be created
@@ -58,11 +58,11 @@ Skill(skill="workflow:init");
 
 **Output**:
 - If BOTH_EXIST: `PROJECT_STATE: initialized`
-- If NOT_FOUND: Calls `/workflow:init` → creates:
+- If NOT_FOUND: Calls `/workflow:spec:setup` → creates:
   - `.workflow/project-tech.json` with full technical analysis
   - `.ccw/specs/*.md` with empty scaffold
 
-**Note**: `/workflow:init` uses cli-explore-agent to build comprehensive project understanding (technology stack, architecture, key components). This step runs once per project. Subsequent executions skip initialization.
+**Note**: `/workflow:spec:setup` uses cli-explore-agent to build comprehensive project understanding (technology stack, architecture, key components). This step runs once per project. Subsequent executions skip initialization.
 
 ## Mode 1: Discovery Mode (Default)
 

.claude/commands/workflow/session/sync.md

@@ -190,13 +190,12 @@ Write(techPath, JSON.stringify(tech, null, 2))
 
 | Error | Resolution |
 |-------|------------|
-| File missing | Create scaffold (same as solidify Step 1) |
+| File missing | Create scaffold (same as spec:setup Step 4) |
 | No git history | Use user summary or session context only |
 | No meaningful updates | Skip guidelines, still add tech entry |
 | Duplicate entry | Skip silently (dedup check in Step 4) |
 
 ## Related Commands
 
-- `/workflow:init` - Initialize project with specs scaffold
-- `/workflow:init-specs` - Interactive wizard to create individual specs with scope selection
-- `/workflow:session:solidify` - Add individual rules one at a time
+- `/workflow:spec:setup` - Initialize project with specs scaffold
+- `/workflow:spec:add` - Interactive wizard to create individual specs with scope selection

.claude/commands/workflow/spec/add.md

@@ -0,0 +1,644 @@
+---
+name: add
+description: Add specs, conventions, constraints, or learnings to project guidelines interactively or automatically
+argument-hint: "[-y|--yes] [--type <convention|constraint|learning>] [--category <category>] [--dimension <specs|personal>] [--scope <global|project>] [--interactive] \"rule text\""
+examples:
+  - /workflow:spec:add "Use functional components for all React code"
+  - /workflow:spec:add -y "No direct DB access from controllers" --type constraint
+  - /workflow:spec:add --scope global --dimension personal
+  - /workflow:spec:add --interactive
+  - /workflow:spec:add "Cache invalidation requires event sourcing" --type learning --category architecture
+---
+
+## Auto Mode
+
+When `--yes` or `-y`: Auto-categorize and add guideline without confirmation.
+
+# Spec Add Command (/workflow:spec:add)
+
+## Overview
+
+Unified command for adding specs one at a time. Supports both interactive wizard mode and direct CLI mode.
+
+**Key Features**:
+- Supports both project specs and personal specs
+- Scope selection (global vs project) for personal specs
+- Category-based organization for workflow stages
+- Interactive wizard mode with smart defaults
+- Direct CLI mode with auto-detection of type and category
+- Auto-confirm mode (`-y`/`--yes`) for scripted usage
+
+## Use Cases
+
+1. **During Session**: Capture important decisions as they're made
+2. **After Session**: Reflect on lessons learned before archiving
+3. **Proactive**: Add team conventions or architectural rules
+4. **Interactive**: Guided wizard for adding rules with full control over dimension, scope, and category
+
+## Usage
+```bash
+/workflow:spec:add                                             # Interactive wizard (all prompts)
+/workflow:spec:add --interactive                                # Explicit interactive wizard
+/workflow:spec:add "Use async/await instead of callbacks"       # Direct mode (auto-detect type)
+/workflow:spec:add -y "No direct DB access" --type constraint   # Auto-confirm, skip confirmation
+/workflow:spec:add --scope global --dimension personal          # Create global personal spec (interactive)
+/workflow:spec:add --dimension specs --category exploration     # Project spec in exploration category (interactive)
+```
+
+## Parameters
+
+| Parameter | Type | Required | Default | Description |
+|-----------|------|----------|---------|-------------|
+| `rule` | string | Yes (unless `--interactive`) | - | The rule, convention, or insight to add |
+| `--type` | enum | No | auto-detect | Type: `convention`, `constraint`, `learning` |
+| `--category` | string | No | auto-detect / `general` | Category for organization (see categories below) |
+| `--dimension` | enum | No | Interactive | `specs` (project) or `personal` |
+| `--scope` | enum | No | `project` | `global` or `project` (only for personal dimension) |
+| `--interactive` | flag | No | - | Launch full guided wizard for adding rules |
+| `-y` / `--yes` | flag | No | - | Auto-categorize and add without confirmation |
+
+### Type Categories
+
+**convention** - Coding style preferences (goes to `conventions` section)
+- Subcategories: `coding_style`, `naming_patterns`, `file_structure`, `documentation`
+
+**constraint** - Hard rules that must not be violated (goes to `constraints` section)
+- Subcategories: `architecture`, `tech_stack`, `performance`, `security`
+
+**learning** - Session-specific insights (goes to `learnings` array)
+- Subcategories: `architecture`, `performance`, `security`, `testing`, `process`, `other`
+
+### Workflow Stage Categories (for `--category`)
+
+| Category | Use Case | Example Rules |
+|----------|----------|---------------|
+| `general` | Applies to all stages | "Use TypeScript strict mode" |
+| `exploration` | Code exploration, debugging | "Always trace the call stack before modifying" |
+| `planning` | Task planning, requirements | "Break down tasks into 2-hour chunks" |
+| `execution` | Implementation, testing | "Run tests after each file modification" |
+
+## Execution Process
+
+```
+Input Parsing:
+   |- Parse: rule text (positional argument, optional if --interactive)
+   |- Parse: --type (convention|constraint|learning)
+   |- Parse: --category (subcategory)
+   |- Parse: --dimension (specs|personal)
+   |- Parse: --scope (global|project)
+   |- Parse: --interactive (flag)
+   +- Parse: -y / --yes (flag)
+
+Step 1: Parse Input
+
+Step 2: Determine Mode
+   |- If --interactive OR no rule text → Full Interactive Wizard (Path A)
+   +- If rule text provided → Direct Mode (Path B)
+
+Path A: Interactive Wizard
+   |- Step A1: Ask dimension (if not specified)
+   |- Step A2: Ask scope (if personal + scope not specified)
+   |- Step A3: Ask category (if not specified)
+   |- Step A4: Ask type (convention|constraint|learning)
+   |- Step A5: Ask content (rule text)
+   +- Continue to Step 3
+
+Path B: Direct Mode
+   |- Step B1: Auto-detect type (if not specified) using detectType()
+   |- Step B2: Auto-detect category (if not specified) using detectCategory()
+   |- Step B3: Default dimension to 'specs' if not specified
+   +- Continue to Step 3
+
+Step 3: Determine Target File
+   |- specs dimension → .ccw/specs/coding-conventions.md or architecture-constraints.md
+   +- personal dimension → ~/.ccw/personal/ or .ccw/personal/
+
+Step 4: Validate and Write Spec
+   |- Ensure target directory and file exist
+   |- Check for duplicates
+   |- Append rule to appropriate section
+   +- Run ccw spec rebuild
+
+Step 5: Display Confirmation
+   +- If -y/--yes: Minimal output
+   +- Otherwise: Full confirmation with location details
+```
+
+## Implementation
+
+### Step 1: Parse Input
+
+```javascript
+// Parse arguments
+const args = $ARGUMENTS
+const argsLower = args.toLowerCase()
+
+// Extract flags
+const autoConfirm = argsLower.includes('--yes') || argsLower.includes('-y')
+const isInteractive = argsLower.includes('--interactive')
+
+// Extract named parameters
+const hasType = argsLower.includes('--type')
+const hasCategory = argsLower.includes('--category')
+const hasDimension = argsLower.includes('--dimension')
+const hasScope = argsLower.includes('--scope')
+
+let type = hasType ? args.match(/--type\s+(\w+)/i)?.[1]?.toLowerCase() : null
+let category = hasCategory ? args.match(/--category\s+(\w+)/i)?.[1]?.toLowerCase() : null
+let dimension = hasDimension ? args.match(/--dimension\s+(\w+)/i)?.[1]?.toLowerCase() : null
+let scope = hasScope ? args.match(/--scope\s+(\w+)/i)?.[1]?.toLowerCase() : null
+
+// Extract rule text (everything before flags, or quoted string)
+let ruleText = args
+  .replace(/--type\s+\w+/gi, '')
+  .replace(/--category\s+\w+/gi, '')
+  .replace(/--dimension\s+\w+/gi, '')
+  .replace(/--scope\s+\w+/gi, '')
+  .replace(/--interactive/gi, '')
+  .replace(/--yes/gi, '')
+  .replace(/-y\b/gi, '')
+  .replace(/^["']|["']$/g, '')
+  .trim()
+
+// Validate values
+if (scope && !['global', 'project'].includes(scope)) {
+  console.log("Invalid scope. Use 'global' or 'project'.")
+  return
+}
+if (dimension && !['specs', 'personal'].includes(dimension)) {
+  console.log("Invalid dimension. Use 'specs' or 'personal'.")
+  return
+}
+if (type && !['convention', 'constraint', 'learning'].includes(type)) {
+  console.log("Invalid type. Use 'convention', 'constraint', or 'learning'.")
+  return
+}
+if (category) {
+  const validCategories = [
+    'general', 'exploration', 'planning', 'execution',
+    'coding_style', 'naming_patterns', 'file_structure', 'documentation',
+    'architecture', 'tech_stack', 'performance', 'security',
+    'testing', 'process', 'other'
+  ]
+  if (!validCategories.includes(category)) {
+    console.log(`Invalid category. Valid categories: ${validCategories.join(', ')}`)
+    return
+  }
+}
+```
+
+### Step 2: Determine Mode
+
+```javascript
+const useInteractiveWizard = isInteractive || !ruleText
+```
+
+### Path A: Interactive Wizard
+
+**If dimension not specified**:
+```javascript
+if (!dimension) {
+  const dimensionAnswer = AskUserQuestion({
+    questions: [{
+      question: "What type of spec do you want to create?",
+      header: "Dimension",
+      multiSelect: false,
+      options: [
+        {
+          label: "Project Spec",
+          description: "Coding conventions, constraints, quality rules for this project (stored in .ccw/specs/)"
+        },
+        {
+          label: "Personal Spec",
+          description: "Personal preferences and constraints that follow you across projects (stored in ~/.ccw/specs/personal/ or .ccw/specs/personal/)"
+        }
+      ]
+    }]
+  })
+  dimension = dimensionAnswer.answers["Dimension"] === "Project Spec" ? "specs" : "personal"
+}
+```
+
+**If personal dimension and scope not specified**:
+```javascript
+if (dimension === 'personal' && !scope) {
+  const scopeAnswer = AskUserQuestion({
+    questions: [{
+      question: "Where should this personal spec be stored?",
+      header: "Scope",
+      multiSelect: false,
+      options: [
+        {
+          label: "Global (Recommended)",
+          description: "Apply to ALL projects (~/.ccw/specs/personal/)"
+        },
+        {
+          label: "Project-only",
+          description: "Apply only to this project (.ccw/specs/personal/)"
+        }
+      ]
+    }]
+  })
+  scope = scopeAnswer.answers["Scope"].includes("Global") ? "global" : "project"
+}
+```
+
+**If category not specified**:
+```javascript
+if (!category) {
+  const categoryAnswer = AskUserQuestion({
+    questions: [{
+      question: "Which workflow stage does this spec apply to?",
+      header: "Category",
+      multiSelect: false,
+      options: [
+        {
+          label: "General (Recommended)",
+          description: "Applies to all stages (default)"
+        },
+        {
+          label: "Exploration",
+          description: "Code exploration, analysis, debugging"
+        },
+        {
+          label: "Planning",
+          description: "Task planning, requirements gathering"
+        },
+        {
+          label: "Execution",
+          description: "Implementation, testing, deployment"
+        }
+      ]
+    }]
+  })
+  const categoryLabel = categoryAnswer.answers["Category"]
+  category = categoryLabel.includes("General") ? "general"
+    : categoryLabel.includes("Exploration") ? "exploration"
+    : categoryLabel.includes("Planning") ? "planning"
+    : "execution"
+}
+```
+
+**Ask type (if not specified)**:
+```javascript
+if (!type) {
+  const typeAnswer = AskUserQuestion({
+    questions: [{
+      question: "What type of rule is this?",
+      header: "Type",
+      multiSelect: false,
+      options: [
+        {
+          label: "Convention",
+          description: "Coding style preference (e.g., use functional components)"
+        },
+        {
+          label: "Constraint",
+          description: "Hard rule that must not be violated (e.g., no direct DB access)"
+        },
+        {
+          label: "Learning",
+          description: "Insight or lesson learned (e.g., cache invalidation needs events)"
+        }
+      ]
+    }]
+  })
+  const typeLabel = typeAnswer.answers["Type"]
+  type = typeLabel.includes("Convention") ? "convention"
+    : typeLabel.includes("Constraint") ? "constraint"
+    : "learning"
+}
+```
+
+**Ask content (rule text)**:
+```javascript
+if (!ruleText) {
+  const contentAnswer = AskUserQuestion({
+    questions: [{
+      question: "Enter the rule or guideline text:",
+      header: "Content",
+      multiSelect: false,
+      options: [
+        { label: "Custom rule", description: "Type your own rule using the 'Other' option below" },
+        { label: "Skip", description: "Cancel adding a spec" }
+      ]
+    }]
+  })
+  if (contentAnswer.answers["Content"] === "Skip") return
+  ruleText = contentAnswer.answers["Content"]
+}
+```
+
+### Path B: Direct Mode
+
+**Auto-detect type if not specified**:
+```javascript
+function detectType(ruleText) {
+  const text = ruleText.toLowerCase();
+
+  // Constraint indicators
+  if (/\b(no|never|must not|forbidden|prohibited|always must)\b/.test(text)) {
+    return 'constraint';
+  }
+
+  // Learning indicators
+  if (/\b(learned|discovered|realized|found that|turns out)\b/.test(text)) {
+    return 'learning';
+  }
+
+  // Default to convention
+  return 'convention';
+}
+
+function detectCategory(ruleText, type) {
+  const text = ruleText.toLowerCase();
+
+  if (type === 'constraint' || type === 'learning') {
+    if (/\b(architecture|layer|module|dependency|circular)\b/.test(text)) return 'architecture';
+    if (/\b(security|auth|permission|sanitize|xss|sql)\b/.test(text)) return 'security';
+    if (/\b(performance|cache|lazy|async|sync|slow)\b/.test(text)) return 'performance';
+    if (/\b(test|coverage|mock|stub)\b/.test(text)) return 'testing';
+  }
+
+  if (type === 'convention') {
+    if (/\b(name|naming|prefix|suffix|camel|pascal)\b/.test(text)) return 'naming_patterns';
+    if (/\b(file|folder|directory|structure|organize)\b/.test(text)) return 'file_structure';
+    if (/\b(doc|comment|jsdoc|readme)\b/.test(text)) return 'documentation';
+    return 'coding_style';
+  }
+
+  return type === 'constraint' ? 'tech_stack' : 'other';
+}
+
+if (!type) {
+  type = detectType(ruleText)
+}
+if (!category) {
+  category = detectCategory(ruleText, type)
+}
+if (!dimension) {
+  dimension = 'specs'  // Default to project specs in direct mode
+}
+```
+
+### Step 3: Ensure Guidelines File Exists
+
+**Uses .ccw/specs/ directory (same as frontend/backend spec-index-builder)**
+
+```bash
+bash(test -f .ccw/specs/coding-conventions.md && echo "EXISTS" || echo "NOT_FOUND")
+```
+
+**If NOT_FOUND**, initialize spec system:
+
+```bash
+Bash('ccw spec init')
+Bash('ccw spec rebuild')
+```
+
+### Step 4: Determine Target File
+
+```javascript
+const path = require('path')
+const os = require('os')
+
+const isConvention = type === 'convention'
+const isConstraint = type === 'constraint'
+const isLearning = type === 'learning'
+
+let targetFile
+let targetDir
+
+if (dimension === 'specs') {
+  // Project specs - use .ccw/specs/ (same as frontend/backend spec-index-builder)
+  targetDir = '.ccw/specs'
+  if (isConstraint) {
+    targetFile = path.join(targetDir, 'architecture-constraints.md')
+  } else {
+    targetFile = path.join(targetDir, 'coding-conventions.md')
+  }
+} else {
+  // Personal specs - use .ccw/personal/ (same as backend spec-index-builder)
+  if (scope === 'global') {
+    targetDir = path.join(os.homedir(), '.ccw', 'personal')
+  } else {
+    targetDir = path.join('.ccw', 'personal')
+  }
+
+  // Create type-based filename
+  const typePrefix = isConstraint ? 'constraints' : isLearning ? 'learnings' : 'conventions'
+  targetFile = path.join(targetDir, `${typePrefix}.md`)
+}
+```
+
+### Step 5: Build Entry
+
+```javascript
+function buildEntry(rule, type, category, sessionId) {
+  if (type === 'learning') {
+    return {
+      date: new Date().toISOString().split('T')[0],
+      session_id: sessionId || null,
+      insight: rule,
+      category: category,
+      context: null
+    };
+  }
+
+  // For conventions and constraints, just return the rule string
+  return rule;
+}
+```
+
+### Step 6: Write Spec
+
+```javascript
+const fs = require('fs')
+
+// Ensure directory exists
+if (!fs.existsSync(targetDir)) {
+  fs.mkdirSync(targetDir, { recursive: true })
+}
+
+// Check if file exists
+const fileExists = fs.existsSync(targetFile)
+
+if (!fileExists) {
+  // Create new file with frontmatter
+  const frontmatter = `---
+title: ${dimension === 'specs' ? 'Project' : 'Personal'} ${isConstraint ? 'Constraints' : isLearning ? 'Learnings' : 'Conventions'}
+readMode: optional
+priority: medium
+category: ${category}
+scope: ${dimension === 'personal' ? scope : 'project'}
+dimension: ${dimension}
+keywords: [${category}, ${isConstraint ? 'constraint' : isLearning ? 'learning' : 'convention'}]
+---
+
+# ${dimension === 'specs' ? 'Project' : 'Personal'} ${isConstraint ? 'Constraints' : isLearning ? 'Learnings' : 'Conventions'}
+
+`
+  fs.writeFileSync(targetFile, frontmatter, 'utf8')
+}
+
+// Read existing content
+let content = fs.readFileSync(targetFile, 'utf8')
+
+// Deduplicate: skip if rule text already exists in the file
+if (content.includes(ruleText)) {
+  console.log(`
+Rule already exists in ${targetFile}
+Text: "${ruleText}"
+`)
+  return
+}
+
+// Format the new rule based on type
+let newRule
+if (isLearning) {
+  const entry = buildEntry(ruleText, type, category)
+  newRule = `- [learning/${category}] ${entry.insight} (${entry.date})`
+} else {
+  newRule = `- [${category}] ${ruleText}`
+}
+
+// Append the rule
+content = content.trimEnd() + '\n' + newRule + '\n'
+fs.writeFileSync(targetFile, content, 'utf8')
+
+// Rebuild spec index
+Bash('ccw spec rebuild')
+```
+
+### Step 7: Display Confirmation
+
+**If `-y`/`--yes` (auto mode)**:
+```
+Spec added: [${type}/${category}] "${ruleText}" -> ${targetFile}
+```
+
+**Otherwise (full confirmation)**:
+```
+Spec created successfully
+
+Dimension: ${dimension}
+Scope: ${dimension === 'personal' ? scope : 'project'}
+Category: ${category}
+Type: ${type}
+Rule: "${ruleText}"
+
+Location: ${targetFile}
+
+Use 'ccw spec list' to view all specs
+Use 'ccw spec load --category ${category}' to load specs by category
+```
+
+## Target File Resolution
+
+### Project Specs (dimension: specs)
+```
+.ccw/specs/
+|- coding-conventions.md    <- conventions, learnings
+|- architecture-constraints.md  <- constraints
++- quality-rules.md         <- quality rules
+```
+
+### Personal Specs (dimension: personal)
+```
+# Global (~/.ccw/personal/)
+~/.ccw/personal/
+|- conventions.md           <- personal conventions (all projects)
+|- constraints.md           <- personal constraints (all projects)
++- learnings.md             <- personal learnings (all projects)
+
+# Project-local (.ccw/personal/)
+.ccw/personal/
+|- conventions.md           <- personal conventions (this project only)
+|- constraints.md           <- personal constraints (this project only)
++- learnings.md             <- personal learnings (this project only)
+```
+
+## Examples
+
+### Interactive Wizard
+```bash
+/workflow:spec:add --interactive
+# Prompts for: dimension -> scope (if personal) -> category -> type -> content
+```
+
+### Add a Convention (Direct)
+```bash
+/workflow:spec:add "Use async/await instead of callbacks" --type convention --category coding_style
+```
+
+Result in `.ccw/specs/coding-conventions.md`:
+```markdown
+- [coding_style] Use async/await instead of callbacks
+```
+
+### Add an Architectural Constraint (Direct)
+```bash
+/workflow:spec:add "No direct DB access from controllers" --type constraint --category architecture
+```
+
+Result in `.ccw/specs/architecture-constraints.md`:
+```markdown
+- [architecture] No direct DB access from controllers
+```
+
+### Capture a Learning (Direct, Auto-detect)
+```bash
+/workflow:spec:add "Cache invalidation requires event sourcing for consistency" --type learning
+```
+
+Result in `.ccw/specs/coding-conventions.md`:
+```markdown
+- [learning/architecture] Cache invalidation requires event sourcing for consistency (2026-03-06)
+```
+
+### Auto-confirm Mode
+```bash
+/workflow:spec:add -y "No direct DB access from controllers" --type constraint
+# Auto-detects category as 'architecture', writes without confirmation prompt
+```
+
+### Personal Spec (Global)
+```bash
+/workflow:spec:add --scope global --dimension personal --type convention "Prefer descriptive variable names"
+```
+
+Result in `~/.ccw/personal/conventions.md`:
+```markdown
+- [general] Prefer descriptive variable names
+```
+
+### Personal Spec (Project)
+```bash
+/workflow:spec:add --scope project --dimension personal --type constraint "No ORM in this project"
+```
+
+Result in `.ccw/personal/constraints.md`:
+```markdown
+- [general] No ORM in this project
+```
+
+## Error Handling
+
+- **Duplicate Rule**: Warn and skip if exact rule text already exists in target file
+- **Invalid Category**: Suggest valid categories for the type
+- **Invalid Scope**: Exit with error - must be 'global' or 'project'
+- **Invalid Dimension**: Exit with error - must be 'specs' or 'personal'
+- **Invalid Type**: Exit with error - must be 'convention', 'constraint', or 'learning'
+- **File not writable**: Check permissions, suggest manual creation
+- **Invalid path**: Exit with error message
+- **File Corruption**: Backup existing file before modification
+
+## Related Commands
+
+- `/workflow:spec:setup` - Initialize project with specs scaffold
+- `/workflow:session:sync` - Quick-sync session work to specs and project-tech
+- `/workflow:session:start` - Start a session
+- `/workflow:session:complete` - Complete session (prompts for learnings)
+- `ccw spec list` - View all specs
+- `ccw spec load --category <cat>` - Load filtered specs
+- `ccw spec rebuild` - Rebuild spec index

.claude/commands/workflow/spec/setup.md

@@ -1,74 +1,208 @@
 ---
-name: init-guidelines
-description: Interactive wizard to fill specs/*.md based on project analysis
-argument-hint: "[--reset]"
+name: setup
+description: Initialize project-level state and configure specs via interactive questionnaire using cli-explore-agent
+argument-hint: "[--regenerate] [--skip-specs] [--reset]"
 examples:
-  - /workflow:init-guidelines
-  - /workflow:init-guidelines --reset
+  - /workflow:spec:setup
+  - /workflow:spec:setup --regenerate
+  - /workflow:spec:setup --skip-specs
+  - /workflow:spec:setup --reset
 ---
 
-# Workflow Init Guidelines Command (/workflow:init-guidelines)
+# Workflow Spec Setup Command (/workflow:spec:setup)
 
 ## Overview
 
-Interactive multi-round wizard that analyzes the current project (via `project-tech.json`) and asks targeted questions to populate `.ccw/specs/*.md` with coding conventions, constraints, and quality rules.
+Initialize `.workflow/project-tech.json` and `.ccw/specs/*.md` with comprehensive project understanding by delegating analysis to **cli-explore-agent**, then interactively configure project guidelines through a multi-round questionnaire.
+
+**Dual File System**:
+- `project-tech.json`: Auto-generated technical analysis (stack, architecture, components)
+- `specs/*.md`: User-maintained rules and constraints (created and populated interactively)
 
 **Design Principle**: Questions are dynamically generated based on the project's tech stack, architecture, and patterns — not generic boilerplate.
 
-**Note**: This command may be called by `/workflow:init` after initialization. Upon completion, return to the calling workflow if applicable.
+**Note**: This command may be called by other workflow commands. Upon completion, return immediately to continue the calling workflow without interrupting the task flow.
 
 ## Usage
 ```bash
-/workflow:init-guidelines          # Fill guidelines interactively (skip if already populated)
-/workflow:init-guidelines --reset  # Reset and re-fill guidelines from scratch
+/workflow:spec:setup                 # Initialize (skip if exists)
+/workflow:spec:setup --regenerate    # Force regeneration of project-tech.json
+/workflow:spec:setup --skip-specs    # Initialize project-tech only, skip spec initialization and questionnaire
+/workflow:spec:setup --reset         # Reset specs content before questionnaire
 ```
 
 ## Execution Process
 
 ```
 Input Parsing:
+   ├─ Parse --regenerate flag → regenerate = true | false
+   ├─ Parse --skip-specs flag → skipSpecs = true | false
    └─ Parse --reset flag → reset = true | false
 
-Step 1: Check Prerequisites
-   ├─ project-tech.json must exist (run /workflow:init first)
-   ├─ specs/*.md: check if populated or scaffold-only
-   └─ If populated + no --reset → Ask: "Guidelines already exist. Overwrite or append?"
+Decision:
+   ├─ BOTH_EXIST + no --regenerate + no --reset → Exit: "Already initialized"
+   ├─ EXISTS + --regenerate → Backup existing → Continue analysis
+   ├─ EXISTS + --reset → Reset specs, keep project-tech → Skip to questionnaire
+   └─ NOT_FOUND → Continue full flow
 
-Step 2: Load Project Context
-   └─ Read project-tech.json → extract tech stack, architecture, patterns
+Full Flow:
+   ├─ Step 1: Parse input and check existing state
+   ├─ Step 2: Get project metadata (name, root)
+   ├─ Step 3: Invoke cli-explore-agent
+   │   ├─ Structural scan (get_modules_by_depth.sh, find, wc)
+   │   ├─ Semantic analysis (Gemini CLI)
+   │   ├─ Synthesis and merge
+   │   └─ Write .workflow/project-tech.json
+   ├─ Step 4: Initialize Spec System (if not --skip-specs)
+   │   ├─ Check if specs/*.md exist
+   │   ├─ If NOT_FOUND → Run ccw spec init
+   │   └─ Run ccw spec rebuild
+   ├─ Step 5: Multi-Round Interactive Questionnaire (if not --skip-specs)
+   │   ├─ Check if guidelines already populated → Ask: "Append / Reset / Cancel"
+   │   ├─ Load project context from project-tech.json
+   │   ├─ Round 1: Coding Conventions (coding_style, naming_patterns)
+   │   ├─ Round 2: File & Documentation Conventions (file_structure, documentation)
+   │   ├─ Round 3: Architecture & Tech Constraints (architecture, tech_stack)
+   │   ├─ Round 4: Performance & Security Constraints (performance, security)
+   │   └─ Round 5: Quality Rules (quality_rules)
+   ├─ Step 6: Write specs/*.md (if not --skip-specs)
+   └─ Step 7: Display Summary
 
-Step 3: Multi-Round Interactive Questionnaire
-   ├─ Round 1: Coding Conventions (coding_style, naming_patterns)
-   ├─ Round 2: File & Documentation Conventions (file_structure, documentation)
-   ├─ Round 3: Architecture & Tech Constraints (architecture, tech_stack)
-   ├─ Round 4: Performance & Security Constraints (performance, security)
-   └─ Round 5: Quality Rules (quality_rules)
-
-Step 4: Write specs/*.md
-
-Step 5: Display Summary
+Output:
+   ├─ .workflow/project-tech.json (+ .backup if regenerate)
+   └─ .ccw/specs/*.md (scaffold or configured, unless --skip-specs)
 ```
 
 ## Implementation
 
-### Step 1: Check Prerequisites
+### Step 1: Parse Input and Check Existing State
+
+**Parse flags**:
+```javascript
+const regenerate = $ARGUMENTS.includes('--regenerate')
+const skipSpecs = $ARGUMENTS.includes('--skip-specs')
+const reset = $ARGUMENTS.includes('--reset')
+```
+
+**Check existing state**:
 
 ```bash
 bash(test -f .workflow/project-tech.json && echo "TECH_EXISTS" || echo "TECH_NOT_FOUND")
 bash(test -f .ccw/specs/coding-conventions.md && echo "SPECS_EXISTS" || echo "SPECS_NOT_FOUND")
 ```
 
-**If TECH_NOT_FOUND**: Exit with message
+**If BOTH_EXIST and no --regenerate and no --reset**: Exit early
 ```
-Project tech analysis not found. Run /workflow:init first.
+Project already initialized:
+- Tech analysis: .workflow/project-tech.json
+- Guidelines: .ccw/specs/*.md
+
+Use /workflow:spec:setup --regenerate to rebuild tech analysis
+Use /workflow:spec:setup --reset to reconfigure guidelines
+Use /workflow:spec:add to add individual rules
+Use /workflow:status --project to view state
 ```
 
-**Parse --reset flag**:
+### Step 2: Get Project Metadata
+
+```bash
+bash(basename "$(git rev-parse --show-toplevel 2>/dev/null || pwd)")
+bash(git rev-parse --show-toplevel 2>/dev/null || pwd)
+bash(mkdir -p .workflow)
+```
+
+### Step 3: Invoke cli-explore-agent
+
+**For --regenerate**: Backup and preserve existing data
+```bash
+bash(cp .workflow/project-tech.json .workflow/project-tech.json.backup)
+```
+
+**Delegate analysis to agent**:
+
 ```javascript
-const reset = $ARGUMENTS.includes('--reset')
+Task(
+  subagent_type="cli-explore-agent",
+  run_in_background=false,
+  description="Deep project analysis",
+  prompt=`
+Analyze project for workflow initialization and generate .workflow/project-tech.json.
+
+## MANDATORY FIRST STEPS
+1. Execute: cat ~/.ccw/workflows/cli-templates/schemas/project-tech-schema.json (get schema reference)
+2. Execute: ccw tool exec get_modules_by_depth '{}' (get project structure)
+
+## Task
+Generate complete project-tech.json following the schema structure:
+- project_name: "${projectName}"
+- initialized_at: ISO 8601 timestamp
+- overview: {
+    description: "Brief project description",
+    technology_stack: {
+      languages: [{name, file_count, primary}],
+      frameworks: ["string"],
+      build_tools: ["string"],
+      test_frameworks: ["string"]
+    },
+    architecture: {style, layers: [], patterns: []},
+    key_components: [{name, path, description, importance}]
+  }
+- features: []
+- development_index: ${regenerate ? 'preserve from backup' : '{feature: [], enhancement: [], bugfix: [], refactor: [], docs: []}'}
+- statistics: ${regenerate ? 'preserve from backup' : '{total_features: 0, total_sessions: 0, last_updated: ISO timestamp}'}
+- _metadata: {initialized_by: "cli-explore-agent", analysis_timestamp: ISO timestamp, analysis_mode: "deep-scan"}
+
+## Analysis Requirements
+
+**Technology Stack**:
+- Languages: File counts, mark primary
+- Frameworks: From package.json, requirements.txt, go.mod, etc.
+- Build tools: npm, cargo, maven, webpack, vite
+- Test frameworks: jest, pytest, go test, junit
+
+**Architecture**:
+- Style: MVC, microservices, layered (from structure & imports)
+- Layers: presentation, business-logic, data-access
+- Patterns: singleton, factory, repository
+- Key components: 5-10 modules {name, path, description, importance}
+
+## Execution
+1. Structural scan: get_modules_by_depth.sh, find, wc -l
+2. Semantic analysis: Gemini for patterns/architecture
+3. Synthesis: Merge findings
+4. ${regenerate ? 'Merge with preserved development_index and statistics from .workflow/project-tech.json.backup' : ''}
+5. Write JSON: Write('.workflow/project-tech.json', jsonContent)
+6. Report: Return brief completion summary
+
+Project root: ${projectRoot}
+`
+)
 ```
 
-**If GUIDELINES_EXISTS and not --reset**: Check if guidelines are populated (not just scaffold)
+### Step 4: Initialize Spec System (if not --skip-specs)
+
+```javascript
+// Skip spec initialization if --skip-specs flag is provided
+if (!skipSpecs) {
+  // Initialize spec system if not already initialized
+  const specsCheck = Bash('test -f .ccw/specs/coding-conventions.md && echo EXISTS || echo NOT_FOUND')
+  if (specsCheck.includes('NOT_FOUND')) {
+    console.log('Initializing spec system...')
+    Bash('ccw spec init')
+    Bash('ccw spec rebuild')
+  }
+} else {
+  console.log('Skipping spec initialization and questionnaire (--skip-specs)')
+}
+```
+
+If `--skip-specs` is provided, skip directly to Step 7 (Display Summary) with limited output.
+
+### Step 5: Multi-Round Interactive Questionnaire (if not --skip-specs)
+
+#### Step 5.0: Check Existing Guidelines
+
+If guidelines already have content, ask the user how to proceed:
 
 ```javascript
 // Check if specs already have content via ccw spec list
@@ -76,7 +210,7 @@ const specsList = Bash('ccw spec list --json 2>/dev/null || echo "{}"')
 const specsData = JSON.parse(specsList)
 const isPopulated = (specsData.total || 0) > 5  // More than seed docs
 
-if (isPopulated) {
+if (isPopulated && !reset) {
   AskUserQuestion({
     questions: [{
       question: "Project guidelines already contain entries. How would you like to proceed?",
@@ -93,9 +227,15 @@ if (isPopulated) {
   // If Reset → clear all arrays before proceeding
   // If Append → keep existing, wizard adds to them
 }
+
+// If --reset flag was provided, clear existing entries before proceeding
+if (reset) {
+  // Reset specs content
+  console.log('Resetting existing guidelines...')
+}
 ```
 
-### Step 2: Load Project Context
+#### Step 5.1: Load Project Context
 
 ```javascript
 // Load project context via ccw spec load for planning context
@@ -112,15 +252,15 @@ const archPatterns = specData.overview?.architecture?.patterns || []
 const buildTools = specData.overview?.technology_stack?.build_tools || []
 ```
 
-### Step 3: Multi-Round Interactive Questionnaire
+#### Step 5.2: Multi-Round Questionnaire
 
 Each round uses `AskUserQuestion` with project-aware options. The user can always select "Other" to provide custom input.
 
-**⚠️ CRITICAL**: After each round, collect the user's answers and convert them into guideline entries. Do NOT batch all rounds — process each round's answers before proceeding to the next.
+**CRITICAL**: After each round, collect the user's answers and convert them into guideline entries. Do NOT batch all rounds — process each round's answers before proceeding to the next.
 
 ---
 
-#### Round 1: Coding Conventions
+##### Round 1: Coding Conventions
 
 Generate options dynamically based on detected language/framework:
 
@@ -175,11 +315,11 @@ AskUserQuestion({
 })
 ```
 
-**Process Round 1 answers** → add to `conventions.coding_style` and `conventions.naming_patterns` arrays.
+**Process Round 1 answers** -> add to `conventions.coding_style` and `conventions.naming_patterns` arrays.
 
 ---
 
-#### Round 2: File Structure & Documentation
+##### Round 2: File Structure & Documentation
 
 ```javascript
 AskUserQuestion({
@@ -210,11 +350,11 @@ AskUserQuestion({
 })
 ```
 
-**Process Round 2 answers** → add to `conventions.file_structure` and `conventions.documentation`.
+**Process Round 2 answers** -> add to `conventions.file_structure` and `conventions.documentation`.
 
 ---
 
-#### Round 3: Architecture & Tech Stack Constraints
+##### Round 3: Architecture & Tech Stack Constraints
 
 ```javascript
 // Build architecture-specific options
@@ -259,11 +399,11 @@ AskUserQuestion({
 })
 ```
 
-**Process Round 3 answers** → add to `constraints.architecture` and `constraints.tech_stack`.
+**Process Round 3 answers** -> add to `constraints.architecture` and `constraints.tech_stack`.
 
 ---
 
-#### Round 4: Performance & Security Constraints
+##### Round 4: Performance & Security Constraints
 
 ```javascript
 AskUserQuestion({
@@ -294,11 +434,11 @@ AskUserQuestion({
 })
 ```
 
-**Process Round 4 answers** → add to `constraints.performance` and `constraints.security`.
+**Process Round 4 answers** -> add to `constraints.performance` and `constraints.security`.
 
 ---
 
-#### Round 5: Quality Rules
+##### Round 5: Quality Rules
 
 ```javascript
 AskUserQuestion({
@@ -318,9 +458,9 @@ AskUserQuestion({
 })
 ```
 
-**Process Round 5 answers** → add to `quality_rules` array as `{ rule, scope, enforced_by }` objects.
+**Process Round 5 answers** -> add to `quality_rules` array as `{ rule, scope, enforced_by }` objects.
 
-### Step 4: Write specs/*.md
+### Step 6: Write specs/*.md (if not --skip-specs)
 
 For each category of collected answers, append rules to the corresponding spec MD file. Each spec file uses YAML frontmatter with `readMode`, `priority`, `category`, and `keywords`.
 
@@ -404,51 +544,107 @@ keywords: [execution, quality, testing, coverage, lint]
 Bash('ccw spec rebuild')
 ```
 
-### Step 5: Display Summary
+#### Answer Processing Rules
+
+When converting user selections to guideline entries:
+
+1. **Selected option** -> Use the option's `description` as the guideline string (it's more precise than the label)
+2. **"Other" with custom text** -> Use the user's text directly as the guideline string
+3. **Deduplication** -> Skip entries that already exist in the guidelines (exact string match)
+4. **Quality rules** -> Convert to `{ rule: description, scope: "all", enforced_by: "code-review" }` format
+
+### Step 7: Display Summary
 
 ```javascript
-const countConventions = newCodingStyle.length + newNamingPatterns.length
-  + newFileStructure.length + newDocumentation.length
-const countConstraints = newArchitecture.length + newTechStack.length
-  + newPerformance.length + newSecurity.length
-const countQuality = newQualityRules.length
+const projectTech = JSON.parse(Read('.workflow/project-tech.json'));
 
-// Get updated spec list
-const specsList = Bash('ccw spec list --json 2>/dev/null || echo "{}"')
+if (skipSpecs) {
+  // Minimal summary for --skip-specs mode
+  console.log(`
+Project initialized successfully (tech analysis only)
 
-console.log(`
-✓ Project guidelines configured
+## Project Overview
+Name: ${projectTech.project_name}
+Description: ${projectTech.overview.description}
 
-## Summary
+### Technology Stack
+Languages: ${projectTech.overview.technology_stack.languages.map(l => l.name).join(', ')}
+Frameworks: ${projectTech.overview.technology_stack.frameworks.join(', ')}
+
+### Architecture
+Style: ${projectTech.overview.architecture.style}
+Components: ${projectTech.overview.key_components.length} core modules
+
+---
+Files created:
+- Tech analysis: .workflow/project-tech.json
+- Specs: (skipped via --skip-specs)
+${regenerate ? '- Backup: .workflow/project-tech.json.backup' : ''}
+
+Next steps:
+- Use /workflow:spec:setup (without --skip-specs) to configure guidelines
+- Use /workflow:spec:add to create individual specs
+- Use workflow-plan skill to start planning
+`);
+} else {
+  // Full summary with guidelines stats
+  const countConventions = newCodingStyle.length + newNamingPatterns.length
+    + newFileStructure.length + newDocumentation.length
+  const countConstraints = newArchitecture.length + newTechStack.length
+    + newPerformance.length + newSecurity.length
+  const countQuality = newQualityRules.length
+
+  // Get updated spec list
+  const specsList = Bash('ccw spec list --json 2>/dev/null || echo "{}"')
+
+  console.log(`
+Project initialized and guidelines configured
+
+## Project Overview
+Name: ${projectTech.project_name}
+Description: ${projectTech.overview.description}
+
+### Technology Stack
+Languages: ${projectTech.overview.technology_stack.languages.map(l => l.name).join(', ')}
+Frameworks: ${projectTech.overview.technology_stack.frameworks.join(', ')}
+
+### Architecture
+Style: ${projectTech.overview.architecture.style}
+Components: ${projectTech.overview.key_components.length} core modules
+
+### Guidelines Summary
 - Conventions: ${countConventions} rules added to coding-conventions.md
 - Constraints: ${countConstraints} rules added to architecture-constraints.md
 - Quality rules: ${countQuality} rules added to quality-rules.md
 
 Spec index rebuilt. Use \`ccw spec list\` to view all specs.
 
+---
+Files created:
+- Tech analysis: .workflow/project-tech.json
+- Specs: .ccw/specs/ (configured)
+${regenerate ? '- Backup: .workflow/project-tech.json.backup' : ''}
+
 Next steps:
-- Use /workflow:session:solidify to add individual rules later
+- Use /workflow:spec:add to add individual rules later
 - Specs are auto-loaded via hook on each prompt
-`)
+- Use workflow-plan skill to start planning
+`);
+}
 ```
 
-## Answer Processing Rules
-
-When converting user selections to guideline entries:
-
-1. **Selected option** → Use the option's `description` as the guideline string (it's more precise than the label)
-2. **"Other" with custom text** → Use the user's text directly as the guideline string
-3. **Deduplication** → Skip entries that already exist in the guidelines (exact string match)
-4. **Quality rules** → Convert to `{ rule: description, scope: "all", enforced_by: "code-review" }` format
-
 ## Error Handling
 
-- **No project-tech.json**: Exit with instruction to run `/workflow:init` first
-- **User cancels mid-wizard**: Save whatever was collected so far (partial is better than nothing)
-- **File write failure**: Report error, suggest manual edit
+**Agent Failure**: Fall back to basic initialization with placeholder overview
+**Missing Tools**: Agent uses Qwen fallback or bash-only
+**Empty Project**: Create minimal JSON with all gaps identified
+**No project-tech.json** (when --reset without prior init): Run full flow from Step 2
+**User cancels mid-wizard**: Save whatever was collected so far (partial is better than nothing)
+**File write failure**: Report error, suggest manual edit
 
 ## Related Commands
 
-- `/workflow:init` - Creates scaffold; optionally calls this command
-- `/workflow:init-specs` - Interactive wizard to create individual specs with scope selection
-- `/workflow:session:solidify` - Add individual rules one at a time
+- `/workflow:spec:add` - Interactive wizard to create individual specs with scope selection
+- `/workflow:session:sync` - Quick-sync session work to specs and project-tech
+- `workflow-plan` skill - Start planning with initialized project context
+- `/workflow:status --project` - View project state and guidelines

.claude/commands/workflow/ui-design/animation-extract.md

@@ -2,7 +2,7 @@
 name: animation-extract
 description: Extract animation and transition patterns from prompt inference and image references for design system documentation
 argument-hint: "[-y|--yes] [--design-id <id>] [--session <id>] [--images "<glob>"] [--focus "<types>"] [--interactive] [--refine]"
-allowed-tools: TodoWrite(*), Read(*), Write(*), Glob(*), Bash(*), AskUserQuestion(*), Task(ui-design-agent)
+allowed-tools: TodoWrite(*), Read(*), Write(*), Glob(*), Bash(*), AskUserQuestion(*), Agent(ui-design-agent)
 ---
 
 ## Auto Mode
@@ -207,14 +207,14 @@ IF has_images:
 
 ### Step 2: Generate Animation Specification Options (Agent Task 1)
 
-**Executor**: `Task(ui-design-agent)`
+**Executor**: `Agent(ui-design-agent)`
 
 **Conditional Logic**: Branch based on `refine_mode` flag
 
 ```javascript
 IF NOT refine_mode:
     // EXPLORATION MODE (default)
-    Task(ui-design-agent): `
+    Agent(ui-design-agent): `
       [ANIMATION_SPECIFICATION_GENERATION_TASK]
       Generate context-aware animation specification questions
 
@@ -308,7 +308,7 @@ IF NOT refine_mode:
 
 ELSE:
     // REFINEMENT MODE
-    Task(ui-design-agent): `
+    Agent(ui-design-agent): `
       [ANIMATION_REFINEMENT_OPTIONS_TASK]
       Generate refinement options for existing animation system
 
@@ -656,7 +656,7 @@ ELSE:
 
 ## Phase 2: Animation System Generation (Agent Task 2)
 
-**Executor**: `Task(ui-design-agent)` for animation token generation
+**Executor**: `Agent(ui-design-agent)` for animation token generation
 
 ### Step 1: Load User Selection or Use Defaults
 
@@ -706,14 +706,14 @@ IF has_images:
 bash(mkdir -p {base_path}/animation-extraction)
 ```
 
-### Step 3: Launch Animation Generation Task
+### Step 3: Launch Animation Generation Agent
 
 **Conditional Task**: Branch based on `refine_mode` flag
 
 ```javascript
 IF NOT refine_mode:
     // EXPLORATION MODE
-    Task(ui-design-agent): `
+    Agent(ui-design-agent): `
       [ANIMATION_SYSTEM_GENERATION_TASK]
       Generate production-ready animation system based on user preferences and CSS extraction
 
@@ -871,7 +871,7 @@ IF NOT refine_mode:
 
 ELSE:
     // REFINEMENT MODE
-    Task(ui-design-agent): `
+    Agent(ui-design-agent): `
       [ANIMATION_SYSTEM_REFINEMENT_TASK]
       Apply selected refinements to existing animation system
 

.claude/commands/workflow/ui-design/explore-auto.md

@@ -2,7 +2,7 @@
 name: explore-auto
 description: Interactive exploratory UI design workflow with style-centric batch generation, creates design variants from prompts/images with parallel execution and user selection
 argument-hint: "[--input "<value>"] [--targets "<list>"] [--target-type "page|component"] [--session <id>] [--style-variants <count>] [--layout-variants <count>]"
-allowed-tools: Skill(*), TodoWrite(*), Read(*), Bash(*), Glob(*), Write(*), Task(conceptual-planning-agent)
+allowed-tools: Skill(*), TodoWrite(*), Read(*), Bash(*), Glob(*), Write(*), Agent(conceptual-planning-agent)
 ---
 
 # UI Design Auto Workflow Command

.claude/commands/workflow/ui-design/generate.md

@@ -2,7 +2,7 @@
 name: generate
 description: Assemble UI prototypes by combining layout templates with design tokens (default animation support), pure assembler without new content generation
 argument-hint: [--design-id <id>] [--session <id>]
-allowed-tools: TodoWrite(*), Read(*), Write(*), Task(ui-design-agent), Bash(*)
+allowed-tools: TodoWrite(*), Read(*), Write(*), Agent(ui-design-agent), Bash(*)
 ---
 
 # Generate UI Prototypes (/workflow:ui-design:generate)
@@ -129,7 +129,7 @@ ELSE:
 
 ## Phase 2: Assembly (Agent)
 
-**Executor**: `Task(ui-design-agent)` grouped by `target × style` (max 10 layouts per agent, max 6 concurrent agents)
+**Executor**: `Agent(ui-design-agent)` grouped by `target × style` (max 10 layouts per agent, max 6 concurrent agents)
 
 **⚠️ Core Principle**: **Each agent processes ONLY ONE style** (but can process multiple layouts for that style)
 
@@ -204,7 +204,7 @@ TodoWrite({todos: [
 For each batch (up to 6 parallel agents per batch):
 For each agent group `{target, style_id, layout_ids[]}` in current batch:
 ```javascript
-Task(ui-design-agent): `
+Agent(ui-design-agent): `
   [LAYOUT_STYLE_ASSEMBLY]
   🎯 {target} × Style-{style_id} × Layouts-{layout_ids}
   ⚠️ CONSTRAINT: Use ONLY style-{style_id}/design-tokens.json (never mix styles)

.claude/commands/workflow/ui-design/import-from-code.md

@@ -2,7 +2,7 @@
 name: workflow:ui-design:import-from-code
 description: Import design system from code files (CSS/JS/HTML/SCSS) with automatic file discovery and parallel agent analysis
 argument-hint: "[--design-id <id>] [--session <id>] [--source <path>]"
-allowed-tools: Read,Write,Bash,Glob,Grep,Task,TodoWrite
+allowed-tools: Read,Write,Bash,Glob,Grep,Agent,TodoWrite
 auto-continue: true
 ---
 

.claude/commands/workflow/ui-design/layout-extract.md

@@ -2,7 +2,7 @@
 name: layout-extract
 description: Extract structural layout information from reference images or text prompts using Claude analysis with variant generation or refinement mode
 argument-hint: "[-y|--yes] [--design-id <id>] [--session <id>] [--images "<glob>"] [--prompt "<desc>"] [--targets "<list>"] [--variants <count>] [--device-type <desktop|mobile|tablet|responsive>] [--interactive] [--refine]"
-allowed-tools: TodoWrite(*), Read(*), Write(*), Glob(*), Bash(*), AskUserQuestion(*), Task(ui-design-agent), mcp__exa__web_search_exa(*)
+allowed-tools: TodoWrite(*), Read(*), Write(*), Glob(*), Bash(*), AskUserQuestion(*), Agent(ui-design-agent), mcp__exa__web_search_exa(*)
 ---
 
 ## Auto Mode
@@ -162,7 +162,7 @@ IF refine_mode:
 ```
 
 ### Step 1: Generate Options (Agent Task 1 - Mode-Specific)
-**Executor**: `Task(ui-design-agent)`
+**Executor**: `Agent(ui-design-agent)`
 
 **Exploration Mode** (default): Generate contrasting layout concepts
 **Refinement Mode** (`--refine`): Generate refinement options for existing layouts
@@ -171,7 +171,7 @@ IF refine_mode:
 // Conditional agent task based on refine_mode
 IF NOT refine_mode:
     // EXPLORATION MODE
-    Task(ui-design-agent): `
+    Agent(ui-design-agent): `
       [LAYOUT_CONCEPT_GENERATION_TASK]
       Generate {variants_count} structurally distinct layout concepts for each target
 
@@ -217,7 +217,7 @@ IF NOT refine_mode:
     `
 ELSE:
     // REFINEMENT MODE
-    Task(ui-design-agent): `
+    Agent(ui-design-agent): `
       [LAYOUT_REFINEMENT_OPTIONS_TASK]
       Generate refinement options for existing layout(s)
 
@@ -461,7 +461,7 @@ Proceeding to generate {total_selections} detailed layout template(s)...
 
 ## Phase 2: Layout Template Generation (Agent Task 2)
 
-**Executor**: `Task(ui-design-agent)` × `Total_Selected_Templates` in **parallel**
+**Executor**: `Agent(ui-design-agent)` × `Total_Selected_Templates` in **parallel**
 
 ### Step 1: Load User Selections or Default to All
 ```bash
@@ -512,7 +512,7 @@ REPORT: "Generating {total_tasks} layout templates across {targets.length} targe
 Generate layout templates for ALL selected concepts in parallel:
 ```javascript
 FOR each task in task_list:
-    Task(ui-design-agent): `
+    Agent(ui-design-agent): `
       [LAYOUT_TEMPLATE_GENERATION_TASK #{task.variant_id} for {task.target}]
       Generate detailed layout template based on user-selected concept.
       Focus ONLY on structure and layout. DO NOT concern with visual style (colors, fonts, etc.).

.claude/commands/workflow/ui-design/reference-page-generator.md

@@ -2,7 +2,7 @@
 name: workflow:ui-design:reference-page-generator
 description: Generate multi-component reference pages and documentation from design run extraction
 argument-hint: "[--design-run <path>] [--package-name <name>] [--output-dir <path>]"
-allowed-tools: Read,Write,Bash,Task,TodoWrite
+allowed-tools: Read,Write,Bash,Agent,TodoWrite
 auto-continue: true
 ---
 
@@ -198,7 +198,7 @@ echo "[Phase 1] Component data preparation complete"
 **Agent Task**:
 
 ```javascript
-Task(ui-design-agent): `
+Agent(ui-design-agent): `
   [PREVIEW_SHOWCASE_GENERATION]
   Generate interactive multi-component showcase panel for reference package
 
@@ -210,7 +210,7 @@ Task(ui-design-agent): `
   2. ${package_dir}/design-tokens.json (design tokens - REQUIRED)
   3. ${package_dir}/animation-tokens.json (optional, if exists)
 
-  ## Generation Task
+  ## Generation Agent
 
   Create interactive showcase with these sections:
 

.claude/commands/workflow/unified-execute-with-file.md

@@ -2,7 +2,7 @@
 name: unified-execute-with-file
 description: Universal execution engine for consuming any planning/brainstorm/analysis output with minimal progress tracking, multi-agent coordination, and incremental execution
 argument-hint: "[-y|--yes] [<path>[,<path2>] | -p|--plan <path>[,<path2>]] [--auto-commit] [--commit-prefix \"prefix\"] [\"execution context or task name\"]"
-allowed-tools: TodoWrite(*), Task(*), AskUserQuestion(*), Read(*), Grep(*), Glob(*), Bash(*), Edit(*), Write(*)
+allowed-tools: TodoWrite(*), Agent(*), AskUserQuestion(*), Read(*), Grep(*), Glob(*), Bash(*), Edit(*), Write(*)
 ---
 
 ## Auto Mode
@@ -34,7 +34,7 @@ When `--yes` or `-y`: Auto-confirm execution decisions, follow plan's DAG depend
 ```
 
 **Execution Methods**:
-- **Agent**: Task tool with code-developer (recommended for standard tasks)
+- **Agent**: Agent tool with code-developer (recommended for standard tasks)
 - **CLI-Codex**: `ccw cli --tool codex` (complex tasks, git-aware)
 - **CLI-Gemini**: `ccw cli --tool gemini` (analysis-heavy tasks)
 - **Auto**: Select based on task complexity (default in `-y` mode)
@@ -99,7 +99,7 @@ Universal execution engine consuming **any** planning output and executing it wi
 │  Phase 5: Per-Task Execution (Agent OR CLI)                             │
 │     ├─ Extract relevant notes from previous tasks                       │
 │     ├─ Inject notes into execution context                              │
-│     ├─ Route to Agent (Task tool) OR CLI (ccw cli command)              │
+│     ├─ Route to Agent (Agent tool) OR CLI (ccw cli command)              │
 │     ├─ Generate structured notes for next task                          │
 │     ├─ Auto-commit if enabled (conventional commit format)              │
 │     └─ Append event to unified log                                      │
@@ -507,10 +507,10 @@ ${recommendations.map(r => \`- ${r}\`).join('\\n')}
 
    When: `executionMethod === "Agent"` or `Auto + Low Complexity`
 
-   Execute task via Task tool with code-developer agent:
+   Execute task via Agent tool with code-developer agent:
 
    ```javascript
-   Task({
+   Agent({
      subagent_type: "code-developer",  // or other agent types
      run_in_background: false,
      description: task.title,
@@ -658,9 +658,15 @@ ${recommendations.map(r => \`- ${r}\`).join('\\n')}
    - "优化执行" → Analyze execution improvements
    - "完成" → No further action
 
+5. **Sync Session State** (automatic, unless `--dry-run`)
+   - Execute: `/workflow:session:sync -y "Execution complete: ${completedCount}/${totalCount} tasks succeeded"`
+   - Updates specs/*.md with any learnings from execution
+   - Updates project-tech.json with development index entry
+
 **Success Criteria**:
 - [ ] Statistics collected and displayed
 - [ ] execution.md updated with final status
+- [ ] Session state synced via /workflow:session:sync
 - [ ] User informed of completion
 
 ---

.claude/skills/_shared/COMMAND-TO-SKILL-CONVERSION.md

@@ -83,7 +83,7 @@
 | 内容类型 | 保留要求 | 示例 |
 |---------|---------|------|
 | **Bash命令** | 完整命令，包含所有参数、管道、重定向 | `find . -name "*.json" \| head -1` |
-| **Agent Prompt** | 全文保留，包含OBJECTIVE、TASK、EXPECTED等所有节 | 完整的Task({prompt: "..."}) |
+| **Agent Prompt** | 全文保留，包含OBJECTIVE、TASK、EXPECTED等所有节 | 完整的Agent({prompt: "..."}) |
 | **代码函数** | 完整函数体，所有if/else分支 | `analyzeTaskComplexity()` 全部代码 |
 | **参数表格** | 所有行列，不省略任何参数 | Session Types表格 |
 | **JSON Schema** | 所有字段、类型、required定义 | context-package.json schema |
@@ -95,7 +95,7 @@
 
 1. **将代码替换为描述**
    - ❌ 错误：`Execute context gathering agent`
-   - ✅ 正确：完整的 `Task({ subagent_type: "context-search-agent", prompt: "...[完整200行prompt]..." })`
+   - ✅ 正确：完整的 `Agent({ subagent_type: "context-search-agent", prompt: "...[完整200行prompt]..." })`
 
 2. **省略Prompt内容**
    - ❌ 错误：`Agent prompt for context gathering (see original file)`
@@ -277,7 +277,7 @@ commands/                              skills/
 ---
 name: {skill-name}
 description: {简短描述}. Triggers on "{trigger-phrase}".
-allowed-tools: Task, AskUserQuestion, TodoWrite, Read, Write, Edit, Bash, Glob, Grep
+allowed-tools: Agent, AskUserQuestion, TodoWrite, Read, Write, Edit, Bash, Glob, Grep
 ---
 ```
 
@@ -440,7 +440,7 @@ Complete: IMPL_PLAN.md + Task JSONs
 |--------|---------|---------|
 | **代码块数量** | 计数 ` ```bash ` 和 ` ```javascript ` | 与原文件相等 |
 | **表格数量** | 计数 ` \| ` 开头的行 | 与原文件相等 |
-| **Agent Prompt** | 搜索 `Task({` | 完整的prompt参数内容 |
+| **Agent Prompt** | 搜索 `Agent({` | 完整的prompt参数内容 |
 | **步骤编号** | 检查 `### Step` | 编号序列与原文件一致 |
 | **文件行数** | `wc -l` | ±20%以内 |
 | **关键函数** | 搜索函数名 | 所有函数完整保留 |
@@ -492,10 +492,10 @@ Execute the context-search-agent to gather project context.
 ### Step 2: Run context gathering
 
 ```javascript
-Task({
+Agent({
   subagent_type: "context-search-agent",
   prompt: `
-## Context Search Task
+## Context Search Agent
 
 ### OBJECTIVE
 Gather comprehensive context for planning session ${sessionId}
@@ -535,7 +535,7 @@ Gather comprehensive context for planning session ${sessionId}
 │       └─→ 数量应相等                                            │
 │                                                                  │
 │  Step 3: 关键内容抽查                                            │
-│       - 搜索 Task({ → Agent Prompt 完整性                        │
+│       - 搜索 Agent({ → Agent Prompt 完整性                        │
 │       - 搜索函数名 → 函数体完整性                                │
 │       - 搜索表格标记 → 表格完整性                                │
 │                                                                  │
@@ -562,8 +562,8 @@ grep -c '^|' commands/workflow/tools/context-gather.md
 grep -c '^|' skills/workflow-plan/phases/02-context-gathering.md
 
 # 4. Agent Prompt检查
-grep -c 'Task({' commands/workflow/tools/context-gather.md
-grep -c 'Task({' skills/workflow-plan/phases/02-context-gathering.md
+grep -c 'Agent({' commands/workflow/tools/context-gather.md
+grep -c 'Agent({' skills/workflow-plan/phases/02-context-gathering.md
 
 # 5. 函数定义检查
 grep -E '^(function|const.*=.*=>|async function)' commands/workflow/tools/context-gather.md

.claude/skills/_shared/SKILL-DESIGN-SPEC.md

@@ -140,7 +140,7 @@ graph TD
 ---
 name: {skill-name}
 description: {一句话描述}. {触发关键词}. Triggers on "{关键词1}", "{关键词2}".
-allowed-tools: Task, AskUserQuestion, Read, Bash, Glob, Grep, Write, {其他MCP工具}
+allowed-tools: Agent, AskUserQuestion, Read, Bash, Glob, Grep, Write, {其他MCP工具}
 ---
 
 # {Skill 标题}
@@ -192,7 +192,7 @@ description: |                # 必需：描述 + 触发词
   Generate XXX documents. 
   Triggers on "keyword1", "keyword2".
 allowed-tools: |              # 必需：允许使用的工具
-  Task, AskUserQuestion, Read, Bash, 
+  Agent, AskUserQuestion, Read, Bash,
   Glob, Grep, Write, mcp__chrome__*
 ---
 ```
@@ -641,7 +641,7 @@ touch my-skill/templates/agent-base.md
 ---
 name: my-skill
 description: Generate XXX. Triggers on "keyword1", "keyword2".
-allowed-tools: Task, AskUserQuestion, Read, Bash, Glob, Grep, Write
+allowed-tools: Agent, AskUserQuestion, Read, Bash, Glob, Grep, Write
 ---
 
 # My Skill
@@ -680,7 +680,7 @@ Generate XXX through multi-phase analysis.
 
 | 工具 | 用途 | 适用 Skill |
 |------|------|------------|
-| `Task` | 启动子 Agent | 所有 |
+| `Agent` | 启动子 Agent | 所有 |
 | `AskUserQuestion` | 用户交互 | 所有 |
 | `Read/Write/Glob/Grep` | 文件操作 | 所有 |
 | `Bash` | 脚本执行 | 需要自动化 |

.claude/skills/_shared/mermaid-utils.md

@@ -1,584 +0,0 @@
-# Mermaid Utilities Library
-
-Shared utilities for generating and validating Mermaid diagrams across all analysis skills.
-
-## Sanitization Functions
-
-### sanitizeId
-
-Convert any text to a valid Mermaid node ID.
-
-```javascript
-/**
- * Sanitize text to valid Mermaid node ID
- * - Only alphanumeric and underscore allowed
- * - Cannot start with number
- * - Truncates to 50 chars max
- * 
- * @param {string} text - Input text
- * @returns {string} - Valid Mermaid ID
- */
-function sanitizeId(text) {
-  if (!text) return '_empty';
-  return text
-    .replace(/[^a-zA-Z0-9_\u4e00-\u9fa5]/g, '_')  // Allow Chinese chars
-    .replace(/^[0-9]/, '_$&')                      // Prefix number with _
-    .replace(/_+/g, '_')                           // Collapse multiple _
-    .substring(0, 50);                             // Limit length
-}
-
-// Examples:
-// sanitizeId("User-Service") → "User_Service"
-// sanitizeId("3rdParty") → "_3rdParty"
-// sanitizeId("用户服务") → "用户服务"
-```
-
-### escapeLabel
-
-Escape special characters for Mermaid labels.
-
-```javascript
-/**
- * Escape special characters in Mermaid labels
- * Uses HTML entity encoding for problematic chars
- * 
- * @param {string} text - Label text
- * @returns {string} - Escaped label
- */
-function escapeLabel(text) {
-  if (!text) return '';
-  return text
-    .replace(/"/g, "'")                            // Avoid quote issues
-    .replace(/\(/g, '#40;')                        // (
-    .replace(/\)/g, '#41;')                        // )
-    .replace(/\{/g, '#123;')                       // {
-    .replace(/\}/g, '#125;')                       // }
-    .replace(/\[/g, '#91;')                        // [
-    .replace(/\]/g, '#93;')                        // ]
-    .replace(/</g, '#60;')                         // <
-    .replace(/>/g, '#62;')                         // >
-    .replace(/\|/g, '#124;')                       // |
-    .substring(0, 80);                             // Limit length
-}
-
-// Examples:
-// escapeLabel("Process(data)") → "Process#40;data#41;"
-// escapeLabel("Check {valid?}") → "Check #123;valid?#125;"
-```
-
-### sanitizeType
-
-Sanitize type names for class diagrams.
-
-```javascript
-/**
- * Sanitize type names for Mermaid classDiagram
- * Removes generics syntax that causes issues
- * 
- * @param {string} type - Type name
- * @returns {string} - Sanitized type
- */
-function sanitizeType(type) {
-  if (!type) return 'any';
-  return type
-    .replace(/<[^>]*>/g, '')           // Remove generics <T>
-    .replace(/\|/g, ' or ')            // Union types
-    .replace(/&/g, ' and ')            // Intersection types
-    .replace(/\[\]/g, 'Array')         // Array notation
-    .substring(0, 30);
-}
-
-// Examples:
-// sanitizeType("Array<string>") → "Array"
-// sanitizeType("string | number") → "string or number"
-```
-
-## Diagram Generation Functions
-
-### generateFlowchartNode
-
-Generate a flowchart node with proper shape.
-
-```javascript
-/**
- * Generate flowchart node with shape
- * 
- * @param {string} id - Node ID
- * @param {string} label - Display label
- * @param {string} type - Node type: start|end|process|decision|io|subroutine
- * @returns {string} - Mermaid node definition
- */
-function generateFlowchartNode(id, label, type = 'process') {
-  const safeId = sanitizeId(id);
-  const safeLabel = escapeLabel(label);
-  
-  const shapes = {
-    start: `${safeId}(["${safeLabel}"])`,           // Stadium shape
-    end: `${safeId}(["${safeLabel}"])`,             // Stadium shape
-    process: `${safeId}["${safeLabel}"]`,           // Rectangle
-    decision: `${safeId}{"${safeLabel}"}`,          // Diamond
-    io: `${safeId}[/"${safeLabel}"/]`,              // Parallelogram
-    subroutine: `${safeId}[["${safeLabel}"]]`,      // Subroutine
-    database: `${safeId}[("${safeLabel}")]`,        // Cylinder
-    manual: `${safeId}[/"${safeLabel}"\\]`          // Trapezoid
-  };
-  
-  return shapes[type] || shapes.process;
-}
-```
-
-### generateFlowchartEdge
-
-Generate a flowchart edge with optional label.
-
-```javascript
-/**
- * Generate flowchart edge
- * 
- * @param {string} from - Source node ID
- * @param {string} to - Target node ID
- * @param {string} label - Edge label (optional)
- * @param {string} style - Edge style: solid|dashed|thick
- * @returns {string} - Mermaid edge definition
- */
-function generateFlowchartEdge(from, to, label = '', style = 'solid') {
-  const safeFrom = sanitizeId(from);
-  const safeTo = sanitizeId(to);
-  const safeLabel = label ? `|"${escapeLabel(label)}"|` : '';
-  
-  const arrows = {
-    solid: '-->',
-    dashed: '-.->',
-    thick: '==>'
-  };
-  
-  const arrow = arrows[style] || arrows.solid;
-  return `    ${safeFrom} ${arrow}${safeLabel} ${safeTo}`;
-}
-```
-
-### generateAlgorithmFlowchart (Enhanced)
-
-Generate algorithm flowchart with branch/loop support.
-
-```javascript
-/**
- * Generate algorithm flowchart with decision support
- * 
- * @param {Object} algorithm - Algorithm definition
- *   - name: Algorithm name
- *   - inputs: [{name, type}]
- *   - outputs: [{name, type}]
- *   - steps: [{id, description, type, next: [id], conditions: [text]}]
- * @returns {string} - Complete Mermaid flowchart
- */
-function generateAlgorithmFlowchart(algorithm) {
-  let mermaid = 'flowchart TD\n';
-  
-  // Start node
-  mermaid += `    START(["开始: ${escapeLabel(algorithm.name)}"])\n`;
-  
-  // Input node (if has inputs)
-  if (algorithm.inputs?.length > 0) {
-    const inputList = algorithm.inputs.map(i => `${i.name}: ${i.type}`).join(', ');
-    mermaid += `    INPUT[/"输入: ${escapeLabel(inputList)}"/]\n`;
-    mermaid += `    START --> INPUT\n`;
-  }
-  
-  // Process nodes
-  const steps = algorithm.steps || [];
-  for (const step of steps) {
-    const nodeId = sanitizeId(step.id || `STEP_${step.step_num}`);
-    
-    if (step.type === 'decision') {
-      mermaid += `    ${nodeId}{"${escapeLabel(step.description)}"}\n`;
-    } else if (step.type === 'io') {
-      mermaid += `    ${nodeId}[/"${escapeLabel(step.description)}"/]\n`;
-    } else if (step.type === 'loop_start') {
-      mermaid += `    ${nodeId}[["循环: ${escapeLabel(step.description)}"]]\n`;
-    } else {
-      mermaid += `    ${nodeId}["${escapeLabel(step.description)}"]\n`;
-    }
-  }
-  
-  // Output node
-  const outputDesc = algorithm.outputs?.map(o => o.name).join(', ') || '结果';
-  mermaid += `    OUTPUT[/"输出: ${escapeLabel(outputDesc)}"/]\n`;
-  mermaid += `    END_(["结束"])\n`;
-  
-  // Connect first step to input/start
-  if (steps.length > 0) {
-    const firstStep = sanitizeId(steps[0].id || 'STEP_1');
-    if (algorithm.inputs?.length > 0) {
-      mermaid += `    INPUT --> ${firstStep}\n`;
-    } else {
-      mermaid += `    START --> ${firstStep}\n`;
-    }
-  }
-  
-  // Connect steps based on next array
-  for (const step of steps) {
-    const nodeId = sanitizeId(step.id || `STEP_${step.step_num}`);
-    
-    if (step.next && step.next.length > 0) {
-      step.next.forEach((nextId, index) => {
-        const safeNextId = sanitizeId(nextId);
-        const condition = step.conditions?.[index];
-        
-        if (condition) {
-          mermaid += `    ${nodeId} -->|"${escapeLabel(condition)}"| ${safeNextId}\n`;
-        } else {
-          mermaid += `    ${nodeId} --> ${safeNextId}\n`;
-        }
-      });
-    } else if (!step.type?.includes('end')) {
-      // Default: connect to next step or output
-      const stepIndex = steps.indexOf(step);
-      if (stepIndex < steps.length - 1) {
-        const nextStep = sanitizeId(steps[stepIndex + 1].id || `STEP_${stepIndex + 2}`);
-        mermaid += `    ${nodeId} --> ${nextStep}\n`;
-      } else {
-        mermaid += `    ${nodeId} --> OUTPUT\n`;
-      }
-    }
-  }
-  
-  // Connect output to end
-  mermaid += `    OUTPUT --> END_\n`;
-  
-  return mermaid;
-}
-```
-
-## Diagram Validation
-
-### validateMermaidSyntax
-
-Comprehensive Mermaid syntax validation.
-
-```javascript
-/**
- * Validate Mermaid diagram syntax
- * 
- * @param {string} content - Mermaid diagram content
- * @returns {Object} - {valid: boolean, issues: string[]}
- */
-function validateMermaidSyntax(content) {
-  const issues = [];
-  
-  // Check 1: Diagram type declaration
-  if (!content.match(/^(graph|flowchart|classDiagram|sequenceDiagram|stateDiagram|erDiagram|gantt|pie|mindmap)/m)) {
-    issues.push('Missing diagram type declaration');
-  }
-  
-  // Check 2: Undefined values
-  if (content.includes('undefined') || content.includes('null')) {
-    issues.push('Contains undefined/null values');
-  }
-  
-  // Check 3: Invalid arrow syntax
-  if (content.match(/-->\s*-->/)) {
-    issues.push('Double arrow syntax error');
-  }
-  
-  // Check 4: Unescaped special characters in labels
-  const labelMatches = content.match(/\["[^"]*[(){}[\]<>][^"]*"\]/g);
-  if (labelMatches?.some(m => !m.includes('#'))) {
-    issues.push('Unescaped special characters in labels');
-  }
-  
-  // Check 5: Node ID starts with number
-  if (content.match(/\n\s*[0-9][a-zA-Z0-9_]*[\[\({]/)) {
-    issues.push('Node ID cannot start with number');
-  }
-  
-  // Check 6: Nested subgraph syntax error
-  if (content.match(/subgraph\s+\S+\s*\n[^e]*subgraph/)) {
-    // This is actually valid, only flag if brackets don't match
-    const subgraphCount = (content.match(/subgraph/g) || []).length;
-    const endCount = (content.match(/\bend\b/g) || []).length;
-    if (subgraphCount > endCount) {
-      issues.push('Unbalanced subgraph/end blocks');
-    }
-  }
-  
-  // Check 7: Invalid arrow type for diagram type
-  const diagramType = content.match(/^(graph|flowchart|classDiagram|sequenceDiagram)/m)?.[1];
-  if (diagramType === 'classDiagram' && content.includes('-->|')) {
-    issues.push('Invalid edge label syntax for classDiagram');
-  }
-  
-  // Check 8: Empty node labels
-  if (content.match(/\[""\]|\{\}|\(\)/)) {
-    issues.push('Empty node labels detected');
-  }
-  
-  // Check 9: Reserved keywords as IDs
-  const reserved = ['end', 'graph', 'subgraph', 'direction', 'class', 'click'];
-  for (const keyword of reserved) {
-    const pattern = new RegExp(`\\n\\s*${keyword}\\s*[\\[\\(\\{]`, 'i');
-    if (content.match(pattern)) {
-      issues.push(`Reserved keyword "${keyword}" used as node ID`);
-    }
-  }
-  
-  // Check 10: Line length (Mermaid has issues with very long lines)
-  const lines = content.split('\n');
-  for (let i = 0; i < lines.length; i++) {
-    if (lines[i].length > 500) {
-      issues.push(`Line ${i + 1} exceeds 500 characters`);
-    }
-  }
-  
-  return {
-    valid: issues.length === 0,
-    issues
-  };
-}
-```
-
-### validateDiagramDirectory
-
-Validate all diagrams in a directory.
-
-```javascript
-/**
- * Validate all Mermaid diagrams in directory
- * 
- * @param {string} diagramDir - Path to diagrams directory
- * @returns {Object[]} - Array of {file, valid, issues}
- */
-function validateDiagramDirectory(diagramDir) {
-  const files = Glob(`${diagramDir}/*.mmd`);
-  const results = [];
-
-  for (const file of files) {
-    const content = Read(file);
-    const validation = validateMermaidSyntax(content);
-    
-    results.push({
-      file: file.split('/').pop(),
-      path: file,
-      valid: validation.valid,
-      issues: validation.issues,
-      lines: content.split('\n').length
-    });
-  }
-
-  return results;
-}
-```
-
-## Class Diagram Utilities
-
-### generateClassDiagram
-
-Generate class diagram with relationships.
-
-```javascript
-/**
- * Generate class diagram from analysis data
- * 
- * @param {Object} analysis - Data structure analysis
- *   - entities: [{name, type, properties, methods}]
- *   - relationships: [{from, to, type, label}]
- * @param {Object} options - Generation options
- *   - maxClasses: Max classes to include (default: 15)
- *   - maxProperties: Max properties per class (default: 8)
- *   - maxMethods: Max methods per class (default: 6)
- * @returns {string} - Mermaid classDiagram
- */
-function generateClassDiagram(analysis, options = {}) {
-  const maxClasses = options.maxClasses || 15;
-  const maxProperties = options.maxProperties || 8;
-  const maxMethods = options.maxMethods || 6;
-  
-  let mermaid = 'classDiagram\n';
-
-  const entities = (analysis.entities || []).slice(0, maxClasses);
-  
-  // Generate classes
-  for (const entity of entities) {
-    const className = sanitizeId(entity.name);
-    mermaid += `    class ${className} {\n`;
-
-    // Properties
-    for (const prop of (entity.properties || []).slice(0, maxProperties)) {
-      const vis = {public: '+', private: '-', protected: '#'}[prop.visibility] || '+';
-      const type = sanitizeType(prop.type);
-      mermaid += `        ${vis}${type} ${prop.name}\n`;
-    }
-
-    // Methods
-    for (const method of (entity.methods || []).slice(0, maxMethods)) {
-      const vis = {public: '+', private: '-', protected: '#'}[method.visibility] || '+';
-      const params = (method.params || []).map(p => p.name).join(', ');
-      const returnType = sanitizeType(method.returnType || 'void');
-      mermaid += `        ${vis}${method.name}(${params}) ${returnType}\n`;
-    }
-
-    mermaid += '    }\n';
-    
-    // Add stereotype if applicable
-    if (entity.type === 'interface') {
-      mermaid += `    <<interface>> ${className}\n`;
-    } else if (entity.type === 'abstract') {
-      mermaid += `    <<abstract>> ${className}\n`;
-    }
-  }
-
-  // Generate relationships
-  const arrows = {
-    inheritance: '--|>',
-    implementation: '..|>',
-    composition: '*--',
-    aggregation: 'o--',
-    association: '-->',
-    dependency: '..>'
-  };
-
-  for (const rel of (analysis.relationships || [])) {
-    const from = sanitizeId(rel.from);
-    const to = sanitizeId(rel.to);
-    const arrow = arrows[rel.type] || '-->';
-    const label = rel.label ? ` : ${escapeLabel(rel.label)}` : '';
-    
-    // Only include if both entities exist
-    if (entities.some(e => sanitizeId(e.name) === from) && 
-        entities.some(e => sanitizeId(e.name) === to)) {
-      mermaid += `    ${from} ${arrow} ${to}${label}\n`;
-    }
-  }
-
-  return mermaid;
-}
-```
-
-## Sequence Diagram Utilities
-
-### generateSequenceDiagram
-
-Generate sequence diagram from scenario.
-
-```javascript
-/**
- * Generate sequence diagram from scenario
- * 
- * @param {Object} scenario - Sequence scenario
- *   - name: Scenario name
- *   - actors: [{id, name, type}]
- *   - messages: [{from, to, description, type}]
- *   - blocks: [{type, condition, messages}]
- * @returns {string} - Mermaid sequenceDiagram
- */
-function generateSequenceDiagram(scenario) {
-  let mermaid = 'sequenceDiagram\n';
-
-  // Title
-  if (scenario.name) {
-    mermaid += `    title ${escapeLabel(scenario.name)}\n`;
-  }
-
-  // Participants
-  for (const actor of scenario.actors || []) {
-    const actorType = actor.type === 'external' ? 'actor' : 'participant';
-    mermaid += `    ${actorType} ${sanitizeId(actor.id)} as ${escapeLabel(actor.name)}\n`;
-  }
-
-  mermaid += '\n';
-
-  // Messages
-  for (const msg of scenario.messages || []) {
-    const from = sanitizeId(msg.from);
-    const to = sanitizeId(msg.to);
-    const desc = escapeLabel(msg.description);
-    
-    let arrow;
-    switch (msg.type) {
-      case 'async': arrow = '->>'; break;
-      case 'response': arrow = '-->>'; break;
-      case 'create': arrow = '->>+'; break;
-      case 'destroy': arrow = '->>-'; break;
-      case 'self': arrow = '->>'; break;
-      default: arrow = '->>';
-    }
-
-    mermaid += `    ${from}${arrow}${to}: ${desc}\n`;
-
-    // Activation
-    if (msg.activate) {
-      mermaid += `    activate ${to}\n`;
-    }
-    if (msg.deactivate) {
-      mermaid += `    deactivate ${from}\n`;
-    }
-
-    // Notes
-    if (msg.note) {
-      mermaid += `    Note over ${to}: ${escapeLabel(msg.note)}\n`;
-    }
-  }
-
-  // Blocks (loops, alt, opt)
-  for (const block of scenario.blocks || []) {
-    switch (block.type) {
-      case 'loop':
-        mermaid += `    loop ${escapeLabel(block.condition)}\n`;
-        break;
-      case 'alt':
-        mermaid += `    alt ${escapeLabel(block.condition)}\n`;
-        break;
-      case 'opt':
-        mermaid += `    opt ${escapeLabel(block.condition)}\n`;
-        break;
-    }
-    
-    for (const m of block.messages || []) {
-      mermaid += `        ${sanitizeId(m.from)}->>${sanitizeId(m.to)}: ${escapeLabel(m.description)}\n`;
-    }
-    
-    mermaid += '    end\n';
-  }
-
-  return mermaid;
-}
-```
-
-## Usage Examples
-
-### Example 1: Algorithm with Branches
-
-```javascript
-const algorithm = {
-  name: "用户认证流程",
-  inputs: [{name: "credentials", type: "Object"}],
-  outputs: [{name: "token", type: "JWT"}],
-  steps: [
-    {id: "validate", description: "验证输入格式", type: "process"},
-    {id: "check_user", description: "用户是否存在?", type: "decision", 
-     next: ["verify_pwd", "error_user"], conditions: ["是", "否"]},
-    {id: "verify_pwd", description: "验证密码", type: "process"},
-    {id: "pwd_ok", description: "密码正确?", type: "decision",
-     next: ["gen_token", "error_pwd"], conditions: ["是", "否"]},
-    {id: "gen_token", description: "生成 JWT Token", type: "process"},
-    {id: "error_user", description: "返回用户不存在", type: "io"},
-    {id: "error_pwd", description: "返回密码错误", type: "io"}
-  ]
-};
-
-const flowchart = generateAlgorithmFlowchart(algorithm);
-```
-
-### Example 2: Validate Before Output
-
-```javascript
-const diagram = generateClassDiagram(analysis);
-const validation = validateMermaidSyntax(diagram);
-
-if (!validation.valid) {
-  console.log("Diagram has issues:", validation.issues);
-  // Fix issues or regenerate
-} else {
-  Write(`${outputDir}/class-diagram.mmd`, diagram);
-}
-```

.claude/skills/brainstorm/README.md

@@ -0,0 +1,177 @@
+# Brainstorm Skill
+
+Unified brainstorming skill combining interactive framework generation, multi-role parallel analysis, and cross-role synthesis into a single entry point with two operational modes.
+
+## Key Features
+
+- **Dual-Mode Operation**: Auto mode (full pipeline) and single role mode (individual analysis)
+- **Interactive Framework Generation**: Seven-phase workflow for guidance specification
+- **Parallel Role Analysis**: Concurrent execution of multiple role perspectives
+- **Cross-Role Synthesis**: Integration of insights into feature specifications
+- **SPEC.md Quality Standards**: Guidance specification includes Concepts & Terminology, Non-Goals, RFC 2119 constraints
+- **Template-Driven Role Analysis**: system-architect produces Data Model, State Machine, Error Handling, Observability, Configuration Model, Boundary Scenarios
+- **Automated Quality Gates**: Validation agents ensure outputs meet quality standards
+- **Session Continuity**: All phases share state via workflow-session.json
+- **Progressive Loading**: Phase documents loaded on-demand via Ref markers
+
+## Architecture
+
+```
+┌─────────────────────────────────────────────────────────────┐
+│                    /brainstorm                                │
+│         Unified Entry Point + Interactive Routing             │
+└───────────────────────┬─────────────────────────────────────┘
+                        │
+              ┌─────────┴─────────┐
+              ↓                   ↓
+    ┌─────────────────┐  ┌──────────────────┐
+    │   Auto Mode     │  │ Single Role Mode │
+    │  (自动模式)      │  │ (单角色分析模式)   │
+    └────────┬────────┘  └────────┬─────────┘
+             │                    │
+    ┌────────┼────────┐          │
+    ↓        ↓        ↓          ↓
+ Phase 2  Phase 3  Phase 4    Phase 3
+Artifacts  N×Role  Synthesis  1×Role
+ (7步)    Analysis  (8步)    Analysis
+           并行               (4步)
+```
+
+### Execution Flow
+
+**Auto Mode**:
+1. **Phase 1**: Mode detection and parameter parsing
+2. **Phase 1.5**: Terminology & Boundary Definition (extract terms, collect Non-Goals)
+3. **Phase 2**: Interactive Framework Generation (7 sub-phases)
+   - Context collection → Topic analysis → Role selection → Role questions → Conflict resolution → Final check → Generate specification
+   - **Phase 5**: Generate guidance-specification.md with Concepts & Terminology, Non-Goals, RFC 2119 constraints
+4. **Phase 3**: Parallel Role Analysis (N concurrent role analyses)
+   - Template-driven analysis with quality validation
+   - system-architect includes: Data Model, State Machine, Error Handling, Observability, Configuration Model, Boundary Scenarios
+5. **Phase 4**: Synthesis Integration (6 sub-phases)
+   - Discovery → File discovery → Cross-role analysis → User interaction → Spec generation → Finalization
+
+**Single Role Mode**:
+1. **Phase 1**: Mode detection and parameter parsing
+2. **Phase 3**: Single role analysis (4 sub-phases)
+   - Detection → Context → Agent → Validation
+
+## Usage
+
+### Auto Mode
+
+```bash
+# Full pipeline with default settings
+/brainstorm "Build real-time collaboration platform"
+
+# Auto-select mode with specific role count
+/brainstorm -y "GOAL: Build platform SCOPE: 100 users" --count 5
+
+# With style skill for UI designer
+/brainstorm "Design payment system" --style-skill material-design
+```
+
+### Single Role Mode
+
+```bash
+# Analyze with specific role
+/brainstorm system-architect --session WFS-xxx
+
+# With interactive questions
+/brainstorm ux-expert --include-questions
+
+# Update existing analysis
+/brainstorm ui-designer --session WFS-xxx --update --style-skill material-design
+
+# Skip questions (use defaults)
+/brainstorm product-manager --skip-questions
+```
+
+## Available Roles
+
+| Role ID | Title | Focus Area |
+|---------|-------|------------|
+| `data-architect` | 数据架构师 | Data models, storage strategies, data flow |
+| `product-manager` | 产品经理 | Product strategy, roadmap, prioritization |
+| `product-owner` | 产品负责人 | Backlog management, user stories, acceptance criteria |
+| `scrum-master` | 敏捷教练 | Process facilitation, impediment removal |
+| `subject-matter-expert` | 领域专家 | Domain knowledge, business rules, compliance |
+| `system-architect` | 系统架构师 | Technical architecture, scalability, integration |
+| `test-strategist` | 测试策略师 | Test strategy, quality assurance |
+| `ui-designer` | UI设计师 | Visual design, mockups, design systems |
+| `ux-expert` | UX专家 | User research, information architecture, journey |
+
+## Output Files
+
+```
+.workflow/active/WFS-{topic}/
+├── workflow-session.json              # Session metadata
+├── .process/
+│   └── context-package.json           # Phase 0 output
+└── .brainstorming/
+    ├── guidance-specification.md      # Framework with terminology, non-goals
+    ├── feature-index.json             # Feature index
+    ├── synthesis-changelog.md         # Synthesis decisions
+    ├── feature-specs/                 # Feature specifications
+    │   ├── F-001-{slug}.md
+    │   └── F-00N-{slug}.md
+    ├── specs/
+    │   └── terminology-template.json  # Terminology glossary schema
+    ├── templates/
+    │   └── role-templates/
+    │       └── system-architect-template.md  # System architect analysis template
+    ├── agents/
+    │   └── role-analysis-reviewer-agent.md   # Role analysis validation agent
+    ├── {role}/                        # Role analyses (immutable)
+    │   ├── {role}-context.md          # Q&A responses
+    │   ├── analysis.md                # Main document
+    │   ├── analysis-cross-cutting.md  # Cross-feature
+    │   └── analysis-F-{id}-{slug}.md  # Per-feature
+    └── synthesis-specification.md     # Integration
+```
+
+## Quality Standards
+
+### Guidance Specification
+- **Section 2**: Concepts & Terminology (5-10 core terms with definitions, aliases, categories)
+- **Section 3**: Non-Goals (Out of Scope) with rationale
+- **RFC 2119 Keywords**: All requirements use MUST, SHOULD, MAY
+
+### Role Analysis (system-architect)
+1. **Architecture Overview**: High-level system design
+2. **Data Model**: 3-5 core entities with precise field definitions
+3. **State Machine**: Lifecycle for 1-2 entities with complex workflows
+4. **Error Handling Strategy**: Global + per-component recovery
+5. **Observability Requirements**: Metrics, logs, health checks
+6. **Configuration Model**: All configurable parameters with validation
+7. **Boundary Scenarios**: Concurrency, rate limiting, shutdown, cleanup, scalability, DR
+
+### Quality Validation
+- Template compliance checking
+- RFC 2119 keyword usage verification
+- Diagram syntax validation
+- Section completeness scoring
+
+## Parameters
+
+| Parameter | Description | Default |
+|-----------|-------------|---------|
+| `--yes`, `-y` | Auto mode, skip all questions | - |
+| `--count N` | Number of roles to select | 3 |
+| `--session ID` | Use existing session | - |
+| `--update` | Update existing analysis | - |
+| `--include-questions` | Interactive context gathering | - |
+| `--skip-questions` | Use default answers | - |
+| `--style-skill PKG` | Style package for ui-designer | - |
+
+## Follow-up Commands
+
+After brainstorm completes:
+- `/workflow-plan --session {sessionId}` - Generate implementation plan
+- `/workflow:brainstorm:synthesis --session {sessionId}` - Run synthesis standalone
+
+## Related Documentation
+
+- **Template Source**: `~/.ccw/workflows/cli-templates/planning-roles/`
+- **Style SKILL Packages**: `.claude/skills/style-{package-name}/`
+- **Phase Documents**: `phases/01-mode-routing.md`, `phases/02-artifacts.md`, `phases/03-role-analysis.md`, `phases/04-synthesis.md`

.claude/skills/brainstorm/SKILL.md

@@ -1,7 +1,7 @@
 ---
 name: brainstorm
 description: Unified brainstorming skill with dual-mode operation - auto pipeline and single role analysis. Triggers on "brainstorm", "头脑风暴".
-allowed-tools: Skill(*), Task(conceptual-planning-agent, context-search-agent), AskUserQuestion(*), TodoWrite(*), Read(*), Write(*), Edit(*), Glob(*), Bash(*)
+allowed-tools: Skill(*), Agent(conceptual-planning-agent, context-search-agent), AskUserQuestion(*), TodoWrite(*), Read(*), Write(*), Edit(*), Glob(*), Bash(*)
 ---
 
 # Brainstorm
@@ -49,6 +49,9 @@ Single Role Mode:
 3. **Task Attachment/Collapse**: Sub-tasks attached during phase execution, collapsed after completion
 4. **Session Continuity**: All phases share session state via workflow-session.json
 5. **Auto-Continue Execution**: Phases chain automatically without user intervention between them
+6. **SPEC.md Quality Alignment**: Guidance specification and role analysis follow SPEC.md standards (Concepts & Terminology, Non-Goals, Data Model, State Machine, RFC 2119 constraints)
+7. **Template-Driven Analysis**: Role-specific templates (e.g., system-architect) ensure consistent, high-quality outputs
+8. **Quality Gates**: Automated validation of guidance specification and role analysis against quality standards
 
 ## Auto Mode
 
@@ -73,13 +76,19 @@ Parse arguments, detect mode from flags/parameters, or ask user via AskUserQuest
 
 ### Auto Mode Execution (execution_mode = "auto")
 
+**Phase 1.5: Terminology & Boundary Definition**
+   - Extract 5-10 core domain terms from user input and Phase 1 context
+   - Generate terminology table (term, definition, aliases, category)
+   - Collect Non-Goals via AskUserQuestion (明确排除的范围)
+   - Store to `session.terminology` and `session.non_goals`
+
 #### Phase 2: Interactive Framework Generation
    Ref: phases/02-artifacts.md
 
 Seven-phase interactive workflow: Context collection → Topic analysis → Role selection → Role questions → Conflict resolution → Final check → Generate specification.
 
 **Input**: topic description, --count N, --yes flag
-**Output**: guidance-specification.md, workflow-session.json (selected_roles[], session_id)
+**Output**: guidance-specification.md (with Concepts & Terminology, Non-Goals, RFC 2119 constraints), workflow-session.json (selected_roles[], session_id)
 
 **TodoWrite**: Attach 7 sub-tasks (Phase 0-5), execute sequentially, collapse on completion.
 
@@ -95,6 +104,16 @@ Execute role analysis for EACH selected role in parallel.
 
 For ui-designer: append `--style-skill {package}` if provided.
 
+**Template-Driven Analysis**:
+- Load role-specific template if exists (e.g., `templates/role-templates/system-architect-template.md`)
+- Inject template into agent prompt as required structure
+- For system-architect: MUST include Data Model, State Machine, Error Handling, Observability, Configuration Model, Boundary Scenarios
+
+**Quality Validation**:
+- After analysis generation, invoke `role-analysis-reviewer-agent` to validate against template
+- Check MUST have sections (blocking), SHOULD have sections (warning), quality checks (RFC keywords, valid diagrams)
+- Output validation report with score and recommendations
+
 **TodoWrite**: Attach N parallel sub-tasks, execute concurrently, collapse on completion.
 
 #### Phase 4: Synthesis Integration
@@ -327,6 +346,13 @@ Initial → Phase 1 Mode Routing (completed)
     ├── feature-specs/                 # Feature specs (Phase 4, auto mode, feature_mode)
     │   ├── F-001-{slug}.md
     │   └── F-00N-{slug}.md
+    ├── specs/
+    │   └── terminology-template.json  # Terminology schema
+    ├── templates/
+    │   └── role-templates/
+    │       └── system-architect-template.md  # System architect analysis template
+    ├── agents/
+    │   └── role-analysis-reviewer-agent.md   # Role analysis validation agent
     ├── {role}/                        # Role analyses (IMMUTABLE after Phase 3)
     │   ├── {role}-context.md          # Interactive Q&A responses
     │   ├── analysis.md                # Main/index document

.claude/skills/brainstorm/phases/02-artifacts.md

@@ -117,6 +117,73 @@ AskUserQuestion({
 
 **⚠️ CRITICAL**: Questions MUST reference topic keywords. Generic "Project type?" violates dynamic generation.
 
+### Phase 1.5: Terminology & Boundary Definition
+
+**Goal**: Extract core terminology and define scope boundaries (Non-Goals)
+
+**Steps**:
+1. Analyze Phase 1 user responses and topic description
+2. Extract 5-10 core domain terms that will be used throughout the specification
+3. Generate terminology clarification questions if needed
+4. Define scope boundaries by identifying what is explicitly OUT of scope
+
+**Terminology Extraction**:
+```javascript
+// Based on Phase 1 context and user input
+const coreTerms = extractTerminology({
+  topic: session.topic,
+  userResponses: session.intent_context,
+  contextPackage: contextPackage // from Phase 0
+});
+
+// Generate terminology table
+const terminologyTable = coreTerms.map(term => ({
+  term: term.canonical,
+  definition: term.definition,
+  aliases: term.alternatives,
+  category: term.category // core|technical|business
+}));
+```
+
+**Non-Goals Definition**:
+```javascript
+AskUserQuestion({
+  questions: [{
+    question: "以下哪些是明确 NOT 包含在本次项目范围内的？（可多选）",
+    header: "范围边界 (Non-Goals)",
+    multiSelect: true,
+    options: [
+      { label: "移动端应用", description: "本次只做 Web 端，移动端后续考虑" },
+      { label: "多语言支持", description: "MVP 阶段只支持中文" },
+      { label: "第三方集成", description: "暂不集成外部系统" },
+      { label: "高级分析功能", description: "基础功能优先，分析功能 v2" },
+      { label: "其他（请在后续补充）", description: "用户自定义排除项" }
+    ]
+  }]
+});
+
+// If user selects "其他", follow up with:
+if (selectedNonGoals.includes("其他")) {
+  AskUserQuestion({
+    questions: [{
+      question: "请描述其他明确排除的功能或范围",
+      header: "补充 Non-Goals",
+      multiSelect: false,
+      freeText: true
+    }]
+  });
+}
+
+// Store to session
+session.terminology = terminologyTable;
+session.non_goals = selectedNonGoals.map(ng => ({
+  item: ng.label,
+  rationale: ng.description
+}));
+```
+
+**Output**: Updated `workflow-session.json` with `terminology` and `non_goals` fields
+
 ### Phase 2: Role Selection
 
 **Goal**: User selects roles from intelligent recommendations
@@ -303,11 +370,26 @@ After final clarification, extract implementable feature units from all Phase 1-
 ### Phase 5: Generate Specification
 
 **Steps**:
-1. Load all decisions: `intent_context` + `selected_roles` + `role_decisions` + `cross_role_decisions` + `additional_decisions` + `feature_list`
+1. Load all decisions: `intent_context` + `selected_roles` + `role_decisions` + `cross_role_decisions` + `additional_decisions` + `feature_list` + `terminology` + `non_goals`
 2. Transform Q&A to declarative: Questions → Headers, Answers → CONFIRMED/SELECTED statements
-3. Generate `guidance-specification.md`
-4. Update `workflow-session.json` (metadata only)
-5. Validate: No interrogative sentences, all decisions traceable
+3. Apply RFC 2119 keywords (MUST, SHOULD, MAY, MUST NOT, SHOULD NOT) to all behavioral requirements
+4. Generate `guidance-specification.md` with Concepts & Terminology and Non-Goals sections
+5. Update `workflow-session.json` (metadata only)
+6. Validate: No interrogative sentences, all decisions traceable, RFC keywords applied
+
+**RFC 2119 Compliance**:
+
+All behavioral requirements and constraints MUST be expressed using RFC 2119 keywords:
+- **MUST**: Absolute requirement, non-negotiable
+- **MUST NOT**: Absolute prohibition
+- **SHOULD**: Strong recommendation, may be ignored with valid reason
+- **SHOULD NOT**: Strong discouragement
+- **MAY**: Optional, implementer's choice
+
+Example transformations:
+- "用户需要登录" → "The system MUST authenticate users before granting access"
+- "建议使用缓存" → "The system SHOULD cache frequently accessed data"
+- "可以支持 OAuth" → "The system MAY support OAuth2 authentication"
 
 ## Question Guidelines
 
@@ -366,15 +448,43 @@ for (let i = 0; i < allQuestions.length; i += BATCH_SIZE) {
 **CONFIRMED Objectives**: [from topic + Phase 1]
 **CONFIRMED Success Criteria**: [from Phase 1 answers]
 
-## 2-N. [Role] Decisions
+## 2. Concepts & Terminology
+
+**Core Terms**: The following terms are used consistently throughout this specification.
+
+| Term | Definition | Aliases | Category |
+|------|------------|---------|----------|
+${session.terminology.map(t => `| ${t.term} | ${t.definition} | ${t.aliases.join(', ')} | ${t.category} |`).join('\n')}
+
+**Usage Rules**:
+- All documents MUST use the canonical term
+- Aliases are for reference only
+- New terms introduced in role analysis MUST be added to this glossary
+
+## 3. Non-Goals (Out of Scope)
+
+The following are explicitly OUT of scope for this project:
+
+${session.non_goals.map(ng => `- **${ng.item}**: ${ng.rationale}`).join('\n')}
+
+**Rationale**: These exclusions help maintain focus on core objectives and prevent scope creep.
+
+## 4-N. [Role] Decisions
 ### SELECTED Choices
-**[Question topic]**: [User's answer]
+**[Question topic]**: [User's answer with RFC 2119 keywords]
 - **Rationale**: [From option description]
-- **Impact**: [Implications]
+- **Impact**: [Implications with RFC keywords]
+- **Requirement Level**: [MUST/SHOULD/MAY based on criticality]
+
+**Example**:
+- The system MUST authenticate users within 200ms (P99)
+- The system SHOULD cache frequently accessed data
+- The system MAY support OAuth2 providers (Google, GitHub)
 
 ### Cross-Role Considerations
-**[Conflict resolved]**: [Resolution from Phase 4]
+**[Conflict resolved]**: [Resolution from Phase 4 with RFC keywords]
 - **Affected Roles**: [Roles involved]
+- **Decision**: [MUST/SHOULD/MAY statement]
 
 ## Cross-Role Integration
 **CONFIRMED Integration Points**: [API/Data/Auth from multiple roles]

.claude/skills/brainstorm/phases/03-role-analysis.md

@@ -301,6 +301,14 @@ const agentContext = {
   original_topic: original_topic,
   session_id: session_id
 };
+
+// Load role-specific template if exists
+let roleTemplate = null;
+try {
+  roleTemplate = Read(`templates/role-templates/${role_name}-template.md`);
+} catch (e) {
+  // No template, use generic analysis
+}
 ```
 
 **Step 3.3.3: Execute Conceptual Planning Agent**
@@ -362,6 +370,13 @@ UPDATE_MODE: ${update_mode}
    - Command: Read(${brainstorm_dir}/${role_name}/${role_name}-context.md)
    - Output: user_context_answers
 
+${roleTemplate ? `
+5. **load_role_template**
+   - Action: Load role-specific analysis template
+   - Command: Read(templates/role-templates/${role_name}-template.md)
+   - Output: role_specific_template
+` : ''}
+
 5. **${update_mode ? 'load_existing_analysis' : 'skip'}**
    ${update_mode ? `
    - Action: Load existing analysis for incremental update
@@ -378,6 +393,21 @@ ${featureListBlock}
 **Role Focus**: ${roleConfig[role_name].focus_area}
 **Template Integration**: Apply role template guidelines within framework structure
 ${feature_mode ? `**Feature Organization**: Organize analysis by feature points - each feature gets its own sub-document. Cross-cutting concerns go into analysis-cross-cutting.md.` : ''}
+**RFC 2119 Compliance**: Use RFC 2119 keywords (MUST, SHOULD, MAY, MUST NOT, SHOULD NOT) to define all behavioral constraints and recommendations. Every technical decision MUST be expressed with appropriate RFC keyword. Distinguish between absolute requirements (MUST) and recommendations (SHOULD).
+
+${roleTemplate ? `
+**ROLE-SPECIFIC TEMPLATE (MUST follow this structure)**:
+${roleTemplate}
+
+Your analysis MUST include all Required Sections from the template above.
+` : ''}
+
+**For system-architect role specifically**:
+- MUST define Data Model for 3-5 core entities with fields, types, constraints, relationships
+- MUST create State Machine for at least 1 entity with complex lifecycle (ASCII diagram + transition table)
+- MUST define Error Handling Strategy with error classification and recovery mechanisms
+- MUST specify Observability Requirements with metrics (at least 5), log events, and health checks
+- All constraints MUST use RFC 2119 keywords (MUST, SHOULD, MAY)
 
 ## Expected Deliverables
 ${feature_mode ? `

.claude/skills/brainstorm/phases/04-synthesis.md

@@ -531,22 +531,32 @@ ${feature_mode ? `
 **Status**: Draft (from synthesis)
 
 ## 1. Requirements Summary
-[Consolidated requirements from all role perspectives]
-- Functional requirements (from product-manager, product-owner)
-- User experience requirements (from ux-expert, ui-designer)
-- Technical requirements (from system-architect, data-architect, api-designer)
-- Domain requirements (from subject-matter-expert)
+[Consolidated requirements from all role perspectives using RFC 2119 keywords]
+- Functional requirements (from product-manager, product-owner) - use MUST/SHOULD/MAY
+- User experience requirements (from ux-expert, ui-designer) - use MUST/SHOULD/MAY
+- Technical requirements (from system-architect, data-architect, api-designer) - use MUST/SHOULD/MAY
+- Domain requirements (from subject-matter-expert) - use MUST/SHOULD/MAY
+
+**Example**:
+- The feature MUST support user authentication via email/password
+- The UI SHOULD provide real-time feedback within 100ms
+- The system MAY cache user preferences for offline access
 
 ## 2. Design Decisions [CORE SECTION]
 [Key architectural and design decisions with rationale - 40%+ of word count]
 For each decision:
-- **Decision**: [What was decided]
+- **Decision**: [What was decided - MUST use RFC 2119 keywords]
 - **Context**: [Why this decision was needed]
 - **Options Considered**: [Alternatives from different roles]
-- **Chosen Approach**: [Selected option with rationale]
+- **Chosen Approach**: [Selected option with rationale using MUST/SHOULD/MAY]
 - **Trade-offs**: [What we gain vs. what we sacrifice]
 - **Source**: [Which role(s) drove this decision]
 
+**RFC 2119 Examples**:
+- "The system MUST authenticate users before granting access"
+- "The feature SHOULD cache frequently accessed data for performance"
+- "The component MAY support OAuth2 authentication as an optional enhancement"
+
 ## 3. Interface Contract
 [API endpoints, data models, component interfaces]
 - External interfaces (API contracts from api-designer)

.claude/skills/brainstorm/specs/terminology-template.json

@@ -0,0 +1,22 @@
+{
+  "version": "1.0",
+  "description": "Terminology glossary schema for brainstorm guidance-specification",
+  "schema": {
+    "terminology": {
+      "type": "array",
+      "items": {
+        "term": "string (required) - canonical term",
+        "definition": "string (required) - concise definition",
+        "aliases": "array of strings - alternative names",
+        "category": "enum: core|technical|business (required)",
+        "first_used_in": "string - source document"
+      }
+    }
+  },
+  "validation_rules": {
+    "min_terms": 5,
+    "max_terms": 20,
+    "term_format": "lowercase, alphanumeric + hyphens",
+    "definition_max_length": 200
+  }
+}

.claude/skills/ccw-help/SKILL.md

@@ -1,18 +1,18 @@
 ---
 name: ccw-help
-description: CCW command help system. Search, browse, recommend commands. Triggers "ccw-help", "ccw-issue".
+description: CCW command help system. Search, browse, recommend commands, skills, teams. Triggers "ccw-help", "ccw-issue".
 allowed-tools: Read, Grep, Glob, AskUserQuestion
-version: 7.0.0
+version: 8.0.0
 ---
 
 # CCW-Help Skill
 
-CCW 命令帮助系统，提供命令搜索、推荐、文档查看功能。
+CCW 命令帮助系统，提供命令搜索、推荐、文档查看、Skill/Team 浏览功能。
 
 ## Trigger Conditions
 
-- 关键词: "ccw-help", "ccw-issue", "帮助", "命令", "怎么用", "ccw 怎么用", "工作流"
-- 场景: 询问命令用法、搜索命令、请求下一步建议、询问任务应该用哪个工作流
+- 关键词: "ccw-help", "ccw-issue", "帮助", "命令", "怎么用", "ccw 怎么用", "工作流", "skill", "team"
+- 场景: 询问命令用法、搜索命令、请求下一步建议、询问任务应该用哪个工作流、浏览 Skill/Team 目录
 
 ## Operation Modes
 
@@ -61,7 +61,7 @@ CCW 命令帮助系统，提供命令搜索、推荐、文档查看功能。
 4. Get user confirmation
 5. Execute chain with TODO tracking
 
-**Supported Workflows**:
+**Supported Workflows** (参考 [ccw.md](../../commands/ccw.md)):
 - **Level 1** (Lite-Lite-Lite): Ultra-simple quick tasks
 - **Level 2** (Rapid/Hotfix): Bug fixes, simple features, documentation
 - **Level 2.5** (Rapid-to-Issue): Bridge from quick planning to issue workflow
@@ -71,12 +71,17 @@ CCW 命令帮助系统，提供命令搜索、推荐、文档查看功能。
   - Test-fix workflows (debug failing tests)
   - Review workflows (code review and fixes)
   - UI design workflows
+  - Multi-CLI collaborative workflows
+  - Cycle workflows (integration-test, refactor)
 - **Level 4** (Full): Exploratory tasks with brainstorming
 - **With-File Workflows**: Documented exploration with multi-CLI collaboration
-  - `brainstorm-with-file`: Multi-perspective ideation
-  - `debug-with-file`: Hypothesis-driven debugging
-  - `analyze-with-file`: Collaborative analysis
+  - `brainstorm-with-file`: Multi-perspective ideation → workflow-plan → workflow-execute
+  - `debug-with-file`: Hypothesis-driven debugging (standalone)
+  - `analyze-with-file`: Collaborative analysis → workflow-lite-plan
+  - `collaborative-plan-with-file`: Multi-agent planning → unified-execute
+  - `roadmap-with-file`: Strategic requirement roadmap → team-planex
 - **Issue Workflow**: Batch issue discovery, planning, queueing, execution
+- **Team Workflow**: team-planex wave pipeline for parallel execution
 
 ### Mode 6: Issue Reporting
 
@@ -86,6 +91,16 @@ CCW 命令帮助系统，提供命令搜索、推荐、文档查看功能。
 1. Use AskUserQuestion to gather context
 2. Generate structured issue template
 
+### Mode 7: Skill & Team Browsing
+
+**Triggers**: "skill", "team", "技能", "团队", "有哪些 skill", "team 怎么用"
+
+**Process**:
+1. Query `command.json` skills array
+2. Filter by category: workflow / team / review / meta / utility / standalone
+3. Present categorized skill list with descriptions
+4. For team skills, explain team architecture and usage patterns
+
 ## Data Source
 
 Single source of truth: **[command.json](command.json)**
@@ -94,8 +109,9 @@ Single source of truth: **[command.json](command.json)**
 |-------|---------|
 | `commands[]` | Flat command list with metadata |
 | `commands[].flow` | Relationships (next_steps, prerequisites) |
-| `commands[].essential` | Essential flag for onboarding |
 | `agents[]` | Agent directory |
+| `skills[]` | Skill directory with categories |
+| `skills[].is_team` | Whether skill uses team architecture |
 | `essential_commands[]` | Core commands list |
 
 ### Source Path Format
@@ -109,6 +125,77 @@ Single source of truth: **[command.json](command.json)**
 }
 ```
 
+## Skill Catalog
+
+### Workflow Skills (核心工作流)
+
+| Skill | 内部流水线 | 触发词 |
+|-------|-----------|--------|
+| `workflow-lite-plan` | explore → plan → confirm → execute | "lite-plan", 快速任务 |
+| `workflow-plan` | session → context → convention → gen → verify | "workflow-plan", 正式规划 |
+| `workflow-execute` | session discovery → task processing → commit | "workflow-execute", 执行 |
+| `workflow-tdd-plan` | 6-phase TDD plan → verify | "tdd-plan", TDD 开发 |
+| `workflow-test-fix` | session → context → analysis → gen → cycle | "test-fix", 测试修复 |
+| `workflow-multi-cli-plan` | ACE context → CLI discussion → plan → execute | "multi-cli", 多CLI协作 |
+| `workflow-skill-designer` | Meta-skill for designing workflow skills | "skill-designer" |
+
+### Team Skills (团队协作)
+
+Team Skills 使用 `team-worker` agent 架构，Coordinator 编排流水线，Workers 是加载了 role-spec 的 `team-worker` agents。
+
+| Skill | 用途 | 架构 |
+|-------|------|------|
+| `team-planex` | 规划+执行 wave pipeline | planner + executor, 适合清晰 issue/roadmap |
+| `team-lifecycle` | 完整生命周期 (spec/impl/test) | team-worker agents with role-specs |
+| `team-lifecycle-v4` | 优化版生命周期 | Optimized pipeline |
+| `team-lifecycle-v3` | 基础版生命周期 | All roles invoke unified skill |
+| `team-coordinate` | 通用动态团队协调 | 运行时动态生成 role-specs |
+| `team-coordinate` | 通用团队协调 v1 | Dynamic role generation |
+| `team-brainstorm` | 团队头脑风暴 | Multi-perspective analysis |
+| `team-frontend` | 前端开发团队 | Frontend specialists |
+| `team-issue` | Issue 解决团队 | Issue resolution pipeline |
+| `team-iterdev` | 迭代开发团队 | Iterative development |
+| `team-review` | 代码扫描/漏洞审查 | Scanning + vulnerability review |
+| `team-roadmap-dev` | Roadmap 驱动开发 | Requirement → implementation |
+| `team-tech-debt` | 技术债务清理 | Debt identification + cleanup |
+| `team-testing` | 测试团队 | Test planning + execution |
+| `team-quality-assurance` | QA 团队 | Quality assurance pipeline |
+| `team-uidesign` | UI 设计团队 | Design system + prototyping |
+| `team-ultra-analyze` | 深度协作分析 | Deep collaborative analysis |
+| `team-executor` | 轻量执行 (恢复会话) | Resume existing sessions |
+| `team-executor` | 轻量执行 v2 | Improved session resumption |
+
+### Standalone Skills (独立技能)
+
+| Skill | 用途 |
+|-------|------|
+| `brainstorm` | 双模头脑风暴 (auto pipeline / single role) |
+| `review-code` | 多维度代码审查 |
+| `review-cycle` | 审查+自动修复编排 |
+| `spec-generator` | 6阶段规格文档链 (product-brief → PRD → architecture → epics) |
+| `issue-manage` | 交互式 Issue 管理 (CRUD) |
+| `memory-capture` | 统一记忆捕获 (session compact / quick tip) |
+| `memory-manage` | 统一记忆管理 (CLAUDE.md + documentation) |
+| `command-generator` | 命令文件生成器 |
+| `skill-generator` | Meta-skill: 创建新 Skill |
+| `skill-tuning` | Skill 诊断与优化 |
+
+## Workflow Mapping (CCW Auto-Route)
+
+CCW 根据任务意图自动选择工作流级别（参考 [ccw.md](../../commands/ccw.md)）：
+
+| 输入示例 | 类型 | 级别 | 流水线 |
+|---------|------|------|--------|
+| "Add API endpoint" | feature (low) | 2 | workflow-lite-plan → workflow-test-fix |
+| "Fix login timeout" | bugfix | 2 | workflow-lite-plan → workflow-test-fix |
+| "协作分析: 认证架构" | analyze-file | 3 | analyze-with-file → workflow-lite-plan |
+| "重构 auth 模块" | refactor | 3 | workflow:refactor-cycle |
+| "multi-cli: API设计" | multi-cli | 3 | workflow-multi-cli-plan → workflow-test-fix |
+| "头脑风暴: 通知系统" | brainstorm | 4 | brainstorm-with-file → workflow-plan → workflow-execute |
+| "roadmap: OAuth + 2FA" | roadmap | 4 | roadmap-with-file → team-planex |
+| "specification: 用户系统" | spec-driven | 4 | spec-generator → workflow-plan → workflow-execute |
+| "team planex: 用户系统" | team-planex | Team | team-planex |
+
 ## Slash Commands
 
 ```bash
@@ -116,6 +203,8 @@ Single source of truth: **[command.json](command.json)**
 /ccw-help                        # General help entry
 /ccw-help search <keyword>       # Search commands
 /ccw-help next <command>         # Get next step suggestions
+/ccw-help skills                 # Browse skill catalog
+/ccw-help teams                  # Browse team skills
 /ccw-issue                       # Issue reporting
 ```
 
@@ -128,6 +217,9 @@ Single source of truth: **[command.json](command.json)**
 /ccw "头脑风暴: 用户通知系统"          # → detect brainstorm, use brainstorm-with-file
 /ccw "深度调试: 系统随机崩溃"          # → detect debug-file, use debug-with-file
 /ccw "协作分析: 认证架构设计"          # → detect analyze-file, use analyze-with-file
+/ccw "roadmap: OAuth + 2FA 路线图"     # → roadmap-with-file → team-planex
+/ccw "集成测试: 支付流程"              # → integration-test-cycle
+/ccw "重构 auth 模块"                  # → refactor-cycle
 ```
 
 ## Maintenance
@@ -135,6 +227,7 @@ Single source of truth: **[command.json](command.json)**
 ### Update Mechanism
 
 CCW-Help skill supports manual updates through user confirmation dialog.
+Script scans `commands/`, `agents/`, and `skills/` directories to regenerate all indexes.
 
 #### How to Update
 
@@ -153,18 +246,33 @@ cd D:/Claude_dms3/.claude/skills/ccw-help
 python scripts/auto-update.py
 ```
 
-This runs `analyze_commands.py` to scan commands/ and agents/ directories and regenerate `command.json`.
+This runs `analyze_commands.py` to scan commands/, agents/, and skills/ directories and regenerate `command.json` + all index files.
 
 #### Update Scripts
 
 - **`auto-update.py`**: Simple wrapper that runs analyze_commands.py
-- **`analyze_commands.py`**: Scans directories and generates command index
+- **`analyze_commands.py`**: Scans directories and generates command/agent/skill indexes
+
+#### Generated Index Files
+
+| File | Content |
+|------|---------|
+| `command.json` | Master index: commands + agents + skills |
+| `index/all-commands.json` | Flat command list |
+| `index/all-agents.json` | Agent directory |
+| `index/all-skills.json` | Skill directory with metadata |
+| `index/skills-by-category.json` | Skills grouped by category |
+| `index/by-category.json` | Commands by category |
+| `index/by-use-case.json` | Commands by usage scenario |
+| `index/essential-commands.json` | Core commands for onboarding |
+| `index/command-relationships.json` | Command flow relationships |
 
 ## Statistics
 
 - **Commands**: 50+
-- **Agents**: 16
-- **Workflows**: 6 main levels + 3 with-file variants
+- **Agents**: 22
+- **Skills**: 36+ (7 workflow, 19 team, 10+ standalone/utility)
+- **Workflows**: 6 main levels + 5 with-file variants + 2 cycle variants
 - **Essential**: 10 core commands
 
 ## Core Principle

.claude/skills/ccw-help/index/all-agents.json

@@ -29,6 +29,11 @@
     "description": "|",
     "source": "../../../agents/cli-planning-agent.md"
   },
+  {
+    "name": "cli-roadmap-plan-agent",
+    "description": "|",
+    "source": "../../../agents/cli-roadmap-plan-agent.md"
+  },
   {
     "name": "code-developer",
     "description": "|",
@@ -74,6 +79,16 @@
     "description": "|",
     "source": "../../../agents/tdd-developer.md"
   },
+  {
+    "name": "team-worker",
+    "description": "|",
+    "source": "../../../agents/team-worker.md"
+  },
+  {
+    "name": "test-action-planning-agent",
+    "description": "|",
+    "source": "../../../agents/test-action-planning-agent.md"
+  },
   {
     "name": "test-context-search-agent",
     "description": "|",

.claude/skills/ccw-help/index/all-commands.json

@@ -43,6 +43,72 @@
     "difficulty": "Intermediate",
     "source": "../../../commands/cli/codex-review.md"
   },
+  {
+    "name": "flow-create",
+    "command": "/flow-create",
+    "description": "Flow Template Generator - Generate workflow templates for meta-skill/flow-coordinator with interactive 3-phase workflow",
+    "arguments": "[template-name] [--output <path>]",
+    "category": "general",
+    "subcategory": null,
+    "usage_scenario": "implementation",
+    "difficulty": "Intermediate",
+    "source": "../../../commands/flow-create.md"
+  },
+  {
+    "name": "add",
+    "command": "/idaw:add",
+    "description": "Add IDAW tasks - manual creation or import from ccw issue",
+    "arguments": "[-y|--yes] [--from-issue <id>[,<id>,...]] \\\"description\\\" [--type <task_type>] [--priority <1-5>]",
+    "category": "idaw",
+    "subcategory": null,
+    "usage_scenario": "general",
+    "difficulty": "Intermediate",
+    "source": "../../../commands/idaw/add.md"
+  },
+  {
+    "name": "resume",
+    "command": "/idaw:resume",
+    "description": "Resume interrupted IDAW session from last checkpoint",
+    "arguments": "[-y|--yes] [session-id]",
+    "category": "idaw",
+    "subcategory": null,
+    "usage_scenario": "session-management",
+    "difficulty": "Intermediate",
+    "source": "../../../commands/idaw/resume.md"
+  },
+  {
+    "name": "run-coordinate",
+    "command": "/idaw:run-coordinate",
+    "description": "IDAW coordinator - execute task skill chains via external CLI with hook callbacks and git checkpoints",
+    "arguments": "[-y|--yes] [--task <id>[,<id>,...]] [--dry-run] [--tool <tool>]",
+    "category": "idaw",
+    "subcategory": null,
+    "usage_scenario": "general",
+    "difficulty": "Intermediate",
+    "source": "../../../commands/idaw/run-coordinate.md"
+  },
+  {
+    "name": "run",
+    "command": "/idaw:run",
+    "description": "IDAW orchestrator - execute task skill chains serially with git checkpoints",
+    "arguments": "[-y|--yes] [--task <id>[,<id>,...]] [--dry-run]",
+    "category": "idaw",
+    "subcategory": null,
+    "usage_scenario": "general",
+    "difficulty": "Intermediate",
+    "source": "../../../commands/idaw/run.md"
+  },
+  {
+    "name": "status",
+    "command": "/idaw:status",
+    "description": "View IDAW task and session progress",
+    "arguments": "[session-id]",
+    "category": "idaw",
+    "subcategory": null,
+    "usage_scenario": "session-management",
+    "difficulty": "Beginner",
+    "source": "../../../commands/idaw/status.md"
+  },
   {
     "name": "convert-to-plan",
     "command": "/issue:convert-to-plan",
@@ -131,6 +197,17 @@
     "difficulty": "Intermediate",
     "source": "../../../commands/issue/queue.md"
   },
+  {
+    "name": "prepare",
+    "command": "/memory:prepare",
+    "description": "Delegate to universal-executor agent to analyze project via Gemini/Qwen CLI and return JSON core content package for task context",
+    "arguments": "[--tool gemini|qwen] \\\"task context description\\",
+    "category": "memory",
+    "subcategory": null,
+    "usage_scenario": "general",
+    "difficulty": "Intermediate",
+    "source": "../../../commands/memory/prepare.md"
+  },
   {
     "name": "style-skill-memory",
     "command": "/memory:style-skill-memory",
@@ -175,6 +252,17 @@
     "difficulty": "Intermediate",
     "source": "../../../commands/workflow/clean.md"
   },
+  {
+    "name": "workflow:collaborative-plan-with-file",
+    "command": "/workflow:collaborative-plan-with-file",
+    "description": "Collaborative planning with Plan Note - Understanding agent creates shared plan-note.md template, parallel agents fill pre-allocated sections, conflict detection without merge. Outputs executable plan-note.md.",
+    "arguments": "[-y|--yes] <task description> [--max-agents=5]",
+    "category": "workflow",
+    "subcategory": null,
+    "usage_scenario": "planning",
+    "difficulty": "Intermediate",
+    "source": "../../../commands/workflow/collaborative-plan-with-file.md"
+  },
   {
     "name": "debug-with-file",
     "command": "/workflow:debug-with-file",
@@ -186,17 +274,72 @@
     "difficulty": "Intermediate",
     "source": "../../../commands/workflow/debug-with-file.md"
   },
+  {
+    "name": "init-guidelines",
+    "command": "/workflow:init-guidelines",
+    "description": "Interactive wizard to fill specs/*.md based on project analysis",
+    "arguments": "[--reset]",
+    "category": "workflow",
+    "subcategory": null,
+    "usage_scenario": "general",
+    "difficulty": "Intermediate",
+    "source": "../../../commands/workflow/init-guidelines.md"
+  },
+  {
+    "name": "init-specs",
+    "command": "/workflow:init-specs",
+    "description": "Interactive wizard to create individual specs or personal constraints with scope selection",
+    "arguments": "[--scope <global|project>] [--dimension <specs|personal>] [--category <general|exploration|planning|execution>]",
+    "category": "workflow",
+    "subcategory": null,
+    "usage_scenario": "general",
+    "difficulty": "Intermediate",
+    "source": "../../../commands/workflow/init-specs.md"
+  },
   {
     "name": "init",
     "command": "/workflow:init",
     "description": "Initialize project-level state with intelligent project analysis using cli-explore-agent",
-    "arguments": "[--regenerate]",
+    "arguments": "[--regenerate] [--skip-specs]",
     "category": "workflow",
     "subcategory": null,
     "usage_scenario": "general",
     "difficulty": "Intermediate",
     "source": "../../../commands/workflow/init.md"
   },
+  {
+    "name": "integration-test-cycle",
+    "command": "/workflow:integration-test-cycle",
+    "description": "Self-iterating integration test workflow with codebase exploration, test development, autonomous test-fix cycles, and reflection-driven strategy adjustment",
+    "arguments": "[-y|--yes] [-c|--continue] [--max-iterations=N] \\\"module or feature description\\",
+    "category": "workflow",
+    "subcategory": null,
+    "usage_scenario": "testing",
+    "difficulty": "Intermediate",
+    "source": "../../../commands/workflow/integration-test-cycle.md"
+  },
+  {
+    "name": "refactor-cycle",
+    "command": "/workflow:refactor-cycle",
+    "description": "Tech debt discovery and self-iterating refactoring with multi-dimensional analysis, prioritized execution, regression validation, and reflection-driven adjustment",
+    "arguments": "[-y|--yes] [-c|--continue] [--scope=module|project] \\\"module or refactoring goal\\",
+    "category": "workflow",
+    "subcategory": null,
+    "usage_scenario": "general",
+    "difficulty": "Intermediate",
+    "source": "../../../commands/workflow/refactor-cycle.md"
+  },
+  {
+    "name": "roadmap-with-file",
+    "command": "/workflow:roadmap-with-file",
+    "description": "Strategic requirement roadmap with iterative decomposition and issue creation. Outputs roadmap.md (human-readable, single source) + issues.jsonl (machine-executable). Handoff to team-planex.",
+    "arguments": "[-y|--yes] [-c|--continue] [-m progressive|direct|auto] \\\"requirement description\\",
+    "category": "workflow",
+    "subcategory": null,
+    "usage_scenario": "general",
+    "difficulty": "Intermediate",
+    "source": "../../../commands/workflow/roadmap-with-file.md"
+  },
   {
     "name": "complete",
     "command": "/workflow:session:complete",
@@ -233,8 +376,8 @@
   {
     "name": "solidify",
     "command": "/workflow:session:solidify",
-    "description": "Crystallize session learnings and user-defined constraints into permanent project guidelines",
-    "arguments": "[-y|--yes] [--type <convention|constraint|learning>] [--category <category>] \\\"rule or insight\\",
+    "description": "Crystallize session learnings and user-defined constraints into permanent project guidelines, or compress recent memories",
+    "arguments": "[-y|--yes] [--type <convention|constraint|learning|compress>] [--category <category>] [--limit <N>] \\\"rule or insight\\",
     "category": "workflow",
     "subcategory": "session",
     "usage_scenario": "general",
@@ -252,6 +395,17 @@
     "difficulty": "Intermediate",
     "source": "../../../commands/workflow/session/start.md"
   },
+  {
+    "name": "sync",
+    "command": "/workflow:session:sync",
+    "description": "Quick-sync session work to specs/*.md and project-tech",
+    "arguments": "[-y|--yes] [\\\"what was done\\\"]",
+    "category": "workflow",
+    "subcategory": "session",
+    "usage_scenario": "general",
+    "difficulty": "Intermediate",
+    "source": "../../../commands/workflow/session/sync.md"
+  },
   {
     "name": "animation-extract",
     "command": "/workflow:ui-design:animation-extract",
@@ -366,11 +520,11 @@
     "name": "unified-execute-with-file",
     "command": "/workflow:unified-execute-with-file",
     "description": "Universal execution engine for consuming any planning/brainstorm/analysis output with minimal progress tracking, multi-agent coordination, and incremental execution",
-    "arguments": "[-y|--yes] [-p|--plan <path>] [-m|--mode sequential|parallel] [\\\"execution context or task name\\\"]",
+    "arguments": "[-y|--yes] [<path>[,<path2>] | -p|--plan <path>[,<path2>]] [--auto-commit] [--commit-prefix \\\"prefix\\\"] [\\\"execution context or task name\\\"]",
     "category": "workflow",
     "subcategory": null,
     "usage_scenario": "implementation",
     "difficulty": "Intermediate",
     "source": "../../../commands/workflow/unified-execute-with-file.md"
   }
-]
+]

.claude/skills/ccw-help/index/all-skills.json

@@ -0,0 +1,352 @@
+[
+  {
+    "name": "brainstorm",
+    "description": "Unified brainstorming skill with dual-mode operation - auto pipeline and single role analysis. Triggers on \"brainstorm\", \"头脑风暴\".",
+    "category": "standalone",
+    "is_team": false,
+    "has_phases": true,
+    "has_role_specs": false,
+    "version": "",
+    "source": "../../../skills/brainstorm/SKILL.md"
+  },
+  {
+    "name": "ccw-help",
+    "description": "CCW command help system. Search, browse, recommend commands, skills, teams. Triggers \"ccw-help\", \"ccw-issue\".",
+    "category": "utility",
+    "is_team": false,
+    "has_phases": false,
+    "has_role_specs": false,
+    "version": "8.0.0",
+    "source": "../../../skills/ccw-help/SKILL.md"
+  },
+  {
+    "name": "command-generator",
+    "description": "Command file generator - 5 phase workflow for creating Claude Code command files with YAML frontmatter. Generates .md command files for project or user scope. Triggers on \"create command\", \"new command\", \"command generator\".",
+    "category": "meta",
+    "is_team": false,
+    "has_phases": true,
+    "has_role_specs": false,
+    "version": "",
+    "source": "../../../skills/command-generator/SKILL.md"
+  },
+  {
+    "name": "issue-manage",
+    "description": "Interactive issue management with menu-driven CRUD operations. Use when managing issues, viewing issue status, editing issue fields, performing bulk operations, or viewing issue history. Triggers on \"manage issue\", \"list issues\", \"edit issue\", \"delete issue\", \"bulk update\", \"issue dashboard\", \"issue history\", \"completed issues\".",
+    "category": "utility",
+    "is_team": false,
+    "has_phases": false,
+    "has_role_specs": false,
+    "version": "",
+    "source": "../../../skills/issue-manage/SKILL.md"
+  },
+  {
+    "name": "memory-capture",
+    "description": "Unified memory capture with routing - session compact or quick tips. Triggers on \"memory capture\", \"compact session\", \"save session\", \"quick tip\", \"memory tips\", \"记录\", \"压缩会话\".",
+    "category": "utility",
+    "is_team": false,
+    "has_phases": true,
+    "has_role_specs": false,
+    "version": "",
+    "source": "../../../skills/memory-capture/SKILL.md"
+  },
+  {
+    "name": "memory-manage",
+    "description": "Unified memory management - CLAUDE.md updates and documentation generation with interactive routing. Triggers on \"memory manage\", \"update claude\", \"update memory\", \"generate docs\", \"更新记忆\", \"生成文档\".",
+    "category": "utility",
+    "is_team": false,
+    "has_phases": true,
+    "has_role_specs": false,
+    "version": "",
+    "source": "../../../skills/memory-manage/SKILL.md"
+  },
+  {
+    "name": "review-code",
+    "description": "Multi-dimensional code review with structured reports. Analyzes correctness, readability, performance, security, testing, and architecture. Triggers on \"review code\", \"code review\", \"审查代码\", \"代码审查\".",
+    "category": "review",
+    "is_team": false,
+    "has_phases": true,
+    "has_role_specs": false,
+    "version": "",
+    "source": "../../../skills/review-code/SKILL.md"
+  },
+  {
+    "name": "review-cycle",
+    "description": "Unified multi-dimensional code review with automated fix orchestration. Routes to session-based (git changes), module-based (path patterns), or fix mode. Triggers on \"workflow:review-cycle\", \"workflow:review-session-cycle\", \"workflow:review-module-cycle\", \"workflow:review-cycle-fix\".",
+    "category": "review",
+    "is_team": false,
+    "has_phases": true,
+    "has_role_specs": false,
+    "version": "",
+    "source": "../../../skills/review-cycle/SKILL.md"
+  },
+  {
+    "name": "skill-generator",
+    "description": "Meta-skill for creating new Claude Code skills with configurable execution modes. Supports sequential (fixed order) and autonomous (stateless) phase patterns. Use for skill scaffolding, skill creation, or building new workflows. Triggers on \"create skill\", \"new skill\", \"skill generator\".",
+    "category": "meta",
+    "is_team": false,
+    "has_phases": true,
+    "has_role_specs": false,
+    "version": "",
+    "source": "../../../skills/skill-generator/SKILL.md"
+  },
+  {
+    "name": "skill-tuning",
+    "description": "Universal skill diagnosis and optimization tool. Detect and fix skill execution issues including context explosion, long-tail forgetting, data flow disruption, and agent coordination failures. Supports Gemini CLI for deep analysis. Triggers on \"skill tuning\", \"tune skill\", \"skill diagnosis\", \"optimize skill\", \"skill debug\".",
+    "category": "meta",
+    "is_team": false,
+    "has_phases": true,
+    "has_role_specs": false,
+    "version": "",
+    "source": "../../../skills/skill-tuning/SKILL.md"
+  },
+  {
+    "name": "spec-generator",
+    "description": "Specification generator - 6 phase document chain producing product brief, PRD, architecture, and epics. Triggers on \"generate spec\", \"create specification\", \"spec generator\", \"workflow:spec\".",
+    "category": "meta",
+    "is_team": false,
+    "has_phases": true,
+    "has_role_specs": false,
+    "version": "",
+    "source": "../../../skills/spec-generator/SKILL.md"
+  },
+  {
+    "name": "team-arch-opt",
+    "description": "Unified team skill for architecture optimization. Uses team-worker agent architecture with role-spec files for domain logic. Coordinator orchestrates pipeline, workers are team-worker agents. Triggers on \"team arch-opt\".",
+    "category": "team",
+    "is_team": true,
+    "has_phases": false,
+    "has_role_specs": true,
+    "version": "",
+    "source": "../../../skills/team-arch-opt/SKILL.md"
+  },
+  {
+    "name": "team-brainstorm",
+    "description": "Unified team skill for brainstorming team. All roles invoke this skill with --role arg for role-specific execution. Triggers on \"team brainstorm\".",
+    "category": "team",
+    "is_team": true,
+    "has_phases": false,
+    "has_role_specs": false,
+    "version": "",
+    "source": "../../../skills/team-brainstorm/SKILL.md"
+  },
+  {
+    "name": "team-coordinate",
+    "description": "Universal team coordination skill with dynamic role generation. Uses team-worker agent architecture with role-spec files. Only coordinator is built-in -- all worker roles are generated at runtime as role-specs and spawned via team-worker agent. Beat/cadence model for orchestration. Triggers on \"Team Coordinate \".",
+    "category": "team",
+    "is_team": true,
+    "has_phases": false,
+    "has_role_specs": false,
+    "version": "",
+    "source": "../../../skills/team-coordinate/SKILL.md"
+  },
+  {
+    "name": "team-executor",
+    "description": "Lightweight session execution skill. Resumes existing team-coordinate sessions for pure execution via team-worker agents. No analysis, no role generation -- only loads and executes. Session path required. Triggers on \"Team Executor\".",
+    "category": "team",
+    "is_team": true,
+    "has_phases": false,
+    "has_role_specs": false,
+    "version": "",
+    "source": "../../../skills/team-executor/SKILL.md"
+  },
+  {
+    "name": "team-frontend",
+    "description": "Unified team skill for frontend development team. All roles invoke this skill with --role arg. Built-in ui-ux-pro-max design intelligence. Triggers on \"team frontend\".",
+    "category": "team",
+    "is_team": true,
+    "has_phases": false,
+    "has_role_specs": false,
+    "version": "",
+    "source": "../../../skills/team-frontend/SKILL.md"
+  },
+  {
+    "name": "team-issue",
+    "description": "Unified team skill for issue resolution. All roles invoke this skill with --role arg for role-specific execution. Triggers on \"team issue\".",
+    "category": "team",
+    "is_team": true,
+    "has_phases": false,
+    "has_role_specs": false,
+    "version": "",
+    "source": "../../../skills/team-issue/SKILL.md"
+  },
+  {
+    "name": "team-iterdev",
+    "description": "Unified team skill for iterative development team. All roles invoke this skill with --role arg for role-specific execution. Triggers on \"team iterdev\".",
+    "category": "team",
+    "is_team": true,
+    "has_phases": false,
+    "has_role_specs": false,
+    "version": "",
+    "source": "../../../skills/team-iterdev/SKILL.md"
+  },
+  {
+    "name": "team-lifecycle",
+    "description": "Unified team skill for full lifecycle - spec/impl/test. Uses team-worker agent architecture with role-spec files for domain logic. Coordinator orchestrates pipeline, workers are team-worker agents loaded with role-specific Phase 2-4 specs. Triggers on \"team lifecycle\".",
+    "category": "team",
+    "is_team": true,
+    "has_phases": false,
+    "has_role_specs": true,
+    "version": "",
+    "source": "../../../skills/team-lifecycle/SKILL.md"
+  },
+  {
+    "name": "team-perf-opt",
+    "description": "Unified team skill for performance optimization. Uses team-worker agent architecture with role-spec files for domain logic. Coordinator orchestrates pipeline, workers are team-worker agents. Triggers on \"team perf-opt\".",
+    "category": "team",
+    "is_team": true,
+    "has_phases": false,
+    "has_role_specs": true,
+    "version": "",
+    "source": "../../../skills/team-perf-opt/SKILL.md"
+  },
+  {
+    "name": "team-planex",
+    "description": "Unified team skill for plan-and-execute pipeline. Uses team-worker agent architecture with role-spec files for domain logic. Coordinator orchestrates pipeline, workers are team-worker agents. Triggers on \"team planex\".",
+    "category": "team",
+    "is_team": true,
+    "has_phases": false,
+    "has_role_specs": true,
+    "version": "",
+    "source": "../../../skills/team-planex/SKILL.md"
+  },
+  {
+    "name": "team-quality-assurance",
+    "description": "Unified team skill for quality assurance team. All roles invoke this skill with --role arg for role-specific execution. Triggers on \"team quality-assurance\", \"team qa\".",
+    "category": "team",
+    "is_team": true,
+    "has_phases": false,
+    "has_role_specs": false,
+    "version": "",
+    "source": "../../../skills/team-quality-assurance/SKILL.md"
+  },
+  {
+    "name": "team-review",
+    "description": "Unified team skill for code scanning, vulnerability review, optimization suggestions, and automated fix. 4-role team: coordinator, scanner, reviewer, fixer. Triggers on team-review.",
+    "category": "team",
+    "is_team": false,
+    "has_phases": false,
+    "has_role_specs": false,
+    "version": "",
+    "source": "../../../skills/team-review/SKILL.md"
+  },
+  {
+    "name": "team-roadmap-dev",
+    "description": "Unified team skill for roadmap-driven development workflow. Coordinator discusses roadmap with user, then dispatches phased execution pipeline (plan -> execute -> verify). All roles invoke this skill with --role arg. Triggers on \"team roadmap-dev\".",
+    "category": "team",
+    "is_team": true,
+    "has_phases": false,
+    "has_role_specs": false,
+    "version": "",
+    "source": "../../../skills/team-roadmap-dev/SKILL.md"
+  },
+  {
+    "name": "team-tech-debt",
+    "description": "Unified team skill for tech debt identification and cleanup. All roles invoke this skill with --role arg for role-specific execution. Triggers on \"team tech-debt\", \"tech debt cleanup\", \"技术债务\".",
+    "category": "team",
+    "is_team": true,
+    "has_phases": false,
+    "has_role_specs": false,
+    "version": "",
+    "source": "../../../skills/team-tech-debt/SKILL.md"
+  },
+  {
+    "name": "team-testing",
+    "description": "Unified team skill for testing team. All roles invoke this skill with --role arg for role-specific execution. Triggers on \"team testing\".",
+    "category": "team",
+    "is_team": true,
+    "has_phases": false,
+    "has_role_specs": false,
+    "version": "",
+    "source": "../../../skills/team-testing/SKILL.md"
+  },
+  {
+    "name": "team-uidesign",
+    "description": "Unified team skill for UI design team. All roles invoke this skill with --role arg for role-specific execution. CP-9 Dual-Track design+implementation.",
+    "category": "team",
+    "is_team": true,
+    "has_phases": false,
+    "has_role_specs": false,
+    "version": "",
+    "source": "../../../skills/team-uidesign/SKILL.md"
+  },
+  {
+    "name": "team-ultra-analyze",
+    "description": "Unified team skill for deep collaborative analysis. All roles invoke this skill with --role arg for role-specific execution. Triggers on \"team ultra-analyze\", \"team analyze\".",
+    "category": "team",
+    "is_team": true,
+    "has_phases": false,
+    "has_role_specs": false,
+    "version": "",
+    "source": "../../../skills/team-ultra-analyze/SKILL.md"
+  },
+  {
+    "name": "workflow-execute",
+    "description": "Coordinate agent execution for workflow tasks with automatic session discovery, parallel task processing, and status tracking. Triggers on \"workflow-execute\".",
+    "category": "workflow",
+    "is_team": false,
+    "has_phases": true,
+    "has_role_specs": false,
+    "version": "",
+    "source": "../../../skills/workflow-execute/SKILL.md"
+  },
+  {
+    "name": "workflow-lite-plan",
+    "description": "Lightweight planning and execution skill (Phase 1: plan, Phase 2: execute). Triggers on \"workflow-lite-plan\".",
+    "category": "workflow",
+    "is_team": false,
+    "has_phases": true,
+    "has_role_specs": false,
+    "version": "",
+    "source": "../../../skills/workflow-lite-plan/SKILL.md"
+  },
+  {
+    "name": "workflow-multi-cli-plan",
+    "description": "Multi-CLI collaborative planning and execution skill with integrated execution phase. Triggers on \"workflow-multi-cli-plan\".",
+    "category": "workflow",
+    "is_team": false,
+    "has_phases": true,
+    "has_role_specs": false,
+    "version": "",
+    "source": "../../../skills/workflow-multi-cli-plan/SKILL.md"
+  },
+  {
+    "name": "workflow-plan",
+    "description": "Unified planning skill - 4-phase planning workflow, plan verification, and interactive replanning. Triggers on \"workflow-plan\", \"workflow-plan-verify\", \"workflow:replan\".",
+    "category": "workflow",
+    "is_team": false,
+    "has_phases": true,
+    "has_role_specs": false,
+    "version": "",
+    "source": "../../../skills/workflow-plan/SKILL.md"
+  },
+  {
+    "name": "workflow-skill-designer",
+    "description": "Meta-skill for designing orchestrator+phases structured workflow skills. Creates SKILL.md coordinator with progressive phase loading, TodoWrite patterns, and data flow. Triggers on \"design workflow skill\", \"create workflow skill\", \"workflow skill designer\".",
+    "category": "workflow",
+    "is_team": false,
+    "has_phases": true,
+    "has_role_specs": false,
+    "version": "",
+    "source": "../../../skills/workflow-skill-designer/SKILL.md"
+  },
+  {
+    "name": "workflow-tdd-plan",
+    "description": "Unified TDD workflow skill combining 6-phase TDD planning with Red-Green-Refactor task chain generation, and 4-phase TDD verification with compliance reporting. Triggers on \"workflow-tdd-plan\", \"workflow-tdd-verify\".",
+    "category": "workflow",
+    "is_team": false,
+    "has_phases": true,
+    "has_role_specs": false,
+    "version": "",
+    "source": "../../../skills/workflow-tdd-plan/SKILL.md"
+  },
+  {
+    "name": "workflow-test-fix",
+    "description": "Unified test-fix pipeline combining test generation (session, context, analysis, task gen) with iterative test-cycle execution (adaptive strategy, progressive testing, CLI fallback). Triggers on \"workflow-test-fix\", \"workflow-test-fix\", \"test fix workflow\".",
+    "category": "workflow",
+    "is_team": false,
+    "has_phases": true,
+    "has_role_specs": false,
+    "version": "",
+    "source": "../../../skills/workflow-test-fix/SKILL.md"
+  }
+]

.claude/skills/ccw-help/index/by-category.json

@@ -22,6 +22,17 @@
         "usage_scenario": "general",
         "difficulty": "Intermediate",
         "source": "../../../commands/ccw.md"
+      },
+      {
+        "name": "flow-create",
+        "command": "/flow-create",
+        "description": "",
+        "arguments": "",
+        "category": "general",
+        "subcategory": null,
+        "usage_scenario": "implementation",
+        "difficulty": "Intermediate",
+        "source": "../../../commands/flow-create.md"
       }
     ]
   },
@@ -51,6 +62,65 @@
       }
     ]
   },
+  "idaw": {
+    "_root": [
+      {
+        "name": "add",
+        "command": "/idaw:add",
+        "description": "Add IDAW tasks - manual creation or import from ccw issue",
+        "arguments": "[-y|--yes] [--from-issue <id>[,<id>,...]] \\\"description\\\" [--type <task_type>] [--priority <1-5>]",
+        "category": "idaw",
+        "subcategory": null,
+        "usage_scenario": "general",
+        "difficulty": "Intermediate",
+        "source": "../../../commands/idaw/add.md"
+      },
+      {
+        "name": "resume",
+        "command": "/idaw:resume",
+        "description": "Resume interrupted IDAW session from last checkpoint",
+        "arguments": "[-y|--yes] [session-id]",
+        "category": "idaw",
+        "subcategory": null,
+        "usage_scenario": "session-management",
+        "difficulty": "Intermediate",
+        "source": "../../../commands/idaw/resume.md"
+      },
+      {
+        "name": "run-coordinate",
+        "command": "/idaw:run-coordinate",
+        "description": "IDAW coordinator - execute task skill chains via external CLI with hook callbacks and git checkpoints",
+        "arguments": "[-y|--yes] [--task <id>[,<id>,...]] [--dry-run] [--tool <tool>]",
+        "category": "idaw",
+        "subcategory": null,
+        "usage_scenario": "general",
+        "difficulty": "Intermediate",
+        "source": "../../../commands/idaw/run-coordinate.md"
+      },
+      {
+        "name": "run",
+        "command": "/idaw:run",
+        "description": "IDAW orchestrator - execute task skill chains serially with git checkpoints",
+        "arguments": "[-y|--yes] [--task <id>[,<id>,...]] [--dry-run]",
+        "category": "idaw",
+        "subcategory": null,
+        "usage_scenario": "general",
+        "difficulty": "Intermediate",
+        "source": "../../../commands/idaw/run.md"
+      },
+      {
+        "name": "status",
+        "command": "/idaw:status",
+        "description": "View IDAW task and session progress",
+        "arguments": "[session-id]",
+        "category": "idaw",
+        "subcategory": null,
+        "usage_scenario": "session-management",
+        "difficulty": "Beginner",
+        "source": "../../../commands/idaw/status.md"
+      }
+    ]
+  },
   "issue": {
     "_root": [
       {
@@ -145,6 +215,17 @@
   },
   "memory": {
     "_root": [
+      {
+        "name": "prepare",
+        "command": "/memory:prepare",
+        "description": "Delegate to universal-executor agent to analyze project via Gemini/Qwen CLI and return JSON core content package for task context",
+        "arguments": "[--tool gemini|qwen] \\\"task context description\\",
+        "category": "memory",
+        "subcategory": null,
+        "usage_scenario": "general",
+        "difficulty": "Intermediate",
+        "source": "../../../commands/memory/prepare.md"
+      },
       {
         "name": "style-skill-memory",
         "command": "/memory:style-skill-memory",
@@ -193,6 +274,17 @@
         "difficulty": "Intermediate",
         "source": "../../../commands/workflow/clean.md"
       },
+      {
+        "name": "workflow:collaborative-plan-with-file",
+        "command": "/workflow:collaborative-plan-with-file",
+        "description": "Collaborative planning with Plan Note - Understanding agent creates shared plan-note.md template, parallel agents fill pre-allocated sections, conflict detection without merge. Outputs executable plan-note.md.",
+        "arguments": "[-y|--yes] <task description> [--max-agents=5]",
+        "category": "workflow",
+        "subcategory": null,
+        "usage_scenario": "planning",
+        "difficulty": "Intermediate",
+        "source": "../../../commands/workflow/collaborative-plan-with-file.md"
+      },
       {
         "name": "debug-with-file",
         "command": "/workflow:debug-with-file",
@@ -204,22 +296,77 @@
         "difficulty": "Intermediate",
         "source": "../../../commands/workflow/debug-with-file.md"
       },
+      {
+        "name": "init-guidelines",
+        "command": "/workflow:init-guidelines",
+        "description": "Interactive wizard to fill specs/*.md based on project analysis",
+        "arguments": "[--reset]",
+        "category": "workflow",
+        "subcategory": null,
+        "usage_scenario": "general",
+        "difficulty": "Intermediate",
+        "source": "../../../commands/workflow/init-guidelines.md"
+      },
+      {
+        "name": "init-specs",
+        "command": "/workflow:init-specs",
+        "description": "Interactive wizard to create individual specs or personal constraints with scope selection",
+        "arguments": "[--scope <global|project>] [--dimension <specs|personal>] [--category <general|exploration|planning|execution>]",
+        "category": "workflow",
+        "subcategory": null,
+        "usage_scenario": "general",
+        "difficulty": "Intermediate",
+        "source": "../../../commands/workflow/init-specs.md"
+      },
       {
         "name": "init",
         "command": "/workflow:init",
         "description": "Initialize project-level state with intelligent project analysis using cli-explore-agent",
-        "arguments": "[--regenerate]",
+        "arguments": "[--regenerate] [--skip-specs]",
         "category": "workflow",
         "subcategory": null,
         "usage_scenario": "general",
         "difficulty": "Intermediate",
         "source": "../../../commands/workflow/init.md"
       },
+      {
+        "name": "integration-test-cycle",
+        "command": "/workflow:integration-test-cycle",
+        "description": "Self-iterating integration test workflow with codebase exploration, test development, autonomous test-fix cycles, and reflection-driven strategy adjustment",
+        "arguments": "[-y|--yes] [-c|--continue] [--max-iterations=N] \\\"module or feature description\\",
+        "category": "workflow",
+        "subcategory": null,
+        "usage_scenario": "testing",
+        "difficulty": "Intermediate",
+        "source": "../../../commands/workflow/integration-test-cycle.md"
+      },
+      {
+        "name": "refactor-cycle",
+        "command": "/workflow:refactor-cycle",
+        "description": "Tech debt discovery and self-iterating refactoring with multi-dimensional analysis, prioritized execution, regression validation, and reflection-driven adjustment",
+        "arguments": "[-y|--yes] [-c|--continue] [--scope=module|project] \\\"module or refactoring goal\\",
+        "category": "workflow",
+        "subcategory": null,
+        "usage_scenario": "general",
+        "difficulty": "Intermediate",
+        "source": "../../../commands/workflow/refactor-cycle.md"
+      },
+      {
+        "name": "roadmap-with-file",
+        "command": "/workflow:roadmap-with-file",
+        "description": "Strategic requirement roadmap with iterative decomposition and issue creation. Outputs roadmap.md (human-readable, single source) + issues.jsonl (machine-executable). Handoff to team-planex.",
+        "arguments": "[-y|--yes] [-c|--continue] [-m progressive|direct|auto] \\\"requirement description\\",
+        "category": "workflow",
+        "subcategory": null,
+        "usage_scenario": "general",
+        "difficulty": "Intermediate",
+        "source": "../../../commands/workflow/roadmap-with-file.md"
+      },
       {
         "name": "unified-execute-with-file",
         "command": "/workflow:unified-execute-with-file",
         "description": "Universal execution engine for consuming any planning/brainstorm/analysis output with minimal progress tracking, multi-agent coordination, and incremental execution",
-        "arguments": "[-y|--yes] [-p|--plan <path>] [-m|--mode sequential|parallel] [\\\"execution context or task name\\\"]",
+        "arguments": "[-y|--yes] [<path>[,<path2>] | -p|--plan <path>[,<path2>]] [--auto-commit] [--commit-prefix \\\"prefix\\\"] [\\\"execution context or task name\\\"]",
         "category": "workflow",
         "subcategory": null,
         "usage_scenario": "implementation",
@@ -264,8 +411,8 @@
       {
         "name": "solidify",
         "command": "/workflow:session:solidify",
-        "description": "Crystallize session learnings and user-defined constraints into permanent project guidelines",
-        "arguments": "[-y|--yes] [--type <convention|constraint|learning>] [--category <category>] \\\"rule or insight\\",
+        "description": "Crystallize session learnings and user-defined constraints into permanent project guidelines, or compress recent memories",
+        "arguments": "[-y|--yes] [--type <convention|constraint|learning|compress>] [--category <category>] [--limit <N>] \\\"rule or insight\\",
         "category": "workflow",
         "subcategory": "session",
         "usage_scenario": "general",
@@ -282,6 +429,17 @@
         "usage_scenario": "general",
         "difficulty": "Intermediate",
         "source": "../../../commands/workflow/session/start.md"
+      },
+      {
+        "name": "sync",
+        "command": "/workflow:session:sync",
+        "description": "Quick-sync session work to specs/*.md and project-tech",
+        "arguments": "[-y|--yes] [\\\"what was done\\\"]",
+        "category": "workflow",
+        "subcategory": "session",
+        "usage_scenario": "general",
+        "difficulty": "Intermediate",
+        "source": "../../../commands/workflow/session/sync.md"
       }
     ],
     "ui-design": [
@@ -397,4 +555,4 @@
       }
     ]
   }
-}
+}

.claude/skills/ccw-help/index/by-use-case.json

@@ -33,6 +33,39 @@
       "difficulty": "Intermediate",
       "source": "../../../commands/cli/cli-init.md"
     },
+    {
+      "name": "add",
+      "command": "/idaw:add",
+      "description": "Add IDAW tasks - manual creation or import from ccw issue",
+      "arguments": "[-y|--yes] [--from-issue <id>[,<id>,...]] \\\"description\\\" [--type <task_type>] [--priority <1-5>]",
+      "category": "idaw",
+      "subcategory": null,
+      "usage_scenario": "general",
+      "difficulty": "Intermediate",
+      "source": "../../../commands/idaw/add.md"
+    },
+    {
+      "name": "run-coordinate",
+      "command": "/idaw:run-coordinate",
+      "description": "IDAW coordinator - execute task skill chains via external CLI with hook callbacks and git checkpoints",
+      "arguments": "[-y|--yes] [--task <id>[,<id>,...]] [--dry-run] [--tool <tool>]",
+      "category": "idaw",
+      "subcategory": null,
+      "usage_scenario": "general",
+      "difficulty": "Intermediate",
+      "source": "../../../commands/idaw/run-coordinate.md"
+    },
+    {
+      "name": "run",
+      "command": "/idaw:run",
+      "description": "IDAW orchestrator - execute task skill chains serially with git checkpoints",
+      "arguments": "[-y|--yes] [--task <id>[,<id>,...]] [--dry-run]",
+      "category": "idaw",
+      "subcategory": null,
+      "usage_scenario": "general",
+      "difficulty": "Intermediate",
+      "source": "../../../commands/idaw/run.md"
+    },
     {
       "name": "issue:discover-by-prompt",
       "command": "/issue:discover-by-prompt",
@@ -77,6 +110,17 @@
       "difficulty": "Intermediate",
       "source": "../../../commands/issue/queue.md"
     },
+    {
+      "name": "prepare",
+      "command": "/memory:prepare",
+      "description": "Delegate to universal-executor agent to analyze project via Gemini/Qwen CLI and return JSON core content package for task context",
+      "arguments": "[--tool gemini|qwen] \\\"task context description\\",
+      "category": "memory",
+      "subcategory": null,
+      "usage_scenario": "general",
+      "difficulty": "Intermediate",
+      "source": "../../../commands/memory/prepare.md"
+    },
     {
       "name": "clean",
       "command": "/workflow:clean",
@@ -99,17 +143,61 @@
       "difficulty": "Intermediate",
       "source": "../../../commands/workflow/debug-with-file.md"
     },
+    {
+      "name": "init-guidelines",
+      "command": "/workflow:init-guidelines",
+      "description": "Interactive wizard to fill specs/*.md based on project analysis",
+      "arguments": "[--reset]",
+      "category": "workflow",
+      "subcategory": null,
+      "usage_scenario": "general",
+      "difficulty": "Intermediate",
+      "source": "../../../commands/workflow/init-guidelines.md"
+    },
+    {
+      "name": "init-specs",
+      "command": "/workflow:init-specs",
+      "description": "Interactive wizard to create individual specs or personal constraints with scope selection",
+      "arguments": "[--scope <global|project>] [--dimension <specs|personal>] [--category <general|exploration|planning|execution>]",
+      "category": "workflow",
+      "subcategory": null,
+      "usage_scenario": "general",
+      "difficulty": "Intermediate",
+      "source": "../../../commands/workflow/init-specs.md"
+    },
     {
       "name": "init",
       "command": "/workflow:init",
       "description": "Initialize project-level state with intelligent project analysis using cli-explore-agent",
-      "arguments": "[--regenerate]",
+      "arguments": "[--regenerate] [--skip-specs]",
       "category": "workflow",
       "subcategory": null,
       "usage_scenario": "general",
       "difficulty": "Intermediate",
       "source": "../../../commands/workflow/init.md"
     },
+    {
+      "name": "refactor-cycle",
+      "command": "/workflow:refactor-cycle",
+      "description": "Tech debt discovery and self-iterating refactoring with multi-dimensional analysis, prioritized execution, regression validation, and reflection-driven adjustment",
+      "arguments": "[-y|--yes] [-c|--continue] [--scope=module|project] \\\"module or refactoring goal\\",
+      "category": "workflow",
+      "subcategory": null,
+      "usage_scenario": "general",
+      "difficulty": "Intermediate",
+      "source": "../../../commands/workflow/refactor-cycle.md"
+    },
+    {
+      "name": "roadmap-with-file",
+      "command": "/workflow:roadmap-with-file",
+      "description": "Strategic requirement roadmap with iterative decomposition and issue creation. Outputs roadmap.md (human-readable, single source) + issues.jsonl (machine-executable). Handoff to team-planex.",
+      "arguments": "[-y|--yes] [-c|--continue] [-m progressive|direct|auto] \\\"requirement description\\",
+      "category": "workflow",
+      "subcategory": null,
+      "usage_scenario": "general",
+      "difficulty": "Intermediate",
+      "source": "../../../commands/workflow/roadmap-with-file.md"
+    },
     {
       "name": "list",
       "command": "/workflow:session:list",
@@ -124,8 +212,8 @@
     {
       "name": "solidify",
       "command": "/workflow:session:solidify",
-      "description": "Crystallize session learnings and user-defined constraints into permanent project guidelines",
-      "arguments": "[-y|--yes] [--type <convention|constraint|learning>] [--category <category>] \\\"rule or insight\\",
+      "description": "Crystallize session learnings and user-defined constraints into permanent project guidelines, or compress recent memories",
+      "arguments": "[-y|--yes] [--type <convention|constraint|learning|compress>] [--category <category>] [--limit <N>] \\\"rule or insight\\",
       "category": "workflow",
       "subcategory": "session",
       "usage_scenario": "general",
@@ -143,6 +231,17 @@
       "difficulty": "Intermediate",
       "source": "../../../commands/workflow/session/start.md"
     },
+    {
+      "name": "sync",
+      "command": "/workflow:session:sync",
+      "description": "Quick-sync session work to specs/*.md and project-tech",
+      "arguments": "[-y|--yes] [\\\"what was done\\\"]",
+      "category": "workflow",
+      "subcategory": "session",
+      "usage_scenario": "general",
+      "difficulty": "Intermediate",
+      "source": "../../../commands/workflow/session/sync.md"
+    },
     {
       "name": "animation-extract",
       "command": "/workflow:ui-design:animation-extract",
@@ -223,6 +322,98 @@
       "source": "../../../commands/workflow/analyze-with-file.md"
     }
   ],
+  "implementation": [
+    {
+      "name": "flow-create",
+      "command": "/flow-create",
+      "description": "",
+      "arguments": "",
+      "category": "general",
+      "subcategory": null,
+      "usage_scenario": "implementation",
+      "difficulty": "Intermediate",
+      "source": "../../../commands/flow-create.md"
+    },
+    {
+      "name": "execute",
+      "command": "/issue:execute",
+      "description": "Execute queue with DAG-based parallel orchestration (one commit per solution)",
+      "arguments": "[-y|--yes] --queue <queue-id> [--worktree [<existing-path>]]",
+      "category": "issue",
+      "subcategory": null,
+      "usage_scenario": "implementation",
+      "difficulty": "Intermediate",
+      "source": "../../../commands/issue/execute.md"
+    },
+    {
+      "name": "generate",
+      "command": "/workflow:ui-design:generate",
+      "description": "Assemble UI prototypes by combining layout templates with design tokens (default animation support), pure assembler without new content generation",
+      "arguments": "[--design-id <id>] [--session <id>]",
+      "category": "workflow",
+      "subcategory": "ui-design",
+      "usage_scenario": "implementation",
+      "difficulty": "Intermediate",
+      "source": "../../../commands/workflow/ui-design/generate.md"
+    },
+    {
+      "name": "unified-execute-with-file",
+      "command": "/workflow:unified-execute-with-file",
+      "description": "Universal execution engine for consuming any planning/brainstorm/analysis output with minimal progress tracking, multi-agent coordination, and incremental execution",
+      "arguments": "[-y|--yes] [<path>[,<path2>] | -p|--plan <path>[,<path2>]] [--auto-commit] [--commit-prefix \\\"prefix\\\"] [\\\"execution context or task name\\\"]",
+      "category": "workflow",
+      "subcategory": null,
+      "usage_scenario": "implementation",
+      "difficulty": "Intermediate",
+      "source": "../../../commands/workflow/unified-execute-with-file.md"
+    }
+  ],
+  "session-management": [
+    {
+      "name": "resume",
+      "command": "/idaw:resume",
+      "description": "Resume interrupted IDAW session from last checkpoint",
+      "arguments": "[-y|--yes] [session-id]",
+      "category": "idaw",
+      "subcategory": null,
+      "usage_scenario": "session-management",
+      "difficulty": "Intermediate",
+      "source": "../../../commands/idaw/resume.md"
+    },
+    {
+      "name": "status",
+      "command": "/idaw:status",
+      "description": "View IDAW task and session progress",
+      "arguments": "[session-id]",
+      "category": "idaw",
+      "subcategory": null,
+      "usage_scenario": "session-management",
+      "difficulty": "Beginner",
+      "source": "../../../commands/idaw/status.md"
+    },
+    {
+      "name": "complete",
+      "command": "/workflow:session:complete",
+      "description": "Mark active workflow session as complete, archive with lessons learned, update manifest, remove active flag",
+      "arguments": "[-y|--yes] [--detailed]",
+      "category": "workflow",
+      "subcategory": "session",
+      "usage_scenario": "session-management",
+      "difficulty": "Intermediate",
+      "source": "../../../commands/workflow/session/complete.md"
+    },
+    {
+      "name": "resume",
+      "command": "/workflow:session:resume",
+      "description": "Resume the most recently paused workflow session with automatic session discovery and status update",
+      "arguments": "",
+      "category": "workflow",
+      "subcategory": "session",
+      "usage_scenario": "session-management",
+      "difficulty": "Intermediate",
+      "source": "../../../commands/workflow/session/resume.md"
+    }
+  ],
   "planning": [
     {
       "name": "convert-to-plan",
@@ -268,6 +459,17 @@
       "difficulty": "Intermediate",
       "source": "../../../commands/workflow/brainstorm-with-file.md"
     },
+    {
+      "name": "workflow:collaborative-plan-with-file",
+      "command": "/workflow:collaborative-plan-with-file",
+      "description": "Collaborative planning with Plan Note - Understanding agent creates shared plan-note.md template, parallel agents fill pre-allocated sections, conflict detection without merge. Outputs executable plan-note.md.",
+      "arguments": "[-y|--yes] <task description> [--max-agents=5]",
+      "category": "workflow",
+      "subcategory": null,
+      "usage_scenario": "planning",
+      "difficulty": "Intermediate",
+      "source": "../../../commands/workflow/collaborative-plan-with-file.md"
+    },
     {
       "name": "workflow:ui-design:codify-style",
       "command": "/workflow:ui-design:codify-style",
@@ -313,41 +515,6 @@
       "source": "../../../commands/workflow/ui-design/reference-page-generator.md"
     }
   ],
-  "implementation": [
-    {
-      "name": "execute",
-      "command": "/issue:execute",
-      "description": "Execute queue with DAG-based parallel orchestration (one commit per solution)",
-      "arguments": "[-y|--yes] --queue <queue-id> [--worktree [<existing-path>]]",
-      "category": "issue",
-      "subcategory": null,
-      "usage_scenario": "implementation",
-      "difficulty": "Intermediate",
-      "source": "../../../commands/issue/execute.md"
-    },
-    {
-      "name": "generate",
-      "command": "/workflow:ui-design:generate",
-      "description": "Assemble UI prototypes by combining layout templates with design tokens (default animation support), pure assembler without new content generation",
-      "arguments": "[--design-id <id>] [--session <id>]",
-      "category": "workflow",
-      "subcategory": "ui-design",
-      "usage_scenario": "implementation",
-      "difficulty": "Intermediate",
-      "source": "../../../commands/workflow/ui-design/generate.md"
-    },
-    {
-      "name": "unified-execute-with-file",
-      "command": "/workflow:unified-execute-with-file",
-      "description": "Universal execution engine for consuming any planning/brainstorm/analysis output with minimal progress tracking, multi-agent coordination, and incremental execution",
-      "arguments": "[-y|--yes] [-p|--plan <path>] [-m|--mode sequential|parallel] [\\\"execution context or task name\\\"]",
-      "category": "workflow",
-      "subcategory": null,
-      "usage_scenario": "implementation",
-      "difficulty": "Intermediate",
-      "source": "../../../commands/workflow/unified-execute-with-file.md"
-    }
-  ],
   "documentation": [
     {
       "name": "style-skill-memory",
@@ -361,28 +528,17 @@
       "source": "../../../commands/memory/style-skill-memory.md"
     }
   ],
-  "session-management": [
+  "testing": [
     {
-      "name": "complete",
-      "command": "/workflow:session:complete",
-      "description": "Mark active workflow session as complete, archive with lessons learned, update manifest, remove active flag",
-      "arguments": "[-y|--yes] [--detailed]",
+      "name": "integration-test-cycle",
+      "command": "/workflow:integration-test-cycle",
+      "description": "Self-iterating integration test workflow with codebase exploration, test development, autonomous test-fix cycles, and reflection-driven strategy adjustment",
+      "arguments": "[-y|--yes] [-c|--continue] [--max-iterations=N] \\\"module or feature description\\",
       "category": "workflow",
-      "subcategory": "session",
-      "usage_scenario": "session-management",
+      "subcategory": null,
+      "usage_scenario": "testing",
       "difficulty": "Intermediate",
-      "source": "../../../commands/workflow/session/complete.md"
-    },
-    {
-      "name": "resume",
-      "command": "/workflow:session:resume",
-      "description": "Resume the most recently paused workflow session with automatic session discovery and status update",
-      "arguments": "",
-      "category": "workflow",
-      "subcategory": "session",
-      "usage_scenario": "session-management",
-      "difficulty": "Intermediate",
-      "source": "../../../commands/workflow/session/resume.md"
+      "source": "../../../commands/workflow/integration-test-cycle.md"
     }
   ]
-}
+}

.claude/skills/ccw-help/index/command-relationships.json

@@ -1,6 +1,64 @@
 {
+  "workflow-plan": {
+    "calls_internally": [
+      "workflow:session:start"
+    ],
+    "next_steps": [
+      "workflow-plan-verify",
+      "workflow:session:list",
+      "workflow:unified-execute-with-file"
+    ],
+    "alternatives": [],
+    "prerequisites": []
+  },
+  "workflow-tdd-plan": {
+    "calls_internally": [
+      "workflow:session:start"
+    ],
+    "next_steps": [
+      "workflow-tdd-verify",
+      "workflow:session:list",
+      "workflow:unified-execute-with-file"
+    ],
+    "alternatives": [],
+    "prerequisites": []
+  },
+  "workflow:unified-execute-with-file": {
+    "prerequisites": [
+      "workflow-plan",
+      "workflow-tdd-plan"
+    ],
+    "related": [
+      "workflow:session:list",
+      "workflow:session:resume"
+    ],
+    "next_steps": [
+      "review-cycle",
+      "workflow-test-fix"
+    ]
+  },
+  "workflow-plan-verify": {
+    "prerequisites": [
+      "workflow-plan"
+    ],
+    "next_steps": [
+      "workflow:unified-execute-with-file"
+    ],
+    "related": [
+      "workflow:session:list"
+    ]
+  },
+  "workflow-tdd-verify": {
+    "prerequisites": [
+      "workflow:unified-execute-with-file"
+    ],
+    "related": []
+  },
   "workflow:session:start": {
-    "next_steps": [],
+    "next_steps": [
+      "workflow-plan",
+      "workflow:unified-execute-with-file"
+    ],
     "related": [
       "workflow:session:list",
       "workflow:session:resume"
@@ -11,5 +69,23 @@
     "related": [
       "workflow:session:list"
     ]
+  },
+  "workflow-lite-plan": {
+    "calls_internally": [],
+    "next_steps": [
+      "workflow:session:list"
+    ],
+    "alternatives": [
+      "workflow-plan"
+    ],
+    "prerequisites": []
+  },
+  "review-cycle": {
+    "prerequisites": [
+      "workflow:unified-execute-with-file"
+    ],
+    "related": [
+      "workflow-test-fix"
+    ]
   }
 }

.claude/skills/ccw-help/index/essential-commands.json

@@ -10,4 +10,4 @@
     "difficulty": "Intermediate",
     "source": "../../../commands/workflow/session/start.md"
   }
-]
+]

.claude/skills/ccw-help/index/skills-by-category.json

@@ -0,0 +1,364 @@
+{
+  "standalone": [
+    {
+      "name": "brainstorm",
+      "description": "Unified brainstorming skill with dual-mode operation - auto pipeline and single role analysis. Triggers on \"brainstorm\", \"头脑风暴\".",
+      "category": "standalone",
+      "is_team": false,
+      "has_phases": true,
+      "has_role_specs": false,
+      "version": "",
+      "source": "../../../skills/brainstorm/SKILL.md"
+    }
+  ],
+  "meta": [
+    {
+      "name": "command-generator",
+      "description": "Command file generator - 5 phase workflow for creating Claude Code command files with YAML frontmatter. Generates .md command files for project or user scope. Triggers on \"create command\", \"new command\", \"command generator\".",
+      "category": "meta",
+      "is_team": false,
+      "has_phases": true,
+      "has_role_specs": false,
+      "version": "",
+      "source": "../../../skills/command-generator/SKILL.md"
+    },
+    {
+      "name": "skill-generator",
+      "description": "Meta-skill for creating new Claude Code skills with configurable execution modes. Supports sequential (fixed order) and autonomous (stateless) phase patterns. Use for skill scaffolding, skill creation, or building new workflows. Triggers on \"create skill\", \"new skill\", \"skill generator\".",
+      "category": "meta",
+      "is_team": false,
+      "has_phases": true,
+      "has_role_specs": false,
+      "version": "",
+      "source": "../../../skills/skill-generator/SKILL.md"
+    },
+    {
+      "name": "skill-tuning",
+      "description": "Universal skill diagnosis and optimization tool. Detect and fix skill execution issues including context explosion, long-tail forgetting, data flow disruption, and agent coordination failures. Supports Gemini CLI for deep analysis. Triggers on \"skill tuning\", \"tune skill\", \"skill diagnosis\", \"optimize skill\", \"skill debug\".",
+      "category": "meta",
+      "is_team": false,
+      "has_phases": true,
+      "has_role_specs": false,
+      "version": "",
+      "source": "../../../skills/skill-tuning/SKILL.md"
+    },
+    {
+      "name": "spec-generator",
+      "description": "Specification generator - 6 phase document chain producing product brief, PRD, architecture, and epics. Triggers on \"generate spec\", \"create specification\", \"spec generator\", \"workflow:spec\".",
+      "category": "meta",
+      "is_team": false,
+      "has_phases": true,
+      "has_role_specs": false,
+      "version": "",
+      "source": "../../../skills/spec-generator/SKILL.md"
+    }
+  ],
+  "utility": [
+    {
+      "name": "ccw-help",
+      "description": "CCW command help system. Search, browse, recommend commands, skills, teams. Triggers \"ccw-help\", \"ccw-issue\".",
+      "category": "utility",
+      "is_team": false,
+      "has_phases": false,
+      "has_role_specs": false,
+      "version": "8.0.0",
+      "source": "../../../skills/ccw-help/SKILL.md"
+    },
+    {
+      "name": "issue-manage",
+      "description": "Interactive issue management with menu-driven CRUD operations. Use when managing issues, viewing issue status, editing issue fields, performing bulk operations, or viewing issue history. Triggers on \"manage issue\", \"list issues\", \"edit issue\", \"delete issue\", \"bulk update\", \"issue dashboard\", \"issue history\", \"completed issues\".",
+      "category": "utility",
+      "is_team": false,
+      "has_phases": false,
+      "has_role_specs": false,
+      "version": "",
+      "source": "../../../skills/issue-manage/SKILL.md"
+    },
+    {
+      "name": "memory-capture",
+      "description": "Unified memory capture with routing - session compact or quick tips. Triggers on \"memory capture\", \"compact session\", \"save session\", \"quick tip\", \"memory tips\", \"记录\", \"压缩会话\".",
+      "category": "utility",
+      "is_team": false,
+      "has_phases": true,
+      "has_role_specs": false,
+      "version": "",
+      "source": "../../../skills/memory-capture/SKILL.md"
+    },
+    {
+      "name": "memory-manage",
+      "description": "Unified memory management - CLAUDE.md updates and documentation generation with interactive routing. Triggers on \"memory manage\", \"update claude\", \"update memory\", \"generate docs\", \"更新记忆\", \"生成文档\".",
+      "category": "utility",
+      "is_team": false,
+      "has_phases": true,
+      "has_role_specs": false,
+      "version": "",
+      "source": "../../../skills/memory-manage/SKILL.md"
+    }
+  ],
+  "review": [
+    {
+      "name": "review-code",
+      "description": "Multi-dimensional code review with structured reports. Analyzes correctness, readability, performance, security, testing, and architecture. Triggers on \"review code\", \"code review\", \"审查代码\", \"代码审查\".",
+      "category": "review",
+      "is_team": false,
+      "has_phases": true,
+      "has_role_specs": false,
+      "version": "",
+      "source": "../../../skills/review-code/SKILL.md"
+    },
+    {
+      "name": "review-cycle",
+      "description": "Unified multi-dimensional code review with automated fix orchestration. Routes to session-based (git changes), module-based (path patterns), or fix mode. Triggers on \"workflow:review-cycle\", \"workflow:review-session-cycle\", \"workflow:review-module-cycle\", \"workflow:review-cycle-fix\".",
+      "category": "review",
+      "is_team": false,
+      "has_phases": true,
+      "has_role_specs": false,
+      "version": "",
+      "source": "../../../skills/review-cycle/SKILL.md"
+    }
+  ],
+  "team": [
+    {
+      "name": "team-arch-opt",
+      "description": "Unified team skill for architecture optimization. Uses team-worker agent architecture with role-spec files for domain logic. Coordinator orchestrates pipeline, workers are team-worker agents. Triggers on \"team arch-opt\".",
+      "category": "team",
+      "is_team": true,
+      "has_phases": false,
+      "has_role_specs": true,
+      "version": "",
+      "source": "../../../skills/team-arch-opt/SKILL.md"
+    },
+    {
+      "name": "team-brainstorm",
+      "description": "Unified team skill for brainstorming team. All roles invoke this skill with --role arg for role-specific execution. Triggers on \"team brainstorm\".",
+      "category": "team",
+      "is_team": true,
+      "has_phases": false,
+      "has_role_specs": false,
+      "version": "",
+      "source": "../../../skills/team-brainstorm/SKILL.md"
+    },
+    {
+      "name": "team-coordinate",
+      "description": "Universal team coordination skill with dynamic role generation. Uses team-worker agent architecture with role-spec files. Only coordinator is built-in -- all worker roles are generated at runtime as role-specs and spawned via team-worker agent. Beat/cadence model for orchestration. Triggers on \"Team Coordinate \".",
+      "category": "team",
+      "is_team": true,
+      "has_phases": false,
+      "has_role_specs": false,
+      "version": "",
+      "source": "../../../skills/team-coordinate/SKILL.md"
+    },
+    {
+      "name": "team-executor",
+      "description": "Lightweight session execution skill. Resumes existing team-coordinate sessions for pure execution via team-worker agents. No analysis, no role generation -- only loads and executes. Session path required. Triggers on \"Team Executor\".",
+      "category": "team",
+      "is_team": true,
+      "has_phases": false,
+      "has_role_specs": false,
+      "version": "",
+      "source": "../../../skills/team-executor/SKILL.md"
+    },
+    {
+      "name": "team-frontend",
+      "description": "Unified team skill for frontend development team. All roles invoke this skill with --role arg. Built-in ui-ux-pro-max design intelligence. Triggers on \"team frontend\".",
+      "category": "team",
+      "is_team": true,
+      "has_phases": false,
+      "has_role_specs": false,
+      "version": "",
+      "source": "../../../skills/team-frontend/SKILL.md"
+    },
+    {
+      "name": "team-issue",
+      "description": "Unified team skill for issue resolution. All roles invoke this skill with --role arg for role-specific execution. Triggers on \"team issue\".",
+      "category": "team",
+      "is_team": true,
+      "has_phases": false,
+      "has_role_specs": false,
+      "version": "",
+      "source": "../../../skills/team-issue/SKILL.md"
+    },
+    {
+      "name": "team-iterdev",
+      "description": "Unified team skill for iterative development team. All roles invoke this skill with --role arg for role-specific execution. Triggers on \"team iterdev\".",
+      "category": "team",
+      "is_team": true,
+      "has_phases": false,
+      "has_role_specs": false,
+      "version": "",
+      "source": "../../../skills/team-iterdev/SKILL.md"
+    },
+    {
+      "name": "team-lifecycle",
+      "description": "Unified team skill for full lifecycle - spec/impl/test. Uses team-worker agent architecture with role-spec files for domain logic. Coordinator orchestrates pipeline, workers are team-worker agents loaded with role-specific Phase 2-4 specs. Triggers on \"team lifecycle\".",
+      "category": "team",
+      "is_team": true,
+      "has_phases": false,
+      "has_role_specs": true,
+      "version": "",
+      "source": "../../../skills/team-lifecycle/SKILL.md"
+    },
+    {
+      "name": "team-perf-opt",
+      "description": "Unified team skill for performance optimization. Uses team-worker agent architecture with role-spec files for domain logic. Coordinator orchestrates pipeline, workers are team-worker agents. Triggers on \"team perf-opt\".",
+      "category": "team",
+      "is_team": true,
+      "has_phases": false,
+      "has_role_specs": true,
+      "version": "",
+      "source": "../../../skills/team-perf-opt/SKILL.md"
+    },
+    {
+      "name": "team-planex",
+      "description": "Unified team skill for plan-and-execute pipeline. Uses team-worker agent architecture with role-spec files for domain logic. Coordinator orchestrates pipeline, workers are team-worker agents. Triggers on \"team planex\".",
+      "category": "team",
+      "is_team": true,
+      "has_phases": false,
+      "has_role_specs": true,
+      "version": "",
+      "source": "../../../skills/team-planex/SKILL.md"
+    },
+    {
+      "name": "team-quality-assurance",
+      "description": "Unified team skill for quality assurance team. All roles invoke this skill with --role arg for role-specific execution. Triggers on \"team quality-assurance\", \"team qa\".",
+      "category": "team",
+      "is_team": true,
+      "has_phases": false,
+      "has_role_specs": false,
+      "version": "",
+      "source": "../../../skills/team-quality-assurance/SKILL.md"
+    },
+    {
+      "name": "team-review",
+      "description": "Unified team skill for code scanning, vulnerability review, optimization suggestions, and automated fix. 4-role team: coordinator, scanner, reviewer, fixer. Triggers on team-review.",
+      "category": "team",
+      "is_team": false,
+      "has_phases": false,
+      "has_role_specs": false,
+      "version": "",
+      "source": "../../../skills/team-review/SKILL.md"
+    },
+    {
+      "name": "team-roadmap-dev",
+      "description": "Unified team skill for roadmap-driven development workflow. Coordinator discusses roadmap with user, then dispatches phased execution pipeline (plan -> execute -> verify). All roles invoke this skill with --role arg. Triggers on \"team roadmap-dev\".",
+      "category": "team",
+      "is_team": true,
+      "has_phases": false,
+      "has_role_specs": false,
+      "version": "",
+      "source": "../../../skills/team-roadmap-dev/SKILL.md"
+    },
+    {
+      "name": "team-tech-debt",
+      "description": "Unified team skill for tech debt identification and cleanup. All roles invoke this skill with --role arg for role-specific execution. Triggers on \"team tech-debt\", \"tech debt cleanup\", \"技术债务\".",
+      "category": "team",
+      "is_team": true,
+      "has_phases": false,
+      "has_role_specs": false,
+      "version": "",
+      "source": "../../../skills/team-tech-debt/SKILL.md"
+    },
+    {
+      "name": "team-testing",
+      "description": "Unified team skill for testing team. All roles invoke this skill with --role arg for role-specific execution. Triggers on \"team testing\".",
+      "category": "team",
+      "is_team": true,
+      "has_phases": false,
+      "has_role_specs": false,
+      "version": "",
+      "source": "../../../skills/team-testing/SKILL.md"
+    },
+    {
+      "name": "team-uidesign",
+      "description": "Unified team skill for UI design team. All roles invoke this skill with --role arg for role-specific execution. CP-9 Dual-Track design+implementation.",
+      "category": "team",
+      "is_team": true,
+      "has_phases": false,
+      "has_role_specs": false,
+      "version": "",
+      "source": "../../../skills/team-uidesign/SKILL.md"
+    },
+    {
+      "name": "team-ultra-analyze",
+      "description": "Unified team skill for deep collaborative analysis. All roles invoke this skill with --role arg for role-specific execution. Triggers on \"team ultra-analyze\", \"team analyze\".",
+      "category": "team",
+      "is_team": true,
+      "has_phases": false,
+      "has_role_specs": false,
+      "version": "",
+      "source": "../../../skills/team-ultra-analyze/SKILL.md"
+    }
+  ],
+  "workflow": [
+    {
+      "name": "workflow-execute",
+      "description": "Coordinate agent execution for workflow tasks with automatic session discovery, parallel task processing, and status tracking. Triggers on \"workflow-execute\".",
+      "category": "workflow",
+      "is_team": false,
+      "has_phases": true,
+      "has_role_specs": false,
+      "version": "",
+      "source": "../../../skills/workflow-execute/SKILL.md"
+    },
+    {
+      "name": "workflow-lite-plan",
+      "description": "Lightweight planning and execution skill (Phase 1: plan, Phase 2: execute). Triggers on \"workflow-lite-plan\".",
+      "category": "workflow",
+      "is_team": false,
+      "has_phases": true,
+      "has_role_specs": false,
+      "version": "",
+      "source": "../../../skills/workflow-lite-plan/SKILL.md"
+    },
+    {
+      "name": "workflow-multi-cli-plan",
+      "description": "Multi-CLI collaborative planning and execution skill with integrated execution phase. Triggers on \"workflow-multi-cli-plan\".",
+      "category": "workflow",
+      "is_team": false,
+      "has_phases": true,
+      "has_role_specs": false,
+      "version": "",
+      "source": "../../../skills/workflow-multi-cli-plan/SKILL.md"
+    },
+    {
+      "name": "workflow-plan",
+      "description": "Unified planning skill - 4-phase planning workflow, plan verification, and interactive replanning. Triggers on \"workflow-plan\", \"workflow-plan-verify\", \"workflow:replan\".",
+      "category": "workflow",
+      "is_team": false,
+      "has_phases": true,
+      "has_role_specs": false,
+      "version": "",
+      "source": "../../../skills/workflow-plan/SKILL.md"
+    },
+    {
+      "name": "workflow-skill-designer",
+      "description": "Meta-skill for designing orchestrator+phases structured workflow skills. Creates SKILL.md coordinator with progressive phase loading, TodoWrite patterns, and data flow. Triggers on \"design workflow skill\", \"create workflow skill\", \"workflow skill designer\".",
+      "category": "workflow",
+      "is_team": false,
+      "has_phases": true,
+      "has_role_specs": false,
+      "version": "",
+      "source": "../../../skills/workflow-skill-designer/SKILL.md"
+    },
+    {
+      "name": "workflow-tdd-plan",
+      "description": "Unified TDD workflow skill combining 6-phase TDD planning with Red-Green-Refactor task chain generation, and 4-phase TDD verification with compliance reporting. Triggers on \"workflow-tdd-plan\", \"workflow-tdd-verify\".",
+      "category": "workflow",
+      "is_team": false,
+      "has_phases": true,
+      "has_role_specs": false,
+      "version": "",
+      "source": "../../../skills/workflow-tdd-plan/SKILL.md"
+    },
+    {
+      "name": "workflow-test-fix",
+      "description": "Unified test-fix pipeline combining test generation (session, context, analysis, task gen) with iterative test-cycle execution (adaptive strategy, progressive testing, CLI fallback). Triggers on \"workflow-test-fix\", \"workflow-test-fix\", \"test fix workflow\".",
+      "category": "workflow",
+      "is_team": false,
+      "has_phases": true,
+      "has_role_specs": false,
+      "version": "",
+      "source": "../../../skills/workflow-test-fix/SKILL.md"
+    }
+  ]
+}

.claude/skills/ccw-help/scripts/analyze_commands.py

@@ -1,11 +1,10 @@
 #!/usr/bin/env python3
 """
-Analyze all command/agent files and generate index files for ccw-help skill.
+Analyze all command/agent/skill files and generate index files for ccw-help skill.
 Outputs relative paths pointing to source files (no reference folder duplication).
 """
 
 import os
-import re
 import json
 from pathlib import Path
 from collections import defaultdict
@@ -15,9 +14,13 @@ from typing import Dict, List, Any
 BASE_DIR = Path("D:/Claude_dms3/.claude")
 COMMANDS_DIR = BASE_DIR / "commands"
 AGENTS_DIR = BASE_DIR / "agents"
+SKILLS_DIR = BASE_DIR / "skills"
 SKILL_DIR = BASE_DIR / "skills" / "ccw-help"
 INDEX_DIR = SKILL_DIR / "index"
 
+# Skills to skip (internal/shared, not user-facing)
+SKIP_SKILLS = {"_shared", "ccw-help"}
+
 def parse_frontmatter(content: str) -> Dict[str, Any]:
     """Extract YAML frontmatter from markdown content."""
     frontmatter = {}
@@ -139,6 +142,66 @@ def analyze_agent_file(file_path: Path) -> Dict[str, Any]:
         "source": rel_path  # Relative from index/ dir (e.g., "../../../agents/...")
     }
 
+def categorize_skill(name: str, description: str) -> str:
+    """Determine skill category from name and description."""
+    if name.startswith('team-'):
+        return "team"
+    if name.startswith('workflow-'):
+        return "workflow"
+    if name.startswith('review-'):
+        return "review"
+    if name.startswith('spec-') or name.startswith('command-') or name.startswith('skill-'):
+        return "meta"
+    if name.startswith('memory-') or name.startswith('issue-'):
+        return "utility"
+    return "standalone"
+
+
+def analyze_skill_dir(skill_path: Path) -> Dict[str, Any] | None:
+    """Analyze a skill directory and extract metadata from SKILL.md."""
+    skill_md = skill_path / "SKILL.md"
+    if not skill_md.exists():
+        return None
+
+    with open(skill_md, 'r', encoding='utf-8') as f:
+        content = f.read()
+
+    frontmatter = parse_frontmatter(content)
+
+    name = frontmatter.get('name', skill_path.name)
+    description = frontmatter.get('description', '')
+    allowed_tools = frontmatter.get('allowed-tools', '')
+    version = frontmatter.get('version', '')
+
+    category = categorize_skill(name, description)
+
+    # Detect if it's a team skill (uses TeamCreate + SendMessage together)
+    is_team = 'TeamCreate' in allowed_tools and 'SendMessage' in allowed_tools
+
+    # Detect if it has phases
+    phases_dir = skill_path / "phases"
+    has_phases = phases_dir.exists() and any(phases_dir.iterdir()) if phases_dir.exists() else False
+
+    # Detect if it has role-specs
+    role_specs_dir = skill_path / "role-specs"
+    has_role_specs = role_specs_dir.exists() and any(role_specs_dir.iterdir()) if role_specs_dir.exists() else False
+
+    # Build relative path from INDEX_DIR
+    rel_from_base = skill_path.relative_to(BASE_DIR)
+    rel_path = "../../../" + str(rel_from_base).replace('\\', '/') + "/SKILL.md"
+
+    return {
+        "name": name,
+        "description": description,
+        "category": category,
+        "is_team": is_team,
+        "has_phases": has_phases,
+        "has_role_specs": has_role_specs,
+        "version": version,
+        "source": rel_path
+    }
+
+
 def build_command_relationships() -> Dict[str, Any]:
     """Build command relationship mappings."""
     return {
@@ -177,20 +240,16 @@ def build_command_relationships() -> Dict[str, Any]:
             "related": ["workflow:session:list", "workflow:status"]
         },
         "workflow-lite-plan": {
-            "calls_internally": ["workflow:lite-execute"],
-            "next_steps": ["workflow:lite-execute", "workflow:status"],
+            "calls_internally": [],
+            "next_steps": ["workflow:status"],
             "alternatives": ["workflow-plan"],
             "prerequisites": []
         },
         "workflow:lite-fix": {
-            "next_steps": ["workflow:lite-execute", "workflow:status"],
+            "next_steps": ["workflow:status"],
             "alternatives": ["workflow-lite-plan"],
             "related": ["workflow-test-fix"]
         },
-        "workflow:lite-execute": {
-            "prerequisites": ["workflow-lite-plan", "workflow:lite-fix"],
-            "related": ["workflow-execute", "workflow:status"]
-        },
         "workflow:review-session-cycle": {
             "prerequisites": ["workflow-execute"],
             "next_steps": ["workflow:review-fix"],
@@ -267,7 +326,24 @@ def main():
         except Exception as e:
             print(f"  ERROR analyzing {agent_file}: {e}")
 
-    print(f"\nAnalyzed {len(all_commands)} commands, {len(all_agents)} agents")
+    # Analyze skill directories
+    print("\n=== Analyzing Skill Files ===")
+    skill_dirs = [d for d in SKILLS_DIR.iterdir() if d.is_dir() and d.name not in SKIP_SKILLS]
+    print(f"Found {len(skill_dirs)} skill directories")
+
+    all_skills = []
+    for skill_dir in sorted(skill_dirs):
+        try:
+            metadata = analyze_skill_dir(skill_dir)
+            if metadata:
+                all_skills.append(metadata)
+                print(f"  OK {metadata['name']} [{metadata['category']}]")
+            else:
+                print(f"  SKIP {skill_dir.name} (no SKILL.md)")
+        except Exception as e:
+            print(f"  ERROR analyzing {skill_dir}: {e}")
+
+    print(f"\nAnalyzed {len(all_commands)} commands, {len(all_agents)} agents, {len(all_skills)} skills")
 
     # Generate index files
     INDEX_DIR.mkdir(parents=True, exist_ok=True)
@@ -320,15 +396,62 @@ def main():
         json.dump(relationships, f, indent=2, ensure_ascii=False)
     print(f"OK Generated {relationships_path.name} ({os.path.getsize(relationships_path)} bytes)")
 
+    # 7. all-skills.json
+    all_skills_path = INDEX_DIR / "all-skills.json"
+    with open(all_skills_path, 'w', encoding='utf-8') as f:
+        json.dump(all_skills, f, indent=2, ensure_ascii=False)
+    print(f"OK Generated {all_skills_path.name} ({os.path.getsize(all_skills_path)} bytes)")
+
+    # 8. skills-by-category.json
+    skills_by_cat = defaultdict(list)
+    for skill in all_skills:
+        skills_by_cat[skill['category']].append(skill)
+
+    skills_by_cat_path = INDEX_DIR / "skills-by-category.json"
+    with open(skills_by_cat_path, 'w', encoding='utf-8') as f:
+        json.dump(dict(skills_by_cat), f, indent=2, ensure_ascii=False)
+    print(f"OK Generated {skills_by_cat_path.name} ({os.path.getsize(skills_by_cat_path)} bytes)")
+
+    # Generate master command.json (includes commands, agents, skills)
+    master = {
+        "_metadata": {
+            "version": "4.0.0",
+            "total_commands": len(all_commands),
+            "total_agents": len(all_agents),
+            "total_skills": len(all_skills),
+            "description": "Auto-generated CCW-Help command index from analyze_commands.py",
+            "generated": "Auto-updated - all commands, agents, skills synced from file system",
+            "last_sync": "command.json now stays in sync with CLI definitions"
+        },
+        "essential_commands": [cmd['name'] for cmd in essential],
+        "commands": all_commands,
+        "agents": all_agents,
+        "skills": all_skills,
+        "categories": sorted(set(cmd['category'] for cmd in all_commands)),
+        "skill_categories": sorted(skills_by_cat.keys())
+    }
+
+    master_path = SKILL_DIR / "command.json"
+    with open(master_path, 'w', encoding='utf-8') as f:
+        json.dump(master, f, indent=2, ensure_ascii=False)
+    print(f"\nOK Generated command.json ({os.path.getsize(master_path)} bytes)")
+
     # Print summary
     print("\n=== Summary ===")
     print(f"Commands: {len(all_commands)}")
     print(f"Agents: {len(all_agents)}")
+    print(f"Skills: {len(all_skills)}")
     print(f"Essential: {len(essential)}")
-    print(f"\nBy category:")
+    print(f"\nCommands by category:")
     for cat in sorted(by_category.keys()):
         total = sum(len(cmds) for cmds in by_category[cat].values())
         print(f"  {cat}: {total}")
+    print(f"\nSkills by category:")
+    for cat in sorted(skills_by_cat.keys()):
+        print(f"  {cat}: {len(skills_by_cat[cat])}")
+        for skill in skills_by_cat[cat]:
+            team_tag = " [team]" if skill['is_team'] else ""
+            print(f"    - {skill['name']}{team_tag}")
 
     print(f"\nIndex: {INDEX_DIR}")
     print("=== Complete ===")

.claude/skills/issue-manage/SKILL.md

@@ -1,7 +1,7 @@
 ---
 name: issue-manage
 description: Interactive issue management with menu-driven CRUD operations. Use when managing issues, viewing issue status, editing issue fields, performing bulk operations, or viewing issue history. Triggers on "manage issue", "list issues", "edit issue", "delete issue", "bulk update", "issue dashboard", "issue history", "completed issues".
-allowed-tools: Bash, Read, Write, AskUserQuestion, Task, Glob
+allowed-tools: Bash, Read, Write, AskUserQuestion, Agent, Glob
 ---
 
 # Issue Management Skill
@@ -219,9 +219,8 @@ const action = AskUserQuestion({
     header: 'Action',
     options: [
       { label: 'List Issues', description: 'Browse active issues' },
-      { label: 'View Issue', description: 'Detail view' },
+      { label: 'View Issue', description: 'Detail view (includes history)' },
       { label: 'Edit Issue', description: 'Modify fields' },
-      { label: 'View History', description: 'Completed issues' },
       { label: 'Bulk Operations', description: 'Batch actions' }
     ]
   }]

.claude/skills/memory-manage/SKILL.md

@@ -1,7 +1,7 @@
 ---
 name: memory-manage
 description: Unified memory management - CLAUDE.md updates and documentation generation with interactive routing. Triggers on "memory manage", "update claude", "update memory", "generate docs", "更新记忆", "生成文档".
-allowed-tools: Task(*), Bash(*), AskUserQuestion(*), Read(*)
+allowed-tools: Agent(*), Bash(*), AskUserQuestion(*), Read(*)
 ---
 
 # Memory Management Skill

.claude/skills/review-code/SKILL.md

@@ -1,7 +1,7 @@
 ---
 name: review-code
 description: Multi-dimensional code review with structured reports. Analyzes correctness, readability, performance, security, testing, and architecture. Triggers on "review code", "code review", "审查代码", "代码审查".
-allowed-tools: Task, AskUserQuestion, Read, Write, Glob, Grep, Bash, mcp__ace-tool__search_context, mcp__ide__getDiagnostics
+allowed-tools: Agent, AskUserQuestion, Read, Write, Glob, Grep, Bash, mcp__ace-tool__search_context, mcp__ide__getDiagnostics
 ---
 
 # Review Code

.claude/skills/review-code/phases/orchestrator.md

@@ -132,8 +132,9 @@ async function runOrchestrator() {
       // 确定当前需要审查的维度（使用 StateManager）
       const currentDimension = StateManager.getNextDimension(state);
 
-      const result = await Task({
+      const result = await Agent({
         subagent_type: 'universal-executor',
+        description: `Execute code review action: ${actionId}`,
         run_in_background: false,
         prompt: `
 [WORK_DIR]

.claude/skills/review-cycle/SKILL.md

@@ -1,7 +1,7 @@
 ---
 name: review-cycle
 description: Unified multi-dimensional code review with automated fix orchestration. Routes to session-based (git changes), module-based (path patterns), or fix mode. Triggers on "workflow:review-cycle", "workflow:review-session-cycle", "workflow:review-module-cycle", "workflow:review-cycle-fix".
-allowed-tools: Task, AskUserQuestion, TaskCreate, TaskUpdate, TaskList, Read, Write, Edit, Bash, Glob, Grep, Skill
+allowed-tools: Agent, AskUserQuestion, TaskCreate, TaskUpdate, TaskList, Read, Write, Edit, Bash, Glob, Grep, Skill
 ---
 
 # Review Cycle

.claude/skills/review-cycle/phases/review-fix.md

@@ -332,7 +332,7 @@ for (let i = 0; i < batches.length; i += MAX_PARALLEL) {
 
   // Launch agents in parallel (run_in_background=true)
   for (const batch of chunk) {
-    const taskId = Task({
+    const taskId = Agent({
       subagent_type: "cli-planning-agent",
       run_in_background: true,
       description: `Plan batch ${batch.batch_id}: ${batch.findings.length} findings`,
@@ -386,7 +386,7 @@ for (let i = 1; i <= aggregatedPlan.groups.length; i++) {
 
 **Planning Agent (Batch Mode - Partial Plan Only)**:
 ```javascript
-Task({
+Agent({
   subagent_type: "cli-planning-agent",
   run_in_background: true,
   description: `Plan batch ${batch.batch_id}: ${batch.findings.length} findings`,
@@ -488,7 +488,7 @@ Before finalizing outputs:
 
 **Execution Agent** (per group):
 ```javascript
-Task({
+Agent({
   subagent_type: "cli-execute-agent",
   description: `Fix ${group.findings.length} issues: ${group.group_name}`,
   prompt: `

.claude/skills/skill-generator/SKILL.md

@@ -1,7 +1,7 @@
 ---
 name: skill-generator
 description: Meta-skill for creating new Claude Code skills with configurable execution modes. Supports sequential (fixed order) and autonomous (stateless) phase patterns. Use for skill scaffolding, skill creation, or building new workflows. Triggers on "create skill", "new skill", "skill generator".
-allowed-tools: Task, AskUserQuestion, Read, Bash, Glob, Grep, Write
+allowed-tools: Agent, AskUserQuestion, Read, Bash, Glob, Grep, Write
 ---
 
 # Skill Generator

.claude/skills/skill-generator/phases/03-phase-generation.md

@@ -240,7 +240,7 @@ async function executePhase(phaseId, phaseConfig, workDir) {
   const phasePrompt = Read(\`\${skillDir}/phases/\${phaseId}.md\`);
 
   // Use Task to invoke Agent
-  const result = await Task({
+  const result = await Agent({
     subagent_type: phaseConfig.agent?.type || 'universal-executor',
     run_in_background: phaseConfig.agent?.run_in_background || false,
     prompt: \`
@@ -573,7 +573,7 @@ async function runOrchestrator(workDir) {
     try {
       const actionPrompt = Read(\`\${skillDir}/phases/actions/\${actionId}.md\`);
 
-      const result = await Task({
+      const result = await Agent({
         subagent_type: 'universal-executor',
         run_in_background: false,
         prompt: \`

.claude/skills/skill-generator/specs/cli-integration.md

@@ -12,7 +12,7 @@ Suitable for scenarios that need immediate results.
 
 ```javascript
 // Agent call - synchronous
-const result = Task({
+const result = Agent({
   subagent_type: 'universal-executor',
   prompt: 'Execute task...',
   run_in_background: false  // Key: synchronous execution
@@ -77,7 +77,7 @@ ccw cli -p "<PROMPT>" --tool <gemini|qwen|codex> --mode <analysis|write>
 General-purpose executor, the most commonly used agent type.
 
 ```javascript
-Task({
+Agent({
   subagent_type: 'universal-executor',
   prompt: `
 Execute task:
@@ -99,7 +99,7 @@ Execute task:
 Code exploration agent for quick codebase understanding.
 
 ```javascript
-Task({
+Agent({
   subagent_type: 'Explore',
   prompt: `
 Explore src/ directory:
@@ -123,7 +123,7 @@ Thoroughness: medium
 Deep code analysis agent.
 
 ```javascript
-Task({
+Agent({
   subagent_type: 'cli-explore-agent',
   prompt: `
 Deep analysis of src/auth/ module:

.claude/skills/skill-generator/templates/autonomous-orchestrator.md

@@ -111,7 +111,7 @@ async function runOrchestrator() {
     try {
       const actionPrompt = Read(\`phases/actions/${actionId}.md\`);
 
-      const result = await Task({
+      const result = await Agent({
         subagent_type: 'universal-executor',
         run_in_background: false,
         prompt: \`

.claude/skills/skill-generator/templates/code-analysis-action.md

@@ -96,7 +96,7 @@ async function execute${toPascalCase(id)}(context) {
   \` : '// No MCP tools configured'}
 
   // 3. Launch Agent for in-depth analysis
-  const agentResult = await Task({
+  const agentResult = await Agent({
     subagent_type: '\${agent.type}',
     prompt: \`
 \${generateAgentPrompt(analysis_type, scope)}
@@ -408,7 +408,7 @@ const semanticContext = await mcp__ace_tool__search_context({
 });
 
 // Use semantic search results as Agent input context
-const agentResult = await Task({
+const agentResult = await Agent({
   subagent_type: 'Explore',
   prompt: \`
 Based on following semantic search results, perform in-depth analysis:

.claude/skills/skill-generator/templates/sequential-phase.md

@@ -274,7 +274,7 @@ const tasks = [
 \`\`\`javascript
 const results = await Promise.all(
   tasks.map(task =>
-    Task({
+    Agent({
       subagent_type: 'universal-executor',
       run_in_background: false,
       prompt: task.prompt

.claude/skills/skill-generator/templates/skill-md.md

@@ -223,7 +223,7 @@ function filterDocsByPhase(specs, phase, phaseIndex) {
 ---
 name: api-docs-generator
 description: Generate API documentation from source code. Triggers on "generate api docs", "api documentation".
-allowed-tools: Task, Read, Write, Glob, Grep, Bash
+allowed-tools: Agent, Read, Write, Glob, Grep, Bash
 ---
 
 # API Docs Generator
@@ -265,7 +265,7 @@ Phase 3: Generation      → api-docs.md
 ---
 name: task-manager
 description: Interactive task management with CRUD operations. Triggers on "manage tasks", "task list".
-allowed-tools: Task, AskUserQuestion, Read, Write
+allowed-tools: Agent, AskUserQuestion, Read, Write
 ---
 
 # Task Manager

.claude/skills/skill-simplify/SKILL.md

@@ -0,0 +1,56 @@
+---
+name: skill-simplify
+description: SKILL.md simplification with functional integrity verification. Analyze redundancy, optimize content, check no functionality lost. Triggers on "simplify skill", "optimize skill", "skill-simplify".
+allowed-tools: AskUserQuestion, Read, Write, Edit, Bash, Glob, Grep
+---
+
+# Skill Simplify
+
+Three-phase pipeline: analyze functional inventory, apply optimization rules, verify integrity.
+
+**Phase Reference Documents** (read on-demand):
+
+| Phase | Document | Purpose |
+|-------|----------|---------|
+| 1 | [phases/01-analysis.md](phases/01-analysis.md) | Extract functional inventory, identify redundancy, validate pseudo-code format |
+| 2 | [phases/02-optimize.md](phases/02-optimize.md) | Apply simplification rules, fix format issues |
+| 3 | [phases/03-check.md](phases/03-check.md) | Verify functional integrity, validate format |
+
+## Input Processing
+
+```javascript
+const targetPath = input.trim()
+const targetFile = targetPath.endsWith('.md') ? targetPath : `${targetPath}/SKILL.md`
+const originalContent = Read(targetFile)
+const originalLineCount = originalContent.split('\n').length
+```
+
+## TodoWrite Pattern
+
+```javascript
+TodoWrite({ todos: [
+  { content: `Phase 1: Analyzing ${targetFile}`, status: "in_progress", activeForm: "Extracting functional inventory" },
+  { content: "Phase 2: Optimize", status: "pending" },
+  { content: "Phase 3: Integrity Check", status: "pending" }
+]})
+```
+
+## Core Rules
+
+1. **Preserve ALL functional elements**: Code blocks with logic, agent calls, data structures, routing, error handling, input/output specs
+2. **Only reduce descriptive content**: Flowcharts, verbose comments, duplicate sections, examples that repeat logic
+3. **Never summarize algorithm logic**: If-else branches, function bodies, schemas must remain verbatim
+4. **Classify code blocks**: Distinguish `functional` (logic, routing, schemas) from `descriptive` (ASCII art, examples, display templates) — only descriptive blocks may be deleted
+5. **Merge equivalent variants**: Single/multi-perspective templates differing only by a parameter → one template with variant comment
+6. **Fix format issues**: Nested backtick template literals in code fences → convert to prose; hardcoded option lists → flag for dynamic generation; workflow handoff references → ensure execution steps present
+7. **Validate pseudo-code**: Check bracket matching, variable consistency, structural completeness
+8. **Quantitative verification**: Phase 3 counts must match Phase 1 counts for functional categories; descriptive block decreases are expected
+
+## Error Handling
+
+| Error | Resolution |
+|-------|------------|
+| Target file not found | Report error, stop |
+| Check FAIL (missing functional elements) | Show delta, revert to original, report which elements lost |
+| Check WARN (descriptive decrease or merge) | Show delta with justification |
+| Format issues found | Report in check, fix in Phase 2 |

.claude/skills/skill-simplify/phases/01-analysis.md

@@ -0,0 +1,224 @@
+# Phase 1: Functional Analysis
+
+Read target file, extract functional inventory with code block classification, identify redundancy, validate pseudo-code format, and produce optimization plan.
+
+## Objective
+
+- Build quantitative functional inventory with code block classification (baseline for Phase 3)
+- Identify redundancy categories with specific line ranges
+- Detect pseudo-code format issues
+- Produce optimization plan with estimated line savings
+
+## Execution
+
+### Step 1.1: Read & Measure Target
+
+```javascript
+const originalContent = Read(targetFile)
+const lines = originalContent.split('\n')
+const originalLineCount = lines.length
+```
+
+### Step 1.2: Extract Functional Inventory
+
+Count and catalog every functional element. These counts are the **baseline** for Phase 3 verification.
+
+```javascript
+const inventory = {
+  // Code structures — with role classification
+  codeBlocks: [],        // { startLine, endLine, language, purpose, role: 'functional'|'descriptive' }
+  agentCalls: [],        // { line, agentType, description, mergeGroup?: string }
+  dataStructures: [],    // { line, name, type: 'object'|'array'|'schema' }
+
+  // Logic elements
+  routingBranches: [],   // { line, condition, outcomes[] }
+  errorHandlers: [],     // { line, errorType, resolution }
+  conditionalLogic: [],  // { line, condition, trueAction, falseAction }
+
+  // Interface elements
+  askUserQuestions: [],   // { line, questionCount, headers[], optionType: 'static'|'dynamic' }
+  inputModes: [],        // { line, mode, description }
+  outputArtifacts: [],   // { line, artifact, format }
+
+  // Structural elements
+  todoWriteBlocks: [],   // { line, phaseCount }
+  phaseHandoffs: [],     // { line, fromPhase, toPhase }
+  skillInvocations: [],  // { line, skillName, hasExecutionSteps: boolean }
+
+  // Reference elements
+  tables: [],            // { startLine, endLine, columns }
+  schemas: [],           // { line, schemaName, fields[] }
+
+  // Format issues
+  formatIssues: [],      // { line, type, description, severity: 'error'|'warning' }
+
+  // Totals (computed)
+  counts: {}
+}
+```
+
+**Extraction rules**:
+- **Code blocks**: Match ` ```language ... ``` ` pairs, record start/end/language/first-line-as-purpose
+- **Agent calls**: Match `Agent(`, `Task(`, `subagent_type=`, record type and prompt summary
+- **Data structures**: Match `const xxx = {`, `const xxx = [`, JSON schema objects
+- **Routing branches**: Match `if/else`, `switch/case`, ternary `? :` with meaningful branching
+- **Error handlers**: Match `catch`, error table rows `| Error |`, fallback patterns
+- **AskUserQuestion**: Match `AskUserQuestion({`, count questions array length
+- **Input modes**: Match `Mode 1/2/3`, `--flag`, argument parsing
+- **Output artifacts**: Match `Write(`, `Output:`, file path patterns in comments
+- **TodoWrite**: Match `TodoWrite({`, count todo items
+- **Phase handoffs**: Match `Read("phases/`, `Skill(`, `proceed_to_next_phase`
+- **Tables**: Match `| header |` markdown table blocks
+- **Schemas**: Match schema references, JSON structure definitions
+
+### Step 1.2.1: Code Block Role Classification
+
+For each code block, determine its role:
+
+| Role | Criteria | Examples |
+|------|----------|---------|
+| `functional` | Contains algorithm logic, routing branches, conditional code, agent calls, schema definitions, data processing, AskUserQuestion, Skill invocations | `if/else`, `Agent({...})`, `const schema = {...}`, `Bash({...})` |
+| `descriptive` | Contains ASCII art, usage examples, display templates, illustrative good/bad comparisons, folder structure trees | `┌───┐`, `# Example usage`, `❌ Bad / ✅ Good`, `├── file.ts` |
+
+**Classification rules**:
+- If block contains ANY of: `Agent(`, `Bash(`, `AskUserQuestion(`, `if (`, `switch`, `Skill(`, `Write(`, `Read(`, `TodoWrite(` → `functional`
+- If block language is `bash` and content is only example invocations (no logic) → `descriptive`
+- If block has no language tag and contains only ASCII box-drawing characters → `descriptive`
+- If block is labeled as "Example" in surrounding markdown heading → `descriptive`
+- **Default**: `functional` (conservative)
+
+### Step 1.2.2: Pseudo-Code Format Validation
+
+Scan all `functional` code blocks for format issues:
+
+| Check | Detection | Severity |
+|-------|-----------|----------|
+| **Nested backticks** | Template literal `` ` `` inside ` ```javascript ``` ` code fence | warning |
+| **Unclosed brackets** | Unmatched `{`, `(`, `[` in code block | error |
+| **Undefined references** | `${variable}` where variable is never declared in the block or prior blocks | warning |
+| **Inconsistent indentation** | Mixed tabs/spaces or inconsistent nesting depth | warning |
+| **Dead code patterns** | Commented-out code blocks (`// if (`, `/* ... */` spanning 5+ lines) | warning |
+| **Missing return/output** | Function-like block with no return, Write, or console.log | warning |
+
+```javascript
+inventory.formatIssues = validatePseudoCode(inventory.codeBlocks.filter(b => b.role === 'functional'))
+```
+
+### Step 1.2.3: Compute Totals
+
+```javascript
+inventory.counts = {
+  codeBlocks: inventory.codeBlocks.length,
+  functionalCodeBlocks: inventory.codeBlocks.filter(b => b.role === 'functional').length,
+  descriptiveCodeBlocks: inventory.codeBlocks.filter(b => b.role === 'descriptive').length,
+  agentCalls: inventory.agentCalls.length,
+  dataStructures: inventory.dataStructures.length,
+  routingBranches: inventory.routingBranches.length,
+  errorHandlers: inventory.errorHandlers.length,
+  conditionalLogic: inventory.conditionalLogic.length,
+  askUserQuestions: inventory.askUserQuestions.length,
+  inputModes: inventory.inputModes.length,
+  outputArtifacts: inventory.outputArtifacts.length,
+  todoWriteBlocks: inventory.todoWriteBlocks.length,
+  phaseHandoffs: inventory.phaseHandoffs.length,
+  skillInvocations: inventory.skillInvocations.length,
+  tables: inventory.tables.length,
+  schemas: inventory.schemas.length,
+  formatIssues: inventory.formatIssues.length
+}
+```
+
+### Step 1.3: Identify Redundancy Categories
+
+Scan for each category, record specific line ranges:
+
+```javascript
+const redundancyMap = {
+  deletable: [],       // { category, startLine, endLine, reason, estimatedSave }
+  simplifiable: [],    // { category, startLine, endLine, strategy, estimatedSave }
+  mergeable: [],       // { items: [{startLine, endLine}], mergeStrategy, estimatedSave }
+  formatFixes: [],     // { line, type, fix }
+  languageUnify: []    // { line, currentLang, targetLang }
+}
+```
+
+**Deletable** (remove entirely, no functional loss):
+
+| Pattern | Detection |
+|---------|-----------|
+| Duplicate Overview | `## Overview` that restates frontmatter description |
+| ASCII flowchart | Flowchart that duplicates Phase Summary table or implementation structure |
+| "When to use" section | Usage guidance not needed for execution |
+| Best Practices section | Advisory content duplicating Core Rules |
+| Duplicate examples | Code examples that repeat logic shown elsewhere |
+| Folder structure duplicate | ASCII tree repeating Output Artifacts table |
+| "Next Phase" paragraphs | Prose between phases when TodoWrite handles flow |
+| Descriptive code blocks | Code blocks classified as `descriptive` whose content is covered by surrounding prose or tables |
+
+**Simplifiable** (compress, preserve meaning):
+
+| Pattern | Strategy |
+|---------|----------|
+| Verbose comments in code blocks | Reduce to single-line; keep only non-obvious logic comments |
+| Multi-line console.log | Compress to single template literal |
+| Wordy section intros | Remove "In this phase, we will..." preamble |
+| Exploration prompt bloat | Trim to essential instructions, remove generic advice |
+| Display-format code blocks | Convert code blocks that only define output format (console.log with template) to prose description |
+
+**Mergeable** (combine related structures):
+
+| Pattern | Strategy |
+|---------|----------|
+| Multiple similar AskUserQuestion calls | Extract shared function with mode parameter |
+| Repeated Option routing | Unify into single dispatch |
+| Sequential single-line operations | Combine into one code block |
+| TodoWrite full blocks x N | Template once + delta comments |
+| Duplicate error handling tables | Merge into single table |
+| Equivalent template variants | Single/multi-perspective templates → one template with variant comment |
+| Multiple output artifact tables | Merge into single combined table |
+
+**Format fixes** (pseudo-code quality):
+
+| Pattern | Fix |
+|---------|-----|
+| Nested backtick template literals | Convert surrounding code block to prose description, or use 4-backtick fence |
+| Hardcoded option lists | Add comment: `// Generate dynamically from {context source}` |
+| Workflow handoff without execution steps | Add execution steps referencing the target command's actual interface |
+| Unclosed brackets | Fix bracket matching |
+
+**Language unification**:
+- Detect mixed Chinese/English in functional comments
+- Recommend consistent language (match majority)
+
+### Step 1.4: Build Optimization Plan
+
+```javascript
+const optimizationPlan = {
+  targetFile,
+  originalLineCount,
+  estimatedReduction: redundancyMap.deletable.reduce((s, d) => s + d.estimatedSave, 0)
+    + redundancyMap.simplifiable.reduce((s, d) => s + d.estimatedSave, 0)
+    + redundancyMap.mergeable.reduce((s, d) => s + d.estimatedSave, 0),
+  categories: {
+    deletable: { count: redundancyMap.deletable.length, totalLines: '...' },
+    simplifiable: { count: redundancyMap.simplifiable.length, totalLines: '...' },
+    mergeable: { count: redundancyMap.mergeable.length, totalLines: '...' },
+    formatFixes: { count: redundancyMap.formatFixes.length },
+    languageUnify: { count: redundancyMap.languageUnify.length }
+  },
+  // Ordered: delete → merge → simplify → format
+  operations: [
+    ...redundancyMap.deletable.map(d => ({ type: 'delete', ...d, priority: 1 })),
+    ...redundancyMap.mergeable.map(m => ({ type: 'merge', ...m, priority: 2 })),
+    ...redundancyMap.simplifiable.map(s => ({ type: 'simplify', ...s, priority: 3 })),
+    ...redundancyMap.formatFixes.map(f => ({ type: 'format', ...f, priority: 4 }))
+  ]
+}
+```
+
+Display plan summary: category counts, estimated reduction percentage, sections NOT changed (functional core).
+
+## Output
+
+- **Variable**: `analysisResult = { inventory, redundancyMap, optimizationPlan, originalContent, originalLineCount }`
+- **TodoWrite**: Mark Phase 1 completed, Phase 2 in_progress

.claude/skills/skill-simplify/phases/02-optimize.md

@@ -0,0 +1,107 @@
+# Phase 2: Optimize
+
+Apply simplification rules from analysisResult to produce optimized content. Write result to disk.
+
+## Objective
+
+- Execute all optimization operations in priority order (delete → merge → simplify → format)
+- Preserve every functional element identified in Phase 1 inventory
+- Fix pseudo-code format issues
+- Write optimized content back to target file
+
+## Execution
+
+### Step 2.1: Apply Operations in Order
+
+Process `analysisResult.optimizationPlan.operations` sorted by priority:
+
+**Priority 1 — Delete** (safest, highest impact):
+
+| Target Pattern | Action |
+|----------------|--------|
+| Duplicate Overview section | Remove `## Overview` if it restates frontmatter `description` |
+| ASCII flowchart | Remove if Phase Summary table or implementation structure covers same info |
+| "When to use" / "Use Cases" section | Remove entirely |
+| Best Practices section | Remove if content duplicates Core Rules |
+| Duplicate folder structure | Remove ASCII tree if Output Artifacts table covers same info |
+| Redundant "Next Phase" prose | Remove when TodoWrite handles flow |
+| Standalone example sections | Remove if logic already demonstrated inline |
+| Descriptive code blocks | Remove if content covered by surrounding prose or tables |
+
+**Priority 2 — Merge** (structural optimization):
+
+| Target Pattern | Action |
+|----------------|--------|
+| Multiple similar AskUserQuestion blocks | Extract shared function with mode parameter |
+| Repeated Option A/B/C routing | Unify into single dispatch |
+| Sequential single-line bash commands | Combine into single code block |
+| TodoWrite full blocks x N | Template ONCE, subsequent as one-line comment |
+| Duplicate error handling across sections | Merge into single `## Error Handling` table |
+| Equivalent template variants | Single/multi templates → one template with `// For multi: add Perspective` comment |
+| Multiple output artifact tables | Merge into single combined table with Phase column |
+
+**Priority 3 — Simplify** (compress descriptive content):
+
+| Target Pattern | Action |
+|----------------|--------|
+| Verbose inline comments | Reduce to single-line; remove obvious restatements |
+| Display-format code blocks | Convert `console.log` with template literal to prose describing output format |
+| Wordy section introductions | Remove preamble sentences |
+| Exploration/agent prompt padding | Remove generic advice |
+| Success Criteria lists > 7 items | Trim to essential 5-7, remove obvious/generic |
+
+**Priority 4 — Format fixes** (pseudo-code quality):
+
+| Target Pattern | Action |
+|----------------|--------|
+| Nested backtick template literals | Convert code block to prose description, or use 4-backtick fence |
+| Hardcoded option lists | Replace with dynamic generation: describe source of options + generation logic |
+| Workflow handoff without execution steps | Add concrete steps referencing target command's interface (e.g., pipe to `ccw issue create`) |
+| Unclosed brackets | Fix bracket matching |
+| Undefined variable references | Add declaration or link to source |
+
+### Step 2.2: Language Unification (if applicable)
+
+```javascript
+if (analysisResult.redundancyMap.languageUnify.length > 0) {
+  // Detect majority language, unify non-functional text
+  // DO NOT change: variable names, function names, schema fields, error messages in code
+}
+```
+
+### Step 2.3: Write Optimized Content
+
+```javascript
+Write(targetFile, optimizedContent)
+const optimizedLineCount = optimizedContent.split('\n').length
+const reduction = originalLineCount - optimizedLineCount
+const reductionPct = Math.round(reduction / originalLineCount * 100)
+```
+
+### Step 2.4: Preserve Optimization Record
+
+```javascript
+const optimizationRecord = {
+  deletedSections: [],    // section names removed
+  mergedGroups: [],       // { from: [sections], to: description }
+  simplifiedAreas: [],    // { section, strategy }
+  formatFixes: [],        // { line, type, fix }
+  linesBefore: originalLineCount,
+  linesAfter: optimizedLineCount
+}
+```
+
+## Key Rules
+
+1. **Never modify functional code blocks** — only compress comments/whitespace within them
+2. **Descriptive code blocks may be deleted** if their content is covered by prose or tables
+3. **Never change function signatures, variable names, or schema fields**
+4. **Merge preserves all branches** — unified function must handle all original cases
+5. **When uncertain, keep original** — conservative approach prevents functional loss
+6. **Format fixes must not alter semantics** — only presentation changes
+
+## Output
+
+- **File**: Target file overwritten with optimized content
+- **Variable**: `optimizationRecord` (changes log for Phase 3)
+- **TodoWrite**: Mark Phase 2 completed, Phase 3 in_progress

.claude/skills/skill-simplify/phases/03-check.md

@@ -0,0 +1,224 @@
+# Phase 3: Integrity Check
+
+Re-extract functional inventory from optimized file, compare against Phase 1 baseline, validate pseudo-code format. Report PASS/FAIL with detailed delta.
+
+## Objective
+
+- Re-run the same inventory extraction on optimized content
+- Compare counts using role-aware classification (functional vs descriptive)
+- Validate pseudo-code format issues are resolved
+- Report check result with actionable details
+- Revert if critical functional elements are missing
+
+## Execution
+
+### Step 3.1: Re-Extract Inventory from Optimized File
+
+```javascript
+const optimizedContent = Read(targetFile)
+const optimizedLineCount = optimizedContent.split('\n').length
+
+// Use SAME extraction logic as Phase 1 (including role classification)
+const afterInventory = extractFunctionalInventory(optimizedContent)
+```
+
+### Step 3.2: Compare Inventories (Role-Aware)
+
+```javascript
+const beforeCounts = analysisResult.inventory.counts
+const afterCounts = afterInventory.counts
+
+const delta = {}
+let hasCriticalLoss = false
+let hasWarning = false
+
+// CRITICAL: Functional elements that MUST NOT decrease
+const CRITICAL = ['functionalCodeBlocks', 'dataStructures', 'routingBranches',
+                  'errorHandlers', 'conditionalLogic', 'askUserQuestions',
+                  'inputModes', 'outputArtifacts', 'skillInvocations']
+
+// MERGE_AWARE: May decrease due to valid merge operations — verify coverage
+const MERGE_AWARE = ['agentCalls', 'codeBlocks']
+
+// EXPECTED_DECREASE: May decrease from merge/consolidation
+const EXPECTED_DECREASE = ['descriptiveCodeBlocks', 'todoWriteBlocks',
+                           'phaseHandoffs', 'tables', 'schemas']
+
+for (const [key, before] of Object.entries(beforeCounts)) {
+  const after = afterCounts[key] || 0
+  const diff = after - before
+  let category, status
+
+  if (CRITICAL.includes(key)) {
+    category = 'critical'
+    status = diff < 0 ? 'FAIL' : 'OK'
+    if (diff < 0) hasCriticalLoss = true
+  } else if (MERGE_AWARE.includes(key)) {
+    category = 'merge_aware'
+    // Decrease is WARN (needs justification), not FAIL
+    status = diff < 0 ? 'WARN' : 'OK'
+    if (diff < 0) hasWarning = true
+  } else {
+    category = 'expected'
+    status = 'OK'  // Descriptive decreases are expected
+  }
+
+  delta[key] = { before, after, diff, category, status }
+}
+```
+
+### Step 3.3: Deep Verification
+
+**For CRITICAL categories with decrease** — identify exactly what was lost:
+
+```javascript
+if (hasCriticalLoss) {
+  const lostElements = {}
+  for (const [key, d] of Object.entries(delta)) {
+    if (d.status === 'FAIL') {
+      const beforeItems = analysisResult.inventory[key]
+      const afterItems = afterInventory[key]
+      lostElements[key] = beforeItems.filter(beforeItem =>
+        !afterItems.some(afterItem => matchesElement(beforeItem, afterItem))
+      )
+    }
+  }
+}
+```
+
+**For MERGE_AWARE categories with decrease** — verify merged coverage:
+
+```javascript
+if (hasWarning) {
+  for (const [key, d] of Object.entries(delta)) {
+    if (d.category === 'merge_aware' && d.diff < 0) {
+      // Check if merged template covers all original variants
+      // e.g., single Agent template with "// For multi: add Perspective" covers both
+      const beforeItems = analysisResult.inventory[key]
+      const afterItems = afterInventory[key]
+      const unmatched = beforeItems.filter(beforeItem =>
+        !afterItems.some(afterItem => matchesElement(beforeItem, afterItem))
+      )
+      if (unmatched.length > 0) {
+        // Check if unmatched items are covered by merge comments in remaining items
+        const mergeComments = afterItems.flatMap(item => extractMergeComments(item))
+        const trulyLost = unmatched.filter(item =>
+          !mergeComments.some(comment => coversElement(comment, item))
+        )
+        if (trulyLost.length > 0) {
+          delta[key].status = 'FAIL'
+          hasCriticalLoss = true
+          delta[key].trulyLost = trulyLost
+        }
+        // else: merge-covered, WARN is correct
+      }
+    }
+  }
+}
+```
+
+### Step 3.4: Pseudo-Code Format Validation
+
+```javascript
+const afterFormatIssues = validatePseudoCode(afterInventory.codeBlocks.filter(b => b.role === 'functional'))
+const beforeFormatCount = analysisResult.inventory.formatIssues.length
+const afterFormatCount = afterFormatIssues.length
+
+const formatDelta = {
+  before: beforeFormatCount,
+  after: afterFormatCount,
+  resolved: beforeFormatCount - afterFormatCount,
+  newIssues: afterFormatIssues.filter(issue =>
+    !analysisResult.inventory.formatIssues.some(orig => orig.line === issue.line && orig.type === issue.type)
+  )
+}
+
+// New format issues introduced by optimization = FAIL
+if (formatDelta.newIssues.length > 0) {
+  hasCriticalLoss = true
+}
+```
+
+**Pseudo-code validation checks**:
+
+| Check | Detection | Action on Failure |
+|-------|-----------|-------------------|
+| Bracket matching | Count `{([` vs `})]` per code block | FAIL — fix or revert |
+| Variable consistency | `${var}` used but never declared | WARNING — note in report |
+| Structural completeness | Function body has entry but no exit (return/Write/output) | WARNING |
+| Nested backtick resolution | Backtick template literals inside code fences | WARNING if pre-existing, FAIL if newly introduced |
+| Schema field preservation | Schema fields in after match before | FAIL if fields lost |
+
+### Step 3.5: Generate Check Report
+
+```javascript
+const status = hasCriticalLoss ? 'FAIL' : (hasWarning ? 'WARN' : 'PASS')
+
+const checkReport = {
+  status,
+  linesBefore: analysisResult.originalLineCount,
+  linesAfter: optimizedLineCount,
+  reduction: `${analysisResult.originalLineCount - optimizedLineCount} lines (-${Math.round((analysisResult.originalLineCount - optimizedLineCount) / analysisResult.originalLineCount * 100)}%)`,
+  delta,
+  formatDelta,
+  lostElements: hasCriticalLoss ? lostElements : null
+}
+
+// Display report table
+// | Category | Before | After | Delta | Status |
+// Show all categories, highlight FAIL/WARN rows
+// Show format issues summary if any
+```
+
+### Step 3.6: Act on Result
+
+```javascript
+if (status === 'FAIL') {
+  Write(targetFile, analysisResult.originalContent)
+  // Report: "Critical elements lost / new format issues introduced. Reverted."
+}
+
+if (status === 'WARN') {
+  // Report: "Decreases from merge/descriptive removal. Verify coverage."
+  // Show merge justifications for MERGE_AWARE categories
+}
+
+if (status === 'PASS') {
+  // Report: "All functional elements preserved. Optimization successful."
+}
+```
+
+## Element Matching Rules
+
+How `matchesElement()` determines if a before-element exists in after-inventory:
+
+| Element Type | Match Criteria |
+|-------------|---------------|
+| codeBlocks | Same language + first meaningful line (ignore whitespace/comments) |
+| agentCalls | Same agentType + similar prompt keywords (>60% overlap) |
+| dataStructures | Same variable name OR same field set |
+| routingBranches | Same condition expression (normalized) |
+| errorHandlers | Same error type/pattern |
+| conditionalLogic | Same condition + same outcome set |
+| askUserQuestions | Same question count + similar option labels |
+| inputModes | Same mode identifier |
+| outputArtifacts | Same file path pattern or artifact name |
+| skillInvocations | Same skill name |
+| todoWriteBlocks | Same phase names (order-independent) |
+| phaseHandoffs | Same target phase reference |
+| tables | Same column headers |
+| schemas | Same schema name or field set |
+
+**Merge coverage check** (`coversElement()`):
+- Agent calls: Merged template contains `// For multi:` or `// Multi-perspective:` comment referencing the missing variant
+- Code blocks: Merged block contains comment noting the alternative was folded in
+
+## Completion
+
+```javascript
+TodoWrite({ todos: [
+  { content: `Phase 1: Analysis [${Object.keys(analysisResult.inventory.counts).length} categories]`, status: "completed" },
+  { content: `Phase 2: Optimize [${checkReport.reduction}]`, status: "completed" },
+  { content: `Phase 3: Check [${checkReport.status}] | Format: ${formatDelta.resolved} resolved, ${formatDelta.newIssues.length} new`, status: "completed" }
+]})
+```

.claude/skills/skill-tuning/SKILL.md

@@ -1,7 +1,7 @@
 ---
 name: skill-tuning
 description: Universal skill diagnosis and optimization tool. Detect and fix skill execution issues including context explosion, long-tail forgetting, data flow disruption, and agent coordination failures. Supports Gemini CLI for deep analysis. Triggers on "skill tuning", "tune skill", "skill diagnosis", "optimize skill", "skill debug".
-allowed-tools: Task, AskUserQuestion, Read, Write, Bash, Glob, Grep, mcp__ace-tool__search_context
+allowed-tools: Agent, AskUserQuestion, Read, Write, Bash, Glob, Grep, mcp__ace-tool__search_context
 ---
 
 # Skill Tuning

.claude/skills/skill-tuning/phases/actions/action-diagnose-agent.md

@@ -193,7 +193,7 @@ async function execute(state, workDir) {
       type: 'agent_failure',
       severity: 'medium',
       location: { file: 'SKILL.md' },
-      description: 'Task tool used but not declared in allowed-tools',
+      description: 'Agent tool used but not declared in allowed-tools',
       evidence: [`${totalCalls} Task calls found, but Task not in allowed-tools`],
       root_cause: 'Tool declaration mismatch',
       impact: 'May cause runtime permission issues',

.claude/skills/skill-tuning/phases/actions/action-propose-fixes.md

@@ -216,7 +216,7 @@ async function execute(state, workDir) {
           file: 'phases/*.md',
           action: 'modify',
           diff: `+ try {
-    const result = await Task({...});
+    const result = await Agent({...});
 +   if (!result) throw new Error('Empty result');
 + } catch (e) {
 +   updateState({ errors: [...errors, e.message], error_count: error_count + 1 });

.claude/skills/skill-tuning/phases/orchestrator.md

@@ -99,8 +99,9 @@ async function runOrchestrator(workDir) {
         target_skill: { name: state.target_skill.name, path: state.target_skill.path }
       };
 
-      const result = await Task({
+      const result = await Agent({
         subagent_type: 'universal-executor',
+        description: `Execute skill-tuning action: ${actionId}`,
         run_in_background: false,
         prompt: `
 [CONTEXT]

.claude/skills/skill-tuning/specs/skill-authoring-principles.md

@@ -114,18 +114,21 @@ Write(`${workDir}/final-output.json`, finalResult);  // 只存最终结果
 // 上下文流转模式
 async function executePhase(context) {
   const { previousResult, constraints, config } = context;
-  
-  const result = await Task({
+
+  const result = await Agent({
+    subagent_type: 'universal-executor',
+    description: 'Execute phase with context passing',
+    run_in_background: false,
     prompt: `
       [CONTEXT]
       Previous: ${JSON.stringify(previousResult)}
       Constraints: ${constraints.join(', ')}
-      
+
       [TASK]
       Process and return result directly.
     `
   });
-  
+
   return {
     ...context,
     currentResult: result,

.claude/skills/skill-tuning/specs/tuning-strategies.md

@@ -140,8 +140,10 @@ function updateHistory(state, newItem) {
 
 ```javascript
 // Add summarization before passing to next phase
-const summary = await Task({
+const summary = await Agent({
   subagent_type: 'universal-executor',
+  description: 'Summarize content for context compression',
+  run_in_background: false,
   prompt: `Summarize in <100 words: ${fullContent}\nReturn JSON: { summary, key_points[] }`
 });
 nextPhasePrompt = `Previous summary: ${summary.summary}`;
@@ -268,12 +270,17 @@ function validateAgentResult(result, requiredFields) {
 ### flatten_nesting
 
 ```javascript
-// Before: Agent A's prompt tells it to call Task({subagent_type: 'B'})
+// Before: Agent A's prompt tells it to call Agent({subagent_type: 'B'})
 // After: Agent A returns signal, orchestrator handles
 // Agent A: return { needs_agent_b: true, context: {...} }
 // Orchestrator:
 if (parsedA.needs_agent_b) {
-  resultB = await Task({ subagent_type: 'B', prompt: `Context: ${parsedA.context}` });
+  resultB = await Agent({
+    subagent_type: 'B',
+    description: 'Handle delegated task from Agent A',
+    run_in_background: false,
+    prompt: `Context: ${parsedA.context}`
+  });
 }
 ```
 

.claude/skills/spec-generator/README.md

@@ -17,33 +17,42 @@ Structured specification document generator producing a complete document chain
 spec-generator/
 |- SKILL.md                          # Entry point: metadata + architecture + flow
 |- phases/
-|  |- 01-discovery.md                # Seed analysis + codebase exploration
-|  |- 02-product-brief.md            # Multi-CLI product brief generation
-|  |- 03-requirements.md             # PRD with MoSCoW priorities
-|  |- 04-architecture.md             # Architecture decisions + review
+|  |- 01-discovery.md                # Seed analysis + codebase exploration + spec type selection
+|  |- 01-5-requirement-clarification.md  # Interactive requirement expansion
+|  |- 02-product-brief.md            # Multi-CLI product brief + glossary generation
+|  |- 03-requirements.md             # PRD with MoSCoW priorities + RFC 2119 constraints
+|  |- 04-architecture.md             # Architecture + state machine + config model + observability
 |  |- 05-epics-stories.md            # Epic/Story decomposition
-|  |- 06-readiness-check.md          # Quality validation + handoff
+|  |- 06-readiness-check.md          # Quality validation + handoff + iterate option
+|  |- 06-5-auto-fix.md               # Auto-fix loop for readiness issues (max 2 iterations)
 |- specs/
 |  |- document-standards.md          # Format, frontmatter, naming rules
-|  |- quality-gates.md               # Per-phase quality criteria
+|  |- quality-gates.md               # Per-phase quality criteria + iteration tracking
+|  |- glossary-template.json         # Terminology glossary schema
 |- templates/
-|  |- product-brief.md               # Product brief template
+|  |- product-brief.md               # Product brief template (+ Concepts & Non-Goals)
 |  |- requirements-prd.md            # PRD template
-|  |- architecture-doc.md            # Architecture document template
-|  |- epics-template.md              # Epic/Story template
+|  |- architecture-doc.md            # Architecture template (+ state machine, config, observability)
+|  |- epics-template.md              # Epic/Story template (+ versioning)
+|  |- profiles/                      # Spec type specialization profiles
+|     |- service-profile.md          # Service spec: lifecycle, observability, trust
+|     |- api-profile.md              # API spec: endpoints, auth, rate limiting
+|     |- library-profile.md          # Library spec: public API, examples, compatibility
 |- README.md                         # This file
 ```
 
 ## 6-Phase Pipeline
 
-| Phase | Name | Output | CLI Tools |
-|-------|------|--------|-----------|
-| 1 | Discovery | spec-config.json | Gemini (analysis) |
-| 2 | Product Brief | product-brief.md | Gemini + Codex + Claude (parallel) |
-| 3 | Requirements | requirements.md | Gemini (analysis) |
-| 4 | Architecture | architecture.md | Gemini + Codex (sequential) |
-| 5 | Epics & Stories | epics.md | Gemini (analysis) |
-| 6 | Readiness Check | readiness-report.md, spec-summary.md | Gemini (validation) |
+| Phase | Name | Output | CLI Tools | Key Features |
+|-------|------|--------|-----------|-------------|
+| 1 | Discovery | spec-config.json | Gemini (analysis) | Spec type selection |
+| 1.5 | Req Expansion | refined-requirements.json | Gemini (analysis) | Multi-round interactive |
+| 2 | Product Brief | product-brief.md, glossary.json | Gemini + Codex + Claude (parallel) | Terminology glossary |
+| 3 | Requirements | requirements/ | Gemini (analysis) | RFC 2119, data model |
+| 4 | Architecture | architecture/ | Gemini + Codex (sequential) | State machine, config, observability |
+| 5 | Epics & Stories | epics/ | Gemini (analysis) | Glossary consistency |
+| 6 | Readiness Check | readiness-report.md, spec-summary.md | Gemini (validation) | Terminology + scope validation |
+| 6.5 | Auto-Fix | Updated phase docs | Gemini (analysis) | Max 2 iterations |
 
 ## Runtime Output
 
@@ -51,12 +60,21 @@ spec-generator/
 .workflow/.spec/SPEC-{slug}-{YYYY-MM-DD}/
 |- spec-config.json              # Session state
 |- discovery-context.json        # Codebase context (optional)
+|- refined-requirements.json     # Phase 1.5 (requirement expansion)
+|- glossary.json                 # Phase 2 (terminology)
 |- product-brief.md              # Phase 2
-|- requirements.md               # Phase 3
-|- architecture.md               # Phase 4
-|- epics.md                      # Phase 5
+|- requirements/                 # Phase 3 (directory)
+|  |- _index.md
+|  |- REQ-*.md
+|  └── NFR-*.md
+|- architecture/                 # Phase 4 (directory)
+|  |- _index.md
+|  └── ADR-*.md
+|- epics/                        # Phase 5 (directory)
+|  |- _index.md
+|  └── EPIC-*.md
 |- readiness-report.md           # Phase 6
-|- spec-summary.md               # Phase 6
+└── spec-summary.md              # Phase 6
 ```
 
 ## Flags
@@ -64,6 +82,9 @@ spec-generator/
 - `-y|--yes`: Auto mode - skip all interactive confirmations
 - `-c|--continue`: Resume from last completed phase
 
+Spec type is selected interactively in Phase 1 (defaults to `service` in auto mode)
+Available types: `service`, `api`, `library`, `platform`
+
 ## Handoff
 
 After Phase 6, choose execution path:
@@ -79,3 +100,6 @@ After Phase 6, choose execution path:
 - **Template-driven**: Consistent format via templates + frontmatter
 - **Resumable**: spec-config.json tracks completed phases
 - **Pure documentation**: No code generation - clean handoff to execution workflows
+- **Type-specialized**: Profiles adapt templates to service/api/library/platform requirements
+- **Iterative quality**: Phase 6.5 auto-fix repairs issues, max 2 iterations before handoff
+- **Terminology-first**: glossary.json ensures consistent terminology across all documents

.claude/skills/spec-generator/SKILL.md

@@ -1,7 +1,7 @@
 ---
 name: spec-generator
 description: Specification generator - 6 phase document chain producing product brief, PRD, architecture, and epics. Triggers on "generate spec", "create specification", "spec generator", "workflow:spec".
-allowed-tools: Task, AskUserQuestion, TaskCreate, TaskUpdate, TaskList, Read, Write, Edit, Bash, Glob, Grep, Skill
+allowed-tools: Agent, AskUserQuestion, TaskCreate, TaskUpdate, TaskList, Read, Write, Edit, Bash, Glob, Grep, Skill
 ---
 
 # Spec Generator
@@ -14,20 +14,26 @@ Structured specification document generator producing a complete specification p
 Phase 0:   Specification Study (Read specs/ + templates/ - mandatory prerequisite)
            |
 Phase 1:   Discovery               -> spec-config.json + discovery-context.json
-           |
+           |                           (includes spec_type selection)
 Phase 1.5: Req Expansion           -> refined-requirements.json (interactive discussion + CLI gap analysis)
            |                           (-y auto mode: auto-expansion, skip interaction)
-Phase 2:   Product Brief            -> product-brief.md  (multi-CLI parallel analysis)
+Phase 2:   Product Brief            -> product-brief.md + glossary.json  (multi-CLI parallel analysis)
            |
 Phase 3:   Requirements (PRD)      -> requirements/  (_index.md + REQ-*.md + NFR-*.md)
-           |
+           |                           (RFC 2119 keywords, data model definitions)
 Phase 4:   Architecture            -> architecture/  (_index.md + ADR-*.md, multi-CLI review)
-           |
+           |                           (state machine, config model, error handling, observability)
 Phase 5:   Epics & Stories         -> epics/  (_index.md + EPIC-*.md)
            |
 Phase 6:   Readiness Check         -> readiness-report.md + spec-summary.md
-           |
-           Handoff to execution workflows
+           |                           (terminology + scope consistency validation)
+           ├── Pass (>=80%): Handoff to execution workflows
+           ├── Review (60-79%): Handoff with caveats
+           └── Fail (<60%): Phase 6.5 Auto-Fix (max 2 iterations)
+                 |
+Phase 6.5: Auto-Fix               -> Updated Phase 2-5 documents
+                 |
+                 └── Re-run Phase 6 validation
 ```
 
 ## Key Design Principles
@@ -38,6 +44,9 @@ Phase 6:   Readiness Check         -> readiness-report.md + spec-summary.md
 4. **Resumable Sessions**: `spec-config.json` tracks completed phases; `-c` flag resumes from last checkpoint
 5. **Template-Driven**: All documents generated from standardized templates with YAML frontmatter
 6. **Pure Documentation**: No code generation or execution - clean handoff to existing execution workflows
+7. **Spec Type Specialization**: Templates adapt to spec type (service/api/library/platform) via profiles for domain-specific depth
+8. **Iterative Quality**: Phase 6.5 auto-fix loop repairs issues found in readiness check (max 2 iterations)
+9. **Terminology Consistency**: glossary.json generated in Phase 2, injected into all subsequent phases
 
 ---
 
@@ -78,6 +87,7 @@ Phase 1: Discovery & Seed Analysis
    |- Parse input (text or file reference)
    |- Gemini CLI seed analysis (problem, users, domain, dimensions)
    |- Codebase exploration (conditional, if project detected)
+   |- Spec type selection: service|api|library|platform (interactive, -y defaults to service)
    |- User confirmation (interactive, -y skips)
    |- Output: spec-config.json, discovery-context.json (optional)
 
@@ -95,13 +105,17 @@ Phase 2: Product Brief
    |- Ref: phases/02-product-brief.md
    |- 3 parallel CLI analyses: Product (Gemini) + Technical (Codex) + User (Claude)
    |- Synthesize perspectives: convergent themes + conflicts
+   |- Generate glossary.json (terminology from product brief + CLI analysis)
    |- Interactive refinement (-y skips)
-   |- Output: product-brief.md (from template)
+   |- Output: product-brief.md (from template), glossary.json
 
 Phase 3: Requirements / PRD
    |- Ref: phases/03-requirements.md
    |- Gemini CLI: expand goals into functional + non-functional requirements
    |- Generate acceptance criteria per requirement
+   |- RFC 2119 behavioral constraints (MUST/SHOULD/MAY)
+   |- Core entity data model definitions
+   |- Glossary injection for terminology consistency
    |- User priority sorting: MoSCoW (interactive, -y auto-assigns)
    |- Output: requirements/ directory (_index.md + REQ-*.md + NFR-*.md, from template)
 
@@ -109,6 +123,12 @@ Phase 4: Architecture
    |- Ref: phases/04-architecture.md
    |- Gemini CLI: core components, tech stack, ADRs
    |- Codebase integration mapping (conditional)
+   |- State machine generation (ASCII diagrams for lifecycle entities)
+   |- Configuration model definition (fields, types, defaults, constraints)
+   |- Error handling strategy (per-component classification + recovery)
+   |- Observability specification (metrics, logs, health checks)
+   |- Spec type profile injection (templates/profiles/{type}-profile.md)
+   |- Glossary injection for terminology consistency
    |- Codex CLI: architecture challenge + review
    |- Interactive ADR decisions (-y auto-accepts)
    |- Output: architecture/ directory (_index.md + ADR-*.md, from template)
@@ -125,9 +145,20 @@ Phase 6: Readiness Check
    |- Ref: phases/06-readiness-check.md
    |- Cross-document validation (completeness, consistency, traceability)
    |- Quality scoring per dimension
+   |- Terminology consistency validation (glossary compliance)
+   |- Scope containment validation (PRD <= Brief scope)
    |- Output: readiness-report.md, spec-summary.md
    |- Handoff options: lite-plan, req-plan, plan, issue:new, export only, iterate
 
+Phase 6.5: Auto-Fix (conditional, triggered when Phase 6 score < 60%)
+   |- Ref: phases/06-5-auto-fix.md
+   |- Parse readiness-report.md for Error/Warning items
+   |- Group issues by originating Phase (2-5)
+   |- Re-generate affected sections via CLI with error context
+   |- Re-run Phase 6 validation
+   |- Max 2 iterations, then force handoff
+   |- Output: Updated Phase 2-5 documents
+
 Complete: Full specification package ready for execution
 
 Phase 6 → Handoff Bridge (conditional, based on user selection):
@@ -161,6 +192,7 @@ Bash(`mkdir -p "${workDir}"`);
 ├── spec-config.json              # Session configuration + phase state
 ├── discovery-context.json        # Codebase exploration results (optional)
 ├── refined-requirements.json     # Phase 1.5: Confirmed requirements after discussion
+├── glossary.json                 # Phase 2: Terminology glossary for cross-doc consistency
 ├── product-brief.md              # Phase 2: Product brief
 ├── requirements/                 # Phase 3: Detailed PRD (directory)
 │   ├── _index.md                 #   Summary, MoSCoW table, traceability, links
@@ -189,6 +221,9 @@ Bash(`mkdir -p "${workDir}"`);
   "complexity": "moderate",
   "depth": "standard",
   "focus_areas": [],
+  "spec_type": "service",
+  "iteration_count": 0,
+  "iteration_history": [],
   "seed_analysis": {
     "problem_statement": "...",
     "target_users": [],
@@ -217,6 +252,9 @@ Bash(`mkdir -p "${workDir}"`);
 5. **DO NOT STOP**: Continuous 6-phase pipeline until all phases complete or user exits
 6. **Respect -y Flag**: When auto mode, skip all AskUserQuestion calls, use recommended defaults
 7. **Respect -c Flag**: When continue mode, load spec-config.json and resume from checkpoint
+8. **Inject Glossary**: From Phase 3 onward, inject glossary.json terms into every CLI prompt
+9. **Load Profile**: Read templates/profiles/{spec_type}-profile.md and inject requirements into Phase 2-5 prompts
+10. **Iterate on Failure**: When Phase 6 score < 60%, auto-trigger Phase 6.5 (max 2 iterations)
 
 ## Reference Documents by Phase
 
@@ -224,6 +262,7 @@ Bash(`mkdir -p "${workDir}"`);
 | Document | Purpose | When to Use |
 |----------|---------|-------------|
 | [phases/01-discovery.md](phases/01-discovery.md) | Seed analysis and session setup | Phase start |
+| [templates/profiles/](templates/profiles/) | Spec type profiles | Spec type selection |
 | [specs/document-standards.md](specs/document-standards.md) | Frontmatter format for spec-config.json | Config generation |
 
 ### Phase 1.5: Requirement Expansion & Clarification
@@ -237,6 +276,7 @@ Bash(`mkdir -p "${workDir}"`);
 |----------|---------|-------------|
 | [phases/02-product-brief.md](phases/02-product-brief.md) | Multi-CLI analysis orchestration | Phase start |
 | [templates/product-brief.md](templates/product-brief.md) | Document template | Document generation |
+| [specs/glossary-template.json](specs/glossary-template.json) | Glossary schema | Glossary generation |
 
 ### Phase 3: Requirements
 | Document | Purpose | When to Use |
@@ -262,6 +302,12 @@ Bash(`mkdir -p "${workDir}"`);
 | [phases/06-readiness-check.md](phases/06-readiness-check.md) | Cross-document validation | Phase start |
 | [specs/quality-gates.md](specs/quality-gates.md) | Quality scoring criteria | Validation |
 
+### Phase 6.5: Auto-Fix
+| Document | Purpose | When to Use |
+|----------|---------|-------------|
+| [phases/06-5-auto-fix.md](phases/06-5-auto-fix.md) | Auto-fix workflow for readiness issues | When Phase 6 score < 60% |
+| [specs/quality-gates.md](specs/quality-gates.md) | Iteration exit criteria | Validation |
+
 ### Debugging & Troubleshooting
 | Issue | Solution Document |
 |-------|-------------------|
@@ -284,6 +330,8 @@ Bash(`mkdir -p "${workDir}"`);
 | Phase 4 | Architecture review fails | No | Skip review, proceed with initial analysis |
 | Phase 5 | Story generation fails | No | Generate epics without detailed stories |
 | Phase 6 | Validation CLI fails | No | Generate partial report with available data |
+| Phase 6.5 | Auto-fix CLI fails | No | Log failure, proceed to handoff with Review status |
+| Phase 6.5 | Max iterations reached | No | Force handoff, report remaining issues |
 
 ### CLI Fallback Chain
 

.claude/skills/spec-generator/phases/01-discovery.md

@@ -117,7 +117,7 @@ const hasCodebase = Glob('**/*.{ts,js,py,java,go,rs}').length > 0
   || Glob('Cargo.toml').length > 0;
 
 if (hasCodebase) {
-  Task({
+  Agent({
     subagent_type: "cli-explore-agent",
     run_in_background: false,
     description: `Explore codebase for spec: ${slug}`,
@@ -185,6 +185,17 @@ if (!autoMode) {
         header: "Focus",
         multiSelect: true,
         options: seedAnalysis.dimensions.map(d => ({ label: d, description: `Explore ${d} in depth` }))
+      },
+      {
+        question: "What type of specification is this?",
+        header: "Spec Type",
+        multiSelect: false,
+        options: [
+          { label: "Service (Recommended)", description: "Long-running service with lifecycle, state machine, observability" },
+          { label: "API", description: "REST/GraphQL API with endpoints, auth, rate limiting" },
+          { label: "Library/SDK", description: "Reusable package with public API surface, examples" },
+          { label: "Platform", description: "Multi-component system, uses Service profile" }
+        ]
       }
     ]
   });
@@ -192,6 +203,7 @@ if (!autoMode) {
   // Auto mode defaults
   depth = "standard";
   focusAreas = seedAnalysis.dimensions;
+  specType = "service"; // default for auto mode
 }
 ```
 
@@ -209,6 +221,9 @@ const specConfig = {
   focus_areas: focusAreas,
   seed_analysis: seedAnalysis,
   has_codebase: hasCodebase,
+  spec_type: specType, // "service" | "api" | "library" | "platform"
+  iteration_count: 0,
+  iteration_history: [],
   phasesCompleted: [
     {
       phase: 1,

.claude/skills/spec-generator/phases/02-product-brief.md

@@ -227,6 +227,33 @@ specConfig.phasesCompleted.push({
 Write(`${workDir}/spec-config.json`, JSON.stringify(specConfig, null, 2));
 ```
 
+### Step 5.5: Generate glossary.json
+
+```javascript
+// Extract terminology from product brief and CLI analysis
+// Generate structured glossary for cross-document consistency
+
+const glossary = {
+  session_id: specConfig.session_id,
+  terms: [
+    // Extract from product brief content:
+    // - Key domain nouns from problem statement
+    // - User persona names
+    // - Technical terms from multi-perspective synthesis
+    // Each term should have:
+    // { term: "...", definition: "...", aliases: [], first_defined_in: "product-brief.md", category: "core|technical|business" }
+  ]
+};
+
+Write(`${workDir}/glossary.json`, JSON.stringify(glossary, null, 2));
+```
+
+**Glossary Injection**: In all subsequent phase prompts, inject the following into the CONTEXT section:
+```
+TERMINOLOGY GLOSSARY (use these terms consistently):
+${JSON.stringify(glossary.terms, null, 2)}
+```
+
 ## Output
 
 - **File**: `product-brief.md`

.claude/skills/spec-generator/phases/03-requirements.md

@@ -60,6 +60,11 @@ TASK:
   - Should: Important but has workaround
   - Could: Nice-to-have, enhances experience
   - Won't: Explicitly deferred
+- Use RFC 2119 keywords (MUST, SHOULD, MAY, MUST NOT, SHOULD NOT) to define behavioral constraints for each requirement. Example: 'The system MUST return a 401 response within 100ms for invalid tokens.'
+- For each core domain entity referenced in requirements, define its data model: fields, types, constraints, and relationships to other entities
+- Maintain terminology consistency with the glossary below:
+  TERMINOLOGY GLOSSARY:
+  \${glossary ? JSON.stringify(glossary.terms, null, 2) : 'N/A - generate terms inline'}
 
 MODE: analysis
 EXPECTED: Structured requirements with: ID, title, description, user story, acceptance criteria, priority, traceability to goals

.claude/skills/spec-generator/phases/04-architecture.md

@@ -33,6 +33,19 @@ if (specConfig.has_codebase) {
     discoveryContext = JSON.parse(Read(`${workDir}/discovery-context.json`));
   } catch (e) { /* no context */ }
 }
+
+// Load glossary for terminology consistency
+let glossary = null;
+try {
+  glossary = JSON.parse(Read(`${workDir}/glossary.json`));
+} catch (e) { /* proceed without */ }
+
+// Load spec type profile for specialized sections
+const specType = specConfig.spec_type || 'service';
+let profile = null;
+try {
+  profile = Read(`templates/profiles/${specType}-profile.md`);
+} catch (e) { /* use base template only */ }
 ```
 
 ### Step 2: Architecture Analysis via Gemini CLI
@@ -66,6 +79,28 @@ TASK:
 - Identify security architecture: auth, authorization, data protection
 - List API endpoints (high-level)
 ${discoveryContext ? '- Map new components to existing codebase modules' : ''}
+- For each core entity with a lifecycle, create an ASCII state machine diagram showing:
+  - All states and transitions
+  - Trigger events for each transition
+  - Side effects of transitions
+  - Error states and recovery paths
+- Define a Configuration Model: list all configurable fields with name, type, default value, constraint, and description
+- Define Error Handling strategy:
+  - Classify errors (transient/permanent/degraded)
+  - Per-component error behavior using RFC 2119 keywords
+  - Recovery mechanisms
+- Define Observability requirements:
+  - Key metrics (name, type: counter/gauge/histogram, labels)
+  - Structured log format and key log events
+  - Health check endpoints
+\${profile ? \`
+SPEC TYPE PROFILE REQUIREMENTS (\${specType}):
+\${profile}
+\` : ''}
+\${glossary ? \`
+TERMINOLOGY GLOSSARY (use consistently):
+\${JSON.stringify(glossary.terms, null, 2)}
+\` : ''}
 
 MODE: analysis
 EXPECTED: Complete architecture with: style justification, component diagram, tech stack table, ADRs, data model, security controls, API overview