diff --git a/.claude/commands/cc/create-command.md b/.claude/commands/cc/create-command.md
index d3a9a2f..c3ac8ef 100644
--- a/.claude/commands/cc/create-command.md
+++ b/.claude/commands/cc/create-command.md
@@ -1,6 +1,6 @@
 ---
 description: Create a new Claude Code custom command
-argument-hint: [command-name] [description]
+argument-hint: "[command-name] [description]"
 allowed-tools: Write, Read, LS, Bash(mkdir:*), Bash(ls:*), WebSearch(*)
 ---
 
diff --git a/.claude/commands/eureka.md b/.claude/commands/eureka.md
index ccef78a..3e22daf 100644
--- a/.claude/commands/eureka.md
+++ b/.claude/commands/eureka.md
@@ -1,6 +1,6 @@
 ---
 description: "Capture technical breakthroughs and transform them into actionable, reusable documentation"
-argument-hint: [breakthrough description]
+argument-hint: "[breakthrough description]"
 ---
 
 # /eureka - Technical Breakthrough Documentation
diff --git a/.claude/commands/gh/fix-issue.md b/.claude/commands/gh/fix-issue.md
index cb211b2..f7904d2 100644
--- a/.claude/commands/gh/fix-issue.md
+++ b/.claude/commands/gh/fix-issue.md
@@ -1,6 +1,6 @@
 ---
 description: Fix GitHub issue
-argument-hint: [issue-number]
+argument-hint: "[issue-number]"
 allowed-tools: Write, Read, LS, Glob, Grep, Bash(gh:*), Bash(git:*)
 ---
 
diff --git a/.claude/commands/gh/review-pr.md b/.claude/commands/gh/review-pr.md
index e47ab0a..5d9ab82 100644
--- a/.claude/commands/gh/review-pr.md
+++ b/.claude/commands/gh/review-pr.md
@@ -1,6 +1,6 @@
 ---
 description: Review GitHub pull request with detailed code analysis
-argument-hint: [pr-number]
+argument-hint: "[pr-number]"
 allowed-tools: Write, Read, LS, Glob, Grep, Bash(gh:*), Bash(git:*)
 ---
 
diff --git a/.claude/commands/kiro/design.md b/.claude/commands/kiro/design.md
index 8d5262d..cfd1c75 100644
--- a/.claude/commands/kiro/design.md
+++ b/.claude/commands/kiro/design.md
@@ -1,6 +1,6 @@
 ---
 description: Create comprehensive feature design documents with research and architecture
-argument-hint: [feature name or rough idea]
+argument-hint: "[feature name or rough idea]"
 ---
 
 # Identity
diff --git a/.claude/commands/kiro/execute.md b/.claude/commands/kiro/execute.md
index f9d2ae3..112eb4a 100644
--- a/.claude/commands/kiro/execute.md
+++ b/.claude/commands/kiro/execute.md
@@ -1,6 +1,6 @@
 ---
 description: Execute specific tasks from Kiro specs with focused implementation
-argument-hint: [feature name] [task description or task number]
+argument-hint: "[feature name] [task description or task number]"
 ---
 
 # Identity
diff --git a/.claude/commands/kiro/spec.md b/.claude/commands/kiro/spec.md
index b5087dd..80beb93 100644
--- a/.claude/commands/kiro/spec.md
+++ b/.claude/commands/kiro/spec.md
@@ -1,6 +1,6 @@
 ---
 description: Create complete feature specifications from requirements to implementation plan
-argument-hint: [feature name or rough idea]
+argument-hint: "[feature name or rough idea]"
 ---
 
 # Identity
diff --git a/.claude/commands/kiro/task.md b/.claude/commands/kiro/task.md
index eca5303..652cf65 100644
--- a/.claude/commands/kiro/task.md
+++ b/.claude/commands/kiro/task.md
@@ -1,6 +1,6 @@
 ---
 description: Generate implementation task lists from approved feature designs
-argument-hint: [feature name]
+argument-hint: "[feature name]"
 ---
 
 # Identity
diff --git a/.claude/commands/kiro/vibe.md b/.claude/commands/kiro/vibe.md
index 832eca1..1c4c416 100644
--- a/.claude/commands/kiro/vibe.md
+++ b/.claude/commands/kiro/vibe.md
@@ -1,6 +1,6 @@
 ---
 description: Quick development assistance with Kiro's laid-back, developer-focused approach
-argument-hint: [problem or question]
+argument-hint: "[problem or question]"
 ---
 
 # Identity
diff --git a/.claude/commands/think-harder.md b/.claude/commands/think-harder.md
index 9de096e..c6f3bb5 100644
--- a/.claude/commands/think-harder.md
+++ b/.claude/commands/think-harder.md
@@ -1,6 +1,6 @@
 ---
 description: Enhanced analytical thinking for complex problems
-argument-hint: [problem or question]
+argument-hint: "[problem or question]"
 ---
 
 # Think Harder Command
diff --git a/.claude/commands/think-ultra.md b/.claude/commands/think-ultra.md
index ca398ee..4a52dc2 100644
--- a/.claude/commands/think-ultra.md
+++ b/.claude/commands/think-ultra.md
@@ -1,6 +1,6 @@
 ---
 description: Ultra-comprehensive analytical thinking for the most complex problems
-argument-hint: [complex problem or question]
+argument-hint: "[complex problem or question]"
 ---
 
 # Think Ultra Command