diff --git a/.claude/commands/cli/codex-review.md b/.claude/commands/cli/codex-review.md
index 330bb482..bca3f872 100644
--- a/.claude/commands/cli/codex-review.md
+++ b/.claude/commands/cli/codex-review.md
@@ -217,8 +217,9 @@ fi
 ccw cli -p "$PROMPT" --tool codex --mode review $TARGET_FLAG $MODEL_FLAG $TITLE_FLAG
 ```
 
-**Full Example Command:**
+**Full Example Commands:**
 
+**Option 1: With custom prompt (reviews uncommitted by default):**
 ```bash
 ccw cli -p "
 PURPOSE: Comprehensive code review to identify issues and improve quality; success = actionable feedback with priorities
@@ -227,7 +228,12 @@ MODE: review
 CONTEXT: Reviewing uncommitted changes | Memory: Project conventions
 EXPECTED: Structured report with severity levels, file:line refs, improvement suggestions
 CONSTRAINTS: Actionable feedback
-" --tool codex --mode review --uncommitted --rule analysis-review-code-quality
+" --tool codex --mode review --rule analysis-review-code-quality
+```
+
+**Option 2: Target flag only (no prompt allowed):**
+```bash
+ccw cli --tool codex --mode review --uncommitted
 ```
 
 ### Step 5: Execute and Display Results
diff --git a/.claude/commands/workflow/lite-execute.md b/.claude/commands/workflow/lite-execute.md
index 6402aa1c..7628f529 100644
--- a/.claude/commands/workflow/lite-execute.md
+++ b/.claude/commands/workflow/lite-execute.md
@@ -81,7 +81,7 @@ AskUserQuestion({
       options: [
         { label: "Skip", description: "No review" },
         { label: "Gemini Review", description: "Gemini CLI tool" },
-        { label: "Codex Review", description: "codex review --uncommitted" },
+        { label: "Codex Review", description: "Git-aware review (prompt OR --uncommitted)" },
         { label: "Agent Review", description: "Current agent review" }
       ]
     }
@@ -471,7 +471,8 @@ Progress tracked at batch level (not individual task level). Icons: ⚡ (paralle
 **Operations**:
 - Agent Review: Current agent performs direct review
 - Gemini Review: Execute gemini CLI with review prompt
-- Custom tool: Execute specified CLI tool (qwen, codex, etc.)
+- Codex Review: Two options - (A) with prompt for complex reviews, (B) `--uncommitted` flag only for quick reviews
+- Custom tool: Execute specified CLI tool (qwen, etc.)
 
 **Unified Review Template** (All tools use same standard):
 
@@ -506,9 +507,17 @@ ccw cli -p "[Shared Prompt Template with artifacts]" --tool gemini --mode analys
 ccw cli -p "[Shared Prompt Template with artifacts]" --tool qwen --mode analysis
 # Same prompt as Gemini, different execution engine
 
-# Method 4: Codex Review (git-aware)
-ccw cli -p "[Shared Prompt Template with artifacts]" --tool codex --mode review --uncommitted
-# Reviews uncommitted changes against plan acceptance criteria
+# Method 4: Codex Review (git-aware) - Two mutually exclusive options:
+
+# Option A: With custom prompt (reviews uncommitted by default)
+ccw cli -p "[Shared Prompt Template with artifacts]" --tool codex --mode review
+# Use for complex reviews with specific focus areas
+
+# Option B: Target flag only (no prompt allowed)
+ccw cli --tool codex --mode review --uncommitted
+# Quick review of uncommitted changes without custom instructions
+
+# ⚠️ IMPORTANT: -p prompt and target flags (--uncommitted/--base/--commit) are MUTUALLY EXCLUSIVE
 ```
 
 **Multi-Round Review with Fixed IDs**:
diff --git a/.claude/commands/workflow/lite-plan.md b/.claude/commands/workflow/lite-plan.md
index ac925c38..7388c41e 100644
--- a/.claude/commands/workflow/lite-plan.md
+++ b/.claude/commands/workflow/lite-plan.md
@@ -526,7 +526,7 @@ AskUserQuestion({
       multiSelect: false,
       options: [
         { label: "Gemini Review", description: "Gemini CLI review" },
-        { label: "Codex Review", description: "codex review --uncommitted" },
+        { label: "Codex Review", description: "Git-aware review (prompt OR --uncommitted)" },
         { label: "Agent Review", description: "@code-reviewer agent" },
         { label: "Skip", description: "No review" }
       ]