@motivation-labs/crosscheck 0.13.0 → 0.13.1-beta.6

package/dist/lib/runner.js

@@ -8,6 +8,7 @@ import { runFixStep } from '../reviewers/fix.js';
 import { runConflictResolveStep, findConflictedFiles } from '../reviewers/conflict-resolve.js';
 import { parseVerdict, prependVerdictToComment, NULL_VERDICT_WARNING } from '../lib/verdict.js';
 import { createGithubClient, postReviewComment, getLastCrossCheckCommentId } from '../github/client.js';
+import { acquireRemoteLock, releaseRemoteLock } from '../github/review-status.js';
 import { log as fileLog, logError } from '../lib/logger.js';
 import { loadWorkflow, evaluateWhen } from '../lib/workflow.js';
 const MAX_CROSSCHECK_COMMITS = 5;
@@ -98,443 +99,494 @@ export async function runWorkflow(ctx) {
     const { owner, repoName, prNumber, pr, tmpDir, token, config, origin, log, onPhaseChange } = ctx;
     const steps = ctx.steps ?? loadWorkflow(process.cwd());
     const results = {};
-    for (const step of steps) {
-        const effectiveType = getEffectiveStepType(step.type, ctx.isRecheckRun === true);
-        if (exceedsMaxRounds(effectiveType, step.type, step.max_rounds, ctx.round)) {
-            fileLog({ level: 'info', event: 'step_skipped', repo: `${owner}/${repoName}`, pr: prNumber, step: step.name, reason: 'max_rounds' });
-            results[step.name] = { skipped: true };
-            if (effectiveType === 'fix')
-                onPhaseChange('', { phase: 'fixed', fixCount: 0 });
-            else if (effectiveType === 'recheck')
-                onPhaseChange('', { phase: 'rechecked' });
-            else if (effectiveType === 'conflict-resolve')
-                onPhaseChange('', { phase: 'fixed', fixCount: 0 });
-            continue;
-        }
-        // Evaluate when condition — skip step if false
-        if (step.when && !evaluateWhen(step.when, results)) {
-            fileLog({ level: 'info', event: 'step_skipped', repo: `${owner}/${repoName}`, pr: prNumber, step: step.name, reason: 'when_condition' });
-            results[step.name] = { skipped: true };
-            if (effectiveType === 'fix')
-                onPhaseChange('', { phase: 'fixed', fixCount: 0 });
-            else if (effectiveType === 'recheck')
-                onPhaseChange('', { phase: 'rechecked' });
-            else if (effectiveType === 'conflict-resolve')
-                onPhaseChange('', { phase: 'fixed', fixCount: 0 });
-            continue;
-        }
-        if (effectiveType === 'review' || effectiveType === 'recheck') {
-            const isRecheck = effectiveType === 'recheck';
-            const reviewer = resolveReviewer(step.reviewer, origin, config, ctx.smartSwitchFallback);
-            if (!reviewer) {
-                fileLog({ level: 'info', event: 'step_skipped', repo: `${owner}/${repoName}`, pr: prNumber, step: step.name, reason: 'no_reviewer' });
+    // SHAs the workflow pushed AND set a `crosscheck/review` pending status on.
+    // Each one must be released in the finally below — otherwise the pending
+    // status would stay forever on GitHub (the 15-min staleness check is
+    // internal to crosscheck's lock detection and does not clear the status,
+    // which can block PRs in repos where `crosscheck/review` is required).
+    //
+    // Use the caller's array if provided so the command-layer signal handler
+    // can iterate the same list and release these shas if SIGINT/SIGTERM fires
+    // mid-workflow (process.exit there bypasses our finally below).
+    const pushedShasNeedingRelease = ctx.pushedShas ?? [];
+    let workflowFailed = false;
+    try {
+        for (const step of steps) {
+            const effectiveType = getEffectiveStepType(step.type, ctx.isRecheckRun === true);
+            if (exceedsMaxRounds(effectiveType, step.type, step.max_rounds, ctx.round)) {
+                fileLog({ level: 'info', event: 'step_skipped', repo: `${owner}/${repoName}`, pr: prNumber, step: step.name, reason: 'max_rounds' });
                 results[step.name] = { skipped: true };
+                if (effectiveType === 'fix')
+                    onPhaseChange('', { phase: 'fixed', fixCount: 0 });
+                else if (effectiveType === 'recheck')
+                    onPhaseChange('', { phase: 'rechecked' });
+                else if (effectiveType === 'conflict-resolve')
+                    onPhaseChange('', { phase: 'fixed', fixCount: 0 });
                 continue;
             }
-            fileLog({ level: 'info', event: 'review_started', repo: `${owner}/${repoName}`, pr: prNumber, reviewer, ...(ctx.round !== undefined && { round: ctx.round }) });
-            const startPhase = isRecheck ? 'rechecking' : 'reviewing';
-            const donePhase = isRecheck ? 'rechecked' : 'reviewed';
-            onPhaseChange(`${reviewer} ${isRecheck ? 'rechecking' : 'reviewing'}...`, { phase: startPhase });
-            let rawReview;
-            let tokensUsed;
-            if (reviewer === 'codex') {
-                ;
-                ({ review: rawReview, tokensUsed } = await runCodexReview(tmpDir, pr.base.ref, pr.title, config.quality, config.vendors.codex, step.instructions));
-            }
-            else {
-                ;
-                ({ review: rawReview, tokensUsed } = await runClaudeReview(tmpDir, pr.base.ref, pr.title, config.quality, config.vendors.claude, config.budget.per_review_usd, step.instructions));
-            }
-            const { verdict, clean } = parseVerdict(rawReview);
-            if (verdict === null) {
-                fileLog({ level: 'warn', event: 'verdict_parse_failed', repo: `${owner}/${repoName}`, pr: prNumber, reviewer, output_length: rawReview.length });
-            }
-            const commentBody = verdict === null
-                ? `${NULL_VERDICT_WARNING}\n\n${clean}`
-                : prependVerdictToComment(clean, verdict);
-            const commentCount = countComments(rawReview);
-            fileLog({ level: 'info', event: 'review_complete', repo: `${owner}/${repoName}`, pr: prNumber, reviewer, verdict, duration_ms: Date.now() - ctx.reviewStart, tokens_used: tokensUsed, ...(ctx.round !== undefined && { round: ctx.round }) });
-            // Recheck verdict is stored separately to preserve the original review's commentCount on the board
-            const phaseUpdate = isRecheck
-                ? { recheckVerdict: verdict, phase: donePhase, recheckTokens: tokensUsed, recheckReviewer: reviewer, qualityTier: config.quality.tier }
-                : { verdict, commentCount, phase: donePhase, crTokens: tokensUsed, crReviewer: reviewer, qualityTier: config.quality.tier };
-            if (ctx.dryRun) {
-                onPhaseChange('dry-run — comment not posted', phaseUpdate);
-                log(chalk.dim(`\n--- dry-run: comment that would be posted ---\n${commentBody}\n--- end ---`));
-                results[step.name] = { verdict, commentBody };
-            }
-            else {
-                onPhaseChange(isRecheck ? 'posting recheck...' : 'posting comment...', phaseUpdate);
-                const octokit = createGithubClient(token);
-                // For rechecks: look up the original review comment ID so the recheck
-                // can link back to it. Check in-run results first (single-run pipelines),
-                // then fall back to GitHub (cross-run: recheck triggered by a new push).
-                let priorReviewId;
-                if (isRecheck) {
-                    priorReviewId = Object.values(results).reverse().find(r => r.commentId !== undefined)?.commentId;
-                    if (priorReviewId === undefined) {
-                        priorReviewId = await getLastCrossCheckCommentId(owner, repoName, prNumber, token);
-                    }
-                }
-                const commentId = await postReviewComment(octokit, owner, repoName, prNumber, commentBody, reviewer, config.brand, origin, verdict ?? undefined, priorReviewId, isRecheck);
-                const commentUrl = `github.com/${owner}/${repoName}/pull/${prNumber}`;
-                fileLog({ level: 'info', event: 'comment_posted', repo: `${owner}/${repoName}`, pr: prNumber, url: `https://${commentUrl}` });
-                results[step.name] = { verdict, commentBody, commentUrl, commentId };
-            }
-        }
-        else if (effectiveType === 'fix') {
-            const skipFix = (reason) => {
-                onPhaseChange('', { phase: 'fixed', fixCount: 0 });
+            // Evaluate when condition — skip step if false
+            if (step.when && !evaluateWhen(step.when, results)) {
+                fileLog({ level: 'info', event: 'step_skipped', repo: `${owner}/${repoName}`, pr: prNumber, step: step.name, reason: 'when_condition' });
                 results[step.name] = { skipped: true };
-                fileLog({ level: 'info', event: 'step_skipped', repo: `${owner}/${repoName}`, pr: prNumber, step: step.name, reason });
-            };
-            if (ctx.dryRun) {
-                skipFix('dry_run');
-                continue;
-            }
-            // Migration gate: honor legacy opt-out fields while users migrate to workflow.yml.
-            const legacyDisabled = config.post_review.auto_fix.enabled === false
-                || config.post_review.auto_fix.trigger === 'never';
-            if (legacyDisabled) {
-                log(chalk.yellow(`⚠  auto_fix.enabled/trigger are deprecated — remove them from config and add a "when:" condition to the fix step in workflow.yml instead`));
-                skipFix('legacy_auto_fix_disabled');
-                continue;
-            }
-            // Find the most recent review result that has a comment body
-            const reviewResult = Object.values(results).reverse().find(r => r.commentBody);
-            if (!reviewResult?.commentBody) {
-                skipFix('no_review_comment');
-                continue;
-            }
-            // Vendor is resolved from the workflow step's reviewer field, same as review/recheck steps.
-            // Use 'origin' to fix with the same vendor that authored the PR (recommended default).
-            const vendor = resolveReviewer(step.reviewer, origin, config, ctx.smartSwitchFallback);
-            if (!vendor) {
-                skipFix('no_vendor');
-                continue;
-            }
-            // Codex fix not yet implemented — skip gracefully
-            if (vendor === 'codex') {
-                skipFix('codex_fix_unsupported');
-                continue;
-            }
-            // Guard: don't push more than MAX_CROSSCHECK_COMMITS per PR.
-            // Scope to commits ahead of base so long-lived branches (e.g. staging)
-            // don't count [crosscheck] commits from previously merged PRs.
-            const existingCount = countCrosscheckCommitsForPR(tmpDir, pr.base.ref);
-            if (existingCount >= MAX_CROSSCHECK_COMMITS) {
-                log(chalk.yellow(`⚠  PR #${prNumber}: ${MAX_CROSSCHECK_COMMITS} [crosscheck] commits already — stopping auto-fix`));
-                skipFix('commit_limit_reached');
+                if (effectiveType === 'fix')
+                    onPhaseChange('', { phase: 'fixed', fixCount: 0 });
+                else if (effectiveType === 'recheck')
+                    onPhaseChange('', { phase: 'rechecked' });
+                else if (effectiveType === 'conflict-resolve')
+                    onPhaseChange('', { phase: 'fixed', fixCount: 0 });
                 continue;
             }
-            onPhaseChange(`${vendor} fixing...`, { phase: 'fixing' });
-            let appliedCount = 0;
-            let fixTokensUsed;
-            let fixErr = undefined;
-            try {
-                ;
-                ({ appliedCount, tokensUsed: fixTokensUsed } = await runFixStep(tmpDir, pr.base.ref, pr.title, reviewResult.commentBody, step.instructions ?? '', config));
-            }
-            catch (err) {
-                logError({ repo: `${owner}/${repoName}`, pr: prNumber, phase: 'fix', attempt: 1 }, err);
-                fixErr = err;
+            if (effectiveType === 'review' || effectiveType === 'recheck') {
+                const isRecheck = effectiveType === 'recheck';
+                const reviewer = resolveReviewer(step.reviewer, origin, config, ctx.smartSwitchFallback);
+                if (!reviewer) {
+                    fileLog({ level: 'info', event: 'step_skipped', repo: `${owner}/${repoName}`, pr: prNumber, step: step.name, reason: 'no_reviewer' });
+                    results[step.name] = { skipped: true };
+                    continue;
+                }
+                fileLog({ level: 'info', event: 'review_started', repo: `${owner}/${repoName}`, pr: prNumber, reviewer, ...(ctx.round !== undefined && { round: ctx.round }) });
+                const startPhase = isRecheck ? 'rechecking' : 'reviewing';
+                const donePhase = isRecheck ? 'rechecked' : 'reviewed';
+                onPhaseChange(`${reviewer} ${isRecheck ? 'rechecking' : 'reviewing'}...`, { phase: startPhase });
+                let rawReview;
+                let tokensUsed;
+                if (reviewer === 'codex') {
+                    ;
+                    ({ review: rawReview, tokensUsed } = await runCodexReview(tmpDir, pr.base.ref, pr.title, config.quality, config.vendors.codex, step.instructions));
+                }
+                else {
+                    ;
+                    ({ review: rawReview, tokensUsed } = await runClaudeReview(tmpDir, pr.base.ref, pr.title, config.quality, config.vendors.claude, config.budget.per_review_usd, step.instructions));
+                }
+                const { verdict, clean } = parseVerdict(rawReview);
+                if (verdict === null) {
+                    fileLog({ level: 'warn', event: 'verdict_parse_failed', repo: `${owner}/${repoName}`, pr: prNumber, reviewer, output_length: rawReview.length });
+                }
+                const commentBody = verdict === null
+                    ? `${NULL_VERDICT_WARNING}\n\n${clean}`
+                    : prependVerdictToComment(clean, verdict);
+                const commentCount = countComments(rawReview);
+                fileLog({ level: 'info', event: 'review_complete', repo: `${owner}/${repoName}`, pr: prNumber, reviewer, verdict, duration_ms: Date.now() - ctx.reviewStart, tokens_used: tokensUsed, ...(ctx.round !== undefined && { round: ctx.round }) });
+                // Recheck verdict is stored separately to preserve the original review's commentCount on the board
+                const phaseUpdate = isRecheck
+                    ? { recheckVerdict: verdict, phase: donePhase, recheckTokens: tokensUsed, recheckReviewer: reviewer, qualityTier: config.quality.tier }
+                    : { verdict, commentCount, phase: donePhase, crTokens: tokensUsed, crReviewer: reviewer, qualityTier: config.quality.tier };
+                if (ctx.dryRun) {
+                    onPhaseChange('dry-run — comment not posted', phaseUpdate);
+                    log(chalk.dim(`\n--- dry-run: comment that would be posted ---\n${commentBody}\n--- end ---`));
+                    results[step.name] = { verdict, commentBody };
+                }
+                else {
+                    onPhaseChange(isRecheck ? 'posting recheck...' : 'posting comment...', phaseUpdate);
+                    const octokit = createGithubClient(token);
+                    // For rechecks: look up the original review comment ID so the recheck
+                    // can link back to it. Check in-run results first (single-run pipelines),
+                    // then fall back to GitHub (cross-run: recheck triggered by a new push).
+                    let priorReviewId;
+                    if (isRecheck) {
+                        priorReviewId = Object.values(results).reverse().find(r => r.commentId !== undefined)?.commentId;
+                        if (priorReviewId === undefined) {
+                            priorReviewId = await getLastCrossCheckCommentId(owner, repoName, prNumber, token);
+                        }
+                    }
+                    const commentId = await postReviewComment(octokit, owner, repoName, prNumber, commentBody, reviewer, config.brand, origin, verdict ?? undefined, priorReviewId, isRecheck);
+                    const commentUrl = `github.com/${owner}/${repoName}/pull/${prNumber}`;
+                    fileLog({ level: 'info', event: 'comment_posted', repo: `${owner}/${repoName}`, pr: prNumber, url: `https://${commentUrl}` });
+                    results[step.name] = { verdict, commentBody, commentUrl, commentId };
+                }
             }
-            if (fixErr !== undefined && isRetryableFixError(fixErr)) {
-                log(chalk.yellow(`⚠  fix step failed — retrying in 2 min...`));
-                onPhaseChange('fix retry in 2 min...', { phase: 'fixing' });
-                fileLog({ level: 'info', event: 'fix_retry_scheduled', repo: `${owner}/${repoName}`, pr: prNumber });
-                await new Promise(resolve => setTimeout(resolve, FIX_RETRY_DELAY_MS));
-                onPhaseChange(`${vendor} fixing (retry)...`, { phase: 'fixing' });
+            else if (effectiveType === 'fix') {
+                const skipFix = (reason) => {
+                    onPhaseChange('', { phase: 'fixed', fixCount: 0 });
+                    results[step.name] = { skipped: true };
+                    fileLog({ level: 'info', event: 'step_skipped', repo: `${owner}/${repoName}`, pr: prNumber, step: step.name, reason });
+                };
+                if (ctx.dryRun) {
+                    skipFix('dry_run');
+                    continue;
+                }
+                // Migration gate: honor legacy opt-out fields while users migrate to workflow.yml.
+                const legacyDisabled = config.post_review.auto_fix.enabled === false
+                    || config.post_review.auto_fix.trigger === 'never';
+                if (legacyDisabled) {
+                    log(chalk.yellow(`⚠  auto_fix.enabled/trigger are deprecated — remove them from config and add a "when:" condition to the fix step in workflow.yml instead`));
+                    skipFix('legacy_auto_fix_disabled');
+                    continue;
+                }
+                // Find the most recent review result that has a comment body
+                const reviewResult = Object.values(results).reverse().find(r => r.commentBody);
+                if (!reviewResult?.commentBody) {
+                    skipFix('no_review_comment');
+                    continue;
+                }
+                // Vendor is resolved from the workflow step's reviewer field, same as review/recheck steps.
+                // Use 'origin' to fix with the same vendor that authored the PR (recommended default).
+                const vendor = resolveReviewer(step.reviewer, origin, config, ctx.smartSwitchFallback);
+                if (!vendor) {
+                    skipFix('no_vendor');
+                    continue;
+                }
+                // Codex fix not yet implemented — skip gracefully
+                if (vendor === 'codex') {
+                    skipFix('codex_fix_unsupported');
+                    continue;
+                }
+                // Guard: don't push more than MAX_CROSSCHECK_COMMITS per PR.
+                // Scope to commits ahead of base so long-lived branches (e.g. staging)
+                // don't count [crosscheck] commits from previously merged PRs.
+                const existingCount = countCrosscheckCommitsForPR(tmpDir, pr.base.ref);
+                if (existingCount >= MAX_CROSSCHECK_COMMITS) {
+                    log(chalk.yellow(`⚠  PR #${prNumber}: ${MAX_CROSSCHECK_COMMITS} [crosscheck] commits already — stopping auto-fix`));
+                    skipFix('commit_limit_reached');
+                    continue;
+                }
+                onPhaseChange(`${vendor} fixing...`, { phase: 'fixing' });
+                let appliedCount = 0;
+                let fixTokensUsed;
+                let fixErr = undefined;
                 try {
                     ;
                     ({ appliedCount, tokensUsed: fixTokensUsed } = await runFixStep(tmpDir, pr.base.ref, pr.title, reviewResult.commentBody, step.instructions ?? '', config));
-                    fileLog({ level: 'info', event: 'fix_retry_succeeded', repo: `${owner}/${repoName}`, pr: prNumber });
-                    fixErr = undefined;
                 }
-                catch (retryErr) {
-                    logError({ repo: `${owner}/${repoName}`, pr: prNumber, phase: 'fix', attempt: 2 }, retryErr);
-                    fixErr = retryErr;
+                catch (err) {
+                    logError({ repo: `${owner}/${repoName}`, pr: prNumber, phase: 'fix', attempt: 1 }, err);
+                    fixErr = err;
                 }
-            }
-            if (fixErr !== undefined) {
-                skipFix('fix_error');
-                // Only notify for transient failures — auth errors are operator issues, not PR author issues
-                if (isRetryableFixError(fixErr)) {
+                if (fixErr !== undefined && isRetryableFixError(fixErr)) {
+                    log(chalk.yellow(`⚠  fix step failed — retrying in 2 min...`));
+                    onPhaseChange('fix retry in 2 min...', { phase: 'fixing' });
+                    fileLog({ level: 'info', event: 'fix_retry_scheduled', repo: `${owner}/${repoName}`, pr: prNumber });
+                    await new Promise(resolve => setTimeout(resolve, FIX_RETRY_DELAY_MS));
+                    onPhaseChange(`${vendor} fixing (retry)...`, { phase: 'fixing' });
                     try {
-                        const octokit = createGithubClient(token);
-                        await octokit.rest.issues.createComment({
-                            owner, repo: repoName, issue_number: prNumber,
-                            body: `⚠️ **Auto-fix failed**\n\nThe fix step timed out after retrying. Push a new commit or run \`crosscheck run ${pr.html_url}\` to retry manually.\n\n<!-- crosscheck: fix_failed -->`,
-                        });
-                        fileLog({ level: 'info', event: 'fix_failed_comment_posted', repo: `${owner}/${repoName}`, pr: prNumber });
+                        ;
+                        ({ appliedCount, tokensUsed: fixTokensUsed } = await runFixStep(tmpDir, pr.base.ref, pr.title, reviewResult.commentBody, step.instructions ?? '', config));
+                        fileLog({ level: 'info', event: 'fix_retry_succeeded', repo: `${owner}/${repoName}`, pr: prNumber });
+                        fixErr = undefined;
+                    }
+                    catch (retryErr) {
+                        logError({ repo: `${owner}/${repoName}`, pr: prNumber, phase: 'fix', attempt: 2 }, retryErr);
+                        fixErr = retryErr;
                     }
-                    catch { /* best-effort notification */ }
                 }
-                continue;
-            }
-            if (appliedCount === 0) {
-                onPhaseChange('', { phase: 'fixed', fixCount: 0, fixTokens: fixTokensUsed });
-                results[step.name] = { applied_count: 0 };
-                continue;
-            }
-            const isFork = pr.head.repo?.full_name !== pr.base.repo.full_name;
-            if (isFork) {
-                skipFix('fork_pr');
-                continue;
-            }
-            const deliveryMode = config.post_review.auto_fix.delivery.mode;
-            if (deliveryMode === 'commit') {
-                execSync('git add -A', { cwd: tmpDir });
-                execSync(`git commit -m "[crosscheck] fix: apply ${appliedCount} fix${appliedCount !== 1 ? 'es' : ''} from code review — by Claude Code"`, { cwd: tmpDir });
-                const newSha = execSync('git rev-parse HEAD', { cwd: tmpDir, encoding: 'utf8' }).trim();
-                execSync(`git push origin HEAD:${pr.head.ref}`, {
-                    cwd: tmpDir,
-                    env: { ...process.env, GITHUB_TOKEN: token, GH_TOKEN: token },
-                });
-                ctx.crosscheckShas.add(newSha);
-                onPhaseChange('fixed ✓', { fixCount: appliedCount, phase: 'fixed', fixTokens: fixTokensUsed });
-                fileLog({ level: 'info', event: 'fix_complete', repo: `${owner}/${repoName}`, pr: prNumber, applied_count: appliedCount, sha: newSha, delivery: 'commit', tokens_used: fixTokensUsed });
-                results[step.name] = { applied_count: appliedCount };
-            }
-            else if (deliveryMode === 'pull_request') {
-                // Create a fix branch and open a PR targeting the original branch
-                const fixBranch = `fix/cr-${prNumber}-review-issues`;
-                execSync(`git checkout -b ${fixBranch}`, { cwd: tmpDir });
-                execSync('git add -A', { cwd: tmpDir });
-                execSync(`git commit -m "[crosscheck] fix: apply CR fixes from review of PR #${prNumber} — by Claude Code"`, { cwd: tmpDir });
-                const newSha = execSync('git rev-parse HEAD', { cwd: tmpDir, encoding: 'utf8' }).trim();
-                execSync(`git push origin HEAD:${fixBranch}`, {
-                    cwd: tmpDir,
-                    env: { ...process.env, GITHUB_TOKEN: token, GH_TOKEN: token },
-                });
-                ctx.crosscheckShas.add(newSha);
-                const octokit = createGithubClient(token);
-                const fixPrTitle = config.post_review.auto_fix.delivery.pr_title.replace('#{original_pr_title}', pr.title);
-                const { data: fixPr } = await octokit.rest.pulls.create({
-                    owner,
-                    repo: repoName,
-                    head: fixBranch,
-                    base: pr.head.ref,
-                    title: fixPrTitle,
-                    body: `Auto-fix by crosscheck for CR issues found in #${prNumber}.\n\nReview: https://github.com/${owner}/${repoName}/pull/${prNumber}`,
-                });
-                if (config.post_review.auto_fix.delivery.label) {
+                if (fixErr !== undefined) {
+                    skipFix('fix_error');
+                    // Only notify for transient failures — auth errors are operator issues, not PR author issues
+                    if (isRetryableFixError(fixErr)) {
+                        try {
+                            const octokit = createGithubClient(token);
+                            await octokit.rest.issues.createComment({
+                                owner, repo: repoName, issue_number: prNumber,
+                                body: `⚠️ **Auto-fix failed**\n\nThe fix step timed out after retrying. Push a new commit or run \`crosscheck run ${pr.html_url}\` to retry manually.\n\n<!-- crosscheck: fix_failed -->`,
+                            });
+                            fileLog({ level: 'info', event: 'fix_failed_comment_posted', repo: `${owner}/${repoName}`, pr: prNumber });
+                        }
+                        catch { /* best-effort notification */ }
+                    }
+                    continue;
+                }
+                if (appliedCount === 0) {
+                    onPhaseChange('', { phase: 'fixed', fixCount: 0, fixTokens: fixTokensUsed });
+                    results[step.name] = { applied_count: 0 };
+                    continue;
+                }
+                const isFork = pr.head.repo?.full_name !== pr.base.repo.full_name;
+                if (isFork) {
+                    skipFix('fork_pr');
+                    continue;
+                }
+                const deliveryMode = config.post_review.auto_fix.delivery.mode;
+                if (deliveryMode === 'commit') {
+                    execSync('git add -A', { cwd: tmpDir });
+                    execSync(`git commit -m "[crosscheck] fix: apply ${appliedCount} fix${appliedCount !== 1 ? 'es' : ''} from code review — by Claude Code"`, { cwd: tmpDir });
+                    const newSha = execSync('git rev-parse HEAD', { cwd: tmpDir, encoding: 'utf8' }).trim();
+                    execSync(`git push origin HEAD:${pr.head.ref}`, {
+                        cwd: tmpDir,
+                        env: { ...process.env, GITHUB_TOKEN: token, GH_TOKEN: token },
+                    });
+                    ctx.crosscheckShas.add(newSha);
+                    onPhaseChange('fixed ✓', { fixCount: appliedCount, phase: 'fixed', fixTokens: fixTokensUsed });
+                    fileLog({ level: 'info', event: 'fix_complete', repo: `${owner}/${repoName}`, pr: prNumber, applied_count: appliedCount, sha: newSha, delivery: 'commit', tokens_used: fixTokensUsed });
+                    results[step.name] = { applied_count: appliedCount };
+                }
+                else if (deliveryMode === 'pull_request') {
+                    // Create a fix branch and open a PR targeting the original branch
+                    const fixBranch = `fix/cr-${prNumber}-review-issues`;
+                    execSync(`git checkout -b ${fixBranch}`, { cwd: tmpDir });
+                    execSync('git add -A', { cwd: tmpDir });
+                    execSync(`git commit -m "[crosscheck] fix: apply CR fixes from review of PR #${prNumber} — by Claude Code"`, { cwd: tmpDir });
+                    const newSha = execSync('git rev-parse HEAD', { cwd: tmpDir, encoding: 'utf8' }).trim();
+                    execSync(`git push origin HEAD:${fixBranch}`, {
+                        cwd: tmpDir,
+                        env: { ...process.env, GITHUB_TOKEN: token, GH_TOKEN: token },
+                    });
+                    ctx.crosscheckShas.add(newSha);
+                    const octokit = createGithubClient(token);
+                    const fixPrTitle = config.post_review.auto_fix.delivery.pr_title.replace('#{original_pr_title}', pr.title);
+                    const { data: fixPr } = await octokit.rest.pulls.create({
+                        owner,
+                        repo: repoName,
+                        head: fixBranch,
+                        base: pr.head.ref,
+                        title: fixPrTitle,
+                        body: `Auto-fix by crosscheck for CR issues found in #${prNumber}.\n\nReview: https://github.com/${owner}/${repoName}/pull/${prNumber}`,
+                    });
+                    if (config.post_review.auto_fix.delivery.label) {
+                        try {
+                            await octokit.rest.issues.addLabels({
+                                owner, repo: repoName, issue_number: fixPr.number, labels: [config.post_review.auto_fix.delivery.label],
+                            });
+                        }
+                        catch { /* label may not exist in this repo — skip */ }
+                    }
+                    onPhaseChange('fixed ✓', { fixCount: appliedCount, phase: 'fixed', fixTokens: fixTokensUsed });
+                    fileLog({ level: 'info', event: 'fix_complete', repo: `${owner}/${repoName}`, pr: prNumber, applied_count: appliedCount, sha: newSha, delivery: 'pull_request', fix_pr: fixPr.number, tokens_used: fixTokensUsed });
+                    results[step.name] = { applied_count: appliedCount };
+                }
+                else {
+                    // comment: post the diff as a suggested-fix comment, no code push needed (works for fork PRs too)
+                    let patch = '';
                     try {
-                        await octokit.rest.issues.addLabels({
-                            owner, repo: repoName, issue_number: fixPr.number, labels: [config.post_review.auto_fix.delivery.label],
-                        });
+                        patch = execSync('git diff', { cwd: tmpDir, encoding: 'utf8' });
+                    }
+                    catch { /* ignore */ }
+                    if (patch) {
+                        const octokit = createGithubClient(token);
+                        const body = `### Suggested fixes (crosscheck auto-fix)\n\n\`\`\`diff\n${patch.slice(0, 16000)}\n\`\`\``;
+                        await octokit.rest.issues.createComment({ owner, repo: repoName, issue_number: prNumber, body });
                     }
-                    catch { /* label may not exist in this repo — skip */ }
+                    onPhaseChange('fixed ✓', { fixCount: appliedCount, phase: 'fixed', fixTokens: fixTokensUsed });
+                    fileLog({ level: 'info', event: 'fix_complete', repo: `${owner}/${repoName}`, pr: prNumber, applied_count: appliedCount, delivery: 'comment', tokens_used: fixTokensUsed });
+                    results[step.name] = { applied_count: appliedCount };
                 }
-                onPhaseChange('fixed ✓', { fixCount: appliedCount, phase: 'fixed', fixTokens: fixTokensUsed });
-                fileLog({ level: 'info', event: 'fix_complete', repo: `${owner}/${repoName}`, pr: prNumber, applied_count: appliedCount, sha: newSha, delivery: 'pull_request', fix_pr: fixPr.number, tokens_used: fixTokensUsed });
-                results[step.name] = { applied_count: appliedCount };
             }
-            else {
-                // comment: post the diff as a suggested-fix comment, no code push needed (works for fork PRs too)
-                let patch = '';
-                try {
-                    patch = execSync('git diff', { cwd: tmpDir, encoding: 'utf8' });
+            else if (effectiveType === 'conflict-resolve') {
+                const skipConflictResolve = (reason) => {
+                    onPhaseChange('', { phase: 'fixed', fixCount: 0 });
+                    results[step.name] = { skipped: true };
+                    fileLog({ level: 'info', event: 'step_skipped', repo: `${owner}/${repoName}`, pr: prNumber, step: step.name, reason });
+                };
+                if (ctx.dryRun) {
+                    skipConflictResolve('dry_run');
+                    continue;
                 }
-                catch { /* ignore */ }
-                if (patch) {
+                // Fast pre-check: GitHub's mergeable field tells us if the PR has conflicts without
+                // cloning. true = no conflicts (skip immediately); false = conflicts confirmed (proceed);
+                // null = GitHub is still computing — fall through to the git merge probe.
+                {
                     const octokit = createGithubClient(token);
-                    const body = `### Suggested fixes (crosscheck auto-fix)\n\n\`\`\`diff\n${patch.slice(0, 16000)}\n\`\`\``;
-                    await octokit.rest.issues.createComment({ owner, repo: repoName, issue_number: prNumber, body });
+                    const { data: prInfo } = await octokit.rest.pulls.get({ owner, repo: repoName, pull_number: prNumber });
+                    if (prInfo.mergeable === true) {
+                        skipConflictResolve('no_conflicts');
+                        continue;
+                    }
                 }
-                onPhaseChange('fixed ✓', { fixCount: appliedCount, phase: 'fixed', fixTokens: fixTokensUsed });
-                fileLog({ level: 'info', event: 'fix_complete', repo: `${owner}/${repoName}`, pr: prNumber, applied_count: appliedCount, delivery: 'comment', tokens_used: fixTokensUsed });
-                results[step.name] = { applied_count: appliedCount };
-            }
-        }
-        else if (effectiveType === 'conflict-resolve') {
-            const skipConflictResolve = (reason) => {
-                onPhaseChange('', { phase: 'fixed', fixCount: 0 });
-                results[step.name] = { skipped: true };
-                fileLog({ level: 'info', event: 'step_skipped', repo: `${owner}/${repoName}`, pr: prNumber, step: step.name, reason });
-            };
-            if (ctx.dryRun) {
-                skipConflictResolve('dry_run');
-                continue;
-            }
-            // Fast pre-check: GitHub's mergeable field tells us if the PR has conflicts without
-            // cloning. true = no conflicts (skip immediately); false = conflicts confirmed (proceed);
-            // null = GitHub is still computing — fall through to the git merge probe.
-            {
-                const octokit = createGithubClient(token);
-                const { data: prInfo } = await octokit.rest.pulls.get({ owner, repo: repoName, pull_number: prNumber });
-                if (prInfo.mergeable === true) {
+                // P1: The clone only has the PR head checked out — no unmerged index entries exist
+                // until we actually attempt the merge. Attempt the merge first; if it succeeds
+                // cleanly (no conflicts) abort it and skip. If it fails, the working tree now has
+                // real conflict markers and UU entries that findConflictedFiles can detect.
+                let hasMergeConflicts = false;
+                try {
+                    execSync(`git merge --no-commit origin/${pr.base.ref}`, { cwd: tmpDir, stdio: 'pipe' });
+                    // Clean merge — undo the staged merge state and skip this step
+                    try {
+                        execSync('git merge --abort', { cwd: tmpDir });
+                    }
+                    catch { /* ignore */ }
+                }
+                catch {
+                    hasMergeConflicts = true;
+                }
+                if (!hasMergeConflicts) {
                     skipConflictResolve('no_conflicts');
                     continue;
                 }
-            }
-            // P1: The clone only has the PR head checked out — no unmerged index entries exist
-            // until we actually attempt the merge. Attempt the merge first; if it succeeds
-            // cleanly (no conflicts) abort it and skip. If it fails, the working tree now has
-            // real conflict markers and UU entries that findConflictedFiles can detect.
-            let hasMergeConflicts = false;
-            try {
-                execSync(`git merge --no-commit origin/${pr.base.ref}`, { cwd: tmpDir, stdio: 'pipe' });
-                // Clean merge — undo the staged merge state and skip this step
-                try {
-                    execSync('git merge --abort', { cwd: tmpDir });
+                const conflictedFiles = findConflictedFiles(tmpDir);
+                if (conflictedFiles.length === 0) {
+                    try {
+                        execSync('git merge --abort', { cwd: tmpDir });
+                    }
+                    catch { /* ignore */ }
+                    skipConflictResolve('no_conflicts');
+                    continue;
                 }
-                catch { /* ignore */ }
-            }
-            catch {
-                hasMergeConflicts = true;
-            }
-            if (!hasMergeConflicts) {
-                skipConflictResolve('no_conflicts');
-                continue;
-            }
-            const conflictedFiles = findConflictedFiles(tmpDir);
-            if (conflictedFiles.length === 0) {
-                try {
-                    execSync('git merge --abort', { cwd: tmpDir });
+                const vendor = resolveReviewer(step.reviewer, origin, config, ctx.smartSwitchFallback);
+                if (!vendor) {
+                    try {
+                        execSync('git merge --abort', { cwd: tmpDir });
+                    }
+                    catch { /* ignore */ }
+                    ;
+                    skipConflictResolve('no_vendor');
+                    continue;
                 }
-                catch { /* ignore */ }
-                skipConflictResolve('no_conflicts');
-                continue;
-            }
-            const vendor = resolveReviewer(step.reviewer, origin, config, ctx.smartSwitchFallback);
-            if (!vendor) {
-                try {
-                    execSync('git merge --abort', { cwd: tmpDir });
+                if (vendor === 'codex') {
+                    try {
+                        execSync('git merge --abort', { cwd: tmpDir });
+                    }
+                    catch { /* ignore */ }
+                    ;
+                    skipConflictResolve('codex_conflict_resolve_unsupported');
+                    continue;
                 }
-                catch { /* ignore */ }
-                ;
-                skipConflictResolve('no_vendor');
-                continue;
-            }
-            if (vendor === 'codex') {
-                try {
-                    execSync('git merge --abort', { cwd: tmpDir });
+                const isFork = pr.head.repo?.full_name !== pr.base.repo.full_name;
+                if (isFork) {
+                    try {
+                        execSync('git merge --abort', { cwd: tmpDir });
+                    }
+                    catch { /* ignore */ }
+                    ;
+                    skipConflictResolve('fork_pr');
+                    continue;
                 }
-                catch { /* ignore */ }
-                ;
-                skipConflictResolve('codex_conflict_resolve_unsupported');
-                continue;
-            }
-            const isFork = pr.head.repo?.full_name !== pr.base.repo.full_name;
-            if (isFork) {
-                try {
-                    execSync('git merge --abort', { cwd: tmpDir });
+                const existingCount = countCrosscheckCommitsForPR(tmpDir, pr.base.ref);
+                if (existingCount >= MAX_CROSSCHECK_COMMITS) {
+                    try {
+                        execSync('git merge --abort', { cwd: tmpDir });
+                    }
+                    catch { /* ignore */ }
+                    log(chalk.yellow(`⚠  PR #${prNumber}: ${MAX_CROSSCHECK_COMMITS} [crosscheck] commits already — stopping conflict-resolve`));
+                    skipConflictResolve('commit_limit_reached');
+                    continue;
                 }
-                catch { /* ignore */ }
-                ;
-                skipConflictResolve('fork_pr');
-                continue;
-            }
-            const existingCount = countCrosscheckCommitsForPR(tmpDir, pr.base.ref);
-            if (existingCount >= MAX_CROSSCHECK_COMMITS) {
+                onPhaseChange(`${vendor} resolving conflicts...`, { phase: 'fixing' });
+                let appliedCount = 0;
+                let resolvedPaths = [];
+                let resolveTokensUsed;
                 try {
-                    execSync('git merge --abort', { cwd: tmpDir });
+                    ;
+                    ({ appliedCount, resolvedPaths, tokensUsed: resolveTokensUsed } = await runConflictResolveStep(tmpDir, pr.title, step.instructions ?? ''));
                 }
-                catch { /* ignore */ }
-                log(chalk.yellow(`⚠  PR #${prNumber}: ${MAX_CROSSCHECK_COMMITS} [crosscheck] commits already — stopping conflict-resolve`));
-                skipConflictResolve('commit_limit_reached');
-                continue;
-            }
-            onPhaseChange(`${vendor} resolving conflicts...`, { phase: 'fixing' });
-            let appliedCount = 0;
-            let resolvedPaths = [];
-            let resolveTokensUsed;
-            try {
-                ;
-                ({ appliedCount, resolvedPaths, tokensUsed: resolveTokensUsed } = await runConflictResolveStep(tmpDir, pr.title, step.instructions ?? ''));
-            }
-            catch (err) {
-                logError({ repo: `${owner}/${repoName}`, pr: prNumber, phase: 'conflict-resolve', attempt: 1 }, err);
-                try {
-                    execSync('git merge --abort', { cwd: tmpDir });
+                catch (err) {
+                    logError({ repo: `${owner}/${repoName}`, pr: prNumber, phase: 'conflict-resolve', attempt: 1 }, err);
+                    try {
+                        execSync('git merge --abort', { cwd: tmpDir });
+                    }
+                    catch { /* ignore */ }
+                    skipConflictResolve('resolve_error');
+                    continue;
                 }
-                catch { /* ignore */ }
-                skipConflictResolve('resolve_error');
-                continue;
-            }
-            if (appliedCount === 0) {
-                try {
-                    execSync('git merge --abort', { cwd: tmpDir });
+                if (appliedCount === 0) {
+                    try {
+                        execSync('git merge --abort', { cwd: tmpDir });
+                    }
+                    catch { /* ignore */ }
+                    onPhaseChange('', { phase: 'fixed', fixCount: 0, fixTokens: resolveTokensUsed });
+                    results[step.name] = { applied_count: 0 };
+                    continue;
                 }
-                catch { /* ignore */ }
-                onPhaseChange('', { phase: 'fixed', fixCount: 0, fixTokens: resolveTokensUsed });
-                results[step.name] = { applied_count: 0 };
-                continue;
-            }
-            // P2: Verify every conflict region was resolved before committing. Scope the
-            // check to the union of (originally-conflicted files) ∪ (files the resolver
-            // actually rewrote) — a repo-wide grep would false-positive on legitimate
-            // "=======" lines in docs (e.g. Markdown setext headings) and abort valid
-            // resolutions, but we still need to cover any path the resolver touched in
-            // case it ever edits outside the original conflict set. Read working-tree
-            // content directly so untrusted PR-controlled paths never reach a shell.
-            const MARKER_RE = /^(<<<<<<<|=======|>>>>>>>)( |$)/m;
-            const pathsToScan = Array.from(new Set([...conflictedFiles, ...resolvedPaths]));
-            const filesWithMarkers = [];
-            for (const f of pathsToScan) {
-                try {
-                    const content = readFileSync(join(tmpDir, f), 'utf8');
-                    if (MARKER_RE.test(content))
-                        filesWithMarkers.push(f);
+                // P2: Verify every conflict region was resolved before committing. Scope the
+                // check to the union of (originally-conflicted files) ∪ (files the resolver
+                // actually rewrote) — a repo-wide grep would false-positive on legitimate
+                // "=======" lines in docs (e.g. Markdown setext headings) and abort valid
+                // resolutions, but we still need to cover any path the resolver touched in
+                // case it ever edits outside the original conflict set. Read working-tree
+                // content directly so untrusted PR-controlled paths never reach a shell.
+                const MARKER_RE = /^(<<<<<<<|=======|>>>>>>>)( |$)/m;
+                const pathsToScan = Array.from(new Set([...conflictedFiles, ...resolvedPaths]));
+                const filesWithMarkers = [];
+                for (const f of pathsToScan) {
+                    try {
+                        const content = readFileSync(join(tmpDir, f), 'utf8');
+                        if (MARKER_RE.test(content))
+                            filesWithMarkers.push(f);
+                    }
+                    catch { /* unreadable (deleted side of modify/delete) — caught by U-filter below */ }
                 }
-                catch { /* unreadable (deleted side of modify/delete) — caught by U-filter below */ }
-            }
-            if (filesWithMarkers.length > 0) {
+                if (filesWithMarkers.length > 0) {
+                    try {
+                        execSync('git merge --abort', { cwd: tmpDir });
+                    }
+                    catch { /* ignore */ }
+                    log(chalk.yellow(`⚠  PR #${prNumber}: ${filesWithMarkers.length} file(s) still contain conflict markers — skipping commit`));
+                    fileLog({ level: 'warn', event: 'conflict_resolve_incomplete', repo: `${owner}/${repoName}`, pr: prNumber, paths: filesWithMarkers });
+                    skipConflictResolve('incomplete_resolution');
+                    continue;
+                }
+                // Stage only files the resolver actually rewrote — `git add -A` would
+                // otherwise silently stage non-text conflicts (binary, modify/delete) using
+                // the worktree side as an un-reviewed resolution. Staging also has to come
+                // BEFORE the unmerged-path check below: git keeps a path in the unmerged
+                // index until it is explicitly added, so checking earlier would always fail
+                // on the resolved files themselves. Use execFileSync (no shell) because
+                // resolvedPaths is derived from model output and PR-controlled filenames.
+                for (const p of resolvedPaths) {
+                    try {
+                        execFileSync('git', ['add', '--', p], { cwd: tmpDir, stdio: 'pipe' });
+                    }
+                    catch { /* skip */ }
+                }
+                // After staging the resolved files, anything still in U state is a conflict
+                // the resolver did not handle (binary, modify/delete, or a failed edit).
+                // Abort rather than commit a partial merge.
+                let unmergedPaths = [];
                 try {
-                    execSync('git merge --abort', { cwd: tmpDir });
+                    const out = execSync('git diff --name-only --diff-filter=U', { cwd: tmpDir, encoding: 'utf8' });
+                    unmergedPaths = out.trim().split('\n').filter(Boolean);
                 }
                 catch { /* ignore */ }
-                log(chalk.yellow(`⚠  PR #${prNumber}: ${filesWithMarkers.length} file(s) still contain conflict markers — skipping commit`));
-                fileLog({ level: 'warn', event: 'conflict_resolve_incomplete', repo: `${owner}/${repoName}`, pr: prNumber, paths: filesWithMarkers });
-                skipConflictResolve('incomplete_resolution');
-                continue;
-            }
-            // Stage only files the resolver actually rewrote — `git add -A` would
-            // otherwise silently stage non-text conflicts (binary, modify/delete) using
-            // the worktree side as an un-reviewed resolution. Staging also has to come
-            // BEFORE the unmerged-path check below: git keeps a path in the unmerged
-            // index until it is explicitly added, so checking earlier would always fail
-            // on the resolved files themselves. Use execFileSync (no shell) because
-            // resolvedPaths is derived from model output and PR-controlled filenames.
-            for (const p of resolvedPaths) {
+                if (unmergedPaths.length > 0) {
+                    try {
+                        execSync('git merge --abort', { cwd: tmpDir });
+                    }
+                    catch { /* ignore */ }
+                    log(chalk.yellow(`⚠  PR #${prNumber}: ${unmergedPaths.length} unmerged path(s) remain after resolve — skipping commit`));
+                    fileLog({ level: 'warn', event: 'conflict_resolve_unmerged_paths', repo: `${owner}/${repoName}`, pr: prNumber, paths: unmergedPaths });
+                    skipConflictResolve('unmerged_paths');
+                    continue;
+                }
+                execSync(`git commit -m "[crosscheck] resolve: resolve ${conflictedFiles.length} conflict${conflictedFiles.length !== 1 ? 's' : ''} — by Claude Code"`, { cwd: tmpDir });
+                const newSha = execSync('git rev-parse HEAD', { cwd: tmpDir, encoding: 'utf8' }).trim();
+                execSync(`git push origin HEAD:${pr.head.ref}`, {
+                    cwd: tmpDir,
+                    env: { ...process.env, GITHUB_TOKEN: token, GH_TOKEN: token },
+                });
+                ctx.crosscheckShas.add(newSha);
+                // Move the in-flight pending status to newSha so watchers on other
+                // machines (which don't share crosscheckShas) see the PR as locked when
+                // they receive the synchronize event and skip duplicate review.
+                // Track the sha so the finally below releases the pending status —
+                // without that release the status would stay pending forever on GitHub.
                 try {
-                    execFileSync('git', ['add', '--', p], { cwd: tmpDir, stdio: 'pipe' });
+                    const lockOctokit = createGithubClient(token);
+                    await acquireRemoteLock(lockOctokit, owner, repoName, newSha);
+                    pushedShasNeedingRelease.push(newSha);
                 }
-                catch { /* skip */ }
-            }
-            // After staging the resolved files, anything still in U state is a conflict
-            // the resolver did not handle (binary, modify/delete, or a failed edit).
-            // Abort rather than commit a partial merge.
-            let unmergedPaths = [];
-            try {
-                const out = execSync('git diff --name-only --diff-filter=U', { cwd: tmpDir, encoding: 'utf8' });
-                unmergedPaths = out.trim().split('\n').filter(Boolean);
+                catch (err) {
+                    fileLog({ level: 'warn', event: 'remote_lock_refresh_failed', repo: `${owner}/${repoName}`, pr: prNumber, sha: newSha, error: err instanceof Error ? err.message : String(err) });
+                }
+                onPhaseChange('conflicts resolved ✓', { fixCount: appliedCount, phase: 'fixed', fixTokens: resolveTokensUsed });
+                fileLog({ level: 'info', event: 'conflict_resolve_complete', repo: `${owner}/${repoName}`, pr: prNumber, conflicts_resolved: conflictedFiles.length, sha: newSha, tokens_used: resolveTokensUsed });
+                results[step.name] = { applied_count: appliedCount };
             }
-            catch { /* ignore */ }
-            if (unmergedPaths.length > 0) {
+        }
+        const verdict = Object.values(results).reverse().find(r => r.verdict !== undefined)?.verdict ?? null;
+        return { verdict: verdict ?? null };
+    }
+    catch (err) {
+        workflowFailed = true;
+        throw err;
+    }
+    finally {
+        if (pushedShasNeedingRelease.length > 0) {
+            const lockOctokit = createGithubClient(token);
+            const outcome = workflowFailed ? 'failure' : 'success';
+            // Drain via shift() so each released sha is synchronously removed from
+            // the shared array. The command-layer SIGINT/SIGTERM handler iterates
+            // the same array — if a late signal arrives after this finally has
+            // already released a sha, the handler won't see it and won't overwrite
+            // the released status with 'failure'. Atomic shift gives clean per-sha
+            // ownership transfer even when both loops are draining concurrently.
+            while (pushedShasNeedingRelease.length > 0) {
+                const s = pushedShasNeedingRelease.shift();
                 try {
-                    execSync('git merge --abort', { cwd: tmpDir });
+                    await releaseRemoteLock(lockOctokit, owner, repoName, s, outcome);
+                }
+                catch (err) {
+                    fileLog({ level: 'warn', event: 'pushed_sha_release_failed', repo: `${owner}/${repoName}`, pr: prNumber, sha: s, error: err instanceof Error ? err.message : String(err) });
                 }
-                catch { /* ignore */ }
-                log(chalk.yellow(`⚠  PR #${prNumber}: ${unmergedPaths.length} unmerged path(s) remain after resolve — skipping commit`));
-                fileLog({ level: 'warn', event: 'conflict_resolve_unmerged_paths', repo: `${owner}/${repoName}`, pr: prNumber, paths: unmergedPaths });
-                skipConflictResolve('unmerged_paths');
-                continue;
             }
-            execSync(`git commit -m "[crosscheck] resolve: resolve ${conflictedFiles.length} conflict${conflictedFiles.length !== 1 ? 's' : ''} — by Claude Code"`, { cwd: tmpDir });
-            const newSha = execSync('git rev-parse HEAD', { cwd: tmpDir, encoding: 'utf8' }).trim();
-            execSync(`git push origin HEAD:${pr.head.ref}`, {
-                cwd: tmpDir,
-                env: { ...process.env, GITHUB_TOKEN: token, GH_TOKEN: token },
-            });
-            ctx.crosscheckShas.add(newSha);
-            onPhaseChange('conflicts resolved ✓', { fixCount: appliedCount, phase: 'fixed', fixTokens: resolveTokensUsed });
-            fileLog({ level: 'info', event: 'conflict_resolve_complete', repo: `${owner}/${repoName}`, pr: prNumber, conflicts_resolved: conflictedFiles.length, sha: newSha, tokens_used: resolveTokensUsed });
-            results[step.name] = { applied_count: appliedCount };
         }
     }
-    const verdict = Object.values(results).reverse().find(r => r.verdict !== undefined)?.verdict ?? null;
-    return { verdict: verdict ?? null };
 }
 //# sourceMappingURL=runner.js.map