diff --git a/.claude/commands/cli/analyze.md b/.claude/commands/cli/analyze.md
index 562e3398..be88cfe5 100644
--- a/.claude/commands/cli/analyze.md
+++ b/.claude/commands/cli/analyze.md
@@ -1,7 +1,6 @@
 ---
 name: analyze
 description: Quick codebase analysis using CLI tools (codex/gemini/qwen)
-usage: /cli:analyze [--tool <codex|gemini|qwen>] [--enhance] <analysis-target>
 argument-hint: "[--tool codex|gemini|qwen] [--enhance] analysis target"
 allowed-tools: SlashCommand(*), Bash(*), TodoWrite(*), Read(*), Glob(*)
 ---
diff --git a/.claude/commands/cli/chat.md b/.claude/commands/cli/chat.md
index 9e86cae0..41c5a265 100644
--- a/.claude/commands/cli/chat.md
+++ b/.claude/commands/cli/chat.md
@@ -1,7 +1,6 @@
 ---
 name: chat
 description: Simple CLI interaction command for direct codebase analysis
-usage: /cli:chat [--tool <codex|gemini|qwen>] [--enhance] "inquiry"
 argument-hint: "[--tool codex|gemini|qwen] [--enhance] inquiry"
 allowed-tools: SlashCommand(*), Bash(*)
 ---
diff --git a/.claude/commands/cli/cli-init.md b/.claude/commands/cli/cli-init.md
index 55352211..8b867ed6 100644
--- a/.claude/commands/cli/cli-init.md
+++ b/.claude/commands/cli/cli-init.md
@@ -1,7 +1,6 @@
 ---
 name: cli-init
 description: Initialize CLI tool configurations (Gemini and Qwen) based on workspace analysis
-usage: /cli:cli-init [--tool <gemini|qwen|all>] [--output=<path>] [--preview]
 argument-hint: "[--tool gemini|qwen|all] [--output path] [--preview]"
 allowed-tools: Bash(*), Read(*), Write(*), Glob(*)
 ---
diff --git a/.claude/commands/cli/codex-execute.md b/.claude/commands/cli/codex-execute.md
index ef4eb4a3..8a32c020 100644
--- a/.claude/commands/cli/codex-execute.md
+++ b/.claude/commands/cli/codex-execute.md
@@ -1,7 +1,6 @@
 ---
 name: codex-execute
 description: Automated task decomposition and execution with Codex using resume mechanism
-usage: /cli:codex-execute [--verify-git] <task-description|task-id>
 argument-hint: "[--verify-git] task description or task-id"
 allowed-tools: SlashCommand(*), Bash(*), TodoWrite(*), Read(*), Glob(*)
 ---
diff --git a/.claude/commands/cli/execute.md b/.claude/commands/cli/execute.md
index 3a377e3d..e6704079 100644
--- a/.claude/commands/cli/execute.md
+++ b/.claude/commands/cli/execute.md
@@ -1,7 +1,6 @@
 ---
 name: execute
 description: Auto-execution of implementation tasks with YOLO permissions and intelligent context inference
-usage: /cli:execute [--tool <codex|gemini|qwen>] [--enhance] <description|task-id>
 argument-hint: "[--tool codex|gemini|qwen] [--enhance] description or task-id"
 allowed-tools: SlashCommand(*), Bash(*)
 ---
diff --git a/.claude/commands/cli/mode/bug-index.md b/.claude/commands/cli/mode/bug-index.md
index a16e10e6..dd963e40 100644
--- a/.claude/commands/cli/mode/bug-index.md
+++ b/.claude/commands/cli/mode/bug-index.md
@@ -1,7 +1,6 @@
 ---
 name: bug-index
 description: Bug analysis and fix suggestions using CLI tools
-usage: /cli:mode:bug-index [--tool <codex|gemini|qwen>] [--enhance] [--cd "path"] "bug description"
 argument-hint: "[--tool codex|gemini|qwen] [--enhance] [--cd path] bug description"
 allowed-tools: SlashCommand(*), Bash(*)
 ---
diff --git a/.claude/commands/cli/mode/code-analysis.md b/.claude/commands/cli/mode/code-analysis.md
index 787fb273..a237ce4d 100644
--- a/.claude/commands/cli/mode/code-analysis.md
+++ b/.claude/commands/cli/mode/code-analysis.md
@@ -1,7 +1,6 @@
 ---
 name: code-analysis
 description: Deep code analysis and debugging using CLI tools with specialized template
-usage: /cli:mode:code-analysis [--tool <codex|gemini|qwen>] [--enhance] [--cd "path"] "analysis target"
 argument-hint: "[--tool codex|gemini|qwen] [--enhance] [--cd path] analysis target"
 allowed-tools: SlashCommand(*), Bash(*)
 ---
