@motivation-labs/crosscheck 0.13.0-beta.7 → 0.13.0

package/dist/lib/runner.js

@@ -1,10 +1,13 @@
-import { execSync } from 'child_process';
+import { execSync, execFileSync } from 'child_process';
+import { readFileSync } from 'fs';
+import { join } from 'path';
 import chalk from 'chalk';
 import { runCodexReview } from '../reviewers/codex.js';
 import { runClaudeReview } from '../reviewers/claude.js';
 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 } from '../github/client.js';
+import { createGithubClient, postReviewComment, getLastCrossCheckCommentId } from '../github/client.js';
 import { log as fileLog, logError } from '../lib/logger.js';
 import { loadWorkflow, evaluateWhen } from '../lib/workflow.js';
 const MAX_CROSSCHECK_COMMITS = 5;
@@ -19,6 +22,33 @@ export function isRetryableFixError(err) {
 export function getEffectiveStepType(stepType, isRecheckRun) {
     return stepType === 'review' && isRecheckRun ? 'recheck' : stepType;
 }
+// Counts crosscheck-authored commits unique to this PR (ahead of base) rather
+// than the branch's full history. Long-lived integration branches like
+// `staging` accumulate [crosscheck] commits from many merged PRs — counting
+// those would trip the per-PR fix-loop guard immediately and skip fix/recheck.
+//
+// Fails closed: when `origin/<base>` isn't available (e.g. clone fetched the
+// base ref with `base_branch_fetch_skipped`), fall back to the full-history
+// count rather than returning 0. Over-counting can stop fix early; returning 0
+// would silently disable the cap and let runaway fix loops keep pushing.
+export function countCrosscheckCommitsForPR(tmpDir, baseRef) {
+    const runLog = (args) => execFileSync('git', ['log', '--oneline', ...args], { cwd: tmpDir, encoding: 'utf8', stdio: ['ignore', 'pipe', 'pipe'] });
+    const count = (out) => out.split('\n').filter(l => l.includes('[crosscheck]')).length;
+    try {
+        return count(runLog([`origin/${baseRef}..HEAD`]));
+    }
+    catch {
+        // Scoped range unavailable — fall back to full history so the cap still
+        // applies. May over-count when the branch has prior merged crosscheck
+        // commits, but that's preferable to bypassing the safety guard.
+        try {
+            return count(runLog([]));
+        }
+        catch {
+            return 0;
+        }
+    }
+}
 // Returns true when fix/recheck steps should be skipped because the configured
 // max_rounds cap has been reached. The review step (even when coerced to recheck)
 // is never skipped — it always produces a verdict for the current push.
@@ -27,6 +57,8 @@ export function exceedsMaxRounds(effectiveType, originalStepType, maxRounds, rou
         return false;
     if (effectiveType === 'fix')
         return round > maxRounds;
+    if (effectiveType === 'conflict-resolve')
+        return round > maxRounds;
     // Recheck step from the workflow (not a review coerced to recheck) is gated
     if (effectiveType === 'recheck' && originalStepType !== 'review')
         return round > maxRounds;
@@ -75,6 +107,8 @@ export async function runWorkflow(ctx) {
                 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
@@ -85,6 +119,8 @@ export async function runWorkflow(ctx) {
                 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') {
@@ -130,10 +166,20 @@ export async function runWorkflow(ctx) {
             else {
                 onPhaseChange(isRecheck ? 'posting recheck...' : 'posting comment...', phaseUpdate);
                 const octokit = createGithubClient(token);
-                await postReviewComment(octokit, owner, repoName, prNumber, commentBody, reviewer, config.brand);
+                // 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 };
+                results[step.name] = { verdict, commentBody, commentUrl, commentId };
             }
         }
         else if (effectiveType === 'fix') {
@@ -172,13 +218,10 @@ export async function runWorkflow(ctx) {
                 skipFix('codex_fix_unsupported');
                 continue;
             }
-            // Guard: don't push more than MAX_CROSSCHECK_COMMITS per PR
-            let existingCount = 0;
-            try {
-                const gitLog = execSync('git log --oneline', { cwd: tmpDir, encoding: 'utf8' });
-                existingCount = gitLog.split('\n').filter(l => l.includes('[crosscheck]')).length;
-            }
-            catch { /* ignore */ }
+            // 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');
@@ -304,6 +347,192 @@ export async function runWorkflow(ctx) {
                 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) {
+                    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 });
+                }
+                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 });
+                }
+                catch { /* ignore */ }
+                skipConflictResolve('no_conflicts');
+                continue;
+            }
+            const vendor = resolveReviewer(step.reviewer, origin, config, ctx.smartSwitchFallback);
+            if (!vendor) {
+                try {
+                    execSync('git merge --abort', { cwd: tmpDir });
+                }
+                catch { /* ignore */ }
+                ;
+                skipConflictResolve('no_vendor');
+                continue;
+            }
+            if (vendor === 'codex') {
+                try {
+                    execSync('git merge --abort', { cwd: tmpDir });
+                }
+                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 });
+                }
+                catch { /* ignore */ }
+                ;
+                skipConflictResolve('fork_pr');
+                continue;
+            }
+            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;
+            }
+            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 { /* ignore */ }
+                skipConflictResolve('resolve_error');
+                continue;
+            }
+            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;
+            }
+            // 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 */ }
+            }
+            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 {
+                const out = execSync('git diff --name-only --diff-filter=U', { cwd: tmpDir, encoding: 'utf8' });
+                unmergedPaths = out.trim().split('\n').filter(Boolean);
+            }
+            catch { /* ignore */ }
+            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);
+            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 };

package/dist/lib/runner.js.map

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

package/dist/lib/workflow.d.ts

@@ -1,20 +1,20 @@
 import { z } from 'zod';
 export declare const WorkflowStepSchema: z.ZodObject<{
     name: z.ZodString;
-    type: z.ZodType<"review" | "fix" | "recheck">;
+    type: z.ZodType<"review" | "fix" | "recheck" | "conflict-resolve">;
     reviewer: z.ZodDefault<z.ZodEnum<["auto", "claude", "codex", "origin"]>>;
     when: z.ZodOptional<z.ZodString>;
     max_rounds: z.ZodDefault<z.ZodNumber>;
     instructions: z.ZodOptional<z.ZodString>;
 }, "strip", z.ZodTypeAny, {
-    type: "review" | "fix" | "recheck";
+    type: "review" | "fix" | "recheck" | "conflict-resolve";
     name: string;
     reviewer: "claude" | "codex" | "auto" | "origin";
     max_rounds: number;
     when?: string | undefined;
     instructions?: string | undefined;
 }, {
-    type: "review" | "fix" | "recheck";
+    type: "review" | "fix" | "recheck" | "conflict-resolve";
     name: string;
     reviewer?: "claude" | "codex" | "auto" | "origin" | undefined;
     when?: string | undefined;
@@ -25,20 +25,20 @@ export declare const WorkflowSchema: z.ZodObject<{
     on: z.ZodDefault<z.ZodArray<z.ZodString, "many">>;
     steps: z.ZodArray<z.ZodObject<{
         name: z.ZodString;
-        type: z.ZodType<"review" | "fix" | "recheck">;
+        type: z.ZodType<"review" | "fix" | "recheck" | "conflict-resolve">;
         reviewer: z.ZodDefault<z.ZodEnum<["auto", "claude", "codex", "origin"]>>;
         when: z.ZodOptional<z.ZodString>;
         max_rounds: z.ZodDefault<z.ZodNumber>;
         instructions: z.ZodOptional<z.ZodString>;
     }, "strip", z.ZodTypeAny, {
-        type: "review" | "fix" | "recheck";
+        type: "review" | "fix" | "recheck" | "conflict-resolve";
         name: string;
         reviewer: "claude" | "codex" | "auto" | "origin";
         max_rounds: number;
         when?: string | undefined;
         instructions?: string | undefined;
     }, {
-        type: "review" | "fix" | "recheck";
+        type: "review" | "fix" | "recheck" | "conflict-resolve";
         name: string;
         reviewer?: "claude" | "codex" | "auto" | "origin" | undefined;
         when?: string | undefined;
@@ -48,7 +48,7 @@ export declare const WorkflowSchema: z.ZodObject<{
 }, "strip", z.ZodTypeAny, {
     on: string[];
     steps: {
-        type: "review" | "fix" | "recheck";
+        type: "review" | "fix" | "recheck" | "conflict-resolve";
         name: string;
         reviewer: "claude" | "codex" | "auto" | "origin";
         max_rounds: number;
@@ -57,7 +57,7 @@ export declare const WorkflowSchema: z.ZodObject<{
     }[];
 }, {
     steps: {
-        type: "review" | "fix" | "recheck";
+        type: "review" | "fix" | "recheck" | "conflict-resolve";
         name: string;
         reviewer?: "claude" | "codex" | "auto" | "origin" | undefined;
         when?: string | undefined;
@@ -70,12 +70,14 @@ export type WorkflowStep = z.infer<typeof WorkflowStepSchema>;
 export declare const DEFAULT_REVIEW_INSTRUCTIONS: string;
 export declare const DEFAULT_FIX_INSTRUCTIONS: string;
 export declare const DEFAULT_RECHECK_INSTRUCTIONS: string;
+export declare const DEFAULT_CONFLICT_RESOLVE_INSTRUCTIONS: string;
 export declare const DEFAULT_WORKFLOW: WorkflowStep[];
 export declare function loadWorkflow(operatorDir?: string): WorkflowStep[];
 export interface StepResult {
     verdict?: string | null;
     commentBody?: string;
     commentUrl?: string;
+    commentId?: number;
     applied_count?: number;
     skipped?: boolean;
 }

package/dist/lib/workflow.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"workflow.d.ts","sourceRoot":"","sources":["../../src/lib/workflow.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AAEvB,eAAO,MAAM,kBAAkB;;UAGwE,CAAC,CAAC,OAAO,CAAC,QAAQ,GAAG,KAAK,GAAG,SAAS,CAAC;;;;;;;;;;;;;;;;;;;EAK5I,CAAA;AAEF,eAAO,MAAM,cAAc;;;;cAP4E,CAAC,CAAC,OAAO,CAAC,QAAQ,GAAG,KAAK,GAAG,SAAS,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAU5I,CAAA;AAEF,MAAM,MAAM,YAAY,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,kBAAkB,CAAC,CAAA;AAE7D,eAAO,MAAM,2BAA2B,QAiB5B,CAAA;AAEZ,eAAO,MAAM,wBAAwB,QAIzB,CAAA;AAEZ,eAAO,MAAM,4BAA4B,QAK7B,CAAA;AAIZ,eAAO,MAAM,gBAAgB,EAAE,YAAY,EAgB1C,CAAA;AAED,wBAAgB,YAAY,CAAC,WAAW,CAAC,EAAE,MAAM,GAAG,YAAY,EAAE,CAkBjE;AAED,MAAM,WAAW,UAAU;IACzB,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;IACvB,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,OAAO,CAAC,EAAE,OAAO,CAAA;CAClB;AAID,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,GAAG,OAAO,CAoBvF"}
+{"version":3,"file":"workflow.d.ts","sourceRoot":"","sources":["../../src/lib/workflow.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AAEvB,eAAO,MAAM,kBAAkB;;UAG4F,CAAC,CAAC,OAAO,CAAC,QAAQ,GAAG,KAAK,GAAG,SAAS,GAAG,kBAAkB,CAAC;;;;;;;;;;;;;;;;;;;EAKrL,CAAA;AAEF,eAAO,MAAM,cAAc;;;;cAPgG,CAAC,CAAC,OAAO,CAAC,QAAQ,GAAG,KAAK,GAAG,SAAS,GAAG,kBAAkB,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAUrL,CAAA;AAEF,MAAM,MAAM,YAAY,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,kBAAkB,CAAC,CAAA;AAE7D,eAAO,MAAM,2BAA2B,QAiB5B,CAAA;AAEZ,eAAO,MAAM,wBAAwB,QAIzB,CAAA;AAEZ,eAAO,MAAM,4BAA4B,QAK7B,CAAA;AAEZ,eAAO,MAAM,qCAAqC,QAKtC,CAAA;AAIZ,eAAO,MAAM,gBAAgB,EAAE,YAAY,EAgB1C,CAAA;AAED,wBAAgB,YAAY,CAAC,WAAW,CAAC,EAAE,MAAM,GAAG,YAAY,EAAE,CAkBjE;AAED,MAAM,WAAW,UAAU;IACzB,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;IACvB,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,OAAO,CAAC,EAAE,OAAO,CAAA;CAClB;AAID,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,GAAG,OAAO,CAoBvF"}

package/dist/lib/workflow.js

@@ -6,7 +6,7 @@ import { z } from 'zod';
 export const WorkflowStepSchema = z.object({
     name: z.string(),
     // 'address' is the legacy name — normalized to 'fix' at parse time for backward compat
-    type: z.enum(['review', 'fix', 'recheck', 'address']).transform(t => t === 'address' ? 'fix' : t),
+    type: z.enum(['review', 'fix', 'recheck', 'address', 'conflict-resolve']).transform(t => t === 'address' ? 'fix' : t),
     reviewer: z.enum(['auto', 'claude', 'codex', 'origin']).default('auto'),
     when: z.string().optional(),
     max_rounds: z.number().int().positive().default(1),
@@ -45,6 +45,12 @@ export const DEFAULT_RECHECK_INSTRUCTIONS = [
     'If issues remain, repeat the original verdict (NEEDS WORK or BLOCK) and list what is still outstanding.',
     'Do not flag new issues — focus only on resolution of the originals.',
 ].join('\n');
+export const DEFAULT_CONFLICT_RESOLVE_INSTRUCTIONS = [
+    'Resolve all merge conflict markers (<<<<<<< HEAD, =======, >>>>>>> branch).',
+    'Keep meaningful changes from both sides when they do not contradict.',
+    'When both sides modify the same line, prefer the incoming branch changes unless they break existing logic.',
+    'Do not change any code outside of conflict regions.',
+].join('\n');
 // Default pipeline: review → fix issues (fix skipped when verdict is APPROVE).
 // Execution always goes through this constant — there is no legacy direct-call path.
 export const DEFAULT_WORKFLOW = [

package/dist/lib/workflow.js.map

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

package/dist/reviewers/conflict-resolve.d.ts

@@ -0,0 +1,14 @@
+export declare function findConflictedFiles(tmpDir: string): string[];
+export declare function extractConflictWindows(content: string): string;
+export declare function runConflictResolveStep(tmpDir: string, prTitle: string, instructions: string): Promise<{
+    appliedCount: number;
+    resolvedPaths: string[];
+    tokensUsed?: number;
+}>;
+export interface ResolverEdit {
+    filePath: string;
+    oldText: string;
+    newText: string;
+}
+export declare function parseResolverEdits(output: string, conflictedFiles: string[]): ResolverEdit[];
+//# sourceMappingURL=conflict-resolve.d.ts.map

package/dist/reviewers/conflict-resolve.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"conflict-resolve.d.ts","sourceRoot":"","sources":["../../src/reviewers/conflict-resolve.ts"],"names":[],"mappings":"AA4CA,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,CAO5D;AAQD,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAuC9D;AAkBD,wBAAsB,sBAAsB,CAC1C,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,MAAM,EACf,YAAY,EAAE,MAAM,GACnB,OAAO,CAAC;IAAE,YAAY,EAAE,MAAM,CAAC;IAAC,aAAa,EAAE,MAAM,EAAE,CAAC;IAAC,UAAU,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,CAwEjF;AAED,MAAM,WAAW,YAAY;IAC3B,QAAQ,EAAE,MAAM,CAAA;IAChB,OAAO,EAAE,MAAM,CAAA;IACf,OAAO,EAAE,MAAM,CAAA;CAChB;AAOD,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,EAAE,GAAG,YAAY,EAAE,CAqB5F"}