Mike/ralpi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: review fires for all tasks — commit then review committed diff, merge on pass

Browse Source 
Previous flow reviewed uncommitted changes, so when a task agent
self-committed its work the review was silently skipped (no uncommitted
changes → review loop body never entered). This caused reviews to fire
inconsistently across tasks.

New review-gated flow (when autoReview is on):
1. Execute task
2. Ensure committed — commit session fallback when the agent didn't
   self-commit (handles both self-commit and no-commit agents)
3. Review the COMPLETE task diff (baseRef..HEAD) captured before
   execution, so the reviewer sees all commits not just the latest
4. On fail → re-execute with feedback → commit → re-review (same
   baseRef, so reviewer sees complete state including fixes)
5. On pass → merge worktree (all changes already committed)

Commit is now mandated when autoReview is on (autoCommit forced true,
not asked at startup). autoCommit only asked when autoReview is off.

Add captureGitHead + getCommitRangeDiff helpers to utils.ts. Switch
review prompt from buildReviewPromptUncommitted to buildReviewPrompt
(reviewing committed changes, not uncommitted).
This commit is contained in:
Michael Freno
2026-07-22 18:29:29 -04:00
parent 0ef540ed47
commit 74c9ead7af
5 changed files with 200 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
index.ts
View File

@@ -123,10 +123,10 @@ function buildPlanByMode(
/**
* Prompt the user to select auto-review and auto-commit options for this loop.
* Reviews are asked about FIRST, then commits — so the user can opt into a
* review gate (review changes, loop on fail) and decide whether a passing
* review should commit. Fields explicitly set in the config YAML are
* skipped (no prompt).
* Reviews are asked about FIRST. When autoReview is on, commit is always
* mandated (it happens before review) — so autoCommit is forced true and not
* asked about. When autoReview is off, autoCommit is asked as a stand-alone
* toggle. Fields explicitly set in the config YAML are skipped (no prompt).
* Returns the selected options (or config defaults if cancelled).
*/
async function selectLoopOptions(
@@ -136,17 +136,16 @@ async function selectLoopOptions(
const explicit = config.execution.explicitKeys;
// ── 1. Auto-review (asked FIRST) ──
// When enabled, a review gate runs BEFORE the commit: uncommitted changes
// are reviewed, and on a "fail" verdict the task is re-executed with the
// review feedback injected (looping until pass or maxReviewRetries is
// exhausted). Only then does the commit session run (when autoCommit is
// also enabled).
// When enabled, a commit is mandated before review (the task agent's
// changes are committed, then the complete diff is reviewed). On 'fail'
// the task is re-executed with review feedback (looping until pass or
// maxReviewRetries exhausted). On pass the worktree merges.
let autoReview: boolean;
if (explicit?.has("autoReview")) {
autoReview = config.execution.autoReview;
} else {
const reviewChoice = await ctx.ui.select("Auto-review after each task?", [
"Yes — review changes and loop on failures (re-execute until pass)",
"Yes — review the task commit and loop on failures (re-execute until pass)",
"No — skip review",
]);
autoReview = reviewChoice
@@ -173,24 +172,15 @@ async function selectLoopOptions(
}
}
// ── 3. Auto-commit (asked AFTER review) ──
// When review is enabled, this gates whether the changes are committed
// after a passing review (or after retries exhaust). When review is
// disabled, this is a stand-alone "commit per task" toggle.
// ── 3. Auto-commit ──
// When autoReview is on, commit is always mandated (it happens before the
// review). autoCommit is forced true and not asked about. When review is
// disabled, autoCommit is asked as a stand-alone "commit per task" toggle.
let autoCommit: boolean;
if (explicit?.has("autoCommit")) {
if (autoReview) {
autoCommit = true; // mandated by the review-gated flow
} else if (explicit?.has("autoCommit")) {
autoCommit = config.execution.autoCommit;
} else if (autoReview) {
const commitChoice = await ctx.ui.select(
"Auto-commit after a passing review?",
[
"Yes — commit changes once the review passes",
"No — leave changes uncommitted after review",
],
);
autoCommit = commitChoice
? commitChoice.startsWith("Yes")
: config.execution.autoCommit;
} else {
const commitChoice = await ctx.ui.select("Auto-commit after each task?", [
"Yes — stage and commit changes automatically",