@straiffi/archon 1.7.10 → 1.8.0

package/dist/server/index.js

@@ -31,7 +31,7 @@ import { runLightweightPrompt } from './lib/lightweightPrompt.js';
 import { advanceBuildChain, startBuildChain, stopBuildChain } from './lib/buildChains.js';
 import { activateQueuedBuildSequenceTicket, compensateBuildSequenceAcceptance, enqueueBundledBuild, getDependencyOrderedBundleTicketIds, getBuildSequenceIdForTicket, hasActiveSequenceForBundle, removeTicketFromBuildSequence, stopBuildSequence, } from './lib/buildSequences.js';
 import { prepareTicketForBuild } from './lib/buildFlow.js';
-import { getBundlePlanMutationBlockerById, shouldBlockPlanForBundleMutationById, } from './lib/bundleActivity.js';
+import { getActiveBundleRepairBlocker, getBundlePlanMutationBlockerById, shouldBlockPlanForBundleMutationById, } from './lib/bundleActivity.js';
 import { getDiscoveredModels, normalizeModelId, normalizeTicketModelId } from './lib/models.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';
@@ -47,7 +47,8 @@ import { exportProjectMemoryArchive, importProjectMemoryArchive } from './lib/pr
 import { buildReviewFindingsResponse, computeDiffSignature, getLatestReviewRunForContext, listReviewFindings } from './lib/reviewFindings.js';
 import { formatBuildOpenQuestionAnswersPrompt, getLatestBuildOpenQuestionBatchStatus, hasActiveBuildOpenQuestionBatch, listBuildOpenQuestionsForBundle, loadBuildOpenQuestionsByBundleIds, } from './lib/buildOpenQuestions.js';
 import { acceptBuildOpenQuestionResolution } from './lib/buildOpenQuestionOperations.js';
