catlog22/Claude-Code-Workflow
1
0
Fork 0
mirror of https://github.com/catlog22/Claude-Code-Workflow.git synced 2026-02-27 09:13:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(cli): add conflict detection for codex review prompt + target flags

Browse Source 
When both prompt and target flags (--uncommitted/--base/--commit) are
provided together for codex review mode, warn user and drop the prompt
to avoid CLI argument conflict error.
This commit is contained in:
catlog22
2026-02-23 22:54:41 +08:00
parent 64d0d0b9d1
commit ab0e25895c
1 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
ccw/src/commands/cli.ts
View File

@@ -686,6 +686,21 @@ 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'));
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) {
console.error(chalk.red('Error: Prompt is required'));
console.error(chalk.gray('Usage: ccw cli -p "<prompt>" --tool gemini'));