diff --git a/.claude/commands/workflow/roadmap-with-file.md b/.claude/commands/workflow/roadmap-with-file.md
index 64c9aac5..4e3194a8 100644
--- a/.claude/commands/workflow/roadmap-with-file.md
+++ b/.claude/commands/workflow/roadmap-with-file.md
@@ -235,20 +235,25 @@ Mode: Append-only (new issues appended to end)
 ### Query Interface
 
 ```bash
-# By ID
-ccw issue get ISS-20260227-001
+# By ID (detail view)
+ccw issue list ISS-20260227-001
 
-# By tag
-ccw issue list --tag wave-1
-ccw issue list --tag roadmap
+# List all with status filter
+ccw issue list --status planned,queued
+ccw issue list --brief  # JSON minimal output
 
-# By session
-ccw issue list --session RMAP-auth-2026-02-27
+# Queue operations (wave-based execution)
+ccw issue queue list              # List all queues
+ccw issue queue dag               # Get dependency graph (JSON)
+ccw issue next --queue <queue-id> # Get next task
 
 # Execute
-ccw issue execute ISS-20260227-001 ISS-20260227-002
+ccw issue queue add <issue-id>    # Add to active queue
+ccw issue done <item-id>          # Mark completed
 ```
 
+> **Note**: Issues are tagged with `wave-N` in `tags[]` field for filtering. Use `--brief` for programmatic parsing.
+
 ### Consumers
 
 | Consumer | Usage |
diff --git a/.codex/skills/roadmap-with-file/SKILL.md b/.codex/skills/roadmap-with-file/SKILL.md
index e737256f..3389044f 100644
--- a/.codex/skills/roadmap-with-file/SKILL.md
+++ b/.codex/skills/roadmap-with-file/SKILL.md
@@ -308,20 +308,25 @@ Mode: Append-only (new issues appended to end)
 ### Query Interface
 
 ```bash
-# By ID
-ccw issue get ISS-20260227-001
+# By ID (detail view)
+ccw issue list ISS-20260227-001
 
-# By tag
-ccw issue list --tag wave-1
-ccw issue list --tag roadmap
+# List all with status filter
+ccw issue list --status planned,queued
+ccw issue list --brief  # JSON minimal output
 
-# By session
-ccw issue list --session RMAP-auth-2026-02-27
+# Queue operations (wave-based execution)
+ccw issue queue list              # List all queues
+ccw issue queue dag               # Get dependency graph (JSON)
+ccw issue next --queue <queue-id> # Get next task
 
 # Execute
-ccw issue execute ISS-20260227-001 ISS-20260227-002
+ccw issue queue add <issue-id>    # Add to active queue
+ccw issue done <item-id>          # Mark completed
 ```
 
+> **Note**: Issues are tagged with `wave-N` in `tags[]` field for filtering. Use `--brief` for programmatic parsing.
+
 ---
 
 ## Implementation