@straiffi/archon 1.8.3 → 1.8.4

package/dist/server/index.js

@@ -15,6 +15,7 @@ import { createProjectChatSession, resolveChatTool, resolveProjectChatPlanQuesti
 import { createProjectSpecSession, deleteProjectSpecSession, resolveProjectSpecPlanQuestionSet, stopProjectSpecSessionResponse, submitProjectSpecSessionMessage, updateProjectSpecSessionMode, } from './lib/specOperations.js';
 import { buildProjectSpecReviewRevisionDraft, getProjectSpecReviewFindings, startProjectSpecReview, stopProjectSpecReview, } from './lib/specReviewOperations.js';
 import { resolveChatSessionTarget } from './lib/chatTargets.js';
+import { resolveSessionTargetForExecution } from './lib/sessionTargets.js';
 import { createChatMessage, getChatMessage, updateChatMessageContent } from './lib/chatMessages.js';
 import { attachChatTicketProposalsToMessageContent } from './lib/chatTicketProposals.js';
 import { createCorsOriginResolver, parseCorsOrigins } from './lib/cors.js';
@@ -43,6 +44,7 @@ import { decodeProjectMemoryCursor } from './lib/projectMemoryCursor.js';
 import { getProjectFileSuggestions } from './lib/projectFileSuggestions.js';
 import { getProjectFileManifest, ProjectFileContentError, ProjectFileTargetUnavailableError, readProjectFileContent } from './lib/projectFiles.js';
 import { updateProjectTargetSelection } from './lib/projectTargets.js';
+import { hasActiveBundleSpecWork } from './lib/specWorkspaceActivity.js';
 import { exportProjectMemoryArchive, importProjectMemoryArchive } from './lib/projectMemoryTransfer.js';
 import { buildReviewFindingsResponse, computeDiffSignature, getLatestReviewRunForContext, listReviewFindings } from './lib/reviewFindings.js';
 import { formatBuildOpenQuestionAnswersPrompt, getLatestBuildOpenQuestionBatchStatus, hasActiveBuildOpenQuestionBatch, listBuildOpenQuestionsForBundle, loadBuildOpenQuestionsByBundleIds, } from './lib/buildOpenQuestions.js';
@@ -55,8 +57,8 @@ import { pausedRunBelongsToProgression, resolveAutomationResumeDecision } from '
 import { getAutomationStageDetails, } from './lib/automationStageDetails.js';
 import { buildAutomationFixInstruction, clearAutomationPause, countBlockingFindings, depthAtLeast, getBundleAutomationState, isAutomationDepth, recordAutomationPause, resolveAutomationConfig, upsertBundleAutomationState, } from './lib/ticketAutomation.js';
 import { resolveAutomationCheckGateResume, runAutomationCommitChain, runAutomationCommitOperation } from './lib/ticketAutomationCommit.js';
-import { canMutateBuildTicketCommitCheckpoint, resolveBuildTicketCommitCheckpointLineage } from './lib/buildTicketCommit.js';
-import { advanceSuccessfulBuildTicketAfterCheckpoint, compensateBuildSequenceTicketActivation } from './lib/buildCompletionContinuation.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';
@@ -814,7 +816,7 @@ const uniqueBundleBranchName = (name, projectId, options = {}) => {
     }
     return branch;
 };