-import { completeAutomationProgression, createAutomationReviewFix, ensureAutomationProgression, finishAutomationReviewFix, getAutomationProgression, recoverLegacyAutomationProgression, recoverStoppedSideEffectProgression, runAutomationProgression, stopAutomationProgression, waitAutomationProgression } from './lib/automationProgression.js';
+import { areBundleTicketsReadyForAutomaticReview } from './lib/bundleAutomationReadiness.js';
+import { abandonAutomationPause, completeAutomationProgression, createAutomationReviewFix, 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';
@@ -82,11 +83,13 @@ import { countInboundProjectLinks, getEffectiveProject, getProjectCheckDefinitio
 import { getActiveRunStatus, getActiveRunStatusForProject, getPreviewStatusForProject, hasRunConfig, isRunning, openIde, openTicketIdeInWorkspace, resolveProjectRunContextKey, runSetupCommandsInWorkspace, runTicketInWorkspace, stopAllTickets, stopTicket } from './lib/run.js';
 import { clearAllTestSessions, createTestSession, deleteTestSession, discoverTestsForSession, doesTestFileExistForSession, getTestSession, isTestSelectionSupported, startTestSessionRun, stopTestSessionRun } from './lib/testSessions.js';
 import { closeCheckRunnerAdmissions, getCheckBatchAttempts, openCheckRunnerAdmissions, rerunCheckBatchAndSchedule, shutdownCheckRunner, startCheckBatch, stopCheckBatch } from './lib/checkRunner.js';
+import { CheckRepairError, getCheckRepairCandidateState, getCheckRepairDetails, getLatestCheckRepairForBatch, retryCheckRepair, startCheckRepair, stopCheckRepair } from './lib/checkRepair.js';
 import { findActiveCheckBatchForTarget, getCheckAttemptDetails, getCheckBatchDetails, hasActiveProjectCheckBatch, isCheckAttemptCurrent, resolveCheckBatchRerunEligibility } from './lib/checkRuns.js';
-import { getCheckDefinitionFingerprint, validateRequiredCheckPolicySnapshotSize } from './lib/checkDefinitions.js';
-import { getCheckGateEvaluation } from './lib/checkGateEvaluations.js';
+import { getCheckAttemptDiagnosticResponse, getCheckBatchDiagnosticResponse } from './lib/checkDiagnostics.js';
+import { getCheckDefinitionFingerprint } from './lib/checkDefinitions.js';
+import { getCheckGateEvaluation, hydrateCheckGatePresentApplicability } from './lib/checkGateEvaluations.js';
 import { captureCheckWorkspaceIdentity } from './lib/checkWorkspaceIdentity.js';
-import { canonicalizeBundleRequiredCheckPolicyOverride, parseBundleRequiredCheckPolicyOverride, resolveEffectiveRequiredCheckPolicyMembership, } from './lib/requiredCheckPolicy.js';
+import { resolveEffectiveRequiredCheckPolicyMembership, resolveRequiredCheckPolicy } from './lib/requiredCheckPolicy.js';
 import { getBundleBuildBlockerResponse, shouldStartBundleBuildNow, transitionTicketState, } from './lib/ticketWorkflowOperations.js';
 import { submitPlanTicketFollowUp, submitTicketFollowUp, } from './lib/ticketFollowUpOperations.js';
 import { closePendingTicketPlanQuestionSet, listPendingTicketPlanQuestionSetMessageIds, resolveTicketPlanQuestionSet, restoreClosedTicketPlanQuestionSets, } from './lib/planQuestionOperations.js';
@@ -103,9 +106,9 @@ import { HttpError } from './lib/httpError.js';
 import { parseIncomingExternalSource } from './lib/externalSource.js';
 import { materializeTicketsWithDependencies } from './lib/ticketBatch.js';
 import { IMPLEMENTATION_READY_DESCRIPTION_SECTION_HEADINGS } from './lib/ticketDescriptionContract.js';
-import { buildSpecImplementationDraft, buildVisualizationAppendix } from './lib/specDraft.js';
+import { buildImplementationResourcesAppendix, buildSpecImplementationDraft, buildVisualizationAppendix } from './lib/specDraft.js';
 import { exportSpecToDocs, checkSpecExportCollision } from './lib/specExport.js';
-import { createTicketDependency, deleteTicketDependenciesForTicket, deleteTicketDependency, getTicketDependency, isTicketRunSetupReady, listTicketDependencies, validateCreateTicketDependency, } from './lib/ticketDependencies.js';
+import { createTicketDependency, deleteTicketDependenciesForTicket, deleteTicketDependency, getTicketDependency, isTicketBuildComplete, isTicketRunSetupReady, listTicketDependencies, validateCreateTicketDependency, } from './lib/ticketDependencies.js';
 import { startBuild } 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';
@@ -380,11 +383,19 @@ const buildExecutionRunDetailResponse = async (project, run) => {
                     retry_eligibility: retryEligibility,
                     action_kind: null,
                 }
-                : run.kind === 'github_actions'
-                    ? { ...serializeGitHubActionsExecutionDetail(getGitHubActionsExecutionDetails(project.id, run.id)), retry_eligibility: retryEligibility }
-                    : ['automation_commit', 'automation_push', 'automation_pull_request'].includes(run.kind)
-                        ? { kind: run.kind, available: true, automation_stage: getAutomationStageDetails(project.id, run.id), retry_eligibility: retryEligibility }
-                        : { kind: run.kind, available: true, retry_eligibility: retryEligibility };
+                : run.kind === 'check_repair'
+                    ? {
+                        kind: 'check_repair',
+                        available: true,
+                        check_repair: getCheckRepairDetails(project.id, run.id),
+                        retry_eligibility: retryEligibility,
+                        action_kind: null,
+                    }
+                    : run.kind === 'github_actions'
+                        ? { ...serializeGitHubActionsExecutionDetail(getGitHubActionsExecutionDetails(project.id, run.id)), retry_eligibility: retryEligibility }
+                        : ['automation_commit', 'automation_push', 'automation_pull_request'].includes(run.kind)
+                            ? { kind: run.kind, available: true, automation_stage: getAutomationStageDetails(project.id, run.id), retry_eligibility: retryEligibility }
+                            : { kind: run.kind, available: true, retry_eligibility: retryEligibility };
     const artifacts = loadExecutionArtifactSummariesForRuns(project.id, [run.id], MAX_ARTIFACTS_PER_RUN).get(run.id)
         ?? { artifacts: [], artifact_count: 0 };
     return {
@@ -444,7 +455,14 @@ const getParkTicketError = (ticket) => {
 const getBundlePlanBlockerError = () => {
     return 'AI planning is blocked because this bundle worktree is currently being modified.';
 };
+const hasActiveBundleCheckWork = (projectId, bundleId) => Boolean(getActiveBundleRepairBlocker(bundleId)
+    || findActiveCheckBatchForTarget(projectId, 'bundle', bundleId));
 const deleteTicketRecord = async (ticket) => {
+    if (ticket.project_id
+        && ticket.worktree_bundle_id
+        && hasActiveBundleCheckWork(ticket.project_id, ticket.worktree_bundle_id)) {
+        return { ok: false, status: 409, error: 'Cannot delete a ticket while its bundle has active check work' };
+    }
     if (ticket.agent_status === 'running'
         || (ticket.project_id && hasActiveBuildExecutionRunForTicket(ticket.project_id, ticket.id))) {
         return { ok: false, status: 409, error: 'Cannot delete a ticket while the agent is running' };
@@ -812,6 +830,9 @@ const cleanupBundleIfEmpty = (bundleId, project) => {
     if (isProjectRootBundle(bundle)) {
         return;
     }
+    if (hasActiveBundleCheckWork(project.id, bundle.id)) {
+        throw new HttpError(409, 'Cannot delete a bundle while check work is active');
+    }
     try {
         deleteWorktree(bundle.branch, project);
     }
@@ -1464,10 +1485,7 @@ const serializeBundleRow = (projectId, bundle, openQuestions = bundle ? loadBuil
     const hasPreparedWorktree = bundle.kind === 'project_root'
         ? true
         : Boolean(project && resolveExistingWorktreePath(bundle.branch, project));
-    const parsedOverride = bundle.kind === 'project_root'
-        ? { value: null }
-        : parseBundleRequiredCheckPolicyOverride(bundle.required_check_policy_override);
-    const effectivePolicy = resolveEffectiveRequiredCheckPolicyMembership(project, bundle);
+    const effectivePolicy = resolveEffectiveRequiredCheckPolicyMembership(project);
     return {
         ...bundle,
         has_prepared_worktree: hasPreparedWorktree,
@@ -1475,7 +1493,6 @@ const serializeBundleRow = (projectId, bundle, openQuestions = bundle ? loadBuil
             ? serializeBundlePullRequest(getBundlePullRequestRecord(bundle.id, projectId))
             : null,
         automation_config: resolveAutomationConfig(bundle, project),
-        required_check_policy_override: 'error' in parsedOverride ? null : parsedOverride.value,
         required_check_policy: 'error' in effectivePolicy
             ? undefined
             : {
@@ -1483,7 +1500,6 @@ const serializeBundleRow = (projectId, bundle, openQuestions = bundle ? loadBuil
                 required_check_definition_ids: effectivePolicy.required_check_definition_ids,
                 pre_review_check_definition_ids: effectivePolicy.pre_review_check_definition_ids,
             },
-        required_check_policy_error: 'error' in parsedOverride ? parsedOverride.error : ('error' in effectivePolicy ? effectivePolicy.error : null),
         open_questions: openQuestions,
         build_open_question_batch_status: getLatestBuildOpenQuestionBatchStatus(projectId, bundle.id),
     };
@@ -3049,11 +3065,14 @@ app.post('/projects/:id/spec-sessions/:sessionId/snapshots/:snapshotId/create-ti
             ? createAutoBundleForName(bundleName, project.id)
             : createAutoPlanningBundle(project.id);
         const ticketsForMaterialization = snapshot.tickets.map(ticket => {
-            const appendix = buildVisualizationAppendix(ticket.relevant_visualizations ?? [], snapshot);
+            const appendices = [
+                buildVisualizationAppendix(ticket.relevant_visualizations ?? [], snapshot),
+                buildImplementationResourcesAppendix(snapshot.resource_urls),
+            ].filter(Boolean);
             return {
                 key: ticket.key,
                 title: ticket.title,
-                description: appendix ? `${ticket.description}\n\n${appendix}` : ticket.description,
+                description: appendices.length > 0 ? `${ticket.description}\n\n${appendices.join('\n\n')}` : ticket.description,
             };
         });
         const { createdTickets, createdDependencies } = materializeTicketsWithDependencies({
@@ -3719,15 +3738,15 @@ app.delete('/bundles/:id', (req, res) => {
     if (isProjectRootBundle(bundle)) {
         return res.status(409).json({ error: 'Project root cannot be deleted' });
     }
+    if (hasActiveBundleCheckWork(result.project.id, bundle.id)) {
+        return res.status(409).json({ error: 'Cannot delete a bundle while check work is active' });
+    }
     if (countBundleTickets(bundle.id, result.project.id) > 0) {
         return res.status(409).json({ error: 'Cannot delete a bundle that is still used by tickets' });
     }
     if (result.project.active_target_kind === 'bundle' && result.project.active_target_bundle_id === bundle.id) {
         return res.status(409).json({ error: 'Cannot delete the currently selected target bundle' });
     }
-    if (findActiveCheckBatchForTarget(result.project.id, 'bundle', bundle.id)) {
-        return res.status(409).json({ error: 'Cannot delete a bundle while checks are running' });
-    }
     const affectedChatSessionIds = listChatSessions(result.project.id)
         .filter(chatSession => chatSession.target_bundle_id === bundle.id)
         .map(chatSession => chatSession.id);
@@ -3758,14 +3777,14 @@ app.patch('/bundles/:id', (req, res) => {
         return res.status(404).json({ error: 'Bundle not found' });
     }
     const hasNameUpdate = hasOwn(req.body, 'name');
-    const hasRequiredCheckPolicyOverrideUpdate = hasOwn(req.body, 'required_check_policy_override');
+    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' });
+    }
     if (isProjectRootBundle(bundle)) {
         return res.status(409).json({
             error: hasNameUpdate
                 ? 'Project root bundles cannot be renamed'
-                : hasRequiredCheckPolicyOverrideUpdate
-                    ? 'Project root bundles cannot override required-check policy'
-                    : 'Project root bundle automation cannot be overridden',
+                : 'Project root bundle automation cannot be overridden',
         });
     }
     let nextName = bundle.name;
@@ -3838,39 +3857,6 @@ app.patch('/bundles/:id', (req, res) => {
             return res.status(400).json({ error: 'automation_pause_on_open_questions must be a boolean' });
         }
     }
-    let requiredCheckPolicyOverride;
-    let requiredCheckPolicyOverrideValue;
-    if (hasRequiredCheckPolicyOverrideUpdate) {
-        const value = req.body.required_check_policy_override;
-        if (value == null) {
-            requiredCheckPolicyOverride = null;
-            requiredCheckPolicyOverrideValue = null;
-        }
-        else {
-            const result = canonicalizeBundleRequiredCheckPolicyOverride(value);
-            if ('error' in result) {
-                return res.status(400).json({ error: result.error });
-            }
-            requiredCheckPolicyOverrideValue = result.value;
-            requiredCheckPolicyOverride = result.value ? JSON.stringify(result.value) : null;
-        }
-    }
-    if (requiredCheckPolicyOverrideValue) {
-        const definitions = getProjectCheckDefinitions(result.project);
-        const definitionIds = new Set(definitions.map(definition => definition.id));
-        const missingId = [
-            ...requiredCheckPolicyOverrideValue.required_check_definition_ids,
-            ...requiredCheckPolicyOverrideValue.pre_review_check_definition_ids,
-        ].find(id => !definitionIds.has(id));
-        if (missingId) {
-            return res.status(400).json({ error: `required_check_policy_override references missing check definition ${missingId}` });
-        }
-        const requiredDefinitions = definitions.filter(definition => requiredCheckPolicyOverrideValue.required_check_definition_ids.includes(definition.id));
-        const policySnapshotSizeError = validateRequiredCheckPolicySnapshotSize(requiredCheckPolicyOverrideValue.required_check_definition_ids, requiredDefinitions);
-        if (policySnapshotSizeError) {
-            return res.status(400).json({ error: policySnapshotSizeError });
-        }
-    }
     let updated = null;
     try {
         updated = db.transaction(() => {
@@ -3888,7 +3874,6 @@ app.patch('/bundles/:id', (req, res) => {
                 automationDepth,
                 automationReviewFixEnabled,
                 automationPauseOnOpenQuestions,
-                requiredCheckPolicyOverride,
             });
         })();
     }
@@ -3928,7 +3913,7 @@ app.post('/bundles/:id/review', (req, res) => {
     }
     return res.json(reviewResult.details);
 });
-app.post('/bundles/:id/build-open-questions/resolve', (req, res) => {
+app.post('/bundles/:id/build-open-questions/resolve', async (req, res) => {
     const result = getRequiredProject(req);
     if ('error' in result) {
         return res.status(400).json({ error: result.error });
@@ -3971,54 +3956,70 @@ app.post('/bundles/:id/build-open-questions/resolve', (req, res) => {
     }
     if (accepted.kind === 'dismissed') {
         const automationConfig = resolveAutomationConfig(bundle, result.project);
-        const reviewResult = depthAtLeast(automationConfig.depth, 'auto_review')
-            ? transitionBundleToReview(result.project.id, bundle.id, io, {
-                automatic: true,
-                initiation: {
-                    causalParentRunId: accepted.progressionRunId,
-                    workflowContext: validateWorkflowContext({ build_open_question_batch_id: accepted.batchId }),
-                },
-            })
-            : null;
-        if (!reviewResult) {
+        if (!depthAtLeast(automationConfig.depth, 'auto_review')) {
             completeAutomationProgression({
                 projectId: result.project.id,
                 bundleId: bundle.id,
                 progressionRunId: accepted.progressionRunId,
                 broadcaster: io,
             });
+            for (const ticket of listDetailedBundleTickets(result.project.id, bundle.id)) {
+                io.emit('ticket:updated', ticket);
+            }
+            return res.json(serializeBundleDetails(result.project, bundle));
         }
-        for (const ticket of listDetailedBundleTickets(result.project.id, bundle.id)) {
-            io.emit('ticket:updated', ticket);
-        }
-        if (reviewResult && !reviewResult.ok) {
-            if (reviewResult.code === 'bundle_build_incomplete') {
-                completeAutomationProgression({
-                    projectId: result.project.id,
-                    bundleId: bundle.id,
-                    progressionRunId: accepted.progressionRunId,
-                    broadcaster: io,
-                });
-                for (const ticket of listDetailedBundleTickets(result.project.id, bundle.id)) {
-                    io.emit('ticket:updated', ticket);
-                }
-                return res.json(serializeBundleDetails(result.project, bundle));
+        const ticketsBeforeReview = listDetailedBundleTickets(result.project.id, bundle.id);
+        if (!areBundleTicketsReadyForAutomaticReview(ticketsBeforeReview, bundle.id)) {
+            completeAutomationProgression({
+                projectId: result.project.id,
+                bundleId: bundle.id,
+                progressionRunId: accepted.progressionRunId,
+                broadcaster: io,
+            });
+            for (const ticket of ticketsBeforeReview) {
+                io.emit('ticket:updated', ticket);
             }
+            return res.json(serializeBundleDetails(result.project, bundle));
+        }
+        let reviewStartFailureStatus = null;
+        let reviewStartFailureError = null;
+        const reviewStarted = await runAutomationReviewGateOrPause({
+            projectId: result.project.id,
+            bundleId: bundle.id,
+            progressionRunId: accepted.progressionRunId,
+            broadcaster: io,
+            pausedStageRunId: null,
+            initiation: {
+                workflowContext: validateWorkflowContext({ build_open_question_batch_id: accepted.batchId }),
+            },
+            onReviewStartFailure: failure => {
+                reviewStartFailureStatus = failure.status;
+                reviewStartFailureError = failure.error;
+            },
+        });
+        if (reviewStartFailureStatus !== null && reviewStartFailureError !== null) {
             waitAutomationProgression({
                 projectId: result.project.id,
                 bundleId: bundle.id,
                 progressionRunId: accepted.progressionRunId,
                 pauseCode: 'review',
-                pauseReason: reviewResult.error,
+                pauseReason: reviewStartFailureError,
                 reasonCode: 'stage_failed',
                 pausedStageRunId: null,
                 broadcaster: io,
             });
-            return res.status(reviewResult.status).json({ error: reviewResult.error });
+            return res.status(reviewStartFailureStatus).json({ error: reviewStartFailureError });
+        }
+        const updatedTickets = listDetailedBundleTickets(result.project.id, bundle.id);
+        for (const ticket of updatedTickets) {
+            io.emit('ticket:updated', ticket);
         }
+        const reviewOwner = reviewStarted
+            ? updatedTickets.find(ticket => ticket.state === 'review' && ticket.parked_at === null)
+            : null;
         return res.json(serializeBundleDetails(result.project, bundle, {
-            review_owner_ticket_id: reviewResult?.ok ? reviewResult.value?.id : undefined,
-            target_ticket_id: reviewResult?.ok ? reviewResult.value?.id : undefined,
+            review_owner_ticket_id: reviewOwner?.id,
+            target_ticket_id: reviewOwner?.id,
         }));
     }
     for (const ticket of listDetailedBundleTickets(result.project.id, bundle.id)) {
@@ -4125,7 +4126,7 @@ app.post('/bundles/:id/follow-up', (req, res) => {
     return res.status(response.status).json(response.value);
 });
 const AUTOMATION_SIDE_EFFECT_KINDS = new Set(['automation_commit', 'automation_push', 'automation_pull_request']);
-const AUTOMATION_WORKER_PAUSE_KINDS = new Set(['build', 'review', 'build_follow_up', 'automation_review_fix', 'check_batch']);
+const AUTOMATION_WORKER_PAUSE_KINDS = new Set(['build', 'review', 'build_follow_up', 'automation_review_fix', 'check_repair', 'check_batch']);
 app.post('/bundles/:id/resume-automation', async (req, res) => {
     const result = getRequiredProject(req);
     if ('error' in result) {
@@ -4208,7 +4209,11 @@ app.post('/bundles/:id/resume-automation', async (req, res) => {
     });
     if (checkpointLineage) {
         const owner = getTicket(decision.owner_ticket_id);
-        if (!owner || owner.id !== checkpointLineage.ticket.id || owner.agent_status !== 'done') {
+        if (!owner
+            || owner.id !== checkpointLineage.ticket.id
+            || owner.state !== 'build'
+            || owner.parked_at !== null
+            || !isTicketBuildComplete(owner)) {
             return res.status(409).json({ error: 'Checkpoint progression owner is no longer the active Build ticket' });
         }
         let retryOfRunId;
@@ -4463,6 +4468,7 @@ app.post('/bundles/:id/resume-automation', async (req, res) => {
             pauseReason: bundleState.automation_paused_reason ?? 'Automation paused',
             reasonCode: bundleState.automation_pause_reason_code ?? 'manual_transition',
             pausedStageRunId: bundleState.automation_paused_stage_run_id,
+            pausedBoundaryPurpose: bundleState.automation_paused_boundary_purpose,
             broadcaster: io,
         });
     };
@@ -4500,7 +4506,62 @@ app.post('/bundles/:id/resume-automation', async (req, res) => {
         }
         return res.json(serializeBundleDetails(result.project, bundle));
     }
-    if (owner.state === 'review' && owner.agent_status !== 'running') {
+    if (decision.outcome === 'complete_manual_boundary') {
+        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,
+        });
+        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'))) {
+        if (!revalidateDecision()) {
+            return res.status(409).json({ error: 'Bundle automation state changed before Resume could start' });
+        }
+        const progression = getAutomationProgression(result.project.id, bundle.id);
+        if (!progression || progression.id !== progressionRunId) {
+            return res.status(409).json({ error: 'Automation progression ownership is invalid' });
+        }
+        const workflowContext = validateWorkflowContext(progression.metadata);
+        let reviewStartFailureStatus = null;
+        let reviewStartFailureError = null;
+        try {
+            runAutomationProgression({
+                projectId: result.project.id,
+                bundleId: bundle.id,
+                progressionRunId,
+                broadcaster: io,
+            });
+            await runAutomationReviewGateOrPause({
+                projectId: result.project.id,
+                bundleId: bundle.id,
+                progressionRunId,
+                broadcaster: io,
+                pausedStageRunId: bundleState.automation_paused_stage_run_id,
+                initiation: { workflowContext },
+                onReviewStartFailure: failure => {
+                    reviewStartFailureStatus = failure.status;
+                    reviewStartFailureError = failure.error;
+                    restoreWaitingProgression();
+                },
+            });
+        }
+        catch (error) {
+            return res.status(409).json({ error: error instanceof Error ? error.message : String(error) });
+        }
+        if (reviewStartFailureStatus !== null && reviewStartFailureError !== null) {
+            return res.status(reviewStartFailureStatus).json({ error: reviewStartFailureError });
+        }
+    }
+    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;
@@ -4610,7 +4671,7 @@ app.post('/bundles/:id/resume-automation', async (req, res) => {
                     broadcaster: io,
                 });
                 const checkGateResume = decision.outcome === 'rerun_required_checks'
-                    ? resolveAutomationCheckGateResume(result.project.id, progressionRunId)
+                    ? resolveAutomationCheckGateResume(result.project.id, progressionRunId, owner.bundle?.kind === 'project_root' ? project.repo_path : resolveWorktreePath(bundle.branch, project))
                     : undefined;
                 await runAutomationCommitChain(owner, project, owner.bundle ?? null, automationConfig, io, progressionRunId, checkGateResume);
             }
@@ -4635,45 +4696,6 @@ app.post('/bundles/:id/resume-automation', async (req, res) => {
             return res.status(409).json({ error: 'The selected Resume outcome no longer matches the bundle state' });
         }
     }
-    else if (owner.state === 'build' && owner.agent_status === 'done' && (decision.outcome === 'start_review' || decision.outcome === 'rerun_review_checks')) {
-        if (!revalidateDecision()) {
-            return res.status(409).json({ error: 'Bundle automation state changed before Resume could start' });
-        }
-        const progression = getAutomationProgression(result.project.id, bundle.id);
-        if (!progression || progression.id !== progressionRunId) {
-            return res.status(409).json({ error: 'Automation progression ownership is invalid' });
-        }
-        const workflowContext = validateWorkflowContext(progression.metadata);
-        let reviewStartFailureStatus = null;
-        let reviewStartFailureError = null;
-        try {
-            runAutomationProgression({
-                projectId: result.project.id,
-                bundleId: bundle.id,
-                progressionRunId,
-                broadcaster: io,
-            });
-            await runAutomationReviewGateOrPause({
-                projectId: result.project.id,
-                bundleId: bundle.id,
-                progressionRunId,
-                broadcaster: io,
-                pausedStageRunId: bundleState.automation_paused_stage_run_id,
-                initiation: { workflowContext },
-                onReviewStartFailure: failure => {
-                    reviewStartFailureStatus = failure.status;
-                    reviewStartFailureError = failure.error;
-                    restoreWaitingProgression();
-                },
-            });
-        }
-        catch (error) {
-            return res.status(409).json({ error: error instanceof Error ? error.message : String(error) });
-        }
-        if (reviewStartFailureStatus !== null && reviewStartFailureError !== null) {
-            return res.status(reviewStartFailureStatus).json({ error: reviewStartFailureError });
-        }
-    }
     else {
         return res.status(409).json({ error: 'Ticket is not in a resumable state' });
     }
@@ -4704,72 +4726,31 @@ app.post('/bundles/:id/dismiss-automation-pause', async (req, res) => {
         && listBuildOpenQuestionsForBundle(result.project.id, bundle.id).length > 0) {
         return res.status(409).json({ error: 'Resolve or dismiss all Build open questions before dismissing this pause' });
     }
-    let progressionRunId = bundleState.automation_progression_run_id;
-    if (!progressionRunId) {
+    const progressionRunId = bundleState.automation_progression_run_id;
+    const checkpointLineage = progressionRunId
+        ? resolveBuildTicketCommitCheckpointLineage({
+            projectId: result.project.id,
+            bundleId: bundle.id,
+            progressionRunId,
+        })
+        : null;
+    if (progressionRunId) {
         try {
-            progressionRunId = (bundleState.automation_paused_stage_run_id
-                ? recoverStoppedSideEffectProgression({
-                    projectId: result.project.id,
-                    bundleId: bundle.id,
-                    broadcaster: io,
-                })
-                : recoverLegacyAutomationProgression({
-                    projectId: result.project.id,
-                    bundleId: bundle.id,
-                    broadcaster: io,
-                })).runId;
-        }
-        catch (error) {
-            return res.status(409).json({ error: error instanceof Error ? error.message : String(error) });
-        }
-    }
-    try {
-        if (getAutomationProgression(result.project.id, bundle.id)?.id !== progressionRunId) {
-            return res.status(409).json({ error: 'Automation progression ownership is invalid' });
-        }
-    }
-    catch (error) {
-        return res.status(409).json({ error: error instanceof Error ? error.message : String(error) });
-    }
-    const checkpointLineage = resolveBuildTicketCommitCheckpointLineage({
-        projectId: result.project.id,
-        bundleId: bundle.id,
-        progressionRunId,
-    });
-    if (bundleState.automation_paused_stage_run_id) {
-        const stage = getExecutionRun(result.project.id, bundleState.automation_paused_stage_run_id);
-        if (!stage
-            || (!AUTOMATION_SIDE_EFFECT_KINDS.has(stage.kind) && !AUTOMATION_WORKER_PAUSE_KINDS.has(stage.kind))
-            || !pausedRunBelongsToProgression(result.project.id, bundle.id, progressionRunId, stage.id)) {
-            return res.status(409).json({ error: 'The paused automation stage does not belong to the active progression' });
+            await stopAutomationProgression({
+                projectId: result.project.id,
+                bundleId: bundle.id,
+                broadcaster: io,
+                stopLocalWorker: worker => (worker.kind === 'review' ? stopReviewAgent(worker.ticket_id) : stopBuildAgent(worker.ticket_id)),
+            });
         }
-        if (AUTOMATION_SIDE_EFFECT_KINDS.has(stage.kind)) {
-            let reconciled;
-            try {
-                reconciled = await reconcileAutomationStage({
-                    projectId: result.project.id,
-                    bundleId: bundle.id,
-                    progressionRunId,
-                    stageRunId: stage.id,
-                });
-            }
-            catch (error) {
-                return res.status(409).json({ error: error instanceof Error ? error.message : String(error) });
-            }
-            if (reconciled.domainStatus === 'ambiguous') {
-                return res.status(409).json({ error: 'The paused automation side effect is ambiguous and cannot be dismissed safely.' });
-            }
-            if (!(reconciled.status === 'completed' && reconciled.domainStatus === 'reconciled_completed')
-                && !(reconciled.status === 'interrupted' && reconciled.domainStatus === 'reconciled_absent')) {
-                return res.status(409).json({ error: 'The paused automation side effect has no safely dismissible outcome.' });
-            }
+        catch {
+            // Explicit abandonment also repairs a stale progression pointer.
         }
     }
-    await stopAutomationProgression({
+    abandonAutomationPause({
         projectId: result.project.id,
         bundleId: bundle.id,
         broadcaster: io,
-        stopLocalWorker: worker => (worker.kind === 'review' ? stopReviewAgent(worker.ticket_id) : stopBuildAgent(worker.ticket_id)),
     });
     if (checkpointLineage) {
         const stoppedSequence = stopBuildSequence(checkpointLineage.ticket.id);
@@ -7187,6 +7168,12 @@ const completeClaimedProjectDeletion = async (projectId, claimId) => {
           WHERE evaluation_id IN (SELECT id FROM check_gate_evaluations WHERE project_id = ?)
         `).run(projectId);
                 db.prepare('DELETE FROM check_gate_evaluations WHERE project_id = ?').run(projectId);
+                if (db.prepare("SELECT 1 FROM sqlite_master WHERE type = 'table' AND name = 'check_repair_details'").get()) {
+                    db.prepare(`
+            DELETE FROM check_repair_details
+            WHERE execution_run_id IN (SELECT id FROM execution_runs WHERE project_id = ?)
+          `).run(projectId);
+                }
                 db.prepare(`
           DELETE FROM check_attempt_details
           WHERE execution_run_id IN (SELECT id FROM execution_runs WHERE project_id = ?)
@@ -8131,6 +8118,98 @@ app.post('/projects/:id/check-batches', async (req, res) => {
         return res.status(409).json({ error: getErrorMessage(error) });
     }
 });
+app.post('/projects/:id/check-repairs', async (req, res) => {
+    const project = getProjectById(req.params.id);
+    if (!project) {
+        return res.status(404).json({ error: 'Not found' });
+    }
+    const body = req.body && typeof req.body === 'object' && !Array.isArray(req.body)
+        ? req.body
+        : null;
+    if (!body || Object.keys(body).some(key => !['diagnostic_ids', 'raw_output_attempt_run_ids', 'ticket_id'].includes(key))) {
+        return res.status(400).json({ error: 'Only diagnostic_ids, raw_output_attempt_run_ids, and optional ticket_id are accepted' });
+    }
+    const diagnosticIds = body.diagnostic_ids === undefined
+        ? []
+        : Array.isArray(body.diagnostic_ids)
+            && body.diagnostic_ids.length <= 32
+            && body.diagnostic_ids.every(id => typeof id === 'string' && id.trim().length > 0 && id.trim().length <= 100)
+            ? body.diagnostic_ids.map(id => id.trim())
+            : null;
+    const rawOutputAttemptRunIds = body.raw_output_attempt_run_ids === undefined
+        ? []
+        : Array.isArray(body.raw_output_attempt_run_ids)
+            && body.raw_output_attempt_run_ids.length <= 8
+            && body.raw_output_attempt_run_ids.every(id => typeof id === 'string' && id.trim().length > 0 && id.trim().length <= 100)
+            ? body.raw_output_attempt_run_ids.map(id => id.trim())
+            : null;
+    if (!diagnosticIds
+        || diagnosticIds.length !== new Set(diagnosticIds).size
+        || !rawOutputAttemptRunIds
+        || rawOutputAttemptRunIds.length !== new Set(rawOutputAttemptRunIds).size
+        || diagnosticIds.length + rawOutputAttemptRunIds.length === 0) {
+        return res.status(400).json({ error: 'At least one unique diagnostic_ids or raw_output_attempt_run_ids evidence reference is required' });
+    }
+    if (body.ticket_id !== undefined && (typeof body.ticket_id !== 'string'
+        || body.ticket_id.trim().length === 0
+        || body.ticket_id.trim().length > 100)) {
+        return res.status(400).json({ error: 'ticket_id must be a non-empty opaque ticket ID' });
+    }
+    try {
+        return res.status(202).json(await startCheckRepair({
+            projectId: project.id,
+            diagnosticIds,
+            rawOutputAttemptRunIds,
+            ticketId: typeof body.ticket_id === 'string' ? body.ticket_id.trim() : null,
+            io,
+        }));
+    }
+    catch (error) {
+        if (error instanceof CheckRepairError) {
+            return res.status(error.status).json({ error: error.message });
+        }
+        return res.status(409).json({ error: getErrorMessage(error) });
+    }
+});
+app.get('/projects/:id/check-repairs/:repairRunId', (req, res) => {
+    const project = getProjectById(req.params.id);
+    if (!project) {
+        return res.status(404).json({ error: 'Not found' });
+    }
+    const repair = getCheckRepairDetails(project.id, req.params.repairRunId);
+    return repair ? res.json(repair) : res.status(404).json({ error: 'Check repair not found' });
+});
+app.post('/projects/:id/check-repairs/:repairRunId/stop', async (req, res) => {
+    if (!getProjectById(req.params.id)) {
+        return res.status(404).json({ error: 'Not found' });
+    }
+    try {
+        return res.json(await stopCheckRepair(req.params.id, req.params.repairRunId, io));
+    }
+    catch (error) {
+        if (error instanceof CheckRepairError) {
+            return res.status(error.status).json({ error: error.message });
+        }
+        return res.status(409).json({ error: getErrorMessage(error) });
+    }
+});
+app.post('/projects/:id/check-repairs/:repairRunId/retry', async (req, res) => {
+    if (!getProjectById(req.params.id)) {
+        return res.status(404).json({ error: 'Not found' });
+    }
+    if (req.body && typeof req.body === 'object' && Object.keys(req.body).length > 0) {
+        return res.status(400).json({ error: 'Check repair retries do not accept client-supplied repair context' });
+    }
+    try {
+        return res.status(202).json(await retryCheckRepair(req.params.id, req.params.repairRunId, io));
+    }
+    catch (error) {
+        if (error instanceof CheckRepairError) {
+            return res.status(error.status).json({ error: error.message });
+        }
+        return res.status(409).json({ error: getErrorMessage(error) });
+    }
+});
 const parseCheckDefinitionIds = (value) => {
     if (!Array.isArray(value) || value.length === 0 || value.some(id => typeof id !== 'string' || id.trim() === '')) {
         return null;
@@ -8230,12 +8309,47 @@ app.get('/projects/:id/check-batches/:batchRunId', async (req, res) => {
         attempts: await hydrateCheckAttemptCurrency(project, batch, getCheckBatchAttempts(req.params.id, req.params.batchRunId)),
     });
 });
-app.get('/projects/:id/check-gate-evaluations/:evaluationId', (req, res) => {
+app.get('/projects/:id/check-batches/:batchRunId/diagnostics', async (req, res) => {
+    const project = getProjectById(req.params.id);
+    if (!project) {
+        return res.status(404).json({ error: 'Not found' });
+    }
+    const diagnostics = getCheckBatchDiagnosticResponse(project.id, req.params.batchRunId);
+    if (!diagnostics) {
+        return res.status(404).json({ error: 'Check batch not found' });
+    }
+    return res.json({
+        ...diagnostics,
+        repair: await getCheckRepairCandidateState(project.id, req.params.batchRunId),
+        latest_repair: getLatestCheckRepairForBatch(project.id, req.params.batchRunId),
+    });
+});
+app.get('/projects/:id/check-attempts/:attemptRunId/diagnostics', (req, res) => {
+    const project = getProjectById(req.params.id);
+    if (!project) {
+        return res.status(404).json({ error: 'Not found' });
+    }
+    const diagnostics = getCheckAttemptDiagnosticResponse(project.id, req.params.attemptRunId);
+    if (!diagnostics) {
+        return res.status(404).json({ error: 'Check attempt diagnostics not found' });
+    }
+    return res.json(diagnostics);
+});
+app.get('/projects/:id/check-gate-evaluations/:evaluationId', async (req, res) => {
+    const project = getProjectById(req.params.id);
+    if (!project) {
+        return res.status(404).json({ error: 'Not found' });
+    }
     const evaluation = getCheckGateEvaluation(req.params.id, req.params.evaluationId);
     if (!evaluation) {
         return res.status(404).json({ error: 'Check gate evaluation not found' });
     }
-    return res.json(evaluation);
+    const workspace = resolveExplicitProjectTestWorkspace(project, evaluation.target.targetKind, evaluation.target.targetBundleId);
+    const currentWorkspaceIdentity = 'error' in workspace
+        ? null
+        : await captureCheckWorkspaceIdentity(workspace.cwd);
+    const currentPolicyResolution = resolveRequiredCheckPolicy(project, { boundaryKind: evaluation.boundaryKind });
+    return res.json(hydrateCheckGatePresentApplicability(evaluation, currentWorkspaceIdentity, currentPolicyResolution));
 });
 app.post('/projects/:id/check-batches/:batchRunId/stop', async (req, res) => {
     if (!getCheckBatchDetails(req.params.id, req.params.batchRunId)) {