@straiffi/archon 1.7.5 → 1.7.6

package/dist/server/index.js

@@ -49,8 +49,9 @@ import { formatBuildOpenQuestionAnswersPrompt, getLatestBuildOpenQuestionBatchSt
 import { acceptBuildOpenQuestionResolution } from './lib/buildOpenQuestionOperations.js';
 import { completeAutomationProgression, createAutomationReviewFix, finishAutomationReviewFix, getAutomationProgression, recoverLegacyAutomationProgression, recoverStoppedSideEffectProgression, runAutomationProgression, stopAutomationProgression, waitAutomationProgression } from './lib/automationProgression.js';
 import { reconcileAutomationStage } from './lib/automationReconciliation.js';
+import { pausedRunBelongsToProgression, resolveAutomationResumeDecision } from './lib/automationResumeDecision.js';
 import { getAutomationStageDetails, } from './lib/automationStageDetails.js';
-import { clearAutomationPause, countBlockingFindings, depthAtLeast, getBundleAutomationState, isAutomationDepth, recordAutomationPause, resolveAutomationConfig, upsertBundleAutomationState, } from './lib/ticketAutomation.js';
+import { buildAutomationFixInstruction, clearAutomationPause, countBlockingFindings, depthAtLeast, getBundleAutomationState, isAutomationDepth, recordAutomationPause, resolveAutomationConfig, upsertBundleAutomationState, } from './lib/ticketAutomation.js';
 import { runAutomationCommitChain } from './lib/ticketAutomationCommit.js';
 import { getDiscoveredSkills, normalizeSkillNames } from './lib/skills.js';
 import { clearAllPreviewProxies } from './lib/previewProxy.js';
@@ -3954,25 +3955,6 @@ app.post('/bundles/:id/follow-up', (req, res) => {
 });
 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']);
-const pausedRunBelongsToProgression = (projectId, bundleId, progressionRunId, pausedRunId) => {
-    const pausedRun = getExecutionRun(projectId, pausedRunId);
-    const progression = getExecutionRun(projectId, progressionRunId);
-    if (!pausedRun || !progression || progression.kind !== 'automation_progression') {
-        return false;
-    }
-    const ownsBundle = listExecutionRunLinks(projectId, pausedRun.id).some(link => (link.entity_type === 'bundle'
-        && link.entity_id === bundleId
-        && (link.relationship === 'primary' || link.relationship === 'context')));
-    if (!ownsBundle) {
-        return false;
-    }
-    if (pausedRun.parent_run_id === progressionRunId) {
-        return true;
-    }
-    const parent = pausedRun.parent_run_id ? getExecutionRun(projectId, pausedRun.parent_run_id) : null;
-    return parent?.kind === 'automation_review_fix' && parent.parent_run_id === progressionRunId
-        || progression.parent_run_id === pausedRun.id;
-};
 app.post('/bundles/:id/resume-automation', async (req, res) => {
     const result = getRequiredProject(req);
     if ('error' in result) {
@@ -3986,15 +3968,38 @@ app.post('/bundles/:id/resume-automation', async (req, res) => {
     if (!bundleState || !bundleState.automation_paused_reason) {
         return res.status(409).json({ error: 'Bundle automation is not paused' });
     }
-    const liveAutomationConfig = resolveAutomationConfig(bundle, result.project);
-    if (hasActiveBuildOpenQuestionBatch(result.project.id, bundle.id)) {
-        return res.status(409).json({ error: 'Build open question resolution is still in progress' });
-    }
-    if (bundleState.automation_paused_code === 'open_questions'
-        && liveAutomationConfig.pauseOnOpenQuestions
-        && listBuildOpenQuestionsForBundle(result.project.id, bundle.id).length > 0) {
-        return res.status(409).json({ error: 'Resolve or dismiss all Build open questions before resuming automation' });
-    }
+    const resolveCurrentDecision = () => {
+        const currentState = getBundleAutomationState(result.project.id, bundle.id);
+        if (!currentState?.automation_paused_reason) {
+            return null;
+        }
+        return resolveAutomationResumeDecision({
+            projectId: result.project.id,
+            bundleId: bundle.id,
+            state: currentState,
+            config: resolveAutomationConfig(getBundle(bundle.id, result.project.id), getProjectById(result.project.id)),
+            tickets: listDetailedBundleTickets(result.project.id, bundle.id),
+            openQuestionCount: listBuildOpenQuestionsForBundle(result.project.id, bundle.id).length,
+            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'
+            ? 'Build open question resolution is still in progress'
+            : decision?.status === 'hidden' && decision.reason === 'resolve_open_questions'
+                ? 'Resolve or dismiss all Build open questions before resuming automation'
+                : decision?.status === 'disabled' && decision.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 });
+    }
+    const revalidateDecision = () => {
+        const current = resolveCurrentDecision();
+        return current?.status === 'enabled'
+            && current.outcome === decision.outcome
+            && current.owner_ticket_id === decision.owner_ticket_id;
+    };
     let progressionRunId = bundleState.automation_progression_run_id;
     if (!progressionRunId) {
         try {
@@ -4022,12 +4027,13 @@ app.post('/bundles/:id/resume-automation', async (req, res) => {
     catch (error) {
         return res.status(409).json({ error: error instanceof Error ? error.message : String(error) });
     }
+    if (!revalidateDecision()) {
+        return res.status(409).json({ error: 'Bundle automation state changed before Resume could start' });
+    }
     let sideEffectResume = null;
-    let pausedRunKind = null;
     if (bundleState.automation_paused_stage_run_id) {
         const stageRunId = bundleState.automation_paused_stage_run_id;
         const stage = getExecutionRun(result.project.id, stageRunId);
-        pausedRunKind = stage?.kind ?? null;
         if (!stage
             || (!AUTOMATION_SIDE_EFFECT_KINDS.has(stage.kind) && !AUTOMATION_WORKER_PAUSE_KINDS.has(stage.kind))
             || !pausedRunBelongsToProgression(result.project.id, bundle.id, progressionRunId, stageRunId)) {
@@ -4091,33 +4097,7 @@ app.post('/bundles/:id/resume-automation', async (req, res) => {
             }
         }
     }
-    if (liveAutomationConfig.depth === 'manual') {
-        completeAutomationProgression({
-            projectId: result.project.id,
-            bundleId: bundle.id,
-            progressionRunId,
-            domainStatus: 'manual_boundary_reached',
-            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 reviewOwnerSource = bundleState.automation_paused_code === 'open_questions'
-        ? listBundleSliceTickets(result.project.id, bundle.id, 'build')
-            .find(ticket => ticket.agent_status === 'done') ?? null
-        : resolveBundleReviewOwner(result.project.id, bundle.id)
-            ?? listBundleSliceTickets(result.project.id, bundle.id, 'review')[0]
-            ?? (bundleState.automation_paused_code === 'review' && (pausedRunKind === 'build' || pausedRunKind === 'build_follow_up')
-                ? listBundleSliceTickets(result.project.id, bundle.id, 'build')
-                    .find(ticket => ticket.agent_status === 'done') ?? null
-                : null)
-            ?? null;
-    if (!reviewOwnerSource) {
-        return res.status(409).json({ error: 'No review ticket to resume from' });
-    }
-    const owner = getTicket(reviewOwnerSource.id);
+    const owner = getTicket(decision.owner_ticket_id);
     if (!owner) {
         return res.status(409).json({ error: 'No review ticket to resume from' });
     }
@@ -4151,6 +4131,9 @@ app.post('/bundles/:id/resume-automation', async (req, res) => {
         };
     };
     if (sideEffectResume) {
+        if (!decision.outcome.startsWith('reconcile_') || !revalidateDecision()) {
+            return res.status(409).json({ error: 'Bundle automation state changed before Resume could start' });
+        }
         try {
             runAutomationProgression({
                 projectId: result.project.id,
@@ -4169,27 +4152,17 @@ app.post('/bundles/:id/resume-automation', async (req, res) => {
         }
         return res.json(serializeBundleDetails(result.project, bundle));
     }
-    if (owner.state === 'review' && owner.agent_status === 'running') {
-        return res.status(409).json({ error: 'Review already running' });
-    }
     if (owner.state === 'review' && owner.agent_status !== 'running') {
-        const latestRun = getLatestReviewRunForContext({
-            ticketId: owner.id,
-            projectId: owner.project_id,
-            worktreeBundleId: owner.worktree_bundle_id,
-        });
-        const findings = latestRun ? listReviewFindings(latestRun.id) : [];
-        const blockingCount = countBlockingFindings(findings, automationConfig);
         const iteration = bundleState.review_iteration_count ?? 0;
-        if (owner.can_re_review
-            && automationConfig.reviewFixEnabled
-            && blockingCount > 0
-            && iteration < automationConfig.reviewMaxIterations) {
+        if (decision.outcome === 'start_review_fix') {
             let reviewFixRunId = 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' });
+                }
                 const progression = getAutomationProgression(result.project.id, bundle.id);
                 if (!progression || progression.id !== progressionRunId) {
                     return res.status(409).json({ error: 'Automation progression ownership is invalid' });
@@ -4219,10 +4192,11 @@ app.post('/bundles/:id/resume-automation', async (req, res) => {
                     ticketId: owner.id,
                     requestedProjectId: result.project.id,
                     payload: {
-                        instruction: `Fix the code review findings at or above "${automationConfig.reviewSeverity}" severity. Address each blocking finding directly and minimally. Do not introduce unrelated changes, reformatting, or refactors. Do not commit.`,
+                        instruction: buildAutomationFixInstruction(automationConfig.reviewSeverity),
                         mode: 'build',
                     },
                     broadcaster: io,
+                    persistTriggerMessage: false,
                     initiation: {
                         initiator: 'automation',
                         causalParentRunId: reviewFix.runId,
@@ -4276,8 +4250,11 @@ app.post('/bundles/:id/resume-automation', async (req, res) => {
                 return res.status(followUpResult.status).json({ error: followUpResult.error });
             }
         }
-        else if (depthAtLeast(automationConfig.depth, 'auto_commit')) {
+        else if (decision.outcome === 'continue_commit_chain') {
             try {
+                if (!revalidateDecision()) {
+                    return res.status(409).json({ error: 'Bundle automation state changed before Resume could start' });
+                }
                 runAutomationProgression({
                     projectId: result.project.id,
                     bundleId: bundle.id,
@@ -4290,7 +4267,10 @@ app.post('/bundles/:id/resume-automation', async (req, res) => {
                 return res.status(409).json({ error: error instanceof Error ? error.message : String(error) });
             }
         }
-        else {
+        else if (decision.outcome === 'rerun_review') {
+            if (!revalidateDecision()) {
+                return res.status(409).json({ error: 'Bundle automation state changed before Resume could start' });
+            }
             const reviewResult = rerunTicketReviewOperation(owner, io, {
                 automatic: true,
                 initiation: { causalParentRunId: progressionRunId },
@@ -4300,8 +4280,14 @@ app.post('/bundles/:id/resume-automation', async (req, res) => {
                 return res.status(reviewResult.status).json({ error: reviewResult.error });
             }
         }
+        else {
+            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') {
+    else if (owner.state === 'build' && owner.agent_status === 'done' && decision.outcome === 'start_review') {
+        if (!revalidateDecision()) {
+            return res.status(409).json({ error: 'Bundle automation state changed before Resume could start' });
+        }
         const reviewResult = transitionBundleToReview(result.project.id, bundle.id, io, {
             automatic: true,
             initiation: { causalParentRunId: progressionRunId },