-const createAutoPlanningBundle = (projectId) => {
+const createAutoPlanningBundle = (projectId, baseBranch = null) => {
     const name = uniqueAutoBundleName(projectId);
     const branch = uniqueBundleBranchName(name, projectId);
     if (!branch) {
@@ -823,6 +825,7 @@ const createAutoPlanningBundle = (projectId) => {
     const bundle = createBundle({
         name,
         branch,
+        baseBranch,
         projectId,
     });
     if (!bundle) {
@@ -830,7 +833,7 @@ const createAutoPlanningBundle = (projectId) => {
     }
     return bundle;
 };
-const createAutoBundleForName = (name, projectId) => {
+const createAutoBundleForName = (name, projectId, baseBranch = null) => {
     const trimmedName = name.trim();
     const requestedName = trimmedName || uniqueAutoBundleName(projectId);
     const branch = uniqueBundleBranchName(requestedName, projectId);
@@ -840,6 +843,7 @@ const createAutoBundleForName = (name, projectId) => {
     const bundle = createBundle({
         name: branch,
         branch,
+        baseBranch,
         projectId,
     });
     if (!bundle) {
@@ -2370,7 +2374,11 @@ const createPlanningAgentTickets = db.transaction(({ draft, initiativePrompt, pr
     return { tickets: createdTickets, dependencies: createdDependencies };
 });
 const createChatProposedTickets = db.transaction(({ project, chatSession, proposals, }) => {
-    const bundle = createAutoPlanningBundle(project.id);
+    const targetResult = resolveSessionTargetForExecution(chatSession, project, 'Chat session');
+    if (!targetResult.ok) {
+        throw new HttpError(409, targetResult.error);
+    }
+    const bundle = createAutoPlanningBundle(project.id, targetResult.target.branch);
     const { createdTickets, createdDependencies, ticketIdsByKey } = materializeTicketsWithDependencies({
         options: {
             projectId: project.id,
@@ -3087,11 +3095,21 @@ app.post('/projects/:id/spec-sessions/:sessionId/snapshots/:snapshotId/create-ti
             error: `Spec tickets must include testing or verification guidance in their descriptions before they can be created on the board. Missing guidance in: ${ticketKeys}`,
         });
     }
+    let generatedBundleId = null;
     try {
+        const targetResult = resolveSessionTargetForExecution(specSession, project, 'Spec session');
+        if (!targetResult.ok) {
+            throw new HttpError(409, targetResult.error);
+        }
+        const target = targetResult.target;
         const bundleName = specSession.external_source?.external_key ?? '';
         const bundle = bundleName
-            ? createAutoBundleForName(bundleName, project.id)
-            : createAutoPlanningBundle(project.id);
+            ? createAutoBundleForName(bundleName, project.id, target.branch)
+            : createAutoPlanningBundle(project.id, target.branch);
+        if (!bundle || isProjectRootBundle(bundle)) {
+            throw new HttpError(409, 'Unable to create a bundle for this Spec snapshot.');
+        }
+        generatedBundleId = bundle.id;
         const ticketsForMaterialization = snapshot.tickets.map(ticket => {
             const appendices = [
                 buildVisualizationAppendix(ticket.relevant_visualizations ?? [], snapshot),
@@ -3130,6 +3148,9 @@ app.post('/projects/:id/spec-sessions/:sessionId/snapshots/:snapshotId/create-ti
         });
     }
     catch (error) {
+        if (generatedBundleId) {
+            cleanupBundleIfEmpty(generatedBundleId, project);
+        }
         if (error instanceof HttpError) {
             return res.status(error.status).json({ error: error.message });
         }
@@ -3149,6 +3170,10 @@ app.post('/projects/:id/spec-sessions/:sessionId/snapshots/:snapshotId/implement
     if (!snapshot || snapshot.spec_session_id !== specSession.id) {
         return res.status(404).json({ error: 'Not found' });
     }
+    const targetResult = resolveSessionTargetForExecution(specSession, project, 'Spec session');
+    if (!targetResult.ok) {
+        return res.status(409).json({ error: targetResult.error });
+    }
     const draftText = buildSpecImplementationDraft({ snapshot, specSession });
     return res.status(200).json({
         draft_text: draftText,
@@ -3169,11 +3194,15 @@ app.post('/projects/:id/spec-sessions/:sessionId/snapshots/:snapshotId/export',
     if (!snapshot || snapshot.spec_session_id !== specSession.id) {
         return res.status(404).json({ error: 'Not found' });
     }
+    const targetResult = resolveSessionTargetForExecution(specSession, project, 'Spec session');
+    if (!targetResult.ok) {
+        return res.status(409).json({ error: targetResult.error });
+    }
     try {
         const overwrite = req.body?.overwrite === true;
         const collision = checkSpecExportCollision({
             specSession,
-            repoPath: project.repo_path,
+            repoPath: targetResult.target.cwd,
         });
         if (collision && !overwrite) {
             return res.status(409).json({
@@ -3184,7 +3213,7 @@ app.post('/projects/:id/spec-sessions/:sessionId/snapshots/:snapshotId/export',
         const result = exportSpecToDocs({
             snapshot,
             specSession,
-            repoPath: project.repo_path,
+            repoPath: targetResult.target.cwd,
         });
         return res.status(201).json({
             path: result.filePath,
@@ -3748,6 +3777,7 @@ app.post('/bundles', async (req, res) => {
     const bundle = createBundle({
         name,
         branch,
+        baseBranch: requestedBaseBranch || null,
         projectId: result.project.id,
     });
     if (!bundle) {
@@ -3783,6 +3813,9 @@ app.delete('/bundles/:id', (req, res) => {
     if (hasActiveBundleCheckWork(result.project.id, bundle.id)) {
         return res.status(409).json({ error: 'Cannot delete a bundle while check work is active' });
     }
+    if (hasActiveBundleSpecWork(result.project.id, bundle.id)) {
+        return res.status(409).json({ error: 'Cannot delete a bundle while Spec 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' });
     }
@@ -3792,6 +3825,9 @@ app.delete('/bundles/:id', (req, res) => {
     const affectedChatSessionIds = listChatSessions(result.project.id)
         .filter(chatSession => chatSession.target_bundle_id === bundle.id)
         .map(chatSession => chatSession.id);
+    const affectedSpecSessionIds = listSpecSessions(result.project.id)
+        .filter(specSession => specSession.target_bundle_id === bundle.id)
+        .map(specSession => specSession.id);
     try {
         deleteWorktree(bundle.branch, result.project);
     }
@@ -3807,6 +3843,12 @@ app.delete('/bundles/:id', (req, res) => {
             io.emit('chat-session:updated', updatedChatSession);
         }
     });
+    affectedSpecSessionIds.forEach(specSessionId => {
+        const updatedSpecSession = getProjectSpecSession(result.project.id, specSessionId);
+        if (updatedSpecSession) {
+            io.emit('spec-session:updated', updatedSpecSession);
+        }
+    });
     res.status(204).end();
 });
 app.patch('/bundles/:id', (req, res) => {
@@ -4345,94 +4387,15 @@ app.post('/bundles/:id/resume-automation', async (req, res) => {
             return res.status(409).json({ error: error instanceof Error ? error.message : String(error) });
         }
         const workflowContext = validateWorkflowContext(checkpointLineage.progression.metadata);
-        const continuation = advanceSuccessfulBuildTicketAfterCheckpoint({
+        await continueAfterBuildCheckpoint({
             ticket: owner,
+            project: result.project,
+            parentRunId: checkpointLineage.parent.id,
+            workflowContext,
+            io,
             emitUpdatedTickets,
+            commitCheckpoint: false,
         });
-        if (continuation.nextBuild) {
-            const nextBuild = continuation.nextBuild;
-            const nextSequenceId = continuation.nextSequenceId;
-            const scheduling = startBuild(nextBuild, io, {
-                initiation: {
-                    initiator: 'automation',
-                    causalParentRunId: checkpointLineage.parent.id,
-                    workflowContext,
-                },
-                sequenceId: nextSequenceId,
-                accept: () => {
-                    const transition = prepareTicketForBuild(nextBuild.id, {
-                        ignoredBlockerTicketIds: continuation.ignoredBlockerTicketIds,
-                    });
-                    if (!transition.ok) {
-                        throw new Error(transition.error);
-                    }
-                    if (!nextSequenceId) {
-                        throw new Error('Build sequence no longer exists');
-                    }
-                    activateQueuedBuildSequenceTicket(nextSequenceId, transition.ticket.id);
-                    return {
-                        ticket: transition.ticket,
-                        sequenceId: nextSequenceId,
-                        compensate: () => compensateBuildSequenceTicketActivation(nextSequenceId, transition.ticket.id),
-                    };
-                },
-            });
-            if (!scheduling.accepted) {
-                const stoppedSequence = stopBuildSequence(nextBuild.id);
-                emitUpdatedTickets(stoppedSequence.affectedTicketIds);
-            }
-        }
-        else if (!continuation.nextTicketId && owner.project_id && owner.worktree_bundle_id) {
-            const resumedOwnerForReview = getTicket(owner.id) ?? owner;
-            const liveProject = getEffectiveProject(resumedOwnerForReview) ?? result.project;
-            const automationConfig = resolveAutomationConfig(resumedOwnerForReview.bundle ?? null, liveProject);
-            const autoReviewEnabled = depthAtLeast(automationConfig.depth, 'auto_review');
-            const latestBundleState = getBundleAutomationState(owner.project_id, owner.worktree_bundle_id);
-            const openQuestions = listBuildOpenQuestionsForBundle(owner.project_id, owner.worktree_bundle_id);
-            const shouldPauseForOpenQuestions = autoReviewEnabled
-                && automationConfig.pauseOnOpenQuestions
-                && openQuestions.length > 0;
-            if (shouldPauseForOpenQuestions) {
-                const reviewProgression = ensureAutomationProgression({
-                    projectId: owner.project_id,
-                    bundleId: owner.worktree_bundle_id,
-                    ticketId: owner.id,
-                    ticketTitle: owner.title,
-                    parentRunId: checkpointLineage.parent.id,
-                    workflowContext,
-                    broadcaster: io,
-                });
-                waitAutomationProgression({
-                    projectId: owner.project_id,
-                    bundleId: owner.worktree_bundle_id,
-                    progressionRunId: reviewProgression.runId,
-                    pauseCode: 'open_questions',
-                    pauseReason: `${openQuestions.length} unresolved Build open question${openQuestions.length === 1 ? '' : 's'}`,
-                    reasonCode: 'precondition_failed',
-                    pausedStageRunId: checkpointLineage.parent.id,
-                    broadcaster: io,
-                });
-            }
-            else if (autoReviewEnabled && (!latestBundleState?.automation_paused_reason || latestBundleState.automation_paused_code === 'open_questions')) {
-                const reviewProgression = ensureAutomationProgression({
-                    projectId: owner.project_id,
-                    bundleId: owner.worktree_bundle_id,
-                    ticketId: owner.id,
-                    ticketTitle: owner.title,
-                    parentRunId: checkpointLineage.parent.id,
-                    workflowContext,
-                    broadcaster: io,
-                });
-                await runAutomationReviewGateOrPause({
-                    projectId: owner.project_id,
-                    bundleId: owner.worktree_bundle_id,
-                    progressionRunId: reviewProgression.runId,
-                    broadcaster: io,
-                    pausedStageRunId: checkpointLineage.parent.id,
-                    initiation: { workflowContext },
-                });
-            }
-        }
         const resumedOwner = getTicket(owner.id);
         if (resumedOwner) {
             io.emit('ticket:updated', resumedOwner);