diff --git a/commands/config.md b/commands/config.md
index 74856ba1..8078c307 100644
--- a/commands/config.md
+++ b/commands/config.md
@@ -3,7 +3,7 @@ name: vbw:config
 category: supporting
 disable-model-invocation: true
 description: View and modify VBW configuration including effort profile, verification tier, and skill-hook wiring.
-argument-hint: [setting value]
+argument-hint: "[setting value]"
 allowed-tools: Read, Write, Edit, Bash, Glob, AskUserQuestion
 ---
 
diff --git a/commands/help.md b/commands/help.md
index 30e12e39..213ff2b8 100644
--- a/commands/help.md
+++ b/commands/help.md
@@ -3,7 +3,7 @@ name: vbw:help
 category: supporting
 disable-model-invocation: true
 description: Display all available VBW commands with descriptions and usage examples.
-argument-hint: [command-name]
+argument-hint: "[command-name]"
 allowed-tools: Read, Glob, Bash
 ---
 
diff --git a/commands/list-todos.md b/commands/list-todos.md
index 3f909aa7..6c794c21 100644
--- a/commands/list-todos.md
+++ b/commands/list-todos.md
@@ -3,7 +3,7 @@ name: vbw:list-todos
 category: supporting
 disable-model-invocation: true
 description: List pending todos from STATE.md with action hints.
-argument-hint: [priority filter]
+argument-hint: "[priority filter]"
 allowed-tools: Read, Edit, Bash
 ---
 
diff --git a/commands/map.md b/commands/map.md
index c891bb2a..775be257 100644
--- a/commands/map.md
+++ b/commands/map.md
@@ -3,7 +3,7 @@ name: vbw:map
 category: advanced
 disable-model-invocation: true
 description: Analyze existing codebase with adaptive Scout teammates to produce structured mapping documents.
-argument-hint: [--incremental] [--package=name] [--tier=solo|duo|quad]
+argument-hint: "[--incremental] [--package=name] [--tier=solo|duo|quad]"
 allowed-tools: Read, Write, Edit, Bash, Glob, Grep, WebFetch, Agent, TeamCreate, TaskCreate, SendMessage, TeamDelete, Skill, LSP
 ---
 
diff --git a/commands/pause.md b/commands/pause.md
index d507eeee..00298cc6 100644
--- a/commands/pause.md
+++ b/commands/pause.md
@@ -3,7 +3,7 @@ name: vbw:pause
 category: supporting
 disable-model-invocation: true
 description: Save session notes for next time (state auto-persists).
-argument-hint: [notes]
+argument-hint: "[notes]"
 allowed-tools: Read, Write
 ---
 
diff --git a/commands/qa.md b/commands/qa.md
index d1bb6771..8f91ed6f 100644
--- a/commands/qa.md
+++ b/commands/qa.md
@@ -4,7 +4,7 @@ category: monitoring
 hidden: true
 disable-model-invocation: true
 description: Run deep verification on completed phase work using the QA agent.
-argument-hint: [phase-number] [--tier=quick|standard|deep] [--effort=thorough|balanced|fast|turbo]
+argument-hint: "[phase-number] [--tier=quick|standard|deep] [--effort=thorough|balanced|fast|turbo]"
 allowed-tools: Read, Write, Bash, Glob, Grep, Agent, Skill, LSP
 ---
 
diff --git a/commands/rtk.md b/commands/rtk.md
index 0cd6e4c5..b5ac2a75 100644
--- a/commands/rtk.md
+++ b/commands/rtk.md
@@ -3,7 +3,7 @@ name: vbw:rtk
 category: supporting
 disable-model-invocation: true
 description: Install, update, verify, and manage optional RTK tool-output compression.
-argument-hint: [status|install|init|verify|update|uninstall]
+argument-hint: "[status|install|init|verify|update|uninstall]"
 allowed-tools: Read, Bash, AskUserQuestion
 ---
 
diff --git a/commands/skills.md b/commands/skills.md
index c8cff1b0..28ca8dcd 100644
--- a/commands/skills.md
+++ b/commands/skills.md
@@ -3,7 +3,7 @@ name: vbw:skills
 category: supporting
 disable-model-invocation: true
 description: Browse and install community skills from skills.sh based on your project's tech stack.
-argument-hint: [--search <query>] [--list] [--refresh]
+argument-hint: "[--search <query>] [--list] [--refresh]"
 allowed-tools: Read, Bash, Glob, Grep, WebFetch, AskUserQuestion, LSP
 ---
 
diff --git a/commands/status.md b/commands/status.md
index 1e2f3403..c6a5fcad 100644
--- a/commands/status.md
+++ b/commands/status.md
@@ -3,7 +3,7 @@ name: vbw:status
 category: monitoring
 disable-model-invocation: true
 description: Display project progress dashboard with phase status, velocity metrics, and next action.
-argument-hint: [--verbose] [--metrics]
+argument-hint: "[--verbose] [--metrics]"
 allowed-tools: Read, Glob, Grep, Bash, LSP
 ---