diff --git a/.claude/commands/cli/mode/plan.md b/.claude/commands/cli/mode/plan.md
index fc7a36fa..a41552ef 100644
--- a/.claude/commands/cli/mode/plan.md
+++ b/.claude/commands/cli/mode/plan.md
@@ -1,7 +1,6 @@
 ---
 name: plan
 description: Project planning and architecture analysis using CLI tools
-usage: /cli:mode:plan [--tool <codex|gemini|qwen>] [--enhance] [--cd "path"] "topic"
 argument-hint: "[--tool codex|gemini|qwen] [--enhance] [--cd path] topic"
 allowed-tools: SlashCommand(*), Bash(*)
 ---
diff --git a/.claude/commands/enhance-prompt.md b/.claude/commands/enhance-prompt.md
index 81563a16..705efed3 100644
--- a/.claude/commands/enhance-prompt.md
+++ b/.claude/commands/enhance-prompt.md
@@ -1,7 +1,6 @@
 ---
 name: enhance-prompt
 description: Context-aware prompt enhancement using session memory and codebase analysis
-usage: /enhance-prompt <user_input>
 argument-hint: "user input to enhance"
 ---
 
diff --git a/.claude/commands/task/breakdown.md b/.claude/commands/task/breakdown.md
index 5a3cf9e5..09b93a75 100644
--- a/.claude/commands/task/breakdown.md
+++ b/.claude/commands/task/breakdown.md
@@ -1,7 +1,6 @@
 ---
 name: breakdown
 description: Intelligent task decomposition with context-aware subtask generation
-usage: /task:breakdown <task-id>
 argument-hint: "task-id"
 ---
 
diff --git a/.claude/commands/task/create.md b/.claude/commands/task/create.md
index d0d416b7..e0820077 100644
--- a/.claude/commands/task/create.md
+++ b/.claude/commands/task/create.md
@@ -1,7 +1,6 @@
 ---
 name: create
 description: Create implementation tasks with automatic context awareness
-usage: /task:create "title"
 argument-hint: "\"task title\""
 ---
 
diff --git a/.claude/commands/task/execute.md b/.claude/commands/task/execute.md
index 31b2f597..2c4b8006 100644
--- a/.claude/commands/task/execute.md
+++ b/.claude/commands/task/execute.md
@@ -1,7 +1,6 @@
 ---
 name: execute
 description: Execute tasks with appropriate agents and context-aware orchestration
-usage: /task:execute <task-id>
 argument-hint: "task-id"
 ---
 
diff --git a/.claude/commands/task/replan.md b/.claude/commands/task/replan.md
index b992b07c..64d47c96 100644
--- a/.claude/commands/task/replan.md
+++ b/.claude/commands/task/replan.md
@@ -1,7 +1,6 @@
 ---
 name: replan
 description: Replan individual tasks with detailed user input and change tracking
-usage: /task:replan <task-id> [input]
 argument-hint: "task-id [\"text\"|file.md]"
 ---
 
diff --git a/.claude/commands/update-memory-full.md b/.claude/commands/update-memory-full.md
index ed4fa29c..67de3b0d 100644
--- a/.claude/commands/update-memory-full.md
+++ b/.claude/commands/update-memory-full.md
@@ -1,7 +1,6 @@
 ---
 name: update-memory-full
 description: Complete project-wide CLAUDE.md documentation update
-usage: /update-memory-full [--tool <gemini|qwen|codex>]
 argument-hint: "[--tool gemini|qwen|codex]"
 ---
 
diff --git a/.claude/commands/update-memory-related.md b/.claude/commands/update-memory-related.md
index a3ea633d..c1c21ffb 100644
--- a/.claude/commands/update-memory-related.md
+++ b/.claude/commands/update-memory-related.md
@@ -1,7 +1,6 @@
 ---
 name: update-memory-related
 description: Context-aware CLAUDE.md documentation updates based on recent changes
-usage: /update-memory-related [--tool <gemini|qwen|codex>]
 argument-hint: "[--tool gemini|qwen|codex]"
 ---
 
diff --git a/.claude/commands/version.md b/.claude/commands/version.md
index 0a946aff..5c4e874b 100644
--- a/.claude/commands/version.md
+++ b/.claude/commands/version.md
@@ -1,7 +1,6 @@
 ---
 name: version
 description: Display version information and check for updates
-usage: /version
 allowed-tools: Bash(*)
 ---
 
diff --git a/.claude/commands/workflow/action-plan-verify.md b/.claude/commands/workflow/action-plan-verify.md
index ced62d07..e677df5e 100644
--- a/.claude/commands/workflow/action-plan-verify.md
+++ b/.claude/commands/workflow/action-plan-verify.md
@@ -1,7 +1,6 @@
 ---
 name: action-plan-verify
 description: Perform non-destructive cross-artifact consistency and quality analysis of IMPL_PLAN.md and task.json before execution
-usage: /workflow:action-plan-verify [--session <session-id>]
 argument-hint: "[optional: --session session-id]"
 allowed-tools: Read(*), TodoWrite(*), Glob(*), Bash(*)
 ---
diff --git a/.claude/commands/workflow/brainstorm/artifacts.md b/.claude/commands/workflow/brainstorm/artifacts.md
index 122b7074..14d3228f 100644
--- a/.claude/commands/workflow/brainstorm/artifacts.md
+++ b/.claude/commands/workflow/brainstorm/artifacts.md
@@ -1,7 +1,6 @@
 ---
 name: artifacts
 description: Generate role-specific topic-framework.md dynamically based on selected roles
-usage: /workflow:brainstorm:artifacts "<topic>" [--roles "role1,role2,role3"]
 argument-hint: "topic or challenge description for framework generation"
 allowed-tools: TodoWrite(*), Read(*), Write(*), Bash(*), Glob(*)
 ---
diff --git a/.claude/commands/workflow/brainstorm/auto-parallel.md b/.claude/commands/workflow/brainstorm/auto-parallel.md
index 9a6b98ea..4e3eb1fb 100644
--- a/.claude/commands/workflow/brainstorm/auto-parallel.md
+++ b/.claude/commands/workflow/brainstorm/auto-parallel.md
@@ -1,7 +1,6 @@
 ---
 name: auto-parallel
 description: Parallel brainstorming automation with dynamic role selection and concurrent execution
-usage: /workflow:brainstorm:auto-parallel "<topic>"
 argument-hint: "topic or challenge description"
 allowed-tools: SlashCommand(*), Task(*), TodoWrite(*), Read(*), Write(*), Bash(*), Glob(*)
 ---
diff --git a/.claude/commands/workflow/brainstorm/auto-squeeze.md b/.claude/commands/workflow/brainstorm/auto-squeeze.md
index 7b48ea8c..26e1fe66 100644
--- a/.claude/commands/workflow/brainstorm/auto-squeeze.md
+++ b/.claude/commands/workflow/brainstorm/auto-squeeze.md
@@ -1,7 +1,6 @@
 ---
 name: auto-squeeze
 description: Orchestrate 3-phase brainstorming workflow by executing commands sequentially
-usage: /workflow:brainstorm:auto-squeeze "<topic>"
 argument-hint: "topic or challenge description for coordinated brainstorming"
 allowed-tools: SlashCommand(*), TodoWrite(*), Read(*), Bash(*), Glob(*)
 ---
diff --git a/.claude/commands/workflow/brainstorm/data-architect.md b/.claude/commands/workflow/brainstorm/data-architect.md
index f9408c81..6da1884c 100644
--- a/.claude/commands/workflow/brainstorm/data-architect.md
+++ b/.claude/commands/workflow/brainstorm/data-architect.md
@@ -1,7 +1,6 @@
 ---
 name: data-architect
 description: Generate or update data-architect/analysis.md addressing topic-framework discussion points
-usage: /workflow:brainstorm:data-architect [topic]
 argument-hint: "optional topic - uses existing framework if available"
 allowed-tools: Task(conceptual-planning-agent), TodoWrite(*), Read(*), Write(*)
 ---
diff --git a/.claude/commands/workflow/brainstorm/product-manager.md b/.claude/commands/workflow/brainstorm/product-manager.md
index ad4991db..8ed60789 100644
--- a/.claude/commands/workflow/brainstorm/product-manager.md
+++ b/.claude/commands/workflow/brainstorm/product-manager.md
@@ -1,7 +1,6 @@
 ---
 name: product-manager
 description: Generate or update product-manager/analysis.md addressing topic-framework discussion points
-usage: /workflow:brainstorm:product-manager [topic]
 argument-hint: "optional topic - uses existing framework if available"
 allowed-tools: Task(conceptual-planning-agent), TodoWrite(*), Read(*), Write(*)
 ---
diff --git a/.claude/commands/workflow/brainstorm/product-owner.md b/.claude/commands/workflow/brainstorm/product-owner.md
index 9d67ce02..3b306513 100644
--- a/.claude/commands/workflow/brainstorm/product-owner.md
+++ b/.claude/commands/workflow/brainstorm/product-owner.md
@@ -1,7 +1,6 @@
 ---
 name: product-owner
 description: Generate or update product-owner/analysis.md addressing topic-framework discussion points
-usage: /workflow:brainstorm:product-owner [topic]
 argument-hint: "optional topic - uses existing framework if available"
 allowed-tools: Task(conceptual-planning-agent), TodoWrite(*), Read(*), Write(*)
 ---
diff --git a/.claude/commands/workflow/brainstorm/scrum-master.md b/.claude/commands/workflow/brainstorm/scrum-master.md
index f1810f38..872d7419 100644
--- a/.claude/commands/workflow/brainstorm/scrum-master.md
+++ b/.claude/commands/workflow/brainstorm/scrum-master.md
@@ -1,7 +1,6 @@
 ---
 name: scrum-master
 description: Generate or update scrum-master/analysis.md addressing topic-framework discussion points
-usage: /workflow:brainstorm:scrum-master [topic]
 argument-hint: "optional topic - uses existing framework if available"
 allowed-tools: Task(conceptual-planning-agent), TodoWrite(*), Read(*), Write(*)
 ---
diff --git a/.claude/commands/workflow/brainstorm/subject-matter-expert.md b/.claude/commands/workflow/brainstorm/subject-matter-expert.md
index c8c2c465..f704438d 100644
--- a/.claude/commands/workflow/brainstorm/subject-matter-expert.md
+++ b/.claude/commands/workflow/brainstorm/subject-matter-expert.md
@@ -1,7 +1,6 @@
 ---
 name: subject-matter-expert
 description: Generate or update subject-matter-expert/analysis.md addressing topic-framework discussion points
-usage: /workflow:brainstorm:subject-matter-expert [topic]
 argument-hint: "optional topic - uses existing framework if available"
 allowed-tools: Task(conceptual-planning-agent), TodoWrite(*), Read(*), Write(*)
 ---
diff --git a/.claude/commands/workflow/brainstorm/synthesis.md b/.claude/commands/workflow/brainstorm/synthesis.md
index 223a5a15..0f879c43 100644
--- a/.claude/commands/workflow/brainstorm/synthesis.md
+++ b/.claude/commands/workflow/brainstorm/synthesis.md
@@ -1,7 +1,6 @@
 ---
 name: synthesis
 description: Generate synthesis-specification.md from topic-framework and role analyses with @ references
-usage: /workflow:brainstorm:synthesis
 argument-hint: "no arguments required - synthesizes existing framework and role analyses"
 allowed-tools: Read(*), Write(*), TodoWrite(*), Glob(*)
 ---
diff --git a/.claude/commands/workflow/brainstorm/system-architect.md b/.claude/commands/workflow/brainstorm/system-architect.md
index c01566c9..fce42c32 100644
--- a/.claude/commands/workflow/brainstorm/system-architect.md
+++ b/.claude/commands/workflow/brainstorm/system-architect.md
@@ -1,7 +1,6 @@
 ---
 name: system-architect
 description: Generate or update system-architect/analysis.md addressing topic-framework discussion points
-usage: /workflow:brainstorm:system-architect [topic]
 argument-hint: "optional topic - uses existing framework if available"
 allowed-tools: Task(conceptual-planning-agent), TodoWrite(*), Read(*), Write(*)
 ---
diff --git a/.claude/commands/workflow/brainstorm/ui-designer.md b/.claude/commands/workflow/brainstorm/ui-designer.md
index 2306e173..a84c593a 100644
--- a/.claude/commands/workflow/brainstorm/ui-designer.md
+++ b/.claude/commands/workflow/brainstorm/ui-designer.md
@@ -1,7 +1,6 @@
 ---
 name: ui-designer
 description: Generate or update ui-designer/analysis.md addressing topic-framework discussion points
-usage: /workflow:brainstorm:ui-designer [topic]
 argument-hint: "optional topic - uses existing framework if available"
 allowed-tools: Task(conceptual-planning-agent), TodoWrite(*), Read(*), Write(*)
 ---
diff --git a/.claude/commands/workflow/brainstorm/ux-expert.md b/.claude/commands/workflow/brainstorm/ux-expert.md
index 65eadd3f..43a851c4 100644
--- a/.claude/commands/workflow/brainstorm/ux-expert.md
+++ b/.claude/commands/workflow/brainstorm/ux-expert.md
@@ -1,7 +1,6 @@
 ---
 name: ux-expert
 description: Generate or update ux-expert/analysis.md addressing topic-framework discussion points
-usage: /workflow:brainstorm:ux-expert [topic]
 argument-hint: "optional topic - uses existing framework if available"
 allowed-tools: Task(conceptual-planning-agent), TodoWrite(*), Read(*), Write(*)
 ---
diff --git a/.claude/commands/workflow/concept-clarify.md b/.claude/commands/workflow/concept-clarify.md
index 509c33ca..e067893e 100644
--- a/.claude/commands/workflow/concept-clarify.md
+++ b/.claude/commands/workflow/concept-clarify.md
@@ -1,7 +1,6 @@
 ---
 name: concept-clarify
 description: Identify underspecified areas in brainstorming artifacts through targeted clarification questions before action planning
-usage: /workflow:concept-clarify [--session <session-id>]
 argument-hint: "[optional: --session session-id]"
 allowed-tools: Read(*), Write(*), Edit(*), TodoWrite(*), Glob(*), Bash(*)
 ---
diff --git a/.claude/commands/workflow/execute.md b/.claude/commands/workflow/execute.md
index 50705e59..85098ba9 100644
--- a/.claude/commands/workflow/execute.md
+++ b/.claude/commands/workflow/execute.md
@@ -1,7 +1,6 @@
 ---
 name: execute
 description: Coordinate agents for existing workflow tasks with automatic discovery
-usage: /workflow:execute [--resume-session="session-id"]
 argument-hint: "[--resume-session=\"session-id\"]"
 ---
 
diff --git a/.claude/commands/workflow/plan.md b/.claude/commands/workflow/plan.md
index 4d8ea4ae..7e421fc3 100644
--- a/.claude/commands/workflow/plan.md
+++ b/.claude/commands/workflow/plan.md
@@ -1,7 +1,6 @@
 ---
 name: plan
 description: Orchestrate 4-phase planning workflow by executing commands and passing context between phases
-usage: /workflow:plan [--agent] <input>
 argument-hint: "[--agent] \"text description\"|file.md"
 allowed-tools: SlashCommand(*), TodoWrite(*), Read(*), Bash(*)
 ---
diff --git a/.claude/commands/workflow/resume.md b/.claude/commands/workflow/resume.md
index 5f767ad7..fb4e3059 100644
--- a/.claude/commands/workflow/resume.md
+++ b/.claude/commands/workflow/resume.md
@@ -1,7 +1,6 @@
 ---
 name: resume
 description: Intelligent workflow session resumption with automatic progress analysis
-usage: /workflow:resume "<session-id>"
 argument-hint: "session-id for workflow session to resume"
 allowed-tools: SlashCommand(*), TodoWrite(*), Read(*), Bash(*)
 ---
diff --git a/.claude/commands/workflow/review.md b/.claude/commands/workflow/review.md
index f87cf7d3..d4d1dc0e 100644
--- a/.claude/commands/workflow/review.md
+++ b/.claude/commands/workflow/review.md
@@ -1,7 +1,6 @@
 ---
 name: review
 description: Optional specialized review (security, architecture, docs) for completed implementation
-usage: /workflow:review [--type=<type>] [session-id]
 argument-hint: "[--type=security|architecture|action-items|quality] [optional: session-id]"
 ---
 
diff --git a/.claude/commands/workflow/status.md b/.claude/commands/workflow/status.md
index 68d7363c..8e5d17be 100644
--- a/.claude/commands/workflow/status.md
+++ b/.claude/commands/workflow/status.md
@@ -1,7 +1,6 @@
 ---
 name: workflow:status
 description: Generate on-demand views from JSON task data
-usage: /workflow:status [task-id]
 argument-hint: "[optional: task-id]"
 ---
 
diff --git a/.claude/commands/workflow/tdd-plan.md b/.claude/commands/workflow/tdd-plan.md
index e4e27e08..aadd3ad4 100644
--- a/.claude/commands/workflow/tdd-plan.md
+++ b/.claude/commands/workflow/tdd-plan.md
@@ -1,7 +1,6 @@
 ---
 name: tdd-plan
 description: Orchestrate TDD workflow planning with Red-Green-Refactor task chains
-usage: /workflow:tdd-plan [--agent] <input>
 argument-hint: "[--agent] \"feature description\"|file.md"
 allowed-tools: SlashCommand(*), TodoWrite(*), Read(*), Bash(*)
 ---
diff --git a/.claude/commands/workflow/tdd-verify.md b/.claude/commands/workflow/tdd-verify.md
index 92b49aa1..f1194147 100644
--- a/.claude/commands/workflow/tdd-verify.md
+++ b/.claude/commands/workflow/tdd-verify.md
@@ -1,7 +1,7 @@
 ---
 name: tdd-verify
 description: Verify TDD workflow compliance and generate quality report
-usage: /workflow:tdd-verify [session-id]
+
 argument-hint: "[optional: WFS-session-id]"
 allowed-tools: SlashCommand(*), TodoWrite(*), Read(*), Bash(gemini-wrapper:*)
 ---
diff --git a/.claude/commands/workflow/test-gen.md b/.claude/commands/workflow/test-gen.md
index 6dbf0f1b..f1888903 100644
--- a/.claude/commands/workflow/test-gen.md
+++ b/.claude/commands/workflow/test-gen.md
@@ -1,7 +1,6 @@
 ---
 name: test-gen
 description: Create independent test-fix workflow session by analyzing completed implementation
-usage: /workflow:test-gen [--use-codex] <source-session-id>
 argument-hint: "[--use-codex] source-session-id"
 allowed-tools: SlashCommand(*), TodoWrite(*), Read(*), Bash(*)
 ---
diff --git a/.claude/commands/workflow/tools/concept-enhanced.md b/.claude/commands/workflow/tools/concept-enhanced.md
index b2e52477..86dd3ccd 100644
--- a/.claude/commands/workflow/tools/concept-enhanced.md
+++ b/.claude/commands/workflow/tools/concept-enhanced.md
@@ -1,7 +1,6 @@
 ---
 name: concept-enhanced
 description: Enhanced intelligent analysis with parallel CLI execution and design blueprint generation
-usage: /workflow:tools:concept-enhanced --session <session_id> --context <context_package_path>
 argument-hint: "--session WFS-session-id --context path/to/context-package.json"
 examples:
   - /workflow:tools:concept-enhanced --session WFS-auth --context .workflow/WFS-auth/.process/context-package.json
diff --git a/.claude/commands/workflow/tools/context-gather.md b/.claude/commands/workflow/tools/context-gather.md
index 3dcf1461..419b22bc 100644
--- a/.claude/commands/workflow/tools/context-gather.md
+++ b/.claude/commands/workflow/tools/context-gather.md
@@ -1,7 +1,6 @@
 ---
 name: gather
 description: Intelligently collect project context based on task description and package into standardized JSON
-usage: /workflow:tools:context-gather --session <session_id> "<task_description>"
 argument-hint: "--session WFS-session-id \"task description\""
 examples:
   - /workflow:tools:context-gather --session WFS-user-auth "Implement user authentication system"
diff --git a/.claude/commands/workflow/tools/docs.md b/.claude/commands/workflow/tools/docs.md
index 8b16473a..c6e021c4 100644
--- a/.claude/commands/workflow/tools/docs.md
+++ b/.claude/commands/workflow/tools/docs.md
@@ -1,7 +1,6 @@
 ---
 name: docs
 description: Documentation planning and orchestration - creates structured documentation tasks for execution
-usage: /workflow:docs <type> [options]
 argument-hint: "architecture"|"api"|"all" [--tool <gemini|qwen|codex>] [--scope <path>]
 examples:
   - /workflow:docs all                          # Complete documentation (gemini default)
diff --git a/.claude/commands/workflow/tools/task-generate-agent.md b/.claude/commands/workflow/tools/task-generate-agent.md
index e36f4150..c425610c 100644
--- a/.claude/commands/workflow/tools/task-generate-agent.md
+++ b/.claude/commands/workflow/tools/task-generate-agent.md
@@ -1,7 +1,6 @@
 ---
 name: task-generate-agent
 description: Autonomous task generation using action-planning-agent with discovery and output phases
-usage: /workflow:tools:task-generate-agent --session <session_id>
 argument-hint: "--session WFS-session-id"
 examples:
   - /workflow:tools:task-generate-agent --session WFS-auth
diff --git a/.claude/commands/workflow/tools/task-generate-tdd.md b/.claude/commands/workflow/tools/task-generate-tdd.md
index 50e83abd..4f48e3da 100644
--- a/.claude/commands/workflow/tools/task-generate-tdd.md
+++ b/.claude/commands/workflow/tools/task-generate-tdd.md
@@ -1,7 +1,6 @@
 ---
 name: task-generate-tdd
 description: Generate TDD task chains with Red-Green-Refactor dependencies
-usage: /workflow:tools:task-generate-tdd --session <session_id> [--agent]
 argument-hint: "--session WFS-session-id [--agent]"
 allowed-tools: Read(*), Write(*), Bash(gemini-wrapper:*), TodoWrite(*)
 ---
diff --git a/.claude/commands/workflow/tools/task-generate.md b/.claude/commands/workflow/tools/task-generate.md
index f9491edc..cdc6b698 100644
--- a/.claude/commands/workflow/tools/task-generate.md
+++ b/.claude/commands/workflow/tools/task-generate.md
@@ -1,7 +1,6 @@
 ---
 name: task-generate
 description: Generate task JSON files and IMPL_PLAN.md from analysis results with artifacts integration
-usage: /workflow:tools:task-generate --session <session_id>
 argument-hint: "--session WFS-session-id"
 examples:
   - /workflow:tools:task-generate --session WFS-auth
diff --git a/.claude/commands/workflow/tools/tdd-coverage-analysis.md b/.claude/commands/workflow/tools/tdd-coverage-analysis.md
index b1d9ace0..2e40bf25 100644
--- a/.claude/commands/workflow/tools/tdd-coverage-analysis.md
+++ b/.claude/commands/workflow/tools/tdd-coverage-analysis.md
@@ -1,7 +1,6 @@
 ---
 name: tdd-coverage-analysis
 description: Analyze test coverage and TDD cycle execution
-usage: /workflow:tools:tdd-coverage-analysis --session <session_id>
 argument-hint: "--session WFS-session-id"
 allowed-tools: Read(*), Write(*), Bash(*)
 ---
diff --git a/.claude/commands/workflow/tools/test-concept-enhanced.md b/.claude/commands/workflow/tools/test-concept-enhanced.md
index a73001e3..ef524b26 100644
--- a/.claude/commands/workflow/tools/test-concept-enhanced.md
+++ b/.claude/commands/workflow/tools/test-concept-enhanced.md
@@ -1,7 +1,6 @@
 ---
 name: test-concept-enhanced
 description: Analyze test requirements and generate test generation strategy using Gemini
-usage: /workflow:tools:test-concept-enhanced --session <test_session_id> --context <test_context_package_path>
 argument-hint: "--session WFS-test-session-id --context path/to/test-context-package.json"
 examples:
   - /workflow:tools:test-concept-enhanced --session WFS-test-auth --context .workflow/WFS-test-auth/.process/test-context-package.json
diff --git a/.claude/commands/workflow/tools/test-context-gather.md b/.claude/commands/workflow/tools/test-context-gather.md
index 72861610..3b32bc01 100644
--- a/.claude/commands/workflow/tools/test-context-gather.md
+++ b/.claude/commands/workflow/tools/test-context-gather.md
@@ -1,7 +1,6 @@
 ---
 name: test-context-gather
 description: Collect test coverage context and identify files requiring test generation
-usage: /workflow:tools:test-context-gather --session <test_session_id>
 argument-hint: "--session WFS-test-session-id"
 examples:
   - /workflow:tools:test-context-gather --session WFS-test-auth
diff --git a/.claude/commands/workflow/tools/test-task-generate.md b/.claude/commands/workflow/tools/test-task-generate.md
index d589f799..31c9f74a 100644
--- a/.claude/commands/workflow/tools/test-task-generate.md
+++ b/.claude/commands/workflow/tools/test-task-generate.md
@@ -1,7 +1,6 @@
 ---
 name: test-task-generate
 description: Generate test-fix task JSON with iterative test-fix-retest cycle specification
-usage: /workflow:tools:test-task-generate [--use-codex] --session <test-session-id>
 argument-hint: "[--use-codex] --session WFS-test-session-id"
 examples:
   - /workflow:tools:test-task-generate --session WFS-test-auth
diff --git a/.claude/commands/workflow/ui-design/capture.md b/.claude/commands/workflow/ui-design/capture.md
index 8037a015..f46a1533 100644
--- a/.claude/commands/workflow/ui-design/capture.md
+++ b/.claude/commands/workflow/ui-design/capture.md
@@ -1,7 +1,6 @@
 ---
 name: capture
 description: Batch screenshot capture for UI design workflows using MCP or local fallback
-usage: /workflow:ui-design:capture --url-map "<map>" [--base-path <path>] [--session <id>]
 argument-hint: --url-map "target:url,..." [--base-path path] [--session id]
 allowed-tools: TodoWrite(*), Read(*), Write(*), Bash(*), Glob(*), ListMcpResourcesTool(*), mcp__chrome-devtools__*, mcp__playwright__*
 ---
diff --git a/.claude/commands/workflow/ui-design/explore-layers.md b/.claude/commands/workflow/ui-design/explore-layers.md
index b3890c76..2f4d3090 100644
--- a/.claude/commands/workflow/ui-design/explore-layers.md
+++ b/.claude/commands/workflow/ui-design/explore-layers.md
@@ -1,7 +1,6 @@
 ---
 name: explore-layers
 description: Interactive deep UI capture with depth-controlled layer exploration
-usage: /workflow:ui-design:explore-layers --url <url> --depth <1-5> [--session <id>] [--base-path <path>]
 argument-hint: --url <url> --depth <1-5> [--session id] [--base-path path]
 allowed-tools: TodoWrite(*), Read(*), Write(*), Bash(*), Glob(*), mcp__chrome-devtools__*
 ---
diff --git a/.claude/commands/workflow/ui-design/generate.md b/.claude/commands/workflow/ui-design/generate.md
index 3b55f525..a830f263 100644
--- a/.claude/commands/workflow/ui-design/generate.md
+++ b/.claude/commands/workflow/ui-design/generate.md
@@ -11,10 +11,11 @@ allowed-tools: TodoWrite(*), Read(*), Write(*), Task(ui-design-agent), Bash(*)
 Pure assembler that combines pre-extracted layout templates with design tokens to generate UI prototypes (`style × layout × targets`). No layout design logic - purely combines existing components.
 
 **Strategy**: Pure Assembly
-- **Input**: `layout-templates.json` + `design-tokens.json`
+- **Input**: `layout-templates.json` + `design-tokens.json` (+ reference images if available)
 - **Process**: Combine structure (DOM) with style (tokens)
 - **Output**: Complete HTML/CSS prototypes
 - **No Design Logic**: All layout and style decisions already made
+- **Automatic Image Reference**: If source images exist in layout templates, they're automatically used for visual context
 
 **Prerequisite Commands**:
 - `/workflow:ui-design:style-extract` → Style tokens
@@ -30,6 +31,8 @@ bash(find .workflow -type d -name "design-*" | head -1)  # Auto-detect
 
 # Get style count
 bash(ls {base_path}/style-consolidation/style-* -d | wc -l)
+
+# Image reference auto-detected from layout template source_image_path
 ```
 
 ### Step 2: Load Layout Templates
@@ -78,18 +81,29 @@ Task(ui-design-agent): `
   1. Layout Template:
      Read("{base_path}/layout-extraction/layout-templates.json")
      Find template where: target={target} AND variant_id="layout-{layout_id}"
-     Extract: dom_structure, css_layout_rules, device_type
+     Extract: dom_structure, css_layout_rules, device_type, source_image_path
 
   2. Design Tokens:
      Read("{base_path}/style-consolidation/style-{style_id}/design-tokens.json")
      Extract: ALL token values (colors, typography, spacing, borders, shadows, breakpoints)
 
+  3. Reference Image (AUTO-DETECTED):
+     IF template.source_image_path exists:
+       Read(template.source_image_path)
+       Purpose: Additional visual context for better placeholder content generation
+       Note: This is for reference only - layout and style decisions already made
+     ELSE:
+       Use generic placeholder content
+
   ## Assembly Process
   1. Build HTML: {base_path}/prototypes/{target}-style-{style_id}-layout-{layout_id}.html
      - Recursively build from template.dom_structure
      - Add: <!DOCTYPE html>, <head>, <meta viewport>
      - CSS link: <link href="{target}-style-{style_id}-layout-{layout_id}.css">
-     - Inject placeholder content (Lorem ipsum, sample data)
+     - Inject placeholder content:
+       * Default: Use Lorem ipsum, generic sample data
+       * If reference image available: Generate more contextually appropriate placeholders
+         (e.g., realistic headings, meaningful text snippets that match the visual context)
      - Preserve all attributes from dom_structure
 
   2. Build CSS: {base_path}/prototypes/{target}-style-{style_id}-layout-{layout_id}.css
@@ -169,6 +183,7 @@ Configuration:
 - Device Type: {device_type}
 - Targets: {targets}
 - Total Prototypes: {S × L × T}
+- Image Reference: Auto-detected (uses source images when available in layout templates)
 
 Assembly Process:
 - Pure assembly: Combined pre-extracted layouts + design tokens
diff --git a/.claude/commands/workflow/ui-design/layout-extract.md b/.claude/commands/workflow/ui-design/layout-extract.md
index b59b6cf6..c3a21cbd 100644
--- a/.claude/commands/workflow/ui-design/layout-extract.md
+++ b/.claude/commands/workflow/ui-design/layout-extract.md
@@ -144,6 +144,11 @@ Task(ui-design-agent): `
   Each template must include:
   - target (string)
   - variant_id (string, e.g., "layout-1")
+  - source_image_path (string, REQUIRED): Path to the primary reference image used for this layout analysis
+    * For image input: Use the actual image file path from {images_pattern}
+    * For URL input: Use the screenshot path if available, or empty string
+    * For text/prompt input: Use empty string
+    * Example: "{base_path}/screenshots/home.png"
   - device_type (string)
   - design_philosophy (string)
   - dom_structure (JSON object)
@@ -276,6 +281,7 @@ bash(echo '{json}' > {base_path}/layout-extraction/layout-templates.json)
     {
       "target": "home",
       "variant_id": "layout-1",
+      "source_image_path": "{base_path}/screenshots/home.png",
       "device_type": "responsive",
       "design_philosophy": "Responsive 3-column holy grail layout with fixed header and footer",
       "dom_structure": {