fix: update conflict detection logic for codex review mode in execAction

Author: catlog22

ccw/src/commands/cli.ts

@@ -698,23 +698,22 @@ async function execAction(positionalPrompt: string | undefined, options: CliExec
 
   // Prompt is required unless resuming OR using review mode with target flags
   // codex review: --uncommitted, --base, --commit don't require a prompt
-  const isReviewWithTarget = mode === 'review' && (uncommitted || base || commit);
-
-  // Conflict detection: prompt + review target flags are mutually exclusive
-  // When both provided, warn user and prioritize target flag (drop prompt)
-  if (isReviewWithTarget && finalPrompt && tool === 'codex') {
-    const targetFlag = uncommitted ? '--uncommitted' : (base ? `--base ${base}` : `--commit ${commit}`);
-    console.log(chalk.yellow('Warning: Prompt is ignored when review target flag is specified'));
+  // Codex review mode: prompt is always incompatible because codex exec review
+  // defaults to --uncommitted which conflicts with prompt/stdin input.
+  const isCodexReview = mode === 'review' && tool === 'codex';
+
+  // Conflict detection: codex review mode is incompatible with prompts
+  // codex exec review always uses a target (--uncommitted by default) which conflicts with prompt input
+  if (isCodexReview && finalPrompt) {
+    const targetFlag = uncommitted ? '--uncommitted' : (base ? `--base ${base}` : (commit ? `--commit ${commit}` : '--uncommitted (default)'));
+    console.log(chalk.yellow('Warning: Prompt is ignored in codex review mode'));
     console.log(chalk.gray(`  Using: ${targetFlag} (prompt will be dropped)`));
-    console.log(chalk.gray('  Valid combinations:'));
-    console.log(chalk.gray('    • ccw cli -p "..." --tool codex --mode review           # prompt only'));
-    console.log(chalk.gray('    • ccw cli --tool codex --mode review --uncommitted       # target only'));
     console.log();
     // Drop prompt to avoid codex CLI argument conflict
     finalPrompt = undefined;
   }
 
-  if (!finalPrompt && !resume && !isReviewWithTarget) {
+  if (!finalPrompt && !resume && !isCodexReview) {
     console.error(chalk.red('Error: Prompt is required'));
     console.error(chalk.gray('Usage: ccw cli -p "<prompt>" --tool gemini'));
     console.error(chalk.gray('   or: ccw cli -f prompt.txt --tool codex'));
@@ -729,7 +728,7 @@ async function execAction(positionalPrompt: string | undefined, options: CliExec
   // Skip template loading when using target flags with codex review
   // codex review: --uncommitted, --base, --commit are all mutually exclusive with [PROMPT]
   // Default to universal-rigorous-style if --rule not specified
-  const skipTemplates = mode === 'review' && (uncommitted || base || commit);
+  const skipTemplates = isCodexReview;
   const effectiveRule = rule || 'universal-rigorous-style';
   let systemRules = '';  // Protocol content
   let roles = '';        // Template content