@magnusekdahl/parallix 1.3.2 → 1.3.4

package/lib/review/review-loop.ts

@@ -8,7 +8,8 @@ import * as fs from 'fs';
 import * as path from 'path';
 import * as fmt from '../core/fmt.js';
 import { git, run } from '../core/git.js';
-import { findMissionDir, resolveWorktree, missionBranchName } from '../core/mission-utils.js';
+import { findMissionDir, findMissionArea, resolveWorktree, missionBranchName, getPrimaryBranch } from '../core/mission-utils.js';
+import { formatVerificationCommand } from '../core/verification.js';
 import { resolveTaskFile, getTaskImplementer, getTaskStatus, enforceTaskAssignee, transitionTask, reportTaskResolution } from '../tools/backlog.js';
 import { toVirtual, transitionVirtual } from '../core/state-map.js';
 import { getPrStatus, readToken, getLatestReviewForPr, getLatestDispositionForPr, providerAvailable, getComments, postComment, postReview, resolveReviewUser, isProviderEnabled } from './review-adapter.js';
@@ -98,8 +99,8 @@ export function recordStageStatsSafe(
     reviewer?: string;
     result?: Record<string, any>;
     sinceMs?: number;
-    log?: (msg: string) => void;
-    error?: (msg: string) => void;
+    log?: (_msg: string) => void;
+    error?: (_msg: string) => void;
     state?: Record<string, any>;
     writeReviewStateFn?: typeof writeReviewState;
     model?: string | null;
@@ -149,7 +150,7 @@ const _require = createRequire(__filename);
 
 export function maybeUpdateGraphifyBeforeReview(
   rootDir: string,
-  { commandRunner = run, log = fmt.log.plain }: { commandRunner?: typeof run; log?: (msg: string) => void } = {}
+  { commandRunner = run, log = fmt.log.plain }: { commandRunner?: typeof run; log?: (_msg: string) => void } = {}
 ): unknown {
   // Lazy require to break circular dependency with core/mission-utils
   const { updateGraphifyKnowledgeGraph } = _require('../core/mission-utils.js');
@@ -180,7 +181,7 @@ export function applyAgentFallback(opts: {
   slug: string;
   worktree?: string;
   taskResolution?: Record<string, any>;
-  log?: (msg: string) => void;
+  log?: (_msg: string) => void;
   writeReviewStateFn?: typeof writeReviewState;
   enforceTaskAssigneeFn?: typeof enforceTaskAssignee;
 }): string {
@@ -208,7 +209,7 @@ export function persistNormalizedPhaseRepair(
   slug: string,
   state: ReviewState,
   worktree: string,
-  { log = fmt.log.plain, writeReviewStateFn = writeReviewState }: { log?: (msg: string) => void; writeReviewStateFn?: typeof writeReviewState } = {}
+  { log = fmt.log.plain, writeReviewStateFn = writeReviewState }: { log?: (_msg: string) => void; writeReviewStateFn?: typeof writeReviewState } = {}
 ): void {
   if (!state || !state.phaseOriginal || (VALID_PHASES as readonly string[]).includes(state.phaseOriginal)) {
     return;
@@ -237,6 +238,245 @@ export function stageLaunchSinceMs(result: { startedAt?: string } | null | undef
   return Number.isFinite(startedMs) ? startedMs : 0;
 }
 
+// ============================================================================
+// Pre-review Gate Enforcement (ADR 0048 Control C1 / TASK-1385)
+// ============================================================================
+
+// Minimal error classifier stub for gate failures (TASK-1389 dependency).
+// Maps gate failures to Class 6: genuine gate failure — code issue, dispatch: auto-send-back.
+// TASK-1389 will replace this with the full 8-class dispatch table.
+const GATE_FAILURE_CLASS = 'class-6-genuine-gate-failure';
+const GATE_FAILURE_ACTION = 'auto-send-back';
+
+export function classifyGateFailure(_output: string): { classification: string; action: string; isRelaunchable: boolean } {
+  // Gate failures are genuine code issues — always relaunchable via auto-send-back.
+  // The full classifier (TASK-1389) will expand this to 8 classes with nuanced dispatch.
+  return {
+    classification: GATE_FAILURE_CLASS,
+    action: GATE_FAILURE_ACTION,
+    isRelaunchable: true,
+  };
+}
+
+export interface PreReviewGateResult {
+  ok: boolean;
+  area: string;
+  command: string;
+  exitCode: number | null;
+  stdout: string;
+  stderr: string;
+  error?: string;
+}
+
+/**
+ * Run the verification gate with the mission area before a review round.
+ * Captures stdout/stderr for use in auto-bounce fix prompts.
+ */
+export async function runPreReviewGate(
+  slug: string,
+  worktree: string,
+  opts: {
+    findMissionAreaFn?: typeof findMissionArea;
+    runFn?: typeof run;
+    log?: (_msg: string) => void;
+    error?: (_msg: string) => void;
+  } = {}
+): Promise<PreReviewGateResult> {
+  const {
+    findMissionAreaFn = findMissionArea,
+    runFn: runFnOverride = run,
+    log = fmt.log.plain,
+    error = fmt.log.plainError,
+  } = opts;
+
+  const missionDir = findMissionDir(slug, worktree);
+  const area = missionDir ? findMissionAreaFn(missionDir) : 'docs';
+  const command = formatVerificationCommand(area, worktree);
+
+  if (command === NO_GATE_NOTICE_ALIAS) {
+    log(fmt.status('INFO', `No verification gate configured for area ${area}; skipping pre-review gate check.`));
+    return { ok: true, area, command, exitCode: 0, stdout: '', stderr: '' };
+  }
+
+  log(fmt.status('INFO', `Pre-review gate for area "${area}": ${fmt.command(command)}`));
+
+  // Run with pipe mode to capture output for auto-bounce fix prompts.
+  const result = runFnOverride('bash', ['-lc', command], {
+    cwd: worktree,
+    stdio: 'pipe',
+    maxBuffer: 10 * 1024 * 1024, // 10MB buffer
+  });
+
+  const stdout = typeof result.stdout === 'string' ? result.stdout : '';
+  const stderr = typeof result.stderr === 'string' ? result.stderr : '';
+
+  if (result.status !== 0) {
+    error(fmt.status('FAIL', `Pre-review gate failed for area "${area}" (exit ${result.status}).`));
+    if (stderr) {
+      error(`  stderr: ${stderr.split('\n').slice(0, 10).join('\n  ')}`);
+    }
+    return {
+      ok: false,
+      area,
+      command,
+      exitCode: result.status,
+      stdout,
+      stderr,
+      error: `verification gate failed with exit code ${result.status}`,
+    };
+  }
+
+  log(fmt.status('PASS', `Pre-review gate passed for area "${area}".`));
+  return { ok: true, area, command, exitCode: 0, stdout, stderr };
+}
+
+const NO_GATE_NOTICE_ALIAS = ': # no verification gate configured (set adapters.verification.command)';
+
+/**
+ * Handle a pre-review gate failure by auto-bouncing to the implementer.
+ * Does NOT consume a reviewer cycle or transition the task out of review status.
+ * Tracks retry count in review state metadata.
+ * Returns true if bounced, false if retry limit exceeded (mission strands).
+ */
+export async function handleGateFailureAutoBounce(
+  slug: string,
+  worktree: string,
+  gateResult: PreReviewGateResult,
+  implementer: string,
+  opts: {
+    startAgentFn?: typeof startAgent;
+    writeReviewStateFn?: typeof writeReviewState;
+    readReviewStateFn?: typeof readReviewState;
+    transitionTaskFn?: typeof transitionTask;
+    applyAgentFallbackFn?: typeof applyAgentFallback;
+    taskResolution?: { ok: boolean; taskFile?: string };
+    enforceTaskAssigneeFn?: typeof enforceTaskAssignee;
+    log?: (_msg: string) => void;
+    error?: (_msg: string) => void;
+    sleepFn?: typeof delay;
+    buildCompactActOnReviewPromptFn?: typeof buildCompactActOnReviewPrompt;
+    isForgejoReviewEnabledFn?: ((_rootDir?: string) => boolean) | null;
+    isReviewProviderEnabledFn?: ((_rootDir?: string) => boolean) | null;
+    legacyIsForgejoReviewEnabledFn?: ((_rootDir?: string) => boolean) | null;
+    exit?: (_code: number) => never;
+  } = {}
+): Promise<{ bounced: boolean; stranded: boolean }> {
+  const {
+    startAgentFn = startAgent,
+    writeReviewStateFn = writeReviewState,
+    readReviewStateFn = readReviewState,
+    transitionTaskFn = transitionTask,
+    applyAgentFallbackFn = applyAgentFallback,
+    taskResolution,
+    enforceTaskAssigneeFn,
+    log = fmt.log.plain,
+    error = fmt.log.plainError,
+    sleepFn: _sleepFn = delay,
+    buildCompactActOnReviewPromptFn: _buildCompactActOnReviewPromptFn = buildCompactActOnReviewPrompt,
+    isForgejoReviewEnabledFn: _isForgejoReviewEnabledFn,
+    isReviewProviderEnabledFn: _isReviewProviderEnabledFn,
+    legacyIsForgejoReviewEnabledFn: _legacyIsForgejoReviewEnabledFn,
+    exit: _exit = process.exit,
+  } = opts;
+
+  const MAX_GATE_RETRY = 2;
+
+  // Read persisted state to get current retry count
+  const persisted = readReviewStateFn(slug, worktree);
+  const retryCount = persisted && persisted.metadata && typeof persisted.metadata === 'object'
+    ? (Number((persisted.metadata as any).gateFailureRetryCount) || 0)
+    : 0;
+
+  if (retryCount >= MAX_GATE_RETRY) {
+    error(fmt.status('FAIL', `Pre-review gate failure: max retries exceeded (${MAX_GATE_RETRY}). Mission stranded for ${slug}.`));
+    error(fmt.status('FAIL', `Area "${gateResult.area}" verification failed ${retryCount} times. Human intervention required.`));
+    error(fmt.status('FAIL', `Gate output:\n${gateResult.stdout || gateResult.stderr || '(no output)'}\n`));
+    return { bounced: false, stranded: true };
+  }
+
+  // Classify the failure
+  const combinedOutput = gateResult.stderr || gateResult.stdout || 'Gate failed with exit code ' + gateResult.exitCode;
+  const classification = classifyGateFailure(combinedOutput);
+
+  log(fmt.status('WARN', `Pre-review gate failed for area "${gateResult.area}" (exit ${gateResult.exitCode}). Classification: ${classification.classification}.`));
+
+  // Build fix prompt with captured gate output
+  const fixPrompt = [
+    `PRE-REVIEW GATE FAILURE — FIX REQUIRED`,
+    ``,
+    `Mission: ${slug}`,
+    `Area: ${gateResult.area}`,
+    `Gate command: ${gateResult.command}`,
+    `Exit code: ${gateResult.exitCode}`,
+    ``,
+    `Gate output (use this to diagnose and fix):`,
+    `---`,
+    gateResult.stdout || '(no stdout)',
+    `---`,
+    gateResult.stderr || '(no stderr)',
+    `---`,
+    ``,
+    `Classification: ${classification.classification} — ${classification.action}`,
+    `Retry attempt: ${retryCount + 1}/${MAX_GATE_RETRY}`,
+    ``,
+    `Fix the underlying issue so the verification gate passes for area "${gateResult.area}".`,
+    `After fixing, the review loop will re-run the gate before the next review round.`,
+  ].join('\n');
+
+  // Increment retry count in metadata
+  if (!persisted || !persisted.metadata || typeof persisted.metadata !== 'object') {
+    // Create new metadata
+  }
+  const metadata = persisted && persisted.metadata && typeof persisted.metadata === 'object'
+    ? { ...persisted.metadata }
+    : {};
+  metadata.gateFailureRetryCount = retryCount + 1;
+
+  // Update review state with incremented retry count
+  if (persisted) {
+    const updatedState = { ...persisted, metadata };
+    writeReviewStateFn(slug, updatedState as any, worktree);
+  } else {
+    writeReviewStateFn(slug, { metadata } as any, worktree);
+  }
+
+  // Transition task back to active (implementer phase) without consuming reviewer cycle
+  transitionTaskFn(slug, 'active', { rootDir: worktree, log });
+  log(fmt.status('INFO', `Auto-bouncing to implementer (${implementer}) with fix prompt. Retry ${retryCount + 1}/${MAX_GATE_RETRY}.`));
+
+  // Launch implementer with the fix prompt
+  try {
+    const launchResult = await startAgentFn('act-on-review', {
+      agent: implementer,
+      prompt: (_actualImplementer: string) => fixPrompt,
+      worktree,
+      slug,
+      role: 'implementer',
+      exclude: [],
+    });
+
+    // Apply any agent fallback if needed
+    implementer = applyAgentFallbackFn({
+      role: 'implementer',
+      original: implementer,
+      launchResult,
+      state: persisted || {},
+      slug,
+      worktree,
+      taskResolution,
+      log,
+      writeReviewStateFn,
+      enforceTaskAssigneeFn,
+    });
+  } catch (err: unknown) {
+    error(fmt.status('FAIL', `Could not relaunch implementer (${implementer}) for gate failure auto-bounce: ${(err as Error).message}`));
+    return { bounced: false, stranded: true };
+  }
+
+  log(fmt.status('INFO', `Implementer (${implementer}) relaunched with gate failure fix prompt.`));
+  return { bounced: true, stranded: false };
+}
+
 // ============================================================================
 // Main Review Loop
 // ============================================================================
@@ -267,12 +507,12 @@ export async function startReviewLoop(slug: string, opts: {
   buildAutonomousReviewMatrixFn?: typeof buildAutonomousReviewMatrix;
   formatMatrixSummaryFn?: typeof formatMatrixSummary;
   selectAgentFn?: typeof selectAgent;
-  providerAvailableFn?: ((url: string) => Promise<boolean>) | null | undefined;
+  providerAvailableFn?: ((_url: string) => Promise<boolean>) | null | undefined;
   runFn?: typeof run;
   getPrStatusFn?: typeof getPrStatus;
   enforceTaskAssigneeFn?: typeof enforceTaskAssignee;
   resolveReviewUserFn?: (() => string) | null | undefined;
-  forgejoAvailableFn?: ((url: string) => Promise<boolean>) | null;
+  forgejoAvailableFn?: ((_url: string) => Promise<boolean>) | null;
   resolveForgejoUserFn?: (() => string) | null;
   readTokenFn?: typeof readToken;
   getCommentsFn?: typeof getComments;
@@ -291,18 +531,20 @@ export async function startReviewLoop(slug: string, opts: {
   consumeImplementerArtifactsFn?: typeof consumeImplementerArtifacts;
   rebaseBeforeReviewRoundFn?: typeof rebaseBeforeReviewRound;
   eligibleAgentsForStepFn?: typeof eligibleAgentsForStep;
-  performHandoffFn?: (slug: string, opts?: Record<string, unknown>) => Promise<Record<string, unknown>>;
-  log?: (msg: string) => void;
-  error?: (msg: string) => void;
+  performHandoffFn?: (_slug: string, _opts?: Record<string, unknown>) => Promise<Record<string, unknown>>;
+  log?: (_msg: string) => void;
+  error?: (_msg: string) => void;
   getLatestReviewForPrFn?: typeof getLatestReviewForPr;
   getLatestDispositionForPrFn?: typeof getLatestDispositionForPr;
   sleepFn?: typeof delay;
-  exit?: (code: number) => never;
+  exit?: (_code: number) => never;
   gitFn?: typeof git;
-  isReviewProviderEnabledFn?: ((rootDir?: string) => boolean) | null | undefined;
-  legacyIsForgejoReviewEnabledFn?: ((rootDir?: string) => boolean) | null;
-  isForgejoReviewEnabledFn?: ((rootDir?: string) => boolean) | null;
-  recordStageStatsSafeFn?: (...args: any[]) => void;
+  isReviewProviderEnabledFn?: ((_rootDir?: string) => boolean) | null | undefined;
+  legacyIsForgejoReviewEnabledFn?: ((_rootDir?: string) => boolean) | null;
+  isForgejoReviewEnabledFn?: ((_rootDir?: string) => boolean) | null;
+  recordStageStatsSafeFn?: (..._args: any[]) => void;
+  runPreReviewGateFn?: typeof runPreReviewGate;
+  handleGateFailureAutoBounceFn?: typeof handleGateFailureAutoBounce;
 } = {}): Promise<void> {
   let {
     implementer,
@@ -317,6 +559,8 @@ export async function startReviewLoop(slug: string, opts: {
     pollTimeoutSeconds = null,
     worktree: callerWorktree,
     missionPath,
+    runPreReviewGateFn = runPreReviewGate,
+    handleGateFailureAutoBounceFn = handleGateFailureAutoBounce,
     resetReviewStateFn = resetReviewState,
     maybeUpdateGraphifyBeforeReviewFn = maybeUpdateGraphifyBeforeReview,
     readReviewStateFn = readReviewState,
@@ -741,6 +985,30 @@ export async function startReviewLoop(slug: string, opts: {
       state.advanceRound();
     }
 
+    // Snapshot the primary branch's HEAD commit for this round. This is a
+    // fallback value only, used for paths that don't rebase this round (a
+    // dry run, or resuming with an existing reviewState): once
+    // rebaseBeforeReviewRoundFn runs below, HEAD is rebased onto primary's
+    // *current* tip, so the baseline is re-captured immediately after the
+    // rebase completes (see below). Capturing it here, before the rebase,
+    // would pin the diff to a stale pre-rebase SHA; since rebase replays
+    // primary's newer commits into HEAD's ancestry, diffing against that
+    // stale SHA would surface exactly the "not rebased to main" noise this
+    // baseline exists to suppress (task-1407).
+    // Falls back to undefined (letting the prompt builders resolve the live
+    // primary branch ref themselves) if the primary branch cannot be detected,
+    // e.g. in a repo with no main/master branch yet.
+    const captureReviewBaseline = (): string | undefined => {
+      try {
+        const primaryBranchName = getPrimaryBranch(worktree, gitFn);
+        const reviewBaselineResult = gitFn(['-C', worktree, 'rev-parse', primaryBranchName]);
+        return (reviewBaselineResult.stdout || '').trim() || primaryBranchName;
+      } catch {
+        return undefined;
+      }
+    };
+    let reviewBaseline: string | undefined = captureReviewBaseline();
+
     let reviewState: unknown;
 
     if (state.phase === 'reviewing') {
@@ -770,7 +1038,7 @@ export async function startReviewLoop(slug: string, opts: {
             log(fmt.status('INFO', `Round ${attempt}: reviewer identity is autonomous; skipping dry-run reviewer prompt and using local review artifacts only.`));
           } else {
             log(`\n--- DRY-RUN: reviewer (${reviewer}) prompt ---`);
-            log((buildReviewPromptFn as any)({ reviewer: reviewer!, branch, implementer: implementer!, focus, attempt, repoRoot: worktree, missionPath: effectiveMissionPath || undefined, actualReviewer: '{{AGENT_NAME}}' }));
+            log((buildReviewPromptFn as any)({ reviewer: reviewer!, branch, implementer: implementer!, focus, attempt, repoRoot: worktree, missionPath: effectiveMissionPath || undefined, actualReviewer: '{{AGENT_NAME}}', reviewBaseline }));
           }
         }
       } else {
@@ -784,9 +1052,57 @@ export async function startReviewLoop(slug: string, opts: {
           });
           if (!rebaseResult.ok) { exit(1); return; }
 
+          // Re-capture after rebase: HEAD is now rebased onto primary's tip,
+          // so the pre-rebase snapshot above is stale and must be replaced
+          // with the SHA that HEAD was actually rebased onto (task-1407).
+          reviewBaseline = captureReviewBaseline();
+
           if (!dryRun) { transitionTaskFn(slug, 'review', { rootDir: worktree, log }); }
           state.phase = 'reviewing';
           writeReviewStateFn(slug, state, worktree);
+
+          // Pre-review gate enforcement (ADR 0048 Control C1 / TASK-1385):
+          // Run the verification gate before the reviewer launches. On failure,
+          // auto-bounce to the implementer with captured gate output as fix prompt.
+          // No reviewer cycle is consumed when the gate fails and auto-bounce occurs.
+          if (!dryRun) {
+            const preReviewGateResult = await runPreReviewGateFn(slug, worktree, {
+              runFn: runFn as any,
+              log,
+              error,
+            });
+            if (!preReviewGateResult.ok) {
+              log(fmt.status('WARN', `Pre-review gate failed for area "${preReviewGateResult.area}" (exit ${preReviewGateResult.exitCode}). Auto-bouncing to implementer.`));
+              const bounceResult = await handleGateFailureAutoBounceFn(slug, worktree, preReviewGateResult, implementer, {
+                startAgentFn: startAgentFn,
+                writeReviewStateFn: writeReviewStateFn,
+                readReviewStateFn: readReviewStateFn,
+                transitionTaskFn: transitionTaskFn,
+                applyAgentFallbackFn: applyAgentFallbackFn,
+                taskResolution,
+                enforceTaskAssigneeFn,
+                log,
+                error,
+                sleepFn,
+                buildCompactActOnReviewPromptFn,
+                isForgejoReviewEnabledFn,
+                isReviewProviderEnabledFn,
+                legacyIsForgejoReviewEnabledFn,
+                exit,
+              });
+              if (bounceResult.stranded) {
+                error(fmt.status('FAIL', `Pre-review gate failure stranded mission ${slug}. Exiting review loop.`));
+                exit(1); return;
+              }
+              if (bounceResult.bounced) {
+                log(fmt.status('INFO', `Auto-bounce succeeded. Continuing to next round.`));
+                continue;
+              }
+            } else {
+              log(fmt.status('PASS', `Pre-review gate passed for area "${preReviewGateResult.area}".`));
+            }
+          }
+
           if (reviewer === 'autonomous' && !forgejoEnabled) {
             log(fmt.status('INFO', `Round ${attempt}: reviewer identity is autonomous; skipping reviewer launch and using local review artifacts only.`));
           } else {
@@ -796,7 +1112,7 @@ export async function startReviewLoop(slug: string, opts: {
             try {
               reviewerLaunchResult = await startAgentFn('review', {
                 agent: reviewer,
-                prompt: (actualReviewer: string) => (buildCompactReviewPromptFn as any)({ reviewer: reviewer!, branch, implementer: implementer!, focus, attempt, repoRoot: worktree, missionPath: effectiveMissionPath || undefined, actualReviewer }),
+                prompt: (actualReviewer: string) => (buildCompactReviewPromptFn as any)({ reviewer: reviewer!, branch, implementer: implementer!, focus, attempt, repoRoot: worktree, missionPath: effectiveMissionPath || undefined, actualReviewer, reviewBaseline }),
                 worktree, slug, role: 'reviewer', exclude: [implementer]
               });
             } catch (err: unknown) {
@@ -861,7 +1177,7 @@ export async function startReviewLoop(slug: string, opts: {
             try {
               relaunchResult = await startAgentFn('review', {
                 agent: reviewer,
-                prompt: (actualReviewer: string) => (buildCompactReviewPromptFn as any)({ reviewer: reviewer!, branch, implementer: implementer!, focus, attempt, repoRoot: worktree, missionPath: effectiveMissionPath || undefined, actualReviewer }) + '\n\n' + recoveryPrompt,
+                prompt: (actualReviewer: string) => (buildCompactReviewPromptFn as any)({ reviewer: reviewer!, branch, implementer: implementer!, focus, attempt, repoRoot: worktree, missionPath: effectiveMissionPath || undefined, actualReviewer, reviewBaseline }) + '\n\n' + recoveryPrompt,
                 worktree, slug, role: 'reviewer', exclude: [implementer]
               });
             } catch (err: unknown) {
@@ -998,7 +1314,7 @@ export async function startReviewLoop(slug: string, opts: {
       // First launch or re-launch after stale BLOCKED/PARKED
       if (dryRun) {
         log(`\n--- DRY-RUN: implementer (${implementer}) act-on-review prompt ---`);
-        log((buildActOnReviewPromptFn as any)({ implementer: implementer!, branch, attempt, repoRoot: worktree, missionPath: effectiveMissionPath || undefined, actualImplementer: '{{AGENT_NAME}}' }));
+        log((buildActOnReviewPromptFn as any)({ implementer: implementer!, branch, attempt, repoRoot: worktree, missionPath: effectiveMissionPath || undefined, actualImplementer: '{{AGENT_NAME}}', reviewBaseline }));
         if (reLaunch!) {
           log(fmt.status('INFO', `Round ${attempt}: stale BLOCKED/PARKED disposition replaced by fresh implementer action.`));
         }
@@ -1016,7 +1332,7 @@ export async function startReviewLoop(slug: string, opts: {
         try {
           implementerLaunchResult = await startAgentFn('act-on-review', {
             agent: implementer,
-            prompt: (actualImplementer: string) => (buildCompactActOnReviewPromptFn as any)({ implementer: implementer!, branch, attempt, reviewOutcome: reviewState, repoRoot: worktree, missionPath: effectiveMissionPath || undefined, actualImplementer }),
+            prompt: (actualImplementer: string) => (buildCompactActOnReviewPromptFn as any)({ implementer: implementer!, branch, attempt, reviewOutcome: reviewState, repoRoot: worktree, missionPath: effectiveMissionPath || undefined, actualImplementer, reviewBaseline }),
             worktree, slug, role: 'implementer', exclude: [reviewer]
           });
         } catch (err: unknown) {
@@ -1078,7 +1394,7 @@ export async function startReviewLoop(slug: string, opts: {
           try {
             relaunchResult = await startAgentFn('act-on-review', {
               agent: implementer,
-              prompt: (actualImplementer: string) => (buildCompactActOnReviewPromptFn as any)({ implementer: implementer!, branch, attempt, reviewOutcome: reviewState, repoRoot: worktree, missionPath: effectiveMissionPath || undefined, actualImplementer }) + '\n\n' + recoveryPrompt,
+              prompt: (actualImplementer: string) => (buildCompactActOnReviewPromptFn as any)({ implementer: implementer!, branch, attempt, reviewOutcome: reviewState, repoRoot: worktree, missionPath: effectiveMissionPath || undefined, actualImplementer, reviewBaseline }) + '\n\n' + recoveryPrompt,
               worktree, slug, role: 'implementer', exclude: [reviewer]
             });
           } catch (err: unknown) {

package/lib/review/review-polling.ts

@@ -64,14 +64,14 @@ async function pollForReview(
   sinceIso: string,
   token: string,
   options: {
-    getLatestReviewForPrFn?: (prNumber: number, reviewerUser: string, sinceIso: string, token: string) => Promise<unknown>;
-    sleepFn?: (ms: number) => Promise<void>;
+    getLatestReviewForPrFn?: (_prNumber: number, _reviewerUser: string, _sinceIso: string, _token: string) => Promise<unknown>;
+    sleepFn?: (_ms: number) => Promise<void>;
     intervalMs?: number;
     timeoutMs?: number;
     verbose?: boolean;
     label?: string;
     retryCount?: number;
-    log?: (msg: string) => void;
+    log?: (_msg: string) => void;
   } = {}
 ): Promise<string | typeof POLL_TIMEOUT | null> {
   const {
@@ -131,14 +131,14 @@ async function pollForDisposition(
   sinceIso: string,
   token: string,
   options: {
-    getLatestDispositionForPrFn?: (prNumber: number, implementerUser: string, sinceIso: string, token: string) => Promise<unknown>;
-    sleepFn?: (ms: number) => Promise<void>;
+    getLatestDispositionForPrFn?: (_prNumber: number, _implementerUser: string, _sinceIso: string, _token: string) => Promise<unknown>;
+    sleepFn?: (_ms: number) => Promise<void>;
     intervalMs?: number;
     timeoutMs?: number;
     verbose?: boolean;
     label?: string;
     retryCount?: number;
-    log?: (msg: string) => void;
+    log?: (_msg: string) => void;
   } = {}
 ): Promise<string | typeof POLL_TIMEOUT | null> {
   const {

package/lib/review/review-prompts.js

@@ -111,7 +111,7 @@ function resolvePrimaryBranch(repoRoot) {
  * @param {{reviewer: string, branch: string, implementer: string, focus?: string, attempt: number, repoRoot?: string, missionPath?: string}} opts
  * @returns {string}
  */
-function buildReviewPrompt({ reviewer, branch, implementer, focus = 'all', attempt, repoRoot = '', missionPath: missionPathOverride }) {
+function buildReviewPrompt({ reviewer, branch, implementer, focus = 'all', attempt, repoRoot = '', missionPath: missionPathOverride, reviewBaseline }) {
     const entrypoint = reviewEntrypoint(reviewer);
     const repoLine = repoRoot ? `\noperate from repo root: ${repoRoot}` : '';
     const slug = branch.replace(/^mission\//, '');
@@ -129,6 +129,7 @@ function buildReviewPrompt({ reviewer, branch, implementer, focus = 'all', attem
         .replaceAll('{{missionPath}}', missionPath)
         .replaceAll('{{artifactDir}}', artifactDir)
         .replaceAll('{{primaryBranch}}', resolvePrimaryBranch(repoRoot))
+        .replaceAll('{{reviewBaseline}}', reviewBaseline || resolvePrimaryBranch(repoRoot))
         .replaceAll('{{review_entrypoint}}', entrypoint)
         .replaceAll('YYYY', year)
         .replaceAll('{{repo_line}}', repoLine ? repoLine.trim() + '\n- ' : '');
@@ -137,7 +138,7 @@ function buildReviewPrompt({ reviewer, branch, implementer, focus = 'all', attem
  * @param {{implementer: string, branch: string, attempt: number, repoRoot?: string, missionPath?: string}} opts
  * @returns {string}
  */
-function buildActOnReviewPrompt({ implementer, branch, attempt, repoRoot = '', missionPath: missionPathOverride }) {
+function buildActOnReviewPrompt({ implementer, branch, attempt, repoRoot = '', missionPath: missionPathOverride, reviewBaseline }) {
     const entrypoint = actOnReviewEntrypoint(implementer);
     const repoLine = repoRoot ? `\noperate from repo root: ${repoRoot}` : '';
     const slug = branch.replace(/^mission\//, '');
@@ -153,6 +154,7 @@ function buildActOnReviewPrompt({ implementer, branch, attempt, repoRoot = '', m
         .replaceAll('{{missionPath}}', missionPath)
         .replaceAll('{{artifactDir}}', artifactDir)
         .replaceAll('{{primaryBranch}}', resolvePrimaryBranch(repoRoot))
+        .replaceAll('{{reviewBaseline}}', reviewBaseline || resolvePrimaryBranch(repoRoot))
         .replaceAll('{{act_on_review_entrypoint}}', entrypoint)
         .replaceAll('YYYY', year)
         .replaceAll('{{repo_line}}', repoLine ? repoLine.trim() + '\n- ' : '');
@@ -161,7 +163,7 @@ function buildActOnReviewPrompt({ implementer, branch, attempt, repoRoot = '', m
  * @param {{reviewer: string, branch: string, implementer: string, focus?: string, attempt: number, actualReviewer?: string, repoRoot?: string, missionPath?: string}} opts
  * @returns {string}
  */
-function buildCompactReviewPrompt({ reviewer, branch, implementer, focus = 'all', attempt, actualReviewer, repoRoot = '', missionPath: missionPathOverride }) {
+function buildCompactReviewPrompt({ reviewer, branch, implementer, focus = 'all', attempt, actualReviewer, repoRoot = '', missionPath: missionPathOverride, reviewBaseline }) {
     const slug = branch.replace(/^mission\//, '');
     const finalReviewer = actualReviewer || reviewer;
     const year = (0, mission_utils_js_1.getMissionYear)(slug, repoRoot || process.cwd());
@@ -179,6 +181,7 @@ function buildCompactReviewPrompt({ reviewer, branch, implementer, focus = 'all'
         .replaceAll('{{missionPath}}', missionPath)
         .replaceAll('{{artifactDir}}', artifactDir)
         .replaceAll('{{primaryBranch}}', primaryBranch)
+        .replaceAll('{{reviewBaseline}}', reviewBaseline || primaryBranch)
         .replaceAll('YYYY', year)
         .replaceAll('{{review_entrypoint}}', reviewEntrypoint(finalReviewer));
 }
@@ -186,7 +189,7 @@ function buildCompactReviewPrompt({ reviewer, branch, implementer, focus = 'all'
  * @param {{implementer: string, branch: string, attempt: number, reviewOutcome?: string, actualImplementer?: string, repoRoot?: string, missionPath?: string}} opts
  * @returns {string}
  */
-function buildCompactActOnReviewPrompt({ implementer, branch, attempt, reviewOutcome = '?', actualImplementer, repoRoot = '', missionPath: missionPathOverride }) {
+function buildCompactActOnReviewPrompt({ implementer, branch, attempt, reviewOutcome = '?', actualImplementer, repoRoot = '', missionPath: missionPathOverride, reviewBaseline }) {
     const slug = branch.replace(/^mission\//, '');
     const finalImplementer = actualImplementer || implementer;
     const year = (0, mission_utils_js_1.getMissionYear)(slug, repoRoot || process.cwd());
@@ -202,6 +205,7 @@ function buildCompactActOnReviewPrompt({ implementer, branch, attempt, reviewOut
         .replaceAll('{{missionPath}}', missionPath)
         .replaceAll('{{artifactDir}}', artifactDir)
         .replaceAll('{{primaryBranch}}', primaryBranch)
+        .replaceAll('{{reviewBaseline}}', reviewBaseline || primaryBranch)
         .replaceAll('{{review_outcome}}', reviewOutcome)
         .replaceAll('YYYY', year)
         .replaceAll('{{act_on_review_entrypoint}}', actOnReviewEntrypoint(finalImplementer));

package/lib/review/review-prompts.ts

@@ -72,8 +72,8 @@ function resolvePrimaryBranch(repoRoot?: string): string {
  * @param {{reviewer: string, branch: string, implementer: string, focus?: string, attempt: number, repoRoot?: string, missionPath?: string}} opts
  * @returns {string}
  */
-export function buildReviewPrompt({ reviewer, branch, implementer, focus = 'all', attempt, repoRoot = '', missionPath: missionPathOverride }: {
-  reviewer: string; branch: string; implementer: string; focus?: string; attempt: number; repoRoot?: string; missionPath?: string;
+export function buildReviewPrompt({ reviewer, branch, implementer, focus = 'all', attempt, repoRoot = '', missionPath: missionPathOverride, reviewBaseline }: {
+  reviewer: string; branch: string; implementer: string; focus?: string; attempt: number; repoRoot?: string; missionPath?: string; reviewBaseline?: string;
 }): string {
   const entrypoint = reviewEntrypoint(reviewer);
   const repoLine = repoRoot ? `\noperate from repo root: ${repoRoot}` : '';
@@ -93,6 +93,7 @@ export function buildReviewPrompt({ reviewer, branch, implementer, focus = 'all'
     .replaceAll('{{missionPath}}',      missionPath)
     .replaceAll('{{artifactDir}}',      artifactDir)
     .replaceAll('{{primaryBranch}}',    resolvePrimaryBranch(repoRoot))
+    .replaceAll('{{reviewBaseline}}',   reviewBaseline || resolvePrimaryBranch(repoRoot))
     .replaceAll('{{review_entrypoint}}', entrypoint)
     .replaceAll('YYYY',                year)
     .replaceAll('{{repo_line}}',        repoLine ? repoLine.trim() + '\n- ' : '');
@@ -102,8 +103,8 @@ export function buildReviewPrompt({ reviewer, branch, implementer, focus = 'all'
  * @param {{implementer: string, branch: string, attempt: number, repoRoot?: string, missionPath?: string}} opts
  * @returns {string}
  */
-export function buildActOnReviewPrompt({ implementer, branch, attempt, repoRoot = '', missionPath: missionPathOverride }: {
-  implementer: string; branch: string; attempt: number; repoRoot?: string; missionPath?: string;
+export function buildActOnReviewPrompt({ implementer, branch, attempt, repoRoot = '', missionPath: missionPathOverride, reviewBaseline }: {
+  implementer: string; branch: string; attempt: number; repoRoot?: string; missionPath?: string; reviewBaseline?: string;
 }): string {
   const entrypoint = actOnReviewEntrypoint(implementer);
   const repoLine = repoRoot ? `\noperate from repo root: ${repoRoot}` : '';
@@ -121,6 +122,7 @@ export function buildActOnReviewPrompt({ implementer, branch, attempt, repoRoot
     .replaceAll('{{missionPath}}',             missionPath)
     .replaceAll('{{artifactDir}}',             artifactDir)
     .replaceAll('{{primaryBranch}}',           resolvePrimaryBranch(repoRoot))
+    .replaceAll('{{reviewBaseline}}',          reviewBaseline || resolvePrimaryBranch(repoRoot))
     .replaceAll('{{act_on_review_entrypoint}}', entrypoint)
     .replaceAll('YYYY',                       year)
     .replaceAll('{{repo_line}}',               repoLine ? repoLine.trim() + '\n- ' : '');
@@ -130,8 +132,8 @@ export function buildActOnReviewPrompt({ implementer, branch, attempt, repoRoot
  * @param {{reviewer: string, branch: string, implementer: string, focus?: string, attempt: number, actualReviewer?: string, repoRoot?: string, missionPath?: string}} opts
  * @returns {string}
  */
-export function buildCompactReviewPrompt({ reviewer, branch, implementer, focus = 'all', attempt, actualReviewer, repoRoot = '', missionPath: missionPathOverride }: {
-  reviewer: string; branch: string; implementer: string; focus?: string; attempt: number; actualReviewer?: string; repoRoot?: string; missionPath?: string;
+export function buildCompactReviewPrompt({ reviewer, branch, implementer, focus = 'all', attempt, actualReviewer, repoRoot = '', missionPath: missionPathOverride, reviewBaseline }: {
+  reviewer: string; branch: string; implementer: string; focus?: string; attempt: number; actualReviewer?: string; repoRoot?: string; missionPath?: string; reviewBaseline?: string;
 }): string {
   const slug = branch.replace(/^mission\//, '');
   const finalReviewer = actualReviewer || reviewer;
@@ -150,6 +152,7 @@ export function buildCompactReviewPrompt({ reviewer, branch, implementer, focus
     .replaceAll('{{missionPath}}',      missionPath)
     .replaceAll('{{artifactDir}}',      artifactDir)
     .replaceAll('{{primaryBranch}}',    primaryBranch)
+    .replaceAll('{{reviewBaseline}}',   reviewBaseline || primaryBranch)
     .replaceAll('YYYY',                year)
     .replaceAll('{{review_entrypoint}}', reviewEntrypoint(finalReviewer));
 }
@@ -158,8 +161,8 @@ export function buildCompactReviewPrompt({ reviewer, branch, implementer, focus
  * @param {{implementer: string, branch: string, attempt: number, reviewOutcome?: string, actualImplementer?: string, repoRoot?: string, missionPath?: string}} opts
  * @returns {string}
  */
-export function buildCompactActOnReviewPrompt({ implementer, branch, attempt, reviewOutcome = '?', actualImplementer, repoRoot = '', missionPath: missionPathOverride }: {
-  implementer: string; branch: string; attempt: number; reviewOutcome?: string; actualImplementer?: string; repoRoot?: string; missionPath?: string;
+export function buildCompactActOnReviewPrompt({ implementer, branch, attempt, reviewOutcome = '?', actualImplementer, repoRoot = '', missionPath: missionPathOverride, reviewBaseline }: {
+  implementer: string; branch: string; attempt: number; reviewOutcome?: string; actualImplementer?: string; repoRoot?: string; missionPath?: string; reviewBaseline?: string;
 }): string {
   const slug = branch.replace(/^mission\//, '');
   const finalImplementer = actualImplementer || implementer;
@@ -176,6 +179,7 @@ export function buildCompactActOnReviewPrompt({ implementer, branch, attempt, re
     .replaceAll('{{missionPath}}',             missionPath)
     .replaceAll('{{artifactDir}}',             artifactDir)
     .replaceAll('{{primaryBranch}}',           primaryBranch)
+    .replaceAll('{{reviewBaseline}}',          reviewBaseline || primaryBranch)
     .replaceAll('{{review_outcome}}',          reviewOutcome)
     .replaceAll('YYYY',                       year)
     .replaceAll('{{act_on_review_entrypoint}}', actOnReviewEntrypoint(finalImplementer));