diff --git a/.claude/commands/workflow/lite-fix.md b/.claude/commands/workflow/lite-fix.md
index 19939cf1..ac7951d9 100644
--- a/.claude/commands/workflow/lite-fix.md
+++ b/.claude/commands/workflow/lite-fix.md
@@ -216,7 +216,7 @@ Execute **${angle}** diagnosis for bug root cause analysis. Analyze codebase fro
 - fix_hints: Suggested fix approaches from ${angle} viewpoint
 - dependencies: Dependencies relevant to ${angle} diagnosis
 - constraints: ${angle}-specific limitations affecting fix
-- clarification_needs: ${angle}-related ambiguities (with options array)
+- clarification_needs: ${angle}-related ambiguities (options array + recommended index)
 - _metadata.diagnosis_angle: "${angle}"
 - _metadata.diagnosis_index: ${index + 1}
 
@@ -228,7 +228,7 @@ Execute **${angle}** diagnosis for bug root cause analysis. Analyze codebase fro
 - [ ] Fix hints are actionable (specific code changes, not generic advice)
 - [ ] Reproduction steps are verifiable
 - [ ] JSON output follows schema exactly
-- [ ] clarification_needs includes options array
+- [ ] clarification_needs includes options + recommended
 
 ## Output
 Write: ${sessionFolder}/diagnosis-${angle}.json
@@ -333,10 +333,13 @@ if (uniqueClarifications.length > 0) {
       question: `[${need.source_angle}] ${need.question}\n\nContext: ${need.context}`,
       header: need.source_angle,
       multiSelect: false,
-      options: need.options.map(opt => ({
-        label: opt,
-        description: `Use ${opt} approach`
-      }))
+      options: need.options.map((opt, index) => {
+        const isRecommended = need.recommended === index
+        return {
+          label: isRecommended ? `${opt} ★` : opt,
+          description: isRecommended ? `Use ${opt} approach (Recommended)` : `Use ${opt} approach`
+        }
+      })
     }))
   })
 }
diff --git a/.claude/commands/workflow/lite-plan.md b/.claude/commands/workflow/lite-plan.md
index abbd457e..21276c10 100644
--- a/.claude/commands/workflow/lite-plan.md
+++ b/.claude/commands/workflow/lite-plan.md
@@ -206,7 +206,7 @@ Execute **${angle}** exploration for task planning context. Analyze codebase fro
 - dependencies: Dependencies relevant to ${angle}
 - integration_points: Where to integrate from ${angle} viewpoint (include file:line locations)
 - constraints: ${angle}-specific limitations/conventions
-- clarification_needs: ${angle}-related ambiguities (with options array)
+- clarification_needs: ${angle}-related ambiguities (options array + recommended index)
 - _metadata.exploration_angle: "${angle}"
 
 ## Success Criteria
@@ -217,7 +217,7 @@ Execute **${angle}** exploration for task planning context. Analyze codebase fro
 - [ ] Integration points include file:line locations
 - [ ] Constraints are project-specific to ${angle}
 - [ ] JSON output follows schema exactly
-- [ ] clarification_needs includes options array
+- [ ] clarification_needs includes options + recommended
 
 ## Output
 Write: ${sessionFolder}/exploration-${angle}.json
@@ -322,10 +322,13 @@ if (uniqueClarifications.length > 0) {
       question: `[${need.source_angle}] ${need.question}\n\nContext: ${need.context}`,
       header: need.source_angle,
       multiSelect: false,
-      options: need.options.map(opt => ({
-        label: opt,
-        description: `Use ${opt} approach`
-      }))
+      options: need.options.map((opt, index) => {
+        const isRecommended = need.recommended === index
+        return {
+          label: isRecommended ? `${opt} ★` : opt,
+          description: isRecommended ? `Use ${opt} approach (Recommended)` : `Use ${opt} approach`
+        }
+      })
     }))
   })
 }
diff --git a/.claude/commands/workflow/tools/context-gather.md b/.claude/commands/workflow/tools/context-gather.md
index b34e53d7..b4cd5c3f 100644
--- a/.claude/commands/workflow/tools/context-gather.md
+++ b/.claude/commands/workflow/tools/context-gather.md
@@ -171,7 +171,7 @@ Execute **${angle}** exploration for task planning context. Analyze codebase fro
 - dependencies: Dependencies relevant to ${angle}
 - integration_points: Where to integrate from ${angle} viewpoint (include file:line locations)
 - constraints: ${angle}-specific limitations/conventions
-- clarification_needs: ${angle}-related ambiguities (with options array)
+- clarification_needs: ${angle}-related ambiguities (options array + recommended index)
 - _metadata.exploration_angle: "${angle}"
 
 ## Success Criteria
@@ -182,7 +182,7 @@ Execute **${angle}** exploration for task planning context. Analyze codebase fro
 - [ ] Integration points include file:line locations
 - [ ] Constraints are project-specific to ${angle}
 - [ ] JSON output follows schema exactly
-- [ ] clarification_needs includes options array
+- [ ] clarification_needs includes options + recommended
 
 ## Output
 Write: ${sessionFolder}/exploration-${angle}.json
diff --git a/.claude/workflows/cli-templates/schemas/explore-json-schema.json b/.claude/workflows/cli-templates/schemas/explore-json-schema.json
index 7855b7a5..1b2ede00 100644
--- a/.claude/workflows/cli-templates/schemas/explore-json-schema.json
+++ b/.claude/workflows/cli-templates/schemas/explore-json-schema.json
@@ -70,6 +70,11 @@
             "type": "array",
             "items": {"type": "string"},
             "description": "Available options for user to choose from (2-4 options)"
+          },
+          "recommended": {
+            "type": "integer",
+            "minimum": 0,
+            "description": "Zero-based index of recommended option in the options array. Based on codebase patterns and best practices analysis."
           }
         }
       },