@humanbased/crosscheck 1.6.1-beta.5 → 1.7.0-beta.22

package/dist/lib/runner.js

@@ -7,7 +7,8 @@ import { filterStepsByTypes } from './repo-workflow.js';
 import { vendorDisplayName } from '../lib/vendor.js';
 import { runCodexReview } from '../reviewers/codex.js';
 import { runClaudeReview } from '../reviewers/claude.js';
-import { runFixStep, runCodexFixStep } from '../reviewers/fix.js';
+import { runOpenCodeReview } from '../reviewers/opencode.js';
+import { runFixStep, runCodexFixStep, runOpenCodeFixStep } from '../reviewers/fix.js';
 import { runConflictResolveStep, findConflictedFiles } from '../reviewers/conflict-resolve.js';
 import { parseVerdict, prependVerdictToComment, NULL_VERDICT_WARNING, applySeverityGate, SEVERITY_GATE_NOTE, DOC_ONLY_GATE_NOTE, detectInconclusiveReview, reviewHasNoFindings } from '../lib/verdict.js';
 import { createGithubClient, postReviewComment, getLastCrossCheckCommentId, getLastCrossCheckReviewComment } from '../github/client.js';
@@ -22,9 +23,9 @@ import { acquireRemoteLock, releaseRemoteLock } from '../github/review-status.js
 import { log as fileLog, logError, classifyError } from '../lib/logger.js';
 import { buildCommitTrailers, parseAnnotation } from '../lib/annotation.js';
 import { shaCovers } from '../lib/pr-workflow-state.js';
-import { resolveClaudeModel, resolveCodexModel } from '../lib/review-models.js';
+import { resolveClaudeModel, resolveCodexModel, resolveOpenCodeModel } from '../lib/review-models.js';
 import { resolveReviewStrategy, escalate, clampToLevels, isDocOnlyChange } from './review-strategy.js';
-import { CLAUDE_EFFORT_LEVELS, CODEX_EFFORT_LEVELS } from '../config/schema.js';
+import { CLAUDE_EFFORT_LEVELS, CODEX_EFFORT_LEVELS, OPENCODE_EFFORT_LEVELS } from '../config/schema.js';
 import { buildStepIdentityFields } from '../lib/event-fields.js';
 import { planAutoFixDelivery, forceWithLeaseArgs, parseLsRemoteOid, isLeaseRejection, assessFixBranchOwnership, isInvalidBaseError } from '../lib/auto-fix-branch.js';
 import { prOpenToVerdictMs } from '../lib/adoption.js';
@@ -254,34 +255,56 @@ function resolveReviewer(reviewer, origin, config, fallback) {
             return 'claude';
         if (origin === 'codex' && config.vendors.codex.enabled)
             return 'codex';
+        if (origin === 'opencode' && config.vendors.opencode.enabled)
+            return 'opencode';
         return fallback && config.vendors[fallback].enabled ? fallback : null;
     }
     if (reviewer === 'auto') {
         if (origin === 'claude' && config.vendors.codex.enabled)
             return 'codex';
+        if (origin === 'claude' && config.vendors.opencode.enabled)
+            return 'opencode';
         if (origin === 'codex' && config.vendors.claude.enabled)
             return 'claude';
+        if (origin === 'codex' && config.vendors.opencode.enabled)
+            return 'opencode';
+        if (origin === 'opencode' && config.vendors.claude.enabled)
+            return 'claude';
+        if (origin === 'opencode' && config.vendors.codex.enabled)
+            return 'codex';
         if (config.vendors.codex.enabled)
             return 'codex';
         if (config.vendors.claude.enabled)
             return 'claude';
+        if (config.vendors.opencode.enabled)
+            return 'opencode';
         return null;
     }
     if (reviewer === 'claude')
         return config.vendors.claude.enabled ? 'claude' : (fallback && config.vendors[fallback].enabled ? fallback : null);
     if (reviewer === 'codex')
         return config.vendors.codex.enabled ? 'codex' : (fallback && config.vendors[fallback].enabled ? fallback : null);
+    if (reviewer === 'opencode')
+        return config.vendors.opencode.enabled ? 'opencode' : (fallback && config.vendors[fallback].enabled ? fallback : null);
     return null;
 }
 function supportsStep(vendor, stepType) {
     if (stepType === 'review' || stepType === 'recheck' || stepType === 'fix')
         return true;
-    // Conflict resolution is Claude-only until Codex conflict resolution exists.
+    // Conflict resolution is Claude-only until Codex/OpenCode conflict resolution exists.
     return vendor === 'claude';
 }
 function resolveLimitFallbackVendor(failedVendor, stepType, config) {
-    const fallback = failedVendor === 'claude' ? 'codex' : 'claude';
-    return config.vendors[fallback].enabled && supportsStep(fallback, stepType) ? fallback : null;
+    const candidates = failedVendor === 'claude'
+        ? ['codex', 'opencode']
+        : failedVendor === 'codex'
+            ? ['claude', 'opencode']
+            : ['claude', 'codex'];
+    for (const candidate of candidates) {
+        if (config.vendors[candidate].enabled && supportsStep(candidate, stepType))
+            return candidate;
+    }
+    return null;
 }
 function notifyVendorFailure(ctx, failedVendor, fallbackVendor, reason, stepName) {
     const handler = ctx.onVendorFailure ?? ctx.onVendorLimit;
@@ -327,7 +350,7 @@ function resolveStepVendor(stepType, stepReviewer, origin, config, fallback) {
     // reviewer: auto, or routing.fallback_reviewer is an operator decision, left as
     // written so the caller can report the precise unsupported-step skip.
     if (stepReviewer === 'origin' &&
-        (origin === 'claude' || origin === 'codex') &&
+        (origin === 'claude' || origin === 'codex' || origin === 'opencode') &&
         vendor !== null &&
         !supportsStep(vendor, stepType)) {
         const capable = vendor === 'claude' ? 'codex' : 'claude';
@@ -344,11 +367,13 @@ function resolveStepVendor(stepType, stepReviewer, origin, config, fallback) {
         humanFallback = config.vendors.claude.enabled ? 'claude' : null;
     else if (fb === 'codex')
         humanFallback = config.vendors.codex.enabled ? 'codex' : null;
+    else if (fb === 'opencode')
+        humanFallback = config.vendors.opencode.enabled ? 'opencode' : null;
     else if (fb !== null) {
-        // 'auto': prefer codex then claude, same as resolveReviewer's auto path,
-        // narrowed to vendors that support this step type.
+        // 'auto': prefer codex then claude then opencode, same as resolveReviewer's
+        // auto path, narrowed to vendors that support this step type.
         const usable = (v) => config.vendors[v].enabled && supportsStep(v, stepType);
-        humanFallback = usable('codex') ? 'codex' : usable('claude') ? 'claude' : null;
+        humanFallback = usable('codex') ? 'codex' : usable('claude') ? 'claude' : usable('opencode') ? 'opencode' : null;
     }
     if (!humanFallback)
         return { vendor: null, usedHumanFallback: false };
@@ -558,6 +583,7 @@ export function resolveRoundExecution(config, strategy, round) {
             quality: config.quality,
             claudeVendor: config.vendors.claude,
             codexVendor: config.vendors.codex,
+            opencodeVendor: config.vendors.opencode,
             roundConfig: config,
             escalated: false,
         };
@@ -575,17 +601,22 @@ export function resolveRoundExecution(config, strategy, round) {
     if (config.vendors.codex.enabled) {
         lanes.push({ model: resolveCodexModel(baseQuality, config.vendors.codex), accepted: CODEX_EFFORT_LEVELS });
     }
+    if (config.vendors.opencode.enabled) {
+        lanes.push({ model: resolveOpenCodeModel(baseQuality, config.vendors.opencode) ?? 'default', accepted: OPENCODE_EFFORT_LEVELS });
+    }
     const escalated = escalate({ tier: strategy.tier ?? config.quality.tier, effort: strategy.effort }, round, lanes);
     const roundStrategy = { ...strategy, tier: escalated.tier, effort: escalated.effort };
     const quality = strategyQuality(config.quality, roundStrategy);
     const claudeVendor = strategyVendor(config.vendors.claude, roundStrategy, CLAUDE_EFFORT_LEVELS);
     const codexVendor = strategyVendor(config.vendors.codex, roundStrategy, CODEX_EFFORT_LEVELS);
+    const opencodeVendor = strategyVendor(config.vendors.opencode, roundStrategy, OPENCODE_EFFORT_LEVELS);
     return {
         strategy: roundStrategy,
         quality,
         claudeVendor,
         codexVendor,
-        roundConfig: { ...config, quality, vendors: { ...config.vendors, claude: claudeVendor, codex: codexVendor } },
+        opencodeVendor,
+        roundConfig: { ...config, quality, vendors: { ...config.vendors, claude: claudeVendor, codex: codexVendor, opencode: opencodeVendor } },
         escalated: escalated.tier !== strategy.tier || escalated.effort !== strategy.effort,
     };
 }
@@ -847,7 +878,7 @@ export async function runWorkflow(ctx) {
     // Above the try, and above emitPRComplexity, because both the complexity event
     // and workflow_complete report the tier that ran: an escalated round reporting
     // the base class tier is the same defect as a comment citing one.
-    const { strategy: roundStrategy, quality, claudeVendor, codexVendor, roundConfig, escalated } = resolveRoundExecution(config, strategy, ctx.round ?? 1);
+    const { strategy: roundStrategy, quality, claudeVendor, codexVendor, opencodeVendor, roundConfig, escalated } = resolveRoundExecution(config, strategy, ctx.round ?? 1);
     emitPRComplexity(ctx, triggerField, quality.tier);
     try {
         // Inside the try so a preflight failure still reaches the completion handler in
@@ -869,11 +900,12 @@ export async function runWorkflow(ctx) {
             const appliedEffort = [...new Set([
                     ...(config.vendors.claude.enabled ? [claudeVendor.effort] : []),
                     ...(config.vendors.codex.enabled ? [codexVendor.effort] : []),
+                    ...(config.vendors.opencode.enabled ? [opencodeVendor.effort] : []),
                 ])].join('/');
             const escalatedNote = escalated ? ` · round ${ctx.round} escalated` : '';
             log(chalk.dim(`  strategy v${strategy.version}: ${strategy.classId} → ${roundStrategy.tier ?? 'skip'} tier${appliedEffort ? ` (${appliedEffort})` : ''}${escalatedNote}`));
             if (escalatedNote) {
-                fileLog({ level: 'info', event: 'strategy_escalated', repo: `${owner}/${repoName}`, pr: prNumber, round: ctx.round, from_tier: strategy.tier, to_tier: roundStrategy.tier, from_effort: strategy.effort, to_effort: roundStrategy.effort, applied_effort_claude: config.vendors.claude.enabled ? claudeVendor.effort : null, applied_effort_codex: config.vendors.codex.enabled ? codexVendor.effort : null, strategy_version: strategy.version });
+                fileLog({ level: 'info', event: 'strategy_escalated', repo: `${owner}/${repoName}`, pr: prNumber, round: ctx.round, from_tier: strategy.tier, to_tier: roundStrategy.tier, from_effort: strategy.effort, to_effort: roundStrategy.effort, applied_effort_claude: config.vendors.claude.enabled ? claudeVendor.effort : null, applied_effort_codex: config.vendors.codex.enabled ? codexVendor.effort : null, applied_effort_opencode: config.vendors.opencode.enabled ? opencodeVendor.effort : null, strategy_version: strategy.version });
             }
         }
         for (const step of steps) {
@@ -978,6 +1010,12 @@ export async function runWorkflow(ctx) {
                         inputTokens = undefined;
                         outputTokens = undefined;
                     }
+                    else if (candidate === 'opencode') {
+                        ;
+                        ({ review: rawReview, tokensUsed, model, effort, retried } = await runOpenCodeReview(tmpDir, pr.base.ref, pr.title, quality, opencodeVendor, memoryPlan?.instructions ?? step.instructions, undefined, ctx.overrideTimeoutMs ?? vendorTimeoutMs(config.vendors.opencode.timeout_sec), log, reviewContext, skillSession));
+                        inputTokens = undefined;
+                        outputTokens = undefined;
+                    }
                     else {
                         ;
                         ({ review: rawReview, tokensUsed, inputTokens, outputTokens, model, effort, retried } = await runClaudeReview(tmpDir, pr.base.ref, pr.title, quality, claudeVendor, config.budget.per_review_usd, memoryPlan?.instructions ?? step.instructions, undefined, ctx.overrideTimeoutMs ?? vendorTimeoutMs(config.vendors.claude.timeout_sec), !!ctx.roundMode, log, reviewContext, skillSession));
@@ -1160,7 +1198,7 @@ export async function runWorkflow(ctx) {
                     // Withheld when an explicit vendors.*.model overrode the tier map:
                     // citing a tier the run did not use would assert a routing decision
                     // that never happened.
-                    strategyCitation(reviewer === 'codex' ? config.vendors.codex : config.vendors.claude, strategy, roundStrategy, model));
+                    strategyCitation(reviewer === 'codex' ? config.vendors.codex : reviewer === 'opencode' ? config.vendors.opencode : config.vendors.claude, strategy, roundStrategy, model));
                     if (memoryPlan && structured?.snapshot) {
                         // The review is already posted; a memory write failure only costs the next review its delta.
                         try {
@@ -1313,6 +1351,7 @@ export async function runWorkflow(ctx) {
                 // away.
                 const claudeFixModel = resolveClaudeModel(quality, claudeVendor);
                 const codexFixModel = resolveCodexModel(quality, codexVendor);
+                const opencodeFixModel = resolveOpenCodeModel(quality, opencodeVendor);
                 // 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.
@@ -1345,6 +1384,9 @@ export async function runWorkflow(ctx) {
                     if (v === 'codex') {
                         return runCodexFixStep(tmpDir, pr.base.ref, pr.title, reviewCommentBody, step.instructions ?? '', codexFixModel, ctx.overrideTimeoutMs ?? vendorTimeoutMs(config.vendors.codex.timeout_sec) ?? tierMs, skillSession, codexVendor.effort, config.skills.codex_full_access, fixHumanFeedback);
                     }
+                    if (v === 'opencode') {
+                        return runOpenCodeFixStep(tmpDir, pr.base.ref, pr.title, reviewCommentBody, step.instructions ?? '', opencodeFixModel, ctx.overrideTimeoutMs ?? vendorTimeoutMs(config.vendors.opencode.timeout_sec) ?? tierMs, skillSession, opencodeVendor.effort, fixHumanFeedback);
+                    }
                     // roundConfig, not config: runFixStep reads vendors.claude.effort and
                     // quality.tier out of it, and both must be this round's values.
                     return runFixStep(tmpDir, pr.base.ref, pr.title, reviewCommentBody, step.instructions ?? '', roundConfig, claudeFixModel, ctx.overrideTimeoutMs ?? vendorTimeoutMs(config.vendors.claude.timeout_sec) ?? tierMs, skillSession, fixHumanFeedback);
@@ -1411,7 +1453,7 @@ export async function runWorkflow(ctx) {
                 const fixAttributionFooter = () => buildAttributionFooter({
                     action: 'Fixed',
                     vendor: activeVendor,
-                    model: activeVendor === 'codex' ? codexFixModel : claudeFixModel,
+                    model: activeVendor === 'codex' ? codexFixModel : activeVendor === 'opencode' ? opencodeFixModel : claudeFixModel,
                     effort: fixEffort,
                     skills: activatedSkills,
                 });
@@ -1426,7 +1468,7 @@ export async function runWorkflow(ctx) {
                                 body: buildFixFailedCommentBody({
                                     prUrl: pr.html_url,
                                     vendor: activeVendor,
-                                    model: activeVendor === 'codex' ? codexFixModel : claudeFixModel,
+                                    model: activeVendor === 'codex' ? codexFixModel : activeVendor === 'opencode' ? opencodeFixModel : claudeFixModel,
                                     effort: fixEffort,
                                     skills: activatedSkills,
                                 }),
@@ -1460,7 +1502,7 @@ export async function runWorkflow(ctx) {
                 const deliveryMode = config.post_review.auto_fix.delivery.mode;
                 const landing = resolveFixLanding(deliveryMode);
                 if (landing === 'branch') {
-                    const fixModel = activeVendor === 'codex' ? codexFixModel : claudeFixModel;
+                    const fixModel = activeVendor === 'codex' ? codexFixModel : activeVendor === 'opencode' ? (opencodeFixModel ?? 'default') : claudeFixModel;
                     runGitWithoutHooks(tmpDir, ['add', '-A']);
                     runGitWithoutHooks(tmpDir, [
                         'commit',
@@ -1512,7 +1554,7 @@ export async function runWorkflow(ctx) {
                             changedFiles: fixChangedFiles,
                             vendor: activeVendor,
                             reviewCommentBody,
-                            model: activeVendor === 'codex' ? codexFixModel : claudeFixModel,
+                            model: activeVendor === 'codex' ? codexFixModel : activeVendor === 'opencode' ? opencodeFixModel : claudeFixModel,
                             effort: fixEffort,
                             skills: activatedSkills,
                         });
@@ -1525,7 +1567,7 @@ export async function runWorkflow(ctx) {
                     results[step.name] = { applied_count: appliedCount, tokens_used: fixTokensUsed, vendor: activeVendor };
                 }
                 else if (landing === 'branch-then-separate-pr') {
-                    const fixModel = activeVendor === 'codex' ? codexFixModel : claudeFixModel;
+                    const fixModel = activeVendor === 'codex' ? codexFixModel : activeVendor === 'opencode' ? (opencodeFixModel ?? 'default') : claudeFixModel;
                     // Commit the fix on the PR's own branch (already checked out in tmpDir) and
                     // try to push it there, so the fix, recheck, and approval all stay on the
                     // original PR. Only when that push can't land — e.g. the PR was merged and
@@ -1585,7 +1627,7 @@ export async function runWorkflow(ctx) {
                                 changedFiles: fixChangedFiles,
                                 vendor: activeVendor,
                                 reviewCommentBody,
-                                model: activeVendor === 'codex' ? codexFixModel : claudeFixModel,
+                                model: activeVendor === 'codex' ? codexFixModel : activeVendor === 'opencode' ? opencodeFixModel : claudeFixModel,
                                 effort: fixEffort,
                                 skills: activatedSkills,
                             });
@@ -1920,6 +1962,15 @@ export async function runWorkflow(ctx) {
                     skipConflictResolve('codex_conflict_resolve_unsupported');
                     continue;
                 }
+                if (vendor === 'opencode') {
+                    try {
+                        runGitWithoutHooks(tmpDir, ['merge', '--abort']);
+                    }
+                    catch { /* ignore */ }
+                    ;
+                    skipConflictResolve('opencode_conflict_resolve_unsupported');
+                    continue;
+                }
                 // Conflict-resolve is mechanical text surgery bounded by the markers —
                 // measured at 37s against ~643s for a review — so it always runs fast.
                 const conflictResolveModel = resolveClaudeModel({ ...config.quality, tier: config.quality.mode === 'smart' ? 'fast' : config.quality.tier }, config.vendors.claude);