@humanbased/crosscheck 0.14.0 → 0.15.0-beta.145

package/dist/commands/kickass.d.ts

@@ -1,12 +1,19 @@
+import type { Config } from '../config/schema.js';
+import type { ErrorCategory } from '../lib/logger.js';
 import type { ScanPRStatus as PRStatus, ScanResult } from '../lib/pr-status.js';
 export interface KickassOpts {
     force?: boolean;
     staleAfter?: string;
     dryRun?: boolean;
+    roundMode?: 'crazy' | 'halfcrazy';
+    timeout?: string;
+    concurrent?: number;
+    staggerMs?: number;
 }
-export type KickassAction = 'review' | 'fix' | 'recheck' | 'merge' | 'skip';
+export type KickassAction = 'review' | 'fix' | 'recheck' | 'skip';
 export type KickassSkipReason = 'fork_pr' | 'stale_signature';
-export type KickassFailureReason = 'error';
+export type KickassFailureReason = ErrorCategory;
+export type FixDeliveryMode = Config['post_review']['auto_fix']['delivery']['mode'];
 export interface PreflightItem {
     pr: PRStatus;
     action: KickassAction;
@@ -14,6 +21,7 @@ export interface PreflightItem {
     details: string[];
     explanation?: string;
     skipReason?: KickassSkipReason;
+    chainRecheck?: boolean;
 }
 export interface KickassExecutionResult {
     pr: PRStatus;
@@ -22,8 +30,15 @@ export interface KickassExecutionResult {
 }
 export interface ExecuteKickassDeps {
     getCurrentHeadSha: (item: PreflightItem) => Promise<string>;
-    dispatchRun: (item: PreflightItem) => Promise<void>;
-    dispatchMerge: (item: PreflightItem) => Promise<void>;
+    dispatchRun: (item: PreflightItem) => Promise<string | void>;
+    /** Route status messages through a custom sink (e.g. PRBoard scrollback). Defaults to console.log. */
+    log?: (msg: string) => void;
+    /** Called just before dispatchRun — use to add a board slot. */
+    onDispatchStart?: (item: PreflightItem, key: string, startedAt: number) => void;
+    /** Called after a successful dispatchRun — use to complete a board slot. */
+    onDispatchEnd?: (item: PreflightItem, key: string, startedAt: number) => void;
+    /** Called when dispatchRun throws — use to mark a board slot as failed. */
+    onDispatchFail?: (item: PreflightItem, key: string, error: unknown) => void;
 }
 export interface KickassDeps {
     loadScanResult: (options: {
@@ -32,18 +47,21 @@ export interface KickassDeps {
     }) => Promise<ScanResult>;
     pickPRs: (prs: PRStatus[]) => Promise<PRStatus[]>;
     confirm: (message: string) => Promise<boolean>;
+    getFixDeliveryMode?: () => FixDeliveryMode | Promise<FixDeliveryMode>;
     getCurrentHeadSha: (item: PreflightItem) => Promise<string>;
-    dispatchRun: (item: PreflightItem) => Promise<void>;
-    dispatchMerge: (item: PreflightItem) => Promise<void>;
+    onBeforeExecute?: () => void;
+    onAfterExecute?: () => void;
+    dispatchRun: (item: PreflightItem) => Promise<string | void>;
 }
 export declare function runKickass(opts?: KickassOpts): Promise<void>;
 export declare function runKickassWithDeps(opts: KickassOpts | undefined, deps: KickassDeps): Promise<void>;
-export declare function buildPreflightPlan(prs: PRStatus[]): PreflightItem[];
-export declare function executeKickassPlan(plan: PreflightItem[], deps: ExecuteKickassDeps): Promise<KickassExecutionResult[]>;
-export declare function printPreflight(plan: PreflightItem[]): void;
+export declare function buildPreflightPlan(prs: PRStatus[], roundMode?: 'crazy' | 'halfcrazy', fixDeliveryMode?: FixDeliveryMode): PreflightItem[];
+export declare function executeKickassPlan(plan: PreflightItem[], deps: ExecuteKickassDeps, concurrency?: number, staggerMs?: number): Promise<KickassExecutionResult[]>;
+export declare function printPreflight(plan: PreflightItem[], mergeReady?: PRStatus[]): void;
+export declare function printMergeReady(prs: PRStatus[]): void;
 export declare function summarizeExecutionResults(results: KickassExecutionResult[]): string;
 export declare function printExecutionSummary(results: KickassExecutionResult[]): void;
-export declare function buildKickassRunArgs(itemOrPR: PreflightItem | PRStatus): string[];
+export declare function buildKickassRunArgs(itemOrPR: PreflightItem | PRStatus, roundMode?: 'crazy' | 'halfcrazy', timeout?: string): string[];
 export interface CliInvocation {
     command: string;
     args: string[];

package/dist/commands/kickass.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"kickass.d.ts","sourceRoot":"","sources":["../../src/commands/kickass.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"kickass.d.ts","sourceRoot":"","sources":["../../src/commands/kickass.ts"],"names":[],"mappings":"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"}

package/dist/commands/kickass.js

@@ -5,14 +5,19 @@ import { createInterface } from 'readline/promises';
 import { fileURLToPath } from 'url';
 import { execa } from 'execa';
 import { createGithubClient } from '../github/client.js';
-import { mergePullRequest } from '../github/merge.js';
-import { getGithubToken } from '../config/loader.js';
+import { getGithubToken, loadConfig } from '../config/loader.js';
 import { parseDuration } from '../lib/durations.js';
-import { logError } from '../lib/logger.js';
+import { classifyError, logError } from '../lib/logger.js';
 import { pickPRs } from '../lib/pr-picker.js';
 import { handleScanError, loadScanResult } from './scan.js';
+import { PRBoard } from '../lib/board.js';
+import { loadWorkflow } from '../lib/workflow.js';
 export async function runKickass(opts = {}) {
-    await runKickassWithDeps(opts, defaultKickassDeps());
+    const config = loadConfig();
+    const workflow = loadWorkflow(process.cwd());
+    const board = new PRBoard();
+    board.setConfig(config, workflow);
+    await runKickassWithDeps(opts, defaultKickassDeps(opts, board));
 }
 export async function runKickassWithDeps(opts = {}, deps) {
     let staleAfterMs;
@@ -23,11 +28,38 @@ export async function runKickassWithDeps(opts = {}, deps) {
         console.error(chalk.red(`✗ ${err instanceof Error ? err.message : String(err)}`));
         process.exit(1);
     }
+    if (opts.timeout) {
+        try {
+            parseDuration(opts.timeout);
+        }
+        catch {
+            console.error(chalk.red(`✗ Invalid --timeout value "${opts.timeout}". Use a duration like 300s or 10m.`));
+            process.exit(1);
+        }
+    }
+    if (opts.concurrent !== undefined && (opts.concurrent < 0 || !Number.isInteger(opts.concurrent))) {
+        console.error(chalk.red('✗ --concurrent must be a non-negative integer (0 = one agent per selected PR)'));
+        process.exit(1);
+    }
     try {
         const scan = await deps.loadScanResult({ force: opts.force, staleAfterMs });
-        const queue = scan.prs.filter(pr => pr.freshness === 'stale' && pr.nextAction !== null);
+        // Actionable = nextAction is set and is not merge (merge not dispatched in v1).
+        // Stale PRs shown first; not-stale actionable PRs follow.
+        const queue = scan.prs
+            .filter(pr => pr.nextAction !== null && pr.nextAction !== 'merge')
+            .sort((a, b) => {
+            if (a.freshness !== b.freshness)
+                return a.freshness === 'stale' ? -1 : 1;
+            return 0;
+        });
+        const mergeReady = scan.prs.filter(pr => pr.nextAction === 'merge');
+        if (queue.length === 0 && mergeReady.length === 0) {
+            printNoActionablePRsWarning(scan.cached);
+            return;
+        }
         if (queue.length === 0) {
-            console.log(chalk.dim('No stale PRs need attention.'));
+            printMergeReady(mergeReady);
+            console.log(chalk.dim('\nNo PRs need review, fix, or recheck — all actionable work is merge-ready (manual).'));
             return;
         }
         const selected = await deps.pickPRs(queue);
@@ -35,8 +67,9 @@ export async function runKickassWithDeps(opts = {}, deps) {
             console.log(chalk.dim('No PRs selected.'));
             return;
         }
-        const plan = buildPreflightPlan(selected);
-        printPreflight(plan);
+        const fixDeliveryMode = deps.getFixDeliveryMode ? await deps.getFixDeliveryMode() : 'pull_request';
+        const plan = buildPreflightPlan(selected, opts.roundMode, fixDeliveryMode);
+        printPreflight(plan, mergeReady);
         if (opts.dryRun) {
             console.log(chalk.dim('\ndry-run: no mutations executed'));
             return;
@@ -46,7 +79,17 @@ export async function runKickassWithDeps(opts = {}, deps) {
             console.log(chalk.dim('Canceled.'));
             return;
         }
-        const results = await executeKickassPlan(plan, deps);
+        // 0 = one agent per selected PR; undefined/1 = sequential
+        const resolvedConcurrency = opts.concurrent === 0
+            ? selected.length
+            : Math.max(1, opts.concurrent ?? 1);
+        const resolvedStagger = resolvedConcurrency > 1 ? (opts.staggerMs ?? 2_000) : 0;
+        if (resolvedConcurrency > 1) {
+            console.log(chalk.dim(`\n  running ${resolvedConcurrency} agents in parallel (${resolvedStagger}ms stagger)`));
+        }
+        deps.onBeforeExecute?.();
+        const results = await executeKickassPlan(plan, deps, resolvedConcurrency, resolvedStagger);
+        deps.onAfterExecute?.();
         printExecutionSummary(results);
         if (results.some(result => result.status === 'failed')) {
             process.exitCode = 2;
@@ -56,7 +99,9 @@ export async function runKickassWithDeps(opts = {}, deps) {
         handleScanError('kickass', err);
     }
 }
-export function buildPreflightPlan(prs) {
+export function buildPreflightPlan(prs, roundMode, fixDeliveryMode = 'pull_request') {
+    const modeTag = roundMode ? ` [${roundMode}]` : '';
+    const chainRecheck = fixDeliveryMode === 'commit';
     return prs.map((pr) => {
         const fork = isForkPR(pr);
         if (pr.nextAction === 'fix' && fork) {
@@ -89,59 +134,177 @@ export function buildPreflightPlan(prs) {
             return {
                 pr,
                 action: 'fix',
-                transition: `${pr.reviewState} -> Fix`,
-                details: [`fixer ${fixerLabel(pr)}`, 'delivery commit'],
-            };
-        }
-        if (pr.nextAction === 'recheck') {
-            return {
-                pr,
-                action: 'recheck',
-                transition: `${pr.reviewState} -> Recheck`,
-                details: ['links latest review'],
+                transition: chainRecheck
+                    ? `${pr.reviewState} -> fix→recheck${modeTag}`
+                    : `${pr.reviewState} -> fix`,
+                details: [
+                    `fixer ${fixerLabel(pr)}`,
+                    `delivery ${fixDeliveryMode}`,
+                    ...(chainRecheck ? [] : ['recheck deferred']),
+                ],
+                chainRecheck,
             };
         }
+        // nextAction === 'recheck' — fix was applied externally; close the loop with one recheck
         return {
             pr,
-            action: 'merge',
-            transition: 'APPROVE -> Merge',
-            details: ['method squash', `checks ${checksLabel(pr)}`],
+            action: 'recheck',
+            transition: `${pr.reviewState} -> Recheck`,
+            details: ['links latest review'],
         };
     });
 }
-export async function executeKickassPlan(plan, deps) {
-    const results = [];
-    for (const item of plan) {
+function printCapturedOutput(label, output, log = console.log) {
+    const lines = output.trimEnd().split('\n');
+    log(chalk.dim(`\n── ${label} ${'─'.repeat(Math.max(0, 48 - label.length))}`));
+    for (const line of lines)
+        log(`  ${line}`);
+}
+function printNoActionablePRsWarning(fromCache) {
+    console.log(chalk.dim('No actionable PRs found.'));
+    if (fromCache) {
+        console.log(chalk.yellow(`⚠ This result came from the scan cache. Rerun with --force to refresh the queue.`));
+    }
+}
+export async function executeKickassPlan(plan, deps, concurrency = 1, staggerMs = 0) {
+    const results = new Array(plan.length);
+    const log = deps.log ?? console.log;
+    const executeItem = async (item, index, attempt = 1) => {
         if (item.action === 'skip') {
-            console.log(chalk.yellow(`↷ skip ${formatPRSignature(item.pr)}  ${item.skipReason ?? 'skipped'}`));
-            results.push({ pr: item.pr, status: 'skipped', reason: item.skipReason });
-            continue;
+            log(chalk.yellow(`↷ skip ${formatPRSignature(item.pr)}  ${item.skipReason ?? 'skipped'}`));
+            results[index] = { pr: item.pr, status: 'skipped', reason: item.skipReason };
+            return;
         }
         try {
             const currentHeadSha = await deps.getCurrentHeadSha(item);
             if (currentHeadSha !== item.pr.headSha) {
-                console.log(chalk.yellow(`↷ skip ${formatPRSignature(item.pr)}  stale_signature`));
-                results.push({ pr: item.pr, status: 'skipped', reason: 'stale_signature' });
-                continue;
+                log(chalk.yellow(`↷ skip ${formatPRSignature(item.pr)}  stale_signature`));
+                results[index] = { pr: item.pr, status: 'skipped', reason: 'stale_signature' };
+                return;
             }
-            console.log(chalk.cyan(`\n→ ${item.transition}  ${formatPRSignature(item.pr)}`));
-            if (item.action === 'merge') {
-                await deps.dispatchMerge(item);
+            const key = `${item.pr.owner}/${item.pr.repo}#${item.pr.number}@${item.pr.headSha}`;
+            const startedAt = Date.now();
+            const attemptLabel = attempt > 1 ? ` (retry ${attempt - 1})` : '';
+            log(chalk.cyan(`\n→ ${item.transition}  ${formatPRSignature(item.pr)}${attemptLabel}`));
+            deps.onDispatchStart?.(item, key, startedAt);
+            const output = await deps.dispatchRun(item);
+            deps.onDispatchEnd?.(item, key, startedAt);
+            if (typeof output === 'string' && output)
+                printCapturedOutput(formatPRSignature(item.pr), output, log);
+            if (item.action === 'fix' && item.chainRecheck === true) {
+                const fixedHeadSha = await deps.getCurrentHeadSha(item);
+                if (fixedHeadSha !== item.pr.headSha) {
+                    const recheckItem = buildPostFixRecheckItem(item, fixedHeadSha);
+                    const recheckKey = `${recheckItem.pr.owner}/${recheckItem.pr.repo}#${recheckItem.pr.number}@${recheckItem.pr.headSha}`;
+                    const recheckStart = Date.now();
+                    log(chalk.cyan(`\n→ ${recheckItem.transition}  ${formatPRSignature(recheckItem.pr)}`));
+                    deps.onDispatchStart?.(recheckItem, recheckKey, recheckStart);
+                    const recheckOutput = await deps.dispatchRun(recheckItem);
+                    deps.onDispatchEnd?.(recheckItem, recheckKey, recheckStart);
+                    if (typeof recheckOutput === 'string' && recheckOutput)
+                        printCapturedOutput(formatPRSignature(recheckItem.pr), recheckOutput, log);
+                }
+                else {
+                    log(chalk.dim(`  head SHA unchanged after fix — recheck deferred`));
+                }
+            }
+            results[index] = { pr: item.pr, status: 'executed' };
+        }
+        catch (err) {
+            logError({ event: 'kickass_pr_failed', owner: item.pr.owner, repo: item.pr.repo, pr: item.pr.number, ...(attempt > 1 && { attempt }) }, err);
+            log(chalk.red(`✗ failed ${formatPRSignature(item.pr)}`));
+            const failKey = `${item.pr.owner}/${item.pr.repo}#${item.pr.number}@${item.pr.headSha}`;
+            deps.onDispatchFail?.(item, failKey, err);
+            // Classify execa errors using structured fields, not the raw message.
+            // The raw message includes the full CLI invocation (e.g. "Command failed with exit
+            // code 1: node crosscheck run --timeout 300s --no-timeout"), so a text match against
+            // `message` would misclassify ordinary subprocess failures as 'timeout' whenever the
+            // command contains a --timeout flag.
+            const maybeExeca = err;
+            let msgForClassify;
+            if (maybeExeca.timedOut === true) {
+                // execa's structured timeout flag — reliable; bypass message matching entirely.
+                msgForClassify = 'timed out';
+            }
+            else if (typeof maybeExeca.exitCode === 'number') {
+                // Subprocess failure: prefer stderr (actual error output) over the message which
+                // includes the full command string.  Strip the command suffix when stderr is absent.
+                const stderr = typeof maybeExeca.stderr === 'string' ? maybeExeca.stderr.trim() : '';
+                msgForClassify = stderr || (err instanceof Error ? err.message.replace(/:\s*\S.*$/, '') : String(err));
             }
             else {
-                await deps.dispatchRun(item);
+                msgForClassify = err instanceof Error ? err.message : String(err);
             }
-            results.push({ pr: item.pr, status: 'executed' });
+            const category = classifyError(msgForClassify);
+            results[index] = { pr: item.pr, status: 'failed', reason: category };
         }
-        catch (err) {
-            logError({ event: 'kickass_pr_failed', owner: item.pr.owner, repo: item.pr.repo, pr: item.pr.number }, err);
-            console.error(chalk.red(`✗ failed ${formatPRSignature(item.pr)}`));
-            results.push({ pr: item.pr, status: 'failed', reason: 'error' });
+    };
+    if (concurrency <= 1) {
+        for (let i = 0; i < plan.length; i++)
+            await executeItem(plan[i], i);
+    }
+    else {
+        // Worker-pool: up to `concurrency` PRs run in parallel.
+        // staggerMs > 0 delays each worker's start by (workerIdx * staggerMs) to spread
+        // concurrent subprocess startup API calls over time rather than hitting GitHub simultaneously.
+        let ptr = 0;
+        const makeWorker = (workerIdx) => async () => {
+            if (staggerMs > 0 && workerIdx > 0) {
+                await new Promise(resolve => setTimeout(resolve, workerIdx * staggerMs));
+            }
+            while (ptr < plan.length) {
+                const i = ptr++;
+                await executeItem(plan[i], i);
+            }
+        };
+        await Promise.all(Array.from({ length: Math.min(concurrency, plan.length) }, (_, idx) => makeWorker(idx)()));
+    }
+    // Retry transient failures up to 4 times with escalating delays.
+    // Auth and permission failures are operator issues that won't self-heal.
+    const RETRYABLE = new Set(['network', 'timeout']);
+    const RETRY_DELAYS_MS = [60_000, 120_000, 300_000, 600_000];
+    for (let attempt = 2; attempt <= RETRY_DELAYS_MS.length + 1; attempt++) {
+        const delayMs = RETRY_DELAYS_MS[attempt - 2];
+        const retryItems = results
+            .map((r, i) => ({ r, i }))
+            .filter(({ r }) => r.status === 'failed' && RETRYABLE.has(r.reason));
+        if (retryItems.length === 0)
+            break;
+        const delaySec = delayMs / 1000;
+        const delayLabel = delaySec >= 60 ? `${delaySec / 60}m` : `${delaySec}s`;
+        log(chalk.dim(`\n  ${retryItems.length} transient failure(s) — retry ${attempt - 1}/${RETRY_DELAYS_MS.length} in ${delayLabel}...`));
+        await new Promise(resolve => setTimeout(resolve, delayMs));
+        for (const { i } of retryItems) {
+            const priorResult = results[i];
+            await executeItem(plan[i], i, attempt);
+            // Stale-signature means the fix already committed in a prior attempt but the
+            // chained recheck failed transiently.  Instead of reporting that failure as
+            // final, fetch the current head and run a bare recheck to actually retry it.
+            if (results[i].status === 'skipped' && results[i].reason === 'stale_signature'
+                && plan[i].action === 'fix' && plan[i].chainRecheck === true) {
+                try {
+                    const currentHead = await deps.getCurrentHeadSha(plan[i]);
+                    const recheckItem = buildPostFixRecheckItem(plan[i], currentHead);
+                    await executeItem(recheckItem, i, attempt);
+                }
+                catch {
+                    // If we cannot fetch the head (network failure), preserve the original failure.
+                    results[i] = priorResult;
+                }
+            }
         }
     }
     return results;
 }
-export function printPreflight(plan) {
+function buildPostFixRecheckItem(item, headSha) {
+    return {
+        pr: { ...item.pr, headSha, nextAction: 'recheck', reviewState: 'NEEDS_RECHECK' },
+        action: 'recheck',
+        transition: 'fix -> Recheck',
+        details: ['links latest review', `head ${headSha.slice(0, 7)}`],
+    };
+}
+export function printPreflight(plan, mergeReady = []) {
     console.log('\nPreflight');
     const grouped = groupPreflight(plan);
     for (const [transition, items] of grouped) {
@@ -151,6 +314,14 @@ export function printPreflight(plan) {
             console.log(`  ${formatPRSignature(item.pr)}  ${item.details.join('  ')}${explanation}`);
         }
     }
+    if (mergeReady.length > 0)
+        printMergeReady(mergeReady);
+}
+export function printMergeReady(prs) {
+    console.log(chalk.dim('\nneeds merge (manual — not selected)'));
+    for (const pr of prs) {
+        console.log(chalk.dim(`  ${formatPRSignature(pr)}  APPROVE`));
+    }
 }
 export function summarizeExecutionResults(results) {
     const executed = results.filter(result => result.status === 'executed').length;
@@ -161,18 +332,36 @@ export function summarizeExecutionResults(results) {
 export function printExecutionSummary(results) {
     console.log(chalk.dim(`\n${summarizeExecutionResults(results)}`));
 }
-export function buildKickassRunArgs(itemOrPR) {
+export function buildKickassRunArgs(itemOrPR, roundMode, timeout) {
     const item = 'action' in itemOrPR ? itemOrPR : buildPreflightPlan([itemOrPR])[0];
-    if (item.action === 'merge' || item.action === 'skip')
+    if (item.action === 'skip')
         return [];
-    return [
-        'run',
-        item.pr.url,
-        '--steps',
-        stepForAction(item.action),
-        '--expected-head-sha',
-        item.pr.headSha,
-    ];
+    const args = ['run', item.pr.url];
+    // No --steps for normal review/recheck/fix actions: run.ts calls
+    // identifyNextWorkflowStep against live PR history to determine the correct
+    // next step. Exception: when kickass demoted a fix action to review because the
+    // latest annotation covers an older SHA (no_usable_review_comment), we must
+    // force --steps review so run.ts doesn't re-detect from live history and choose
+    // the stale review's fix step, applying fixes to the unreviewed new diff.
+    if (item.action === 'review' && item.explanation === 'no_usable_review_comment') {
+        args.push('--steps', 'review');
+    }
+    args.push('--expected-head-sha', item.pr.headSha);
+    if (item.action !== 'fix') {
+        if (roundMode === 'crazy')
+            args.push('--crazy');
+        else if (roundMode === 'halfcrazy')
+            args.push('--half-crazy');
+    }
+    else if (roundMode) {
+        // fix legs don't loop, but still need the no-timeout constraint lifted
+        args.push('--no-timeout');
+    }
+    // forward user-specified --timeout for runs that aren't already in a round mode
+    if (timeout && !roundMode)
+        args.push('--timeout', timeout);
+    args.push('--trigger', 'kickass');
+    return args;
 }
 export function resolveCliInvocation(options = {}) {
     const exists = options.exists ?? existsSync;
@@ -191,16 +380,48 @@ export function resolveCliInvocation(options = {}) {
         return invocationForEntry(sourceCli, execPath, localTsx, exists);
     throw new Error('Cannot resolve crosscheck CLI entrypoint. Run npm run build before kickass, or run from a source checkout with dev dependencies installed.');
 }
-function defaultKickassDeps() {
+function defaultKickassDeps(opts = {}, board) {
     let cli;
     const getCli = () => {
         cli ??= resolveCliInvocation();
         return cli;
     };
+    const dispatchRun = async (item) => {
+        const invocation = getCli();
+        const args = [...invocation.args, ...buildKickassRunArgs(item, opts.roundMode, opts.timeout)];
+        // When board is active always pipe so output routes through board.log scrollback.
+        // Without board, pipe only for explicit concurrent mode; sequential streams inline.
+        if (board || opts.concurrent !== undefined) {
+            try {
+                const result = await execa(invocation.command, args, { stdio: 'pipe', all: true });
+                return result.all ?? '';
+            }
+            catch (err) {
+                // Surface captured output before re-throwing so the board log includes
+                // the child's stdout/stderr (auth errors, model failures, etc.) that were
+                // previously visible via inherited stdio.
+                const e = err;
+                const captured = typeof e.all === 'string' ? e.all.trim()
+                    : typeof e.stderr === 'string' ? e.stderr.trim() : '';
+                if (captured) {
+                    if (board)
+                        board.log(captured);
+                    else
+                        console.error(captured);
+                }
+                throw err;
+            }
+        }
+        await execa(invocation.command, args, { stdio: 'inherit' });
+    };
+    const actionPhase = (action) => action === 'fix' ? 'fixing' : action === 'recheck' ? 'rechecking' : 'reviewing';
+    const actionLabel = (action) => action === 'fix' ? 'applying fix...' : action === 'recheck' ? 'rechecking...' : 'reviewing...';
+    const donePhase = (action) => action === 'fix' ? 'fixed' : action === 'recheck' ? 'rechecked' : 'reviewed';
     return {
         loadScanResult,
         pickPRs,
         confirm: confirmMutation,
+        getFixDeliveryMode: () => loadConfig().post_review.auto_fix.delivery.mode,
         getCurrentHeadSha: async (item) => {
             const token = getGithubToken();
             const octokit = createGithubClient(token);
@@ -211,18 +432,24 @@ function defaultKickassDeps() {
             });
             return data.head.sha;
         },
-        dispatchRun: async (item) => {
-            const invocation = getCli();
-            await execa(invocation.command, [...invocation.args, ...buildKickassRunArgs(item)], { stdio: 'inherit' });
-        },
-        dispatchMerge: async (item) => {
-            const token = getGithubToken();
-            const octokit = createGithubClient(token);
-            await mergePullRequest(octokit, item.pr.owner, item.pr.repo, item.pr.number, {
-                method: 'squash',
-                expectedHeadSha: item.pr.headSha,
-            });
-        },
+        dispatchRun,
+        ...(board && {
+            log: (msg) => board.log(msg),
+            onDispatchStart: (item, key, _startedAt) => {
+                board.addPR(key, item.pr.number, `${item.pr.owner}/${item.pr.repo}`, item.pr.headRef);
+                board.updatePR(key, { phase: actionPhase(item.action), label: actionLabel(item.action) });
+            },
+            onDispatchEnd: (item, key, startedAt) => {
+                board.updatePR(key, { phase: donePhase(item.action) });
+                board.completePR(key, { elapsedMs: Date.now() - startedAt, url: item.pr.url });
+            },
+            onDispatchFail: (_item, key, err) => {
+                const msg = err instanceof Error ? err.message : String(err);
+                board.failPR(key, msg);
+            },
+            onBeforeExecute: () => board.start(),
+            onAfterExecute: () => board.stop(),
+        }),
     };
 }
 async function confirmMutation(message) {
@@ -268,10 +495,10 @@ function checksLabel(pr) {
         return 'green';
     return pr.merge.mergeStateStatus ?? 'unknown';
 }
-function stepForAction(action) {
-    if (action === 'review')
+function stepsForItem(item) {
+    if (item.action === 'review')
         return 'review';
-    if (action === 'fix')
+    if (item.action === 'fix')
         return 'fix';
     return 'recheck';
 }