@straiffi/archon 1.10.0 → 1.10.2

package/dist/server/index.js

@@ -48,6 +48,8 @@ import { createExecutionProfileSelection, executionProfileSelectionMetadata, val
 import { prepareTicketForBuild } from './lib/buildFlow.js';
 import { getActiveBundleRepairBlocker, getBundlePlanMutationBlockerById, shouldBlockPlanForBundleMutationById, } from './lib/bundleActivity.js';
 import { getDiscoveredModels, normalizeModelId, normalizeTicketModelId } from './lib/models.js';
+import { getSupportedAgentCatalog } from './lib/agentCatalog.js';
+import { parseStoredAgentModelConfig, resolveHelperModelConfig, serializeAgentModelConfig, validateAgentModelConfigUpdate, validateDiscoveredAgentModelConfig, } from './lib/agentModelConfig.js';
 import { upgradeTool, UpgradeInProgressError } from './lib/toolUpgrade.js';
 import { acceptProjectMemorySuggestion, applyProjectMemorySuggestionToDecision, applyProjectMemorySuggestionToConvention, archiveProjectConvention, archiveProjectDecision, createProjectConvention, createProjectDecision, dismissProjectMemorySuggestion, getProjectMemoryById, getProjectMemorySuggestionById, isProjectMemoryEnabled, listProjectConventions, listLatestSuccessfulProjectContextArtifacts, listProjectDecisions, listProjectMemories, listProjectMemorySuggestions, restoreProjectConvention, restoreProjectDecision, serializeProjectMemoryFromConventionValue, serializeProjectMemoryFromDecisionValue, serializeProjectMemoryFromSuggestionValue, supersedeProjectDecision, supersedeProjectDecisionFromSuggestion, updateProjectConvention, updateProjectDecision, validateProjectConventionPayload, validateProjectDecisionPayload, } from './lib/projectMemory.js';
 import { selectRelevantProjectMemory } from './lib/projectMemoryPrompt.js';
@@ -64,20 +66,23 @@ import { buildReviewFindingsResponse, computeDiffSignature, getLatestCompletedRe
 import { formatBuildOpenQuestionAnswersPrompt, getLatestBuildOpenQuestionBatchStatus, hasActiveBuildOpenQuestionBatch, listBuildOpenQuestionsForBundle, loadBuildOpenQuestionsByBundleIds, } from './lib/buildOpenQuestions.js';
 import { acceptBuildOpenQuestionResolution } from './lib/buildOpenQuestionOperations.js';
 import { areBundleTicketsReadyForAutomaticReview } from './lib/bundleAutomationReadiness.js';
-import { abandonAutomationPause, completeAutomationProgression, createAutomationReviewFix, ensureAutomationProgression, finishAutomationReviewFix, getAutomationProgression, recoverLegacyAutomationProgression, recoverStoppedSideEffectProgression, runAutomationProgression, stopAutomationProgression, waitAutomationProgression } from './lib/automationProgression.js';
+import { abandonAutomationPause, completeAutomationProgression, completeAutomationProgressionInTransaction, completeAutomationReviewFixActionInTransaction, createAutomationReviewFixInTransaction, ensureAutomationProgression, finishAutomationReviewFix, getAutomationProgression, recoverLegacyAutomationProgression, recoverStoppedSideEffectProgression, runAutomationProgression, stopAutomationProgression, waitAutomationProgression } from './lib/automationProgression.js';
 import { reconcileAutomationStage } from './lib/automationReconciliation.js';
 import { runAutomationReviewGateOrPause } from './lib/automationReviewGate.js';
 import { pausedRunBelongsToProgression, resolveAutomationResumeDecision } from './lib/automationResumeDecision.js';
+import { isLegacyReviewRepairMigrationPause } from './lib/reviewRepairReconciliation.js';
 import { getAutomationStageDetails, } from './lib/automationStageDetails.js';
-import { buildAutomationFixInstruction, clearAutomationPause, countBlockingFindings, depthAtLeast, getBundleAutomationState, isAutomationDepth, recordAutomationPause, resolveAutomationConfig, upsertBundleAutomationState, } from './lib/ticketAutomation.js';
+import { buildAutomationFixInstruction, clearAutomationPause, countBlockingFindings, depthAtLeast, getBundleAutomationState, isAutomationActive, isAutomationDepth, recordAutomationPause, resetBundleAutomationLoop, resolveAutomationConfig, } from './lib/ticketAutomation.js';
 import { resolveAutomationCheckGateResume, runAutomationCommitChain, runAutomationCommitOperation } from './lib/ticketAutomationCommit.js';
 import { resolveBuildTicketCommitCheckpointLineage, canMutateBuildTicketCommitCheckpoint } from './lib/buildTicketCommit.js';
 import { continueAfterBuildCheckpoint } from './lib/automationBuildContinuation.js';
 import { getDiscoveredSkills, normalizeSkillNames } from './lib/skills.js';
 import { clearAllPreviewProxies } from './lib/previewProxy.js';
 import { createExecutionRun, addExecutionRunLink, addExecutionRunLinks, getExecutionRun, getLifecycleEvent, hasActiveBuildExecutionRunForTicket, getGitHubActionsExecutionDetails, getTestExecutionDetails, GitHubActionsDispatchConflictError, listExecutionRunLinks, listExecutionRuns, listLifecycleEvents, listProjectLifecycleEvents, toCanonicalLifecycleEvent, transitionExecutionRun, withExecutionRunTransaction, } from './lib/executionRuns.js';
+import { appendReviewRepairIterationDecisionInTransaction, attachReviewRepairResultInTransaction, attachReviewRepairActionEnvelopeInTransaction, attachReviewRepairActionInTransaction, claimReviewRepairIterationInTransaction, assertReviewRepairIterationDeletionEligible, deleteTerminalReviewRepairIterationsForTicketInTransaction, getActiveReviewRepairIteration, getReviewRepairIteration, pauseReviewRepairIteration, rewindStaleReviewRepairVerification, replaceReviewRepairActionEnvelopeRetryInTransaction, replaceReviewRepairActionRetryInTransaction, replaceReviewRepairVerificationRetryInTransaction, resetReviewRepairGateForRetry, resumePausedReviewRepairIteration, terminalizeReviewRepairIteration, terminalizeReviewRepairIterationInTransaction, } from './lib/reviewRepairIterations.js';
 import { dispatchExecutionRetry, getExecutionRetryEligibility, resolveExecutionRetry } from './lib/executionRetry.js';
 import { listExecutionTimeline } from './lib/executionTimeline.js';
+import { loadReviewAutomationLoopDetails } from './lib/automationLoopProjection.js';
 import { loadExecutionArtifactSummariesForRuns, openExecutionArtifactForRetrieval, } from './lib/executionArtifacts.js';
 import { cleanupAllExecutionEvidence, EXECUTION_EVIDENCE_CLEANUP_INTERVAL_MS, resolveExecutionEvidenceRetentionDays, } from './lib/executionRunRetention.js';
 import { ExecutionArtifactCleanupError, reconcileExecutionArtifactRegistrationIntents, reconcileFinalizedExecutionArtifacts, reconcileProjectExecutionArtifacts, resolveArtifactCleanupIntervalMs, } from './lib/executionArtifactRetention.js';
@@ -134,7 +139,7 @@ import { buildSpecImplementationDraft } from './lib/specDraft.js';
 import { materializeSpecSnapshotTickets } from './lib/specTicketMaterialization.js';
 import { exportSpecToDocs, checkSpecExportCollision, SpecExportCollisionError } from './lib/specExport.js';
 import { createTicketDependency, deleteTicketDependenciesForTicket, deleteTicketDependency, getTicketDependency, isTicketBuildComplete, isTicketRunSetupReady, listTicketDependencies, validateCreateTicketDependency, } from './lib/ticketDependencies.js';
-import { startBuild } from './workers/build.js';
+import { startBuild, startPostBuildCheckRecovery } from './workers/build.js';
 import { expandPlanningTicketOutline, generatePlanningTicketOutline, generatePlanText, prepareLinkedPlanningResearch, startPlan, stopAllPlanAgents, } from './workers/plan.js';
 import { EXECUTION_RUN_KINDS, MAX_ARTIFACTS_PER_RUN, validateWorkflowContext } from './lib/types.js';
 class ProjectDeletionError extends Error {
@@ -483,6 +488,9 @@ const buildExecutionRunDetailResponse = async (project, run) => {
         agent_runs: listAgentRunsForExecutionRun(run.id),
         ...artifacts,
         environment_context: getExecutionEnvironmentContextForRun(project.id, run.id),
+        automation_loops: run.kind === 'automation_progression'
+            ? loadReviewAutomationLoopDetails(project.id, run.id)
+            : [],
     };
 };
 const formatWorktreeDeleteError = (target, branch, error) => {
@@ -568,6 +576,18 @@ const cleanupWorktreeExecutionTarget = async ({ project, targetKind, targetKey,
     return { branchWarning: buildBranchCleanupWarning(branch, deleteLocalBranch(branch, project)) };
 };
 const deleteTicketRecord = async (ticket) => {
+    if (ticket.project_id) {
+        try {
+            assertReviewRepairIterationDeletionEligible(ticket.project_id, ticket.id);
+        }
+        catch (error) {
+            return {
+                ok: false,
+                status: 409,
+                error: error instanceof Error ? error.message : 'Unable to validate Review repair history',
+            };
+        }
+    }
     if (ticket.project_id
         && ticket.worktree_bundle_id
         && hasActiveBundleCheckWork(ticket.project_id, ticket.worktree_bundle_id)) {
@@ -644,7 +664,21 @@ const deleteTicketRecord = async (ticket) => {
             affectedTicketIds = sequenceRemoval.affectedTicketIds;
         }
     }
-    db.prepare('DELETE FROM tickets WHERE id = ?').run(ticket.id);
+    try {
+        withExecutionRunTransaction(transaction => {
+            if (ticket.project_id) {
+                deleteTerminalReviewRepairIterationsForTicketInTransaction(transaction, ticket.project_id, ticket.id);
+            }
+            db.prepare('DELETE FROM tickets WHERE id = ?').run(ticket.id);
+        }, io, 'immediate');
+    }
+    catch (error) {
+        return {
+            ok: false,
+            status: 409,
+            error: error instanceof Error ? error.message : 'Unable to delete Review repair history',
+        };
+    }
     try {
         clearTicketStageSnapshots(ticket.id);
     }
@@ -1002,6 +1036,34 @@ const asProjectPayload = (body) => {
     }
     return body;
 };
+const validateProjectRoleModelDiscovery = async (body, values, currentProject) => {
+    for (const role of ['helper', 'reviewer']) {
+        const mapField = `${role}_models`;
+        const jsonField = `${role}_models_json`;
+        const hasMapUpdate = Object.hasOwn(body, mapField);
+        const hasLegacyUpdate = Object.hasOwn(body, `${role}_model`) || Object.hasOwn(body, `${role}_variant`);
+        if ((!hasMapUpdate && !hasLegacyUpdate) || !values[jsonField]) {
+            continue;
+        }
+        const submittedAgents = hasMapUpdate
+            ? Object.keys(body[mapField])
+            : ['opencode'];
+        const nextConfig = parseStoredAgentModelConfig(values[jsonField]);
+        const currentConfig = parseStoredAgentModelConfig(currentProject?.[jsonField]);
+        const agents = currentProject
+            ? submittedAgents.filter(agent => (nextConfig[agent]?.model !== currentConfig[agent]?.model
+                || nextConfig[agent]?.variant !== currentConfig[agent]?.variant))
+            : submittedAgents;
+        if (agents.length === 0) {
+            continue;
+        }
+        const validation = await validateDiscoveredAgentModelConfig(nextConfig, mapField, agents);
+        if ('error' in validation) {
+            return validation;
+        }
+    }
+    return { ok: true };
+};
 const isWorktreeReady = (branch, project) => {
     return existsSync(resolveWorktreePath(branch, project));
 };
@@ -1651,7 +1713,7 @@ const startBundlePullRequestDiscoveryIfNeeded = (project, bundle) => {
     })();
     bundlePullRequestDiscoveryInFlight.set(key, task);
 };
-const serializeBundleRow = (projectId, bundle, openQuestions = bundle ? loadBuildOpenQuestionsByBundleIds(projectId, [bundle.id]).get(bundle.id) ?? [] : [], resolvedProject) => {
+const serializeBundleRow = (projectId, bundle, agent, openQuestions = bundle ? loadBuildOpenQuestionsByBundleIds(projectId, [bundle.id]).get(bundle.id) ?? [] : [], resolvedProject) => {
     if (!bundle) {
         return null;
     }
@@ -1660,11 +1722,20 @@ const serializeBundleRow = (projectId, bundle, openQuestions = bundle ? loadBuil
         ? true
         : Boolean(project && resolveExistingWorktreePath(bundle.branch, project));
     const effectivePolicy = resolveEffectiveRequiredCheckPolicyMembership(project);
+    const reviewerModels = bundle.kind === 'project_root'
+        ? {}
+        : parseStoredAgentModelConfig(bundle.reviewer_models_json);
+    const reviewerOpenCode = reviewerModels.opencode;
+    const { reviewer_models_json: _reviewerModelsJson, ...serializedRow } = bundle;
+    void _reviewerModelsJson;
     return {
-        ...bundle,
-        reviewer_model: bundle.kind === 'project_root' ? null : bundle.reviewer_model ?? null,
-        reviewer_variant: bundle.kind === 'project_root' || !bundle.reviewer_model ? null : bundle.reviewer_variant ?? null,
-        reviewer_config: resolveReviewerConfig(bundle.kind === 'project_root' ? null : bundle, project),
+        ...serializedRow,
+        reviewer_model: reviewerOpenCode?.model ?? null,
+        reviewer_variant: reviewerOpenCode?.model ? reviewerOpenCode.variant : null,
+        reviewer_models: reviewerModels,
+        reviewer_config: resolveReviewerConfig(bundle.kind === 'project_root' ? null : {
+            reviewer_models: reviewerModels,
+        }, project, undefined, agent),
         has_prepared_worktree: hasPreparedWorktree,
         pull_request: getGitHubConnectionConfig(projectId)
             ? serializeBundlePullRequest(getBundlePullRequestRecord(bundle.id, projectId))
@@ -1879,8 +1950,9 @@ const resolveBundleRenameEligibility = (project, bundle, tickets = listBundleTic
     return { eligible: true, reason: null };
 };
 const serializeBundleDetails = (project, bundle, extras = {}) => {
+    const agent = config.tool ?? 'opencode';
     const tickets = listDetailedBundleTickets(project.id, bundle.id);
-    const serializedBundle = serializeBundleRow(project.id, bundle, tickets.flatMap(ticket => ticket.build_open_questions ?? []), project);
+    const serializedBundle = serializeBundleRow(project.id, bundle, agent, tickets.flatMap(ticket => ticket.build_open_questions ?? []), project);
     if (!serializedBundle) {
         throw new Error(`Failed to serialize bundle ${bundle.id}`);
     }
@@ -1907,7 +1979,10 @@ const serializeBundleDetails = (project, bundle, extras = {}) => {
         review_recovery_available: getBundleAutomationState(project.id, bundle.id)?.automation_paused_reason
             ? false
             : getBundleReviewRecovery(project.id, bundle.id) !== null,
-        has_helper_model: Boolean(project.helper_model),
+        has_helper_model: Boolean(resolveHelperModelConfig({
+            helperModelsJson: project.helper_models_json,
+            agent,
+        }).model),
         recent_commit_subjects: getBundleRecentCommitSubjects(project, bundle),
     };
 };
@@ -3631,7 +3706,7 @@ app.get('/bundles', async (req, res) => {
     const bundles = listBundles(result.project.id);
     timing.mark('list_bundles');
     const openQuestionsByBundleId = loadBuildOpenQuestionsByBundleIds(result.project.id, bundles.map(bundle => bundle.id));
-    const serializedBundles = bundles.map(bundle => serializeBundleRow(result.project.id, bundle, openQuestionsByBundleId.get(bundle.id) ?? [], result.project));
+    const serializedBundles = bundles.map(bundle => serializeBundleRow(result.project.id, bundle, config.tool ?? 'opencode', openQuestionsByBundleId.get(bundle.id) ?? [], result.project));
     timing.mark('serialize_bundles');
     timing.end({ count: serializedBundles.length });
     res.json(serializedBundles);
@@ -3755,7 +3830,12 @@ app.post('/bundles/:id/pull-request-description', async (req, res) => {
     if (isProjectRootBundle(bundle)) {
         return res.status(409).json({ error: 'Pull request descriptions are not available for the project root bundle.' });
     }
-    if (!result.project.helper_model) {
+    const helperTool = config.tool ?? 'opencode';
+    const helperConfig = resolveHelperModelConfig({
+        helperModelsJson: result.project.helper_models_json,
+        agent: helperTool,
+    });
+    if (!helperConfig.model) {
         return res.status(409).json({ error: 'Set a helper model in project settings before generating a PR description.' });
     }
     const title = asTrimmedString(req.body?.title);
@@ -3772,9 +3852,9 @@ app.post('/bundles/:id/pull-request-description', async (req, res) => {
     try {
         const worktreePath = resolveWorktreePath(bundle.branch, result.project);
         const rawDescription = await runLightweightPrompt({
-            tool: 'opencode',
-            model: result.project.helper_model,
-            variant: result.project.helper_variant,
+            tool: helperTool,
+            model: helperConfig.model,
+            variant: helperConfig.variant,
         }, buildPullRequestDescriptionPrompt({
             title,
             ticketTitles,
@@ -4002,7 +4082,7 @@ app.post('/bundles', async (req, res) => {
             });
         }
     }
-    res.status(201).json(serializeBundleRow(result.project.id, bundle, [], result.project));
+    res.status(201).json(serializeBundleRow(result.project.id, bundle, config.tool ?? 'opencode', [], result.project));
 });
 app.delete('/bundles/:id', async (req, res) => {
     const result = getRequiredProject(req);
@@ -4075,7 +4155,7 @@ app.delete('/bundles/:id', async (req, res) => {
     }
     res.status(204).end();
 });
-app.patch('/bundles/:id', (req, res) => {
+app.patch('/bundles/:id', async (req, res) => {
     const result = getRequiredProject(req);
     if ('error' in result) {
         return res.status(400).json({ error: result.error });
@@ -4085,7 +4165,7 @@ app.patch('/bundles/:id', (req, res) => {
         return res.status(404).json({ error: 'Bundle not found' });
     }
     const hasNameUpdate = hasOwn(req.body, 'name');
-    const hasReviewerUpdate = hasOwn(req.body, 'reviewer_model') || hasOwn(req.body, 'reviewer_variant');
+    const hasReviewerUpdate = hasOwn(req.body, 'reviewer_models') || hasOwn(req.body, 'reviewer_model') || hasOwn(req.body, 'reviewer_variant');
     if (hasOwn(req.body, 'required_check_policy_override')) {
         return res.status(400).json({ error: 'Bundle required-check policy overrides are no longer supported; configure required checks on the project' });
     }
@@ -4181,8 +4261,32 @@ app.patch('/bundles/:id', (req, res) => {
             return res.status(400).json({ error: 'automation_review_max_iterations must be an integer between 1 and 10' });
         }
     }
-    let reviewerModel = bundle.reviewer_model ?? null;
-    let reviewerVariant = reviewerModel ? bundle.reviewer_variant ?? null : null;
+    let reviewerModels = parseStoredAgentModelConfig(bundle.reviewer_models_json);
+    let reviewerModel = reviewerModels.opencode?.model ?? null;
+    let reviewerVariant = reviewerModel ? reviewerModels.opencode?.variant ?? null : null;
+    let reviewerModelsPatch = null;
+    if (hasOwn(req.body, 'reviewer_models')) {
+        if (hasOwn(req.body, 'reviewer_model') || hasOwn(req.body, 'reviewer_variant')) {
+            return res.status(400).json({
+                error: 'reviewer_models cannot be provided with legacy reviewer_model or reviewer_variant fields',
+            });
+        }
+        const result = validateAgentModelConfigUpdate(req.body.reviewer_models, 'reviewer_models');
+        if ('error' in result) {
+            return res.status(400).json({ error: result.error });
+        }
+        const submittedAgents = Object.keys(req.body.reviewer_models);
+        const changedAgents = submittedAgents.filter(agent => (result.value[agent]?.model !== reviewerModels[agent]?.model
+            || result.value[agent]?.variant !== reviewerModels[agent]?.variant));
+        const discoveryValidation = await validateDiscoveredAgentModelConfig(result.value, 'reviewer_models', changedAgents);
+        if ('error' in discoveryValidation) {
+            return res.status(400).json({ error: discoveryValidation.error });
+        }
+        reviewerModelsPatch = result.value;
+        reviewerModels = { ...reviewerModels, ...result.value };
+        reviewerModel = reviewerModels.opencode?.model ?? null;
+        reviewerVariant = reviewerModel ? reviewerModels.opencode?.variant ?? null : null;
+    }
     if (hasOwn(req.body, 'reviewer_model')) {
         const value = req.body.reviewer_model;
         if (value == null) {
@@ -4206,16 +4310,34 @@ app.patch('/bundles/:id', (req, res) => {
             reviewerVariant = null;
         }
         else if (typeof value === 'string' && value.trim()) {
-            reviewerVariant = reviewerModel ? value.trim() : null;
+            reviewerVariant = value.trim();
         }
         else {
             return res.status(400).json({ error: 'reviewer_variant must be a non-empty string' });
         }
     }
+    if (!hasOwn(req.body, 'reviewer_models') && (hasOwn(req.body, 'reviewer_model') || hasOwn(req.body, 'reviewer_variant'))) {
+        const result = validateAgentModelConfigUpdate({
+            opencode: { model: reviewerModel, variant: reviewerVariant },
+        }, 'reviewer_models');
+        if ('error' in result) {
+            return res.status(400).json({ error: result.error });
+        }
+        const discoveryValidation = await validateDiscoveredAgentModelConfig(result.value, 'reviewer_models', ['opencode']);
+        if ('error' in discoveryValidation) {
+            return res.status(400).json({ error: discoveryValidation.error });
+        }
+        reviewerModelsPatch = result.value;
+        reviewerModels = { ...reviewerModels, ...result.value };
+    }
     let updated = null;
     try {
         updated = db.transaction(() => {
-            if (nextName !== bundle.name) {
+            const currentBundle = getBundle(bundle.id, result.project.id);
+            if (!currentBundle) {
+                return null;
+            }
+            if (hasNameUpdate && nextName !== currentBundle.name) {
                 updateBundleIdentity({
                     bundleId: bundle.id,
                     projectId: result.project.id,
@@ -4223,21 +4345,36 @@ app.patch('/bundles/:id', (req, res) => {
                     branch: nextBranch,
                 });
             }
-            updateBundleAutomationConfig({
-                bundleId: bundle.id,
-                projectId: result.project.id,
-                automationDepth,
-                automationReviewFixEnabled,
-                automationPauseOnOpenQuestions,
-                automationReviewMaxIterations,
-            });
+            if (hasOwn(req.body, 'automation_depth')
+                || hasOwn(req.body, 'automation_review_fix_enabled')
+                || hasOwn(req.body, 'automation_pause_on_open_questions')
+                || hasOwn(req.body, 'automation_review_max_iterations')) {
+                updateBundleAutomationConfig({
+                    bundleId: bundle.id,
+                    projectId: result.project.id,
+                    automationDepth: hasOwn(req.body, 'automation_depth') ? automationDepth : currentBundle.automation_depth ?? null,
+                    automationReviewFixEnabled: hasOwn(req.body, 'automation_review_fix_enabled') ? automationReviewFixEnabled : currentBundle.automation_review_fix_enabled ?? null,
+                    automationPauseOnOpenQuestions: hasOwn(req.body, 'automation_pause_on_open_questions') ? automationPauseOnOpenQuestions : currentBundle.automation_pause_on_open_questions ?? null,
+                    automationReviewMaxIterations: hasOwn(req.body, 'automation_review_max_iterations') ? automationReviewMaxIterations : currentBundle.automation_review_max_iterations ?? null,
+                });
+            }
+            if (!reviewerModelsPatch) {
+                return getBundle(bundle.id, result.project.id);
+            }
+            const currentReviewerModels = parseStoredAgentModelConfig(currentBundle.reviewer_models_json);
+            const mergedReviewerModels = validateAgentModelConfigUpdate(reviewerModelsPatch, 'reviewer_models', currentReviewerModels);
+            if ('error' in mergedReviewerModels) {
+                throw new Error(mergedReviewerModels.error);
+            }
+            const currentOpenCode = mergedReviewerModels.value.opencode;
             return updateBundleReviewerConfig({
                 bundleId: bundle.id,
                 projectId: result.project.id,
-                reviewerModel,
-                reviewerVariant,
+                reviewerModel: currentOpenCode?.model ?? null,
+                reviewerVariant: currentOpenCode?.model ? currentOpenCode.variant : null,
+                reviewerModelsJson: serializeAgentModelConfig(mergedReviewerModels.value),
             });
-        })();
+        }).immediate();
     }
     catch (error) {
         if (error instanceof Error && 'code' in error && String(error.code).startsWith('SQLITE_CONSTRAINT')) {
@@ -4248,7 +4385,7 @@ app.patch('/bundles/:id', (req, res) => {
     listBundleTickets(result.project.id, bundle.id).forEach(ticket => {
         io.emit('ticket:updated', ticket);
     });
-    res.json(serializeBundleRow(result.project.id, updated));
+    res.json(serializeBundleRow(result.project.id, updated, config.tool ?? 'opencode'));
 });
 app.post('/bundles/:id/build', (req, res) => {
     const result = getRequiredProject(req);
@@ -4545,17 +4682,18 @@ app.post('/bundles/:id/resume-automation', async (req, res) => {
             questionResolutionActive: hasActiveBuildOpenQuestionBatch(result.project.id, bundle.id),
         });
     };
-    const decision = resolveCurrentDecision();
-    if (!decision || decision.status !== 'enabled') {
-        const error = decision?.status === 'hidden' && decision.reason === 'question_resolution_active'
+    const initialDecision = resolveCurrentDecision();
+    if (!initialDecision || initialDecision.status !== 'enabled') {
+        const error = initialDecision?.status === 'hidden' && initialDecision.reason === 'question_resolution_active'
             ? 'Build open question resolution is still in progress'
-            : decision?.status === 'hidden' && decision.reason === 'resolve_open_questions'
+            : initialDecision?.status === 'hidden' && initialDecision.reason === 'resolve_open_questions'
                 ? 'Resolve or dismiss all Build open questions before resuming automation'
-                : decision?.status === 'disabled' && decision.reason === 'invalid_stage_lineage'
+                : initialDecision?.status === 'disabled' && initialDecision.reason === 'invalid_stage_lineage'
                     ? 'The paused automation stage does not belong to the active progression'
                     : 'Bundle automation cannot be resumed in its current state';
-        return res.status(409).json({ error, automation_resume_decision: decision });
+        return res.status(409).json({ error, automation_resume_decision: initialDecision });
     }
+    let decision = initialDecision;
     const revalidateDecision = () => {
         const current = resolveCurrentDecision();
         return current?.status === 'enabled'
@@ -4770,6 +4908,179 @@ app.post('/bundles/:id/resume-automation', async (req, res) => {
         return res.status(400).json({ error: 'Ticket project no longer exists' });
     }
     const automationConfig = resolveAutomationConfig(owner.bundle ?? null, project);
+    const legacyReviewRepairPause = isLegacyReviewRepairMigrationPause(result.project.id, bundle.id, progressionRunId);
+    let completedVerificationIteration = getActiveReviewRepairIteration(result.project.id, progressionRunId);
+    let reconciledSourceReviewRunId = null;
+    if (completedVerificationIteration?.phase === 'paused') {
+        withExecutionRunTransaction(transaction => {
+            appendReviewRepairIterationDecisionInTransaction(transaction, {
+                projectId: result.project.id,
+                iterationId: completedVerificationIteration.id,
+                decisionPoint: 'resume',
+                effectiveAutomationConfig: automationConfig,
+                decisionCode: 'resume_iteration_requested',
+            });
+        }, io, 'immediate');
+    }
+    if (completedVerificationIteration?.phase === 'paused') {
+        const verificationRunId = completedVerificationIteration.resulting_review_execution_run_id;
+        const verificationRun = verificationRunId ? getExecutionRun(result.project.id, verificationRunId) : null;
+        if (verificationRun?.status === 'completed') {
+            try {
+                completedVerificationIteration = resumePausedReviewRepairIteration({
+                    projectId: result.project.id,
+                    iterationId: completedVerificationIteration.id,
+                    expectedCurrentRunId: verificationRunId,
+                    broadcaster: io,
+                });
+            }
+            catch (error) {
+                const current = getReviewRepairIteration(result.project.id, completedVerificationIteration.id);
+                if (current?.resulting_review_execution_run_id === verificationRunId
+                    && ['verification_active', 'terminal'].includes(current.phase)) {
+                    return res.json(serializeBundleDetails(result.project, bundle));
+                }
+                return res.status(409).json({ error: error instanceof Error ? error.message : String(error) });
+            }
+        }
+    }
+    if (completedVerificationIteration?.phase === 'verification_active'
+        && completedVerificationIteration.resulting_review_execution_run_id) {
+        const verificationRunId = completedVerificationIteration.resulting_review_execution_run_id;
+        const verificationRun = getExecutionRun(result.project.id, verificationRunId);
+        const resultingReview = verificationRun?.status === 'completed'
+            ? db.prepare(`
+          SELECT review.id
+          FROM review_runs review
+          JOIN execution_run_links result_link
+            ON result_link.execution_run_id = ?
+            AND result_link.project_id = review.project_id
+            AND result_link.entity_type = 'review_run'
+            AND result_link.entity_id = review.id
+            AND result_link.relationship = 'result'
+          WHERE review.project_id = ? AND review.ticket_id = ?
+            AND review.worktree_bundle_id = ? AND review.status = 'completed'
+          LIMIT 1
+        `).get(verificationRunId, result.project.id, owner.id, bundle.id)
+            : undefined;
+        if (resultingReview) {
+            reconciledSourceReviewRunId = resultingReview.id;
+            const blockingCount = countBlockingFindings(listReviewFindings(resultingReview.id), automationConfig);
+            const terminal = !isAutomationActive(automationConfig)
+                ? { outcome: 'interrupted', stopReason: 'configuration_changed' }
+                : blockingCount === 0
+                    ? { outcome: 'repaired', stopReason: 'no_blocking_findings' }
+                    : automationConfig.reviewFixEnabled
+                        ? completedVerificationIteration.ordinal < automationConfig.reviewMaxIterations
+                            ? { outcome: 'continuing', stopReason: null }
+                            : { outcome: 'exhausted', stopReason: 'max_iterations' }
+                        : { outcome: 'interrupted', stopReason: 'automation_disabled' };
+            try {
+                withExecutionRunTransaction(transaction => {
+                    if (!completedVerificationIteration.resulting_review_run_id) {
+                        attachReviewRepairResultInTransaction(transaction, {
+                            projectId: result.project.id,
+                            iterationId: completedVerificationIteration.id,
+                            expectedPhase: 'verification_active',
+                            expectedVerificationRunId: verificationRunId,
+                            resultingReviewRunId: resultingReview.id,
+                        });
+                    }
+                    appendReviewRepairIterationDecisionInTransaction(transaction, {
+                        projectId: result.project.id,
+                        iterationId: completedVerificationIteration.id,
+                        decisionPoint: 'verification_completion',
+                        effectiveAutomationConfig: automationConfig,
+                        decisionCode: 'verification_reconciled_on_resume',
+                        operationRunId: verificationRunId,
+                    });
+                    terminalizeReviewRepairIterationInTransaction(transaction, {
+                        projectId: result.project.id,
+                        iterationId: completedVerificationIteration.id,
+                        expectedPhase: 'verification_active',
+                        expectedCurrentRunId: verificationRunId,
+                        outcome: terminal.outcome,
+                        stopReason: terminal.stopReason,
+                        resultingBlockingCount: blockingCount,
+                    });
+                    if (automationConfig.depth === 'manual') {
+                        completeAutomationProgressionInTransaction(transaction, {
+                            projectId: result.project.id,
+                            bundleId: bundle.id,
+                            progressionRunId,
+                            domainStatus: 'manual_boundary_reached',
+                        });
+                    }
+                    if (terminal.outcome === 'continuing') {
+                        claimReviewRepairIterationInTransaction(transaction, {
+                            projectId: result.project.id,
+                            worktreeBundleId: bundle.id,
+                            ownerTicketId: owner.id,
+                            automationProgressionRunId: progressionRunId,
+                            triggeringReviewExecutionRunId: verificationRunId,
+                            triggeringReviewRunId: resultingReview.id,
+                            triggeringBlockingCount: blockingCount,
+                            effectiveAutomationConfig: automationConfig,
+                            decisionCode: 'resume_verification_repair_admitted',
+                        });
+                    }
+                }, io, 'immediate');
+            }
+            catch (error) {
+                const current = getReviewRepairIteration(result.project.id, completedVerificationIteration.id);
+                if (current?.phase === 'terminal'
+                    && current.resulting_review_execution_run_id === verificationRunId
+                    && current.resulting_review_run_id === resultingReview.id) {
+                    return res.json(serializeBundleDetails(result.project, bundle));
+                }
+                return res.status(409).json({ error: error instanceof Error ? error.message : String(error) });
+            }
+            if (terminal.outcome === 'continuing') {
+                const continuationDecision = resolveCurrentDecision();
+                if (!continuationDecision || continuationDecision.status !== 'enabled') {
+                    return res.status(409).json({ error: 'Bundle automation state changed before repair continuation could start' });
+                }
+                decision = continuationDecision;
+            }
+            else if (terminal.outcome === 'repaired') {
+                resetBundleAutomationLoop(result.project.id, bundle.id);
+                runAutomationProgression({
+                    projectId: result.project.id,
+                    bundleId: bundle.id,
+                    progressionRunId,
+                    broadcaster: io,
+                });
+                if (depthAtLeast(automationConfig.depth, 'auto_commit')) {
+                    await runAutomationCommitChain(owner, project, owner.bundle ?? null, automationConfig, io, progressionRunId, undefined, verificationRunId);
+                }
+                else {
+                    completeAutomationProgression({
+                        projectId: result.project.id,
+                        bundleId: bundle.id,
+                        progressionRunId,
+                        broadcaster: io,
+                    });
+                }
+                return res.json(serializeBundleDetails(result.project, bundle));
+            }
+            else if (automationConfig.depth !== 'manual') {
+                waitAutomationProgression({
+                    projectId: result.project.id,
+                    bundleId: bundle.id,
+                    progressionRunId,
+                    pauseCode: 'review',
+                    pauseReason: 'Blocking Review findings remain after repair verification.',
+                    reasonCode: 'precondition_failed',
+                    pausedStageRunId: verificationRunId,
+                    broadcaster: io,
+                });
+                return res.json(serializeBundleDetails(result.project, bundle));
+            }
+            else {
+                return res.json(serializeBundleDetails(result.project, bundle));
+            }
+        }
+    }
     const restoreWaitingProgression = () => {
         waitAutomationProgression({
             projectId: result.project.id,
@@ -4821,19 +5132,36 @@ app.post('/bundles/:id/resume-automation', async (req, res) => {
         if (!revalidateDecision()) {
             return res.status(409).json({ error: 'Bundle automation state changed before Resume could start' });
         }
-        completeAutomationProgression({
-            projectId: result.project.id,
-            bundleId: bundle.id,
-            progressionRunId,
-            domainStatus: 'manual_boundary_reached',
-            broadcaster: io,
-        });
+        withExecutionRunTransaction(transaction => {
+            const activeIteration = getActiveReviewRepairIteration(result.project.id, progressionRunId);
+            if (activeIteration && activeIteration.phase !== 'terminal') {
+                terminalizeReviewRepairIterationInTransaction(transaction, {
+                    projectId: result.project.id,
+                    iterationId: activeIteration.id,
+                    expectedPhase: activeIteration.phase,
+                    expectedCurrentRunId: activeIteration.resulting_review_execution_run_id
+                        ?? activeIteration.gate_batch_run_id
+                        ?? activeIteration.action_run_id
+                        ?? activeIteration.action_envelope_run_id,
+                    outcome: 'interrupted',
+                    stopReason: 'configuration_changed',
+                });
+            }
+            completeAutomationProgressionInTransaction(transaction, {
+                projectId: result.project.id,
+                bundleId: bundle.id,
+                progressionRunId,
+                domainStatus: 'manual_boundary_reached',
+            });
+        }, io, 'immediate');
         return res.json(serializeBundleDetails(result.project, bundle));
     }
     if ((decision.outcome === 'start_review' || decision.outcome === 'rerun_review_checks')
         && owner.parked_at === null
         && isTicketBuildComplete(owner)
-        && (owner.state === 'build' || (decision.outcome === 'rerun_review_checks' && owner.state === 'review'))) {
+        && (owner.state === 'build'
+            || (decision.outcome === 'rerun_review_checks' && owner.state === 'review')
+            || (legacyReviewRepairPause && owner.state === 'review'))) {
         if (!revalidateDecision()) {
             return res.status(409).json({ error: 'Bundle automation state changed before Resume could start' });
         }
@@ -4842,6 +5170,36 @@ app.post('/bundles/:id/resume-automation', async (req, res) => {
             return res.status(409).json({ error: 'Automation progression ownership is invalid' });
         }
         const workflowContext = validateWorkflowContext(progression.metadata);
+        let repairIteration = decision.outcome === 'rerun_review_checks'
+            ? getActiveReviewRepairIteration(result.project.id, progressionRunId)
+            : null;
+        if (repairIteration?.phase === 'paused') {
+            repairIteration = repairIteration.stop_reason === 'stale_evidence'
+                && repairIteration.resulting_review_execution_run_id
+                ? rewindStaleReviewRepairVerification({
+                    projectId: result.project.id,
+                    iterationId: repairIteration.id,
+                    expectedVerificationRunId: repairIteration.resulting_review_execution_run_id,
+                    broadcaster: io,
+                })
+                : resumePausedReviewRepairIteration({
+                    projectId: result.project.id,
+                    iterationId: repairIteration.id,
+                    expectedCurrentRunId: repairIteration.resulting_review_execution_run_id
+                        ?? repairIteration.gate_batch_run_id
+                        ?? repairIteration.action_run_id
+                        ?? repairIteration.action_envelope_run_id,
+                    broadcaster: io,
+                });
+        }
+        if (decision.outcome === 'rerun_review_checks' && repairIteration?.phase === 'gate_active') {
+            repairIteration = resetReviewRepairGateForRetry({
+                projectId: result.project.id,
+                iterationId: repairIteration.id,
+                expectedGateBatchRunId: repairIteration.gate_batch_run_id,
+                broadcaster: io,
+            });
+        }
         let reviewStartFailureStatus = null;
         let reviewStartFailureError = null;
         try {
@@ -4858,6 +5216,7 @@ app.post('/bundles/:id/resume-automation', async (req, res) => {
                 broadcaster: io,
                 pausedStageRunId: bundleState.automation_paused_stage_run_id,
                 initiation: { workflowContext },
+                iterationId: repairIteration?.id,
                 onReviewStartFailure: failure => {
                     reviewStartFailureStatus = failure.status;
                     reviewStartFailureError = failure.error;
@@ -4866,6 +5225,31 @@ app.post('/bundles/:id/resume-automation', async (req, res) => {
             });
         }
         catch (error) {
+            const currentIteration = repairIteration
+                ? getReviewRepairIteration(result.project.id, repairIteration.id)
+                : null;
+            const pausedStage = bundleState.automation_paused_stage_run_id
+                ? getExecutionRun(result.project.id, bundleState.automation_paused_stage_run_id)
+                : null;
+            const retrySource = pausedStage?.retry_of_run_id
+                ? getExecutionRun(result.project.id, pausedStage.retry_of_run_id)
+                : null;
+            console.error('Bundle automation Review resume failed', {
+                project_id: result.project.id,
+                bundle_id: bundle.id,
+                progression_run_id: progressionRunId,
+                decision_outcome: decision.outcome,
+                iteration_id: currentIteration?.id ?? null,
+                iteration_phase: currentIteration?.phase ?? null,
+                iteration_stop_reason: currentIteration?.stop_reason ?? null,
+                paused_stage_run_id: pausedStage?.id ?? null,
+                paused_stage_parent_run_id: pausedStage?.parent_run_id ?? null,
+                paused_stage_retry_of_run_id: pausedStage?.retry_of_run_id ?? null,
+                retry_source_parent_run_id: retrySource?.parent_run_id ?? null,
+                error_name: error instanceof Error ? error.name : null,
+                error_message: error instanceof Error ? error.message : String(error),
+                error_stack: error instanceof Error ? error.stack : null,
+            });
             return res.status(409).json({ error: error instanceof Error ? error.message : String(error) });
         }
         if (reviewStartFailureStatus !== null && reviewStartFailureError !== null) {
@@ -4873,12 +5257,12 @@ app.post('/bundles/:id/resume-automation', async (req, res) => {
         }
     }
     else if (owner.state === 'review' && owner.agent_status !== 'running') {
-        const iteration = bundleState.review_iteration_count ?? 0;
         if (decision.outcome === 'start_review_fix') {
             let reviewFixRunId = null;
+            let repairIterationId = null;
+            let followUpRunId = null;
+            let retryActionRunId = null;
             let followUpResult;
-            const previousIteration = bundleState.review_iteration_count ?? 0;
-            const previousFixLoopActive = bundleState.fix_loop_active;
             try {
                 if (!revalidateDecision()) {
                     return res.status(409).json({ error: 'Bundle automation state changed before Resume could start' });
@@ -4888,17 +5272,14 @@ app.post('/bundles/:id/resume-automation', async (req, res) => {
                     return res.status(409).json({ error: 'Automation progression ownership is invalid' });
                 }
                 const workflowContext = validateWorkflowContext(progression.metadata);
-                const sourceReviewRun = getLatestCompletedReviewRunForContext({
-                    ticketId: owner.id,
-                    projectId: owner.project_id,
-                    worktreeBundleId: owner.worktree_bundle_id,
-                });
-                if (!sourceReviewRun || sourceReviewRun.status !== 'completed') {
+                let existingIteration = getActiveReviewRepairIteration(result.project.id, progressionRunId);
+                const sourceReviewRunId = reconciledSourceReviewRunId ?? existingIteration?.triggering_review_run_id ?? null;
+                if (!sourceReviewRunId) {
                     throw new Error('The completed review findings to resume are unavailable');
                 }
                 const reviewFixWorkflowContext = validateWorkflowContext({
                     ...(workflowContext ?? {}),
-                    review_finding_run_id: sourceReviewRun.id,
+                    review_finding_run_id: sourceReviewRunId,
                     review_severity: automationConfig.reviewSeverity,
                 });
                 runAutomationProgression({
@@ -4907,22 +5288,144 @@ app.post('/bundles/:id/resume-automation', async (req, res) => {
                     progressionRunId,
                     broadcaster: io,
                 });
-                upsertBundleAutomationState(result.project.id, bundle.id, {
-                    review_iteration_count: iteration + 1,
-                    fix_loop_active: 1,
-                });
-                const reviewFix = createAutomationReviewFix({
-                    projectId: result.project.id,
-                    bundleId: bundle.id,
-                    ticketId: owner.id,
-                    ticketTitle: owner.title,
-                    progressionRunId,
-                    workflowContext: reviewFixWorkflowContext,
-                    reviewFindingRunId: sourceReviewRun.id,
-                    reviewSeverity: automationConfig.reviewSeverity,
-                    broadcaster: io,
-                });
-                reviewFixRunId = reviewFix.runId;
+                if (existingIteration?.phase === 'paused') {
+                    existingIteration = resumePausedReviewRepairIteration({
+                        projectId: result.project.id,
+                        iterationId: existingIteration.id,
+                        expectedCurrentRunId: existingIteration.resulting_review_execution_run_id
+                            ?? existingIteration.gate_batch_run_id
+                            ?? existingIteration.action_run_id
+                            ?? existingIteration.action_envelope_run_id,
+                        broadcaster: io,
+                    });
+                }
+                if (existingIteration && ['gate_pending', 'gate_active', 'verification_pending', 'verification_active'].includes(existingIteration.phase)) {
+                    await runAutomationReviewGateOrPause({
+                        projectId: result.project.id,
+                        bundleId: bundle.id,
+                        progressionRunId,
+                        broadcaster: io,
+                        pausedStageRunId: existingIteration.action_run_id,
+                        initiation: { workflowContext: reviewFixWorkflowContext },
+                        iterationId: existingIteration.id,
+                    });
+                    return res.json(serializeBundleDetails(result.project, bundle));
+                }
+                if (existingIteration && existingIteration.triggering_review_run_id !== sourceReviewRunId) {
+                    throw new Error('The active Review repair iteration does not match the Resume source Review');
+                }
+                if (existingIteration?.phase === 'action_active' && existingIteration.action_run_id) {
+                    const actionRun = getExecutionRun(result.project.id, existingIteration.action_run_id);
+                    if (actionRun?.status === 'completed') {
+                        await runAutomationReviewGateOrPause({
+                            projectId: result.project.id,
+                            bundleId: bundle.id,
+                            progressionRunId,
+                            broadcaster: io,
+                            pausedStageRunId: actionRun.id,
+                            initiation: { workflowContext: reviewFixWorkflowContext },
+                            iterationId: existingIteration.id,
+                        });
+                        return res.json(serializeBundleDetails(result.project, bundle));
+                    }
+                    if (!actionRun || ['queued', 'running', 'waiting'].includes(actionRun.status)) {
+                        throw new Error('Review repair action is still active or unavailable');
+                    }
+                    retryActionRunId = actionRun.id;
+                }
+                const sourceReviewExecution = existingIteration ? null : db.prepare(`
+          SELECT execution.id
+          FROM execution_runs execution
+          JOIN execution_run_links result_link
+            ON result_link.execution_run_id = execution.id
+            AND result_link.project_id = execution.project_id
+            AND result_link.entity_type = 'review_run'
+            AND result_link.entity_id = ?
+            AND result_link.relationship = 'result'
+          WHERE execution.project_id = ? AND execution.kind = 'review'
+            AND execution.status = 'completed'
+          LIMIT 1
+        `).get(sourceReviewRunId, result.project.id);
+                if (!existingIteration && !sourceReviewExecution) {
+                    throw new Error('The completed Review execution to resume is unavailable');
+                }
+                const claimed = withExecutionRunTransaction(transaction => {
+                    const repairIteration = existingIteration ?? claimReviewRepairIterationInTransaction(transaction, {
+                        projectId: result.project.id,
+                        worktreeBundleId: bundle.id,
+                        ownerTicketId: owner.id,
+                        automationProgressionRunId: progressionRunId,
+                        triggeringReviewExecutionRunId: sourceReviewExecution.id,
+                        triggeringReviewRunId: sourceReviewRunId,
+                        triggeringBlockingCount: countBlockingFindings(listReviewFindings(sourceReviewRunId), automationConfig),
+                        effectiveAutomationConfig: automationConfig,
+                        decisionCode: 'resume_repair_admitted',
+                    });
+                    if (!existingIteration) {
+                        appendReviewRepairIterationDecisionInTransaction(transaction, {
+                            projectId: result.project.id,
+                            iterationId: repairIteration.id,
+                            decisionPoint: 'resume',
+                            effectiveAutomationConfig: automationConfig,
+                            decisionCode: 'resume_repair_claimed',
+                        });
+                    }
+                    if (repairIteration.phase === 'action_claimed' && repairIteration.action_envelope_run_id) {
+                        const existingEnvelope = getExecutionRun(result.project.id, repairIteration.action_envelope_run_id);
+                        if (existingEnvelope && ['queued', 'running', 'waiting'].includes(existingEnvelope.status)) {
+                            return { iterationId: repairIteration.id, reviewFixRunId: repairIteration.action_envelope_run_id };
+                        }
+                        if (!existingEnvelope) {
+                            throw new Error('Review repair action envelope is unavailable');
+                        }
+                        const replacement = createAutomationReviewFixInTransaction(transaction, {
+                            projectId: result.project.id,
+                            bundleId: bundle.id,
+                            ticketId: owner.id,
+                            ticketTitle: owner.title,
+                            progressionRunId,
+                            workflowContext: reviewFixWorkflowContext,
+                            triggeringReviewRunId: sourceReviewExecution?.id,
+                            reviewFindingRunId: sourceReviewRunId,
+                            reviewSeverity: automationConfig.reviewSeverity,
+                            retryOfRunId: existingEnvelope.id,
+                        });
+                        replaceReviewRepairActionEnvelopeRetryInTransaction(transaction, {
+                            projectId: result.project.id,
+                            iterationId: repairIteration.id,
+                            expectedPhase: 'action_claimed',
+                            expectedCurrentRunId: existingEnvelope.id,
+                            runId: replacement.runId,
+                        });
+                        return { iterationId: repairIteration.id, reviewFixRunId: replacement.runId };
+                    }
+                    if (repairIteration.phase === 'action_active' && repairIteration.action_envelope_run_id && retryActionRunId) {
+                        return { iterationId: repairIteration.id, reviewFixRunId: repairIteration.action_envelope_run_id };
+                    }
+                    if (repairIteration.phase !== 'observed') {
+                        throw new Error('Review repair iteration is not resumable at action dispatch');
+                    }
+                    const reviewFix = createAutomationReviewFixInTransaction(transaction, {
+                        projectId: result.project.id,
+                        bundleId: bundle.id,
+                        ticketId: owner.id,
+                        ticketTitle: owner.title,
+                        progressionRunId,
+                        workflowContext: reviewFixWorkflowContext,
+                        triggeringReviewRunId: sourceReviewExecution?.id,
+                        reviewFindingRunId: sourceReviewRunId,
+                        reviewSeverity: automationConfig.reviewSeverity,
+                    });
+                    attachReviewRepairActionEnvelopeInTransaction(transaction, {
+                        projectId: result.project.id,
+                        iterationId: repairIteration.id,
+                        expectedPhase: 'observed',
+                        runId: reviewFix.runId,
+                    });
+                    return { iterationId: repairIteration.id, reviewFixRunId: reviewFix.runId };
+                }, io, 'immediate');
+                repairIterationId = claimed.iterationId;
+                reviewFixRunId = claimed.reviewFixRunId;
                 followUpResult = submitTicketFollowUp({
                     ticketId: owner.id,
                     requestedProjectId: result.project.id,
@@ -4934,16 +5437,42 @@ app.post('/bundles/:id/resume-automation', async (req, res) => {
                     persistTriggerMessage: false,
                     initiation: {
                         initiator: 'automation',
-                        causalParentRunId: reviewFix.runId,
+                        causalParentRunId: reviewFixRunId,
+                        ...(retryActionRunId ? { retrySourceRunId: retryActionRunId } : {}),
                         workflowContext: reviewFixWorkflowContext,
                     },
+                    onExecutionCreated: (executionContext, transaction) => {
+                        if (retryActionRunId) {
+                            replaceReviewRepairActionRetryInTransaction(transaction, {
+                                projectId: result.project.id,
+                                iterationId: repairIterationId,
+                                expectedPhase: 'action_active',
+                                expectedCurrentRunId: retryActionRunId,
+                                runId: executionContext.runId,
+                            });
+                        }
+                        else {
+                            attachReviewRepairActionInTransaction(transaction, {
+                                projectId: result.project.id,
+                                iterationId: repairIterationId,
+                                expectedPhase: 'action_claimed',
+                                runId: executionContext.runId,
+                            });
+                        }
+                        followUpRunId = executionContext.runId;
+                    },
+                    onExecutionCompleted: (executionContext, transaction) => {
+                        const liveProject = getProjectById(result.project.id) ?? result.project;
+                        const liveBundle = getBundle(bundle.id, result.project.id) ?? bundle;
+                        completeAutomationReviewFixActionInTransaction(transaction, {
+                            projectId: result.project.id,
+                            actionRunId: executionContext.runId,
+                            effectiveAutomationConfig: resolveAutomationConfig(liveBundle, liveProject),
+                        });
+                    },
                 });
             }
             catch (error) {
-                upsertBundleAutomationState(result.project.id, bundle.id, {
-                    review_iteration_count: previousIteration,
-                    fix_loop_active: previousFixLoopActive,
-                });
                 try {
                     if (reviewFixRunId) {
                         finishAutomationReviewFix({
@@ -4952,6 +5481,22 @@ app.post('/bundles/:id/resume-automation', async (req, res) => {
                             failedMessage: error instanceof Error ? error.message : String(error),
                             broadcaster: io,
                         });
+                        const iteration = repairIterationId
+                            ? getActiveReviewRepairIteration(result.project.id, progressionRunId)
+                            : null;
+                        if (iteration && !['paused', 'terminal'].includes(iteration.phase)) {
+                            pauseReviewRepairIteration({
+                                projectId: result.project.id,
+                                iterationId: iteration.id,
+                                expectedPhase: iteration.phase,
+                                expectedCurrentRunId: iteration.resulting_review_execution_run_id
+                                    ?? iteration.gate_batch_run_id
+                                    ?? iteration.action_run_id
+                                    ?? iteration.action_envelope_run_id,
+                                stopReason: 'action_failed',
+                                broadcaster: io,
+                            });
+                        }
                     }
                 }
                 finally {
@@ -4960,10 +5505,6 @@ app.post('/bundles/:id/resume-automation', async (req, res) => {
                 return res.status(409).json({ error: error instanceof Error ? error.message : String(error) });
             }
             if (!followUpResult.ok) {
-                upsertBundleAutomationState(result.project.id, bundle.id, {
-                    review_iteration_count: previousIteration,
-                    fix_loop_active: previousFixLoopActive,
-                });
                 if (reviewFixRunId) {
                     finishAutomationReviewFix({
                         projectId: result.project.id,
@@ -4981,6 +5522,16 @@ app.post('/bundles/:id/resume-automation', async (req, res) => {
                         pausedStageRunId: reviewFixRunId,
                         broadcaster: io,
                     });
+                    if (repairIterationId && followUpRunId) {
+                        pauseReviewRepairIteration({
+                            projectId: result.project.id,
+                            iterationId: repairIterationId,
+                            expectedPhase: 'action_active',
+                            expectedCurrentRunId: followUpRunId,
+                            stopReason: 'action_failed',
+                            broadcaster: io,
+                        });
+                    }
                 }
                 return res.status(followUpResult.status).json({ error: followUpResult.error });
             }
@@ -4990,6 +5541,27 @@ app.post('/bundles/:id/resume-automation', async (req, res) => {
                 if (!revalidateDecision()) {
                     return res.status(409).json({ error: 'Bundle automation state changed before Resume could start' });
                 }
+                if (decision.outcome === 'continue_commit_chain') {
+                    const activeIteration = getActiveReviewRepairIteration(result.project.id, progressionRunId);
+                    if (activeIteration && activeIteration.phase !== 'terminal') {
+                        withExecutionRunTransaction(transaction => {
+                            terminalizeReviewRepairIterationInTransaction(transaction, {
+                                projectId: result.project.id,
+                                iterationId: activeIteration.id,
+                                expectedPhase: activeIteration.phase,
+                                expectedCurrentRunId: activeIteration.resulting_review_execution_run_id
+                                    ?? activeIteration.gate_batch_run_id
+                                    ?? activeIteration.action_run_id
+                                    ?? activeIteration.action_envelope_run_id,
+                                outcome: 'interrupted',
+                                stopReason: 'configuration_changed',
+                            });
+                        }, io, 'immediate');
+                    }
+                    if (bundleState.fix_loop_active === 1) {
+                        resetBundleAutomationLoop(result.project.id, bundle.id);
+                    }
+                }
                 runAutomationProgression({
                     projectId: result.project.id,
                     bundleId: bundle.id,
@@ -5010,6 +5582,22 @@ app.post('/bundles/:id/resume-automation', async (req, res) => {
                 return res.status(409).json({ error: 'Bundle automation state changed before Resume could start' });
             }
             const sourceRunId = bundleState.automation_paused_stage_run_id;
+            let repairIteration = getActiveReviewRepairIteration(result.project.id, progressionRunId);
+            if (repairIteration?.phase === 'paused') {
+                repairIteration = resumePausedReviewRepairIteration({
+                    projectId: result.project.id,
+                    iterationId: repairIteration.id,
+                    expectedCurrentRunId: repairIteration.resulting_review_execution_run_id
+                        ?? repairIteration.gate_batch_run_id
+                        ?? repairIteration.action_run_id
+                        ?? repairIteration.action_envelope_run_id,
+                    broadcaster: io,
+                });
+            }
+            const verificationRetryRunId = repairIteration?.phase === 'verification_active'
+                ? repairIteration.resulting_review_execution_run_id
+                : null;
+            let replacementVerificationRunId = null;
             const reviewResult = rerunTicketReviewOperation(owner, io, {
                 automatic: true,
                 initiation: {
@@ -5018,8 +5606,30 @@ app.post('/bundles/:id/resume-automation', async (req, res) => {
                 },
                 continuation: sourceRunId ? resolveReviewContinuation(sourceRunId) : undefined,
                 accept: acceptResumedReview,
+                onExecutionCreated: verificationRetryRunId && repairIteration
+                    ? (executionContext, transaction) => {
+                        replaceReviewRepairVerificationRetryInTransaction(transaction, {
+                            projectId: result.project.id,
+                            iterationId: repairIteration.id,
+                            expectedPhase: 'verification_active',
+                            expectedCurrentRunId: verificationRetryRunId,
+                            runId: executionContext.runId,
+                        });
+                        replacementVerificationRunId = executionContext.runId;
+                    }
+                    : undefined,
             });
             if (!reviewResult.ok) {
+                if (repairIteration && replacementVerificationRunId) {
+                    pauseReviewRepairIteration({
+                        projectId: result.project.id,
+                        iterationId: repairIteration.id,
+                        expectedPhase: 'verification_active',
+                        expectedCurrentRunId: replacementVerificationRunId,
+                        stopReason: 'verification_failed',
+                        broadcaster: io,
+                    });
+                }
                 return res.status(reviewResult.status).json({ error: reviewResult.error });
             }
         }
@@ -5090,6 +5700,21 @@ app.post('/bundles/:id/dismiss-automation-pause', async (req, res) => {
         catch {
             // Explicit abandonment also repairs a stale progression pointer.
         }
+        const repairIteration = getActiveReviewRepairIteration(result.project.id, progressionRunId);
+        if (repairIteration) {
+            terminalizeReviewRepairIteration({
+                projectId: result.project.id,
+                iterationId: repairIteration.id,
+                expectedPhase: repairIteration.phase,
+                expectedCurrentRunId: repairIteration.resulting_review_execution_run_id
+                    ?? repairIteration.gate_batch_run_id
+                    ?? repairIteration.action_run_id
+                    ?? repairIteration.action_envelope_run_id,
+                outcome: 'cancelled',
+                stopReason: 'cancelled',
+                broadcaster: io,
+            });
+        }
     }
     abandonAutomationPause({
         projectId: result.project.id,
@@ -5114,6 +5739,7 @@ app.post('/tool', (req, res) => {
         return res.status(400).json({ error: 'Invalid tool' });
     }
     config.tool = tool;
+    io.emit('tool:updated', { tool });
     res.json({ tool });
 });
 app.post('/tools/upgrade', async (req, res) => {
@@ -5141,15 +5767,21 @@ app.post('/projects/auto-config', async (req, res) => {
         return res.status(400).json({ error: 'repo_path must be a non-empty string' });
     }
     try {
-        const result = await autoConfigProject(validation.values.repo_path, validation.values.helper_model
-            ? {
-                tool: 'opencode',
-                model: validation.values.helper_model,
-                variant: validation.values.helper_variant ?? null,
-            }
-            : {
-                tool: config.tool ?? 'opencode',
-            });
+        const requestedTool = req.body?.tool;
+        if (requestedTool !== undefined && requestedTool !== 'claude' && requestedTool !== 'opencode') {
+            return res.status(400).json({ error: 'tool must be a supported agent' });
+        }
+        const tool = requestedTool
+            ?? (hasOwn(req.body ?? {}, 'helper_model') && validation.values.helper_model ? 'opencode' : null)
+            ?? config.tool
+            ?? 'opencode';
+        const helperConfig = resolveHelperModelConfig({
+            helperModelsJson: validation.values.helper_models_json,
+            agent: tool,
+        });
+        const result = await autoConfigProject(validation.values.repo_path, helperConfig.model
+            ? { tool, model: helperConfig.model, variant: helperConfig.variant }
+            : { tool });
         return res.json(result);
     }
     catch (error) {
@@ -5229,6 +5861,10 @@ app.get('/models', async (req, res) => {
     timing.end({ count: models.length });
     return res.json(models);
 });
+app.get('/agents', async (_req, res) => {
+    res.set('Cache-Control', 'no-store');
+    return res.json(await getSupportedAgentCatalog());
+});
 app.get('/skills', async (req, res) => {
     const tool = typeof req.query.tool === 'string' ? req.query.tool : '';
     const projectId = typeof req.query.project_id === 'string' ? req.query.project_id : null;
@@ -6178,13 +6814,18 @@ app.get('/projects', (_req, res) => {
     const projects = listProjects();
     res.json(projects.map(serializeProject));
 });
-app.post('/projects', (req, res) => {
-    const validation = validateProjectPayload(asProjectPayload(req.body), { allowRepoInitialization: true });
+app.post('/projects', async (req, res) => {
+    const body = asProjectPayload(req.body);
+    const validation = validateProjectPayload(body, { allowRepoInitialization: true });
     if ('error' in validation) {
         return res.status(400).json({ error: validation.error });
     }
+    const roleModelValidation = await validateProjectRoleModelDiscovery(body, validation.values);
+    if ('error' in roleModelValidation) {
+        return res.status(400).json({ error: roleModelValidation.error });
+    }
     const projectCount = Number(db.prepare('SELECT COUNT(*) AS count FROM projects').get()?.count ?? 0);
-    const { name, repo_path, build_execution_provider, linked_project_ids, run_setup, run_services, check_definitions, required_check_definition_ids, pre_review_check_definition_ids, post_build_check_definition_ids, auto_fix_check_definition_ids, test_commands, run_ide, preview_service_name, preview_path, preview_capability_mode, helper_model, helper_variant, reviewer_model, reviewer_variant, commit_message_rules, commit_after_each_ticket, auto_park_stale_tickets, memory_enabled, scan_include_globs_json, scan_exclude_globs_json, worktree_sync, spec_aware_code_review_enabled, automation_depth, automation_review_fix_enabled, automation_pause_on_open_questions, automation_review_severity, automation_review_max_iterations, } = validation.values;
+    const { name, repo_path, build_execution_provider, linked_project_ids, run_setup, run_services, check_definitions, required_check_definition_ids, pre_review_check_definition_ids, post_build_check_definition_ids, auto_fix_check_definition_ids, test_commands, run_ide, preview_service_name, preview_path, preview_capability_mode, helper_model, helper_variant, helper_models_json, reviewer_model, reviewer_variant, reviewer_models_json, commit_message_rules, commit_after_each_ticket, auto_park_stale_tickets, memory_enabled, scan_include_globs_json, scan_exclude_globs_json, worktree_sync, spec_aware_code_review_enabled, automation_depth, automation_review_fix_enabled, automation_pause_on_open_questions, automation_review_severity, automation_review_max_iterations, } = validation.values;
     if (!repo_path) {
         return res.status(400).json({ error: 'repo_path must be a non-empty string' });
     }
@@ -6217,8 +6858,10 @@ app.post('/projects', (req, res) => {
       preview_capability_mode,
       helper_model,
       helper_variant,
+      helper_models_json,
       reviewer_model,
       reviewer_variant,
+      reviewer_models_json,
       commit_message_rules,
       commit_after_each_ticket,
       auto_park_stale_tickets,
@@ -6233,8 +6876,8 @@ app.post('/projects', (req, res) => {
       automation_review_severity,
       automation_review_max_iterations
     )
-    VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
-  `).run(id, name, normalizedRepoPath, build_execution_provider ?? 'host', run_setup, run_services, check_definitions, required_check_definition_ids ?? '[]', pre_review_check_definition_ids ?? '[]', post_build_check_definition_ids ?? '[]', auto_fix_check_definition_ids ?? '[]', test_commands, run_ide ?? null, preview_service_name ?? null, preview_path ?? null, preview_capability_mode ?? null, helper_model ?? null, helper_variant ?? null, reviewer_model ?? null, reviewer_model ? reviewer_variant ?? null : null, commit_message_rules ?? null, commit_after_each_ticket ?? 0, auto_park_stale_tickets ?? 0, memory_enabled ?? 0, scan_include_globs_json ?? null, scan_exclude_globs_json ?? null, worktree_sync ?? null, spec_aware_code_review_enabled ?? 0, automation_depth ?? 'manual', automation_review_fix_enabled ?? 0, automation_pause_on_open_questions ?? 0, automation_review_severity ?? 'medium', automation_review_max_iterations ?? 3);
+    VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+  `).run(id, name, normalizedRepoPath, build_execution_provider ?? 'host', run_setup, run_services, check_definitions, required_check_definition_ids ?? '[]', pre_review_check_definition_ids ?? '[]', post_build_check_definition_ids ?? '[]', auto_fix_check_definition_ids ?? '[]', test_commands, run_ide ?? null, preview_service_name ?? null, preview_path ?? null, preview_capability_mode ?? null, helper_model ?? null, helper_variant ?? null, helper_models_json ?? '{}', reviewer_model ?? null, reviewer_model ? reviewer_variant ?? null : null, reviewer_models_json ?? '{}', commit_message_rules ?? null, commit_after_each_ticket ?? 0, auto_park_stale_tickets ?? 0, memory_enabled ?? 0, scan_include_globs_json ?? null, scan_exclude_globs_json ?? null, worktree_sync ?? null, spec_aware_code_review_enabled ?? 0, automation_depth ?? 'manual', automation_review_fix_enabled ?? 0, automation_pause_on_open_questions ?? 0, automation_review_severity ?? 'medium', automation_review_max_iterations ?? 3);
     replaceProjectLinks(id, linked_project_ids ?? []);
     ensureProjectRootBundle(id);
     if (projectCount === 0) {
@@ -7240,15 +7883,12 @@ app.post('/projects/:id/git-commit-message', async (req, res) => {
         diff: getSelectedGitUnifiedDiff(workspace.cwd, selectedPaths),
     });
     try {
-        const rawMessage = await runLightweightPrompt(workspace.project.helper_model
-            ? {
-                tool: 'opencode',
-                model: workspace.project.helper_model,
-                variant: workspace.project.helper_variant,
-            }
-            : {
-                tool: config.tool ?? 'opencode',
-            }, prompt, workspace.cwd);
+        const helperTool = config.tool ?? 'opencode';
+        const helperConfig = resolveHelperModelConfig({
+            helperModelsJson: workspace.project.helper_models_json,
+            agent: helperTool,
+        });
+        const rawMessage = await runLightweightPrompt({ tool: helperTool, ...helperConfig }, prompt, workspace.cwd);
         const message = normalizeGeneratedCommitMessage(rawMessage);
         if (!message) {
             return res.status(500).json({ error: 'Unable to generate a commit message right now.' });
@@ -7271,7 +7911,12 @@ app.post('/projects/:id/pull-request-description', async (req, res) => {
     if (workspace.target_kind !== 'repo_root') {
         return res.status(409).json({ error: 'Pull request descriptions for bundle targets should use the bundle route.' });
     }
-    if (!project.helper_model) {
+    const helperTool = config.tool ?? 'opencode';
+    const helperConfig = resolveHelperModelConfig({
+        helperModelsJson: project.helper_models_json,
+        agent: helperTool,
+    });
+    if (!helperConfig.model) {
         return res.status(409).json({ error: 'Set a helper model in project settings before generating a PR description.' });
     }
     const title = asTrimmedString(req.body?.title);
@@ -7283,9 +7928,9 @@ app.post('/projects/:id/pull-request-description', async (req, res) => {
         : [];
     try {
         const rawDescription = await runLightweightPrompt({
-            tool: 'opencode',
-            model: project.helper_model,
-            variant: project.helper_variant,
+            tool: helperTool,
+            model: helperConfig.model,
+            variant: helperConfig.variant,
         }, buildPullRequestDescriptionPrompt({
             title,
             ticketTitles: [],
@@ -7444,7 +8089,7 @@ app.post('/projects/:id/git-squash', async (req, res) => {
         total_count: summary.totalCount,
     });
 });
-app.patch('/projects/:id', (req, res) => {
+app.patch('/projects/:id', async (req, res) => {
     const project = getProjectById(req.params.id);
     if (!project) {
         return res.status(404).json({ error: 'Not found' });
@@ -7455,10 +8100,15 @@ app.patch('/projects/:id', (req, res) => {
             reason: 'execution_profile_required',
         });
     }
-    const validation = validateProjectPayload(asProjectPayload(req.body), { partial: true, currentProjectId: project.id });
+    const body = asProjectPayload(req.body);
+    const validation = validateProjectPayload(body, { partial: true, currentProjectId: project.id });
     if ('error' in validation) {
         return res.status(400).json({ error: validation.error });
     }
+    const roleModelValidation = await validateProjectRoleModelDiscovery(body, validation.values, project);
+    if ('error' in roleModelValidation) {
+        return res.status(400).json({ error: roleModelValidation.error });
+    }
     if (hasOwn(validation.values, 'repo_path') && validation.values.repo_path !== project.repo_path) {
         const stats = getProjectTicketStats(project.id);
         if (stats.ticketCount > 0 || stats.worktreeCount > 0 || stats.bundleCount > 0) {
@@ -7467,7 +8117,7 @@ app.patch('/projects/:id', (req, res) => {
             });
         }
     }
-    const { name, repo_path, linked_project_ids, run_setup, run_services, check_definitions, required_check_definition_ids, pre_review_check_definition_ids, post_build_check_definition_ids, auto_fix_check_definition_ids, test_commands, run_ide, preview_service_name, preview_path, preview_capability_mode, helper_model, helper_variant, reviewer_model, reviewer_variant, commit_message_rules, commit_after_each_ticket, auto_park_stale_tickets, memory_enabled, scan_include_globs_json, scan_exclude_globs_json, worktree_sync, spec_aware_code_review_enabled, automation_depth, automation_review_fix_enabled, automation_pause_on_open_questions, automation_review_severity, automation_review_max_iterations, } = validation.values;
+    const { name, repo_path, linked_project_ids, run_setup, run_services, check_definitions, required_check_definition_ids, pre_review_check_definition_ids, post_build_check_definition_ids, auto_fix_check_definition_ids, test_commands, run_ide, preview_service_name, preview_path, preview_capability_mode, helper_model, helper_variant, helper_models_json, reviewer_model, reviewer_variant, reviewer_models_json, commit_message_rules, commit_after_each_ticket, auto_park_stale_tickets, memory_enabled, scan_include_globs_json, scan_exclude_globs_json, worktree_sync, spec_aware_code_review_enabled, automation_depth, automation_review_fix_enabled, automation_pause_on_open_questions, automation_review_severity, automation_review_max_iterations, } = validation.values;
     const updateProject = db.prepare(`
     UPDATE projects SET
       name = ?,
@@ -7487,8 +8137,10 @@ app.patch('/projects/:id', (req, res) => {
       preview_capability_mode = ?,
       helper_model = ?,
       helper_variant = ?,
+      helper_models_json = ?,
       reviewer_model = ?,
       reviewer_variant = ?,
+      reviewer_models_json = ?,
       commit_message_rules = ?,
       commit_after_each_ticket = ?,
       auto_park_stale_tickets = ?,
@@ -7523,6 +8175,13 @@ app.patch('/projects/:id', (req, res) => {
         ? (hasOwn(validation.values, 'reviewer_variant') ? reviewer_variant ?? null : project.reviewer_variant)
         : null;
     const updateResult = db.transaction(() => {
+        const currentProject = getProjectById(project.id);
+        if (!currentProject || JSON.stringify(currentProject) !== JSON.stringify(project)) {
+            return {
+                error: 'Project changed while model configuration was being validated; retry the update',
+                status: 409,
+            };
+        }
         const policyReferences = validateProjectRequiredCheckPolicyReferences({
             projectId: project.id,
             checkDefinitionsJson: nextCheckDefinitions,
@@ -7549,12 +8208,12 @@ app.patch('/projects/:id', (req, res) => {
                 };
             }
         }
-        updateProject.run(name ?? project.name, repo_path ?? project.repo_path, project.build_execution_provider, hasOwn(validation.values, 'run_setup') ? run_setup : project.run_setup, hasOwn(validation.values, 'run_services') ? run_services : project.run_services, nextCheckDefinitions, nextRequiredCheckDefinitionIds, nextPreReviewCheckDefinitionIds, nextPostBuildCheckDefinitionIds, nextAutoFixCheckDefinitionIds, hasOwn(validation.values, 'test_commands') ? test_commands : project.test_commands, hasOwn(validation.values, 'run_ide') ? run_ide : project.run_ide, hasOwn(validation.values, 'preview_service_name') ? preview_service_name : project.preview_service_name, hasOwn(validation.values, 'preview_path') ? preview_path : project.preview_path, hasOwn(validation.values, 'preview_capability_mode') ? preview_capability_mode : project.preview_capability_mode, hasOwn(validation.values, 'helper_model') ? helper_model : project.helper_model, hasOwn(validation.values, 'helper_variant') ? helper_variant : project.helper_variant, nextReviewerModel, nextReviewerVariant, hasOwn(validation.values, 'commit_message_rules') ? commit_message_rules : project.commit_message_rules, hasOwn(validation.values, 'commit_after_each_ticket') ? commit_after_each_ticket : project.commit_after_each_ticket, hasOwn(validation.values, 'auto_park_stale_tickets') ? auto_park_stale_tickets : project.auto_park_stale_tickets, hasOwn(validation.values, 'memory_enabled') ? memory_enabled : project.memory_enabled, hasOwn(validation.values, 'scan_include_globs_json') ? scan_include_globs_json : project.scan_include_globs_json, hasOwn(validation.values, 'scan_exclude_globs_json') ? scan_exclude_globs_json : project.scan_exclude_globs_json, hasOwn(validation.values, 'worktree_sync') ? worktree_sync : project.worktree_sync, hasOwn(validation.values, 'spec_aware_code_review_enabled') ? spec_aware_code_review_enabled : project.spec_aware_code_review_enabled, hasOwn(validation.values, 'automation_depth') ? automation_depth : project.automation_depth, hasOwn(validation.values, 'automation_review_fix_enabled') ? automation_review_fix_enabled : project.automation_review_fix_enabled, hasOwn(validation.values, 'automation_pause_on_open_questions') ? automation_pause_on_open_questions : project.automation_pause_on_open_questions, hasOwn(validation.values, 'automation_review_severity') ? automation_review_severity : project.automation_review_severity, hasOwn(validation.values, 'automation_review_max_iterations') ? automation_review_max_iterations : project.automation_review_max_iterations, req.params.id);
+        updateProject.run(name ?? project.name, repo_path ?? project.repo_path, project.build_execution_provider, hasOwn(validation.values, 'run_setup') ? run_setup : project.run_setup, hasOwn(validation.values, 'run_services') ? run_services : project.run_services, nextCheckDefinitions, nextRequiredCheckDefinitionIds, nextPreReviewCheckDefinitionIds, nextPostBuildCheckDefinitionIds, nextAutoFixCheckDefinitionIds, hasOwn(validation.values, 'test_commands') ? test_commands : project.test_commands, hasOwn(validation.values, 'run_ide') ? run_ide : project.run_ide, hasOwn(validation.values, 'preview_service_name') ? preview_service_name : project.preview_service_name, hasOwn(validation.values, 'preview_path') ? preview_path : project.preview_path, hasOwn(validation.values, 'preview_capability_mode') ? preview_capability_mode : project.preview_capability_mode, hasOwn(validation.values, 'helper_model') ? helper_model : project.helper_model, hasOwn(validation.values, 'helper_variant') ? helper_variant : project.helper_variant, hasOwn(validation.values, 'helper_models_json') ? helper_models_json : project.helper_models_json, nextReviewerModel, nextReviewerVariant, hasOwn(validation.values, 'reviewer_models_json') ? reviewer_models_json : project.reviewer_models_json, hasOwn(validation.values, 'commit_message_rules') ? commit_message_rules : project.commit_message_rules, hasOwn(validation.values, 'commit_after_each_ticket') ? commit_after_each_ticket : project.commit_after_each_ticket, hasOwn(validation.values, 'auto_park_stale_tickets') ? auto_park_stale_tickets : project.auto_park_stale_tickets, hasOwn(validation.values, 'memory_enabled') ? memory_enabled : project.memory_enabled, hasOwn(validation.values, 'scan_include_globs_json') ? scan_include_globs_json : project.scan_include_globs_json, hasOwn(validation.values, 'scan_exclude_globs_json') ? scan_exclude_globs_json : project.scan_exclude_globs_json, hasOwn(validation.values, 'worktree_sync') ? worktree_sync : project.worktree_sync, hasOwn(validation.values, 'spec_aware_code_review_enabled') ? spec_aware_code_review_enabled : project.spec_aware_code_review_enabled, hasOwn(validation.values, 'automation_depth') ? automation_depth : project.automation_depth, hasOwn(validation.values, 'automation_review_fix_enabled') ? automation_review_fix_enabled : project.automation_review_fix_enabled, hasOwn(validation.values, 'automation_pause_on_open_questions') ? automation_pause_on_open_questions : project.automation_pause_on_open_questions, hasOwn(validation.values, 'automation_review_severity') ? automation_review_severity : project.automation_review_severity, hasOwn(validation.values, 'automation_review_max_iterations') ? automation_review_max_iterations : project.automation_review_max_iterations, req.params.id);
         if (hasOwn(validation.values, 'linked_project_ids')) {
             replaceProjectLinks(project.id, linked_project_ids ?? []);
         }
         return { ok: true };
-    })();
+    }).immediate();
     if ('error' in updateResult) {
         const status = 'status' in updateResult && typeof updateResult.status === 'number'
             ? updateResult.status
@@ -7643,6 +8302,13 @@ const completeClaimedProjectDeletion = async (projectId, claimId) => {
                 }
                 db.prepare("DELETE FROM execution_artifacts WHERE project_id = ? AND availability = 'deleted'").run(projectId);
                 deleteProjectAttachments(projectId);
+                if (db.prepare("SELECT 1 FROM sqlite_master WHERE type = 'table' AND name = 'review_repair_iterations'").get()) {
+                    db.prepare(`
+            DELETE FROM review_repair_iteration_decisions
+            WHERE iteration_id IN (SELECT id FROM review_repair_iterations WHERE project_id = ?)
+          `).run(projectId);
+                    db.prepare('DELETE FROM review_repair_iterations WHERE project_id = ?').run(projectId);
+                }
                 db.prepare(`
           DELETE FROM check_gate_evaluation_attempts
           WHERE evaluation_id IN (SELECT id FROM check_gate_evaluations WHERE project_id = ?)
@@ -8147,6 +8813,13 @@ app.post('/tickets/:id/retry', (req, res) => {
                 return res.status(409).json({ error: buildBlocker.error, blocker_ticket_id: buildBlocker.blocker_ticket_id });
             }
         }
+        const postBuildRecovery = startPostBuildCheckRecovery(ticket, io);
+        if (postBuildRecovery) {
+            if (!postBuildRecovery.accepted) {
+                return res.status(postBuildRecovery.reason === 'queue_failed' ? 503 : 409).json({ error: postBuildRecovery.error });
+            }
+            return res.json(getTicket(req.params.id));
+        }
         const retrySource = ticket.project_id
             ? db.prepare(`
           SELECT er.id
@@ -8476,15 +9149,12 @@ app.post('/tickets/:id/git-commit-message', async (req, res) => {
         diff: getSelectedGitUnifiedDiff(workspace.cwd, selectedPaths),
     });
     try {
-        const rawMessage = await runLightweightPrompt(workspace.project.helper_model
-            ? {
-                tool: 'opencode',
-                model: workspace.project.helper_model,
-                variant: workspace.project.helper_variant,
-            }
-            : {
-                tool: config.tool ?? 'opencode',
-            }, prompt, workspace.cwd);
+        const helperTool = resolveTicketTool(ticket, config.tool ?? 'opencode');
+        const helperConfig = resolveHelperModelConfig({
+            helperModelsJson: workspace.project.helper_models_json,
+            agent: helperTool,
+        });
+        const rawMessage = await runLightweightPrompt({ tool: helperTool, ...helperConfig }, prompt, workspace.cwd);
         const message = normalizeGeneratedCommitMessage(rawMessage);
         if (!message) {
             return res.status(500).json({ error: 'Unable to generate a commit message right now.' });