diff --git a/.claude/commands/cleanup.md b/.claude/commands/cleanup.md
index 34bce559f4b..b0cbbb42fae 100644
--- a/.claude/commands/cleanup.md
+++ b/.claude/commands/cleanup.md
@@ -1,6 +1,6 @@
 ---
 description: Run all code quality skills in sequence — effects, memo, callbacks, state, React Query, emcn design review, and url-state
-argument-hint: [scope] [fix=true|false]
+argument-hint: "[scope] [fix=true|false]"
 ---
 
 # Cleanup
diff --git a/.claude/commands/emcn-design-review.md b/.claude/commands/emcn-design-review.md
index 0c96b074796..741c02c64b9 100644
--- a/.claude/commands/emcn-design-review.md
+++ b/.claude/commands/emcn-design-review.md
@@ -1,6 +1,6 @@
 ---
 description: Review UI code for alignment with the emcn design system — components, tokens, patterns, and conventions
-argument-hint: [scope] [fix=true|false]
+argument-hint: "[scope] [fix=true|false]"
 ---
 
 # EMCN Design Review
diff --git a/.claude/commands/react-query-best-practices.md b/.claude/commands/react-query-best-practices.md
index 0fc450958bf..a1222866f96 100644
--- a/.claude/commands/react-query-best-practices.md
+++ b/.claude/commands/react-query-best-practices.md
@@ -1,6 +1,6 @@
 ---
 description: Audit React Query usage for best practices — key factories, staleTime, mutations, and server state ownership
-argument-hint: [scope] [fix=true|false]
+argument-hint: "[scope] [fix=true|false]"
 ---
 
 # React Query Best Practices
diff --git a/.claude/commands/ship.md b/.claude/commands/ship.md
index 6141fa01c1a..df54f36b95d 100644
--- a/.claude/commands/ship.md
+++ b/.claude/commands/ship.md
@@ -1,6 +1,6 @@
 ---
 description: Commit, push, and open a PR to staging in one shot
-argument-hint: [optional context or scope notes]
+argument-hint: "[optional context or scope notes]"
 ---
 
 # Ship Command
diff --git a/.claude/commands/you-might-not-need-a-callback.md b/.claude/commands/you-might-not-need-a-callback.md
index c25d4c32eab..a67f1ecb7da 100644
--- a/.claude/commands/you-might-not-need-a-callback.md
+++ b/.claude/commands/you-might-not-need-a-callback.md
@@ -1,6 +1,6 @@
 ---
 description: Analyze and fix useCallback anti-patterns in your code
-argument-hint: [scope] [fix=true|false]
+argument-hint: "[scope] [fix=true|false]"
 ---
 
 # You Might Not Need a Callback
diff --git a/.claude/commands/you-might-not-need-a-memo.md b/.claude/commands/you-might-not-need-a-memo.md
index f0c5b3124ab..5b0f5b7983c 100644
--- a/.claude/commands/you-might-not-need-a-memo.md
+++ b/.claude/commands/you-might-not-need-a-memo.md
@@ -1,6 +1,6 @@
 ---
 description: Analyze and fix useMemo/React.memo anti-patterns in your code
-argument-hint: [scope] [fix=true|false]
+argument-hint: "[scope] [fix=true|false]"
 ---
 
 # You Might Not Need a Memo
diff --git a/.claude/commands/you-might-not-need-an-effect.md b/.claude/commands/you-might-not-need-an-effect.md
index 1e798c804e9..cd438e6f01d 100644
--- a/.claude/commands/you-might-not-need-an-effect.md
+++ b/.claude/commands/you-might-not-need-an-effect.md
@@ -1,6 +1,6 @@
 ---
 description: Analyze and fix useEffect anti-patterns in your code
-argument-hint: [scope] [fix=true|false]
+argument-hint: "[scope] [fix=true|false]"
 ---
 
 # You Might Not Need an Effect
diff --git a/.claude/commands/you-might-not-need-state.md b/.claude/commands/you-might-not-need-state.md
index 2e539146f6b..eab91ca7b37 100644
--- a/.claude/commands/you-might-not-need-state.md
+++ b/.claude/commands/you-might-not-need-state.md
@@ -1,6 +1,6 @@
 ---
 description: Analyze and fix unnecessary useState, derived state, and server-state-in-local-state anti-patterns
-argument-hint: [scope] [fix=true|false]
+argument-hint: "[scope] [fix=true|false]"
 ---
 
 # You Might Not Need State
diff --git a/.claude/commands/you-might-not-need-url-state.md b/.claude/commands/you-might-not-need-url-state.md
index 77ba1ebeccb..bcab8ac2db6 100644
--- a/.claude/commands/you-might-not-need-url-state.md
+++ b/.claude/commands/you-might-not-need-url-state.md
@@ -1,6 +1,6 @@
 ---
 description: Analyze and fix URL/query-param state anti-patterns — manual useSearchParams reads, hand-built query mutations, view-state trapped in useState, and objects in the URL
-argument-hint: [scope] [fix=true|false]
+argument-hint: "[scope] [fix=true|false]"
 ---
 
 # You Might Not Need URL State