@straiffi/archon 1.11.9 → 1.11.10

package/dist/server/index.js

@@ -8,6 +8,10 @@ import { createHash, randomUUID } from 'crypto';
 import cors from 'cors';
 import { adjectives, animals, uniqueNamesGenerator } from 'unique-names-generator';
 import db from './db.js';
+import { registerBundleDeletionRoutes } from './lib/bundleDeletionRoutes.js';
+import { registerBundleCleanupRoutes } from './lib/bundleCleanupRoutes.js';
+import { attemptBundleDeletion, beginBundleDeletion, BundleDeletionConflict, resumeBundleDeletions } from './lib/bundleDeletion.js';
+import { isBundleDeletionBranchReserved } from './lib/bundleDeletionStore.js';
 import { pruneAllRepositoryGraphScans } from './lib/repositoryGraphRetention.js';
 import { registerRepositoryGraphRoutes } from './lib/repositoryGraphRoutes.js';
 import { registerWorkspaceDiffRoutes } from './lib/workspaceDiffRoutes.js';
@@ -105,6 +109,7 @@ import { buildImportedIssueSessionTitle, importProviderHostedIssueImages } from
 import { dispatchGitHubWorkflow, getGitHubWorkflowDispatchConfig, getGitHubWorkflowRun, getGitHubWorkflowRunJobs, listGitHubWorkflows, listGitHubWorkflowRuns, } from './lib/integrations/githubActions.js';
 import { clearAllGitHubActionsSessions, getActiveTrackedRunCount, getTrackedGitHubActionsRuns, startGitHubActionsPolling, trackGitHubActionsRun, } from './lib/integrations/githubActionsSessions.js';
 import { reconcileStartupExecutions } from './lib/executionReconciliation.js';
+import { deleteArchivedAbandonedProjectEnvironments } from './lib/executionEnvironmentTargetCleanup.js';
 import { cleanupProjectExecutionEnvironments, cleanupExecutionEnvironmentsForTarget, ExecutionEnvironmentCleanupError, reconcileOrphanedExecutionEnvironments, reconcileExecutionEnvironments, reconcileExecutionEnvironmentLifecycleOperations, reconcileProductionExecutionEnvironmentBindings, } from './lib/executionEnvironmentReconciliation.js';
 import { createExecutionTargetKey, resolveExecutionTarget, resolveProjectRootExecutionTarget } from './lib/executionTargets.js';
 import { getExecutionEnvironmentContextForRun } from './lib/executionEnvironmentContexts.js';
@@ -657,52 +662,28 @@ const deleteTicketRecord = async (ticket) => {
     }
     const bundledProject = isBundledTicket(ticket) ? getEffectiveProject(ticket) : null;
     const deletedBundleId = ticket.worktree_bundle_id;
-    const deletedBundle = bundledProject && deletedBundleId ? getBundle(deletedBundleId, bundledProject.id) : null;
-    const bundleResourcesWereCleaned = Boolean(bundledProject
-        && deletedBundle
-        && !isProjectRootBundle(deletedBundle)
-        && countBundleTickets(deletedBundle.id, bundledProject.id) === 1);
-    if (bundleResourcesWereCleaned && bundledProject && deletedBundle) {
-        try {
-            await cleanupWorktreeExecutionTarget({
-                project: bundledProject,
-                targetKind: 'bundle-worktree',
-                targetKey: createExecutionTargetKey(bundledProject.id, {
-                    kind: 'bundle-worktree',
-                    bundleId: deletedBundle.id,
-                    branch: deletedBundle.branch,
-                }),
-                targetLabel: 'bundle worktree',
-                worktreeTarget: 'bundle',
-                branch: deletedBundle.branch,
-            });
-        }
-        catch (error) {
-            return {
-                ok: false,
-                status: error instanceof HttpError ? error.status : 500,
-                error: error instanceof Error ? error.message : 'Unable to delete the bundle worktree',
-            };
-        }
-    }
+    let bundleCleanup;
     let nextBuildTicketId = null;
     let nextBuildSequenceId = null;
     let affectedTicketIds = [];
-    if (ticket.state === 'build') {
-        const sequenceRemoval = removeTicketFromBuildSequence(ticket.id);
-        if (sequenceRemoval.ok) {
-            nextBuildTicketId = sequenceRemoval.nextTicketId;
-            nextBuildSequenceId = sequenceRemoval.sequenceId;
-            affectedTicketIds = sequenceRemoval.affectedTicketIds;
-        }
-    }
     try {
         withExecutionRunTransaction(transaction => {
             assertTicketServiceTargetMutable(ticket.id);
+            if (ticket.state === 'build') {
+                const sequenceRemoval = removeTicketFromBuildSequence(ticket.id);
+                if (sequenceRemoval.ok) {
+                    nextBuildTicketId = sequenceRemoval.nextTicketId;
+                    nextBuildSequenceId = sequenceRemoval.sequenceId;
+                    affectedTicketIds = sequenceRemoval.affectedTicketIds;
+                }
+            }
             if (ticket.project_id) {
                 deleteTerminalReviewRepairIterationsForTicketInTransaction(transaction, ticket.project_id, ticket.id);
             }
             db.prepare('DELETE FROM tickets WHERE id = ?').run(ticket.id);
+            if (bundledProject && deletedBundleId) {
+                bundleCleanup = cleanupBundleIfEmpty(deletedBundleId, bundledProject);
+            }
         }, io, 'immediate');
     }
     catch (error) {
@@ -718,18 +699,7 @@ const deleteTicketRecord = async (ticket) => {
     catch (error) {
         console.warn(`[ticket-delete] Unable to remove stage snapshots for ticket ${ticket.id}`, error);
     }
-    if (bundledProject && deletedBundleId) {
-        try {
-            await cleanupBundleIfEmpty(deletedBundleId, bundledProject, { resourcesAlreadyCleaned: bundleResourcesWereCleaned });
-        }
-        catch (error) {
-            return {
-                ok: false,
-                status: error instanceof HttpError ? error.status : 500,
-                error: error instanceof Error ? error.message : 'Unable to clean up the empty bundle',
-            };
-        }
-    }
+    await finishAutomaticBundleDeletion(bundleCleanup);
     io.emit('ticket:deleted', { id: ticket.id });
     return { ok: true, nextBuildTicketId, nextBuildSequenceId, affectedTicketIds };
 };
@@ -980,6 +950,9 @@ const uniqueBundleBranchName = (name, projectId, options = {}) => {
     let branch = base;
     let suffix = 2;
     const conflictsWithBranch = (candidate) => {
+        if (isBundleDeletionBranchReserved(projectId, candidate)) {
+            return true;
+        }
         const bundleConflict = getBundleByBranch(candidate, projectId);
         if (bundleConflict && bundleConflict.id !== options.currentBundle?.id) {
             return true;
@@ -1034,7 +1007,7 @@ const createAutoBundleForName = (name, projectId, baseBranch = null) => {
     }
     return bundle;
 };
-const cleanupBundleIfEmpty = async (bundleId, project, options = {}) => {
+const cleanupBundleIfEmpty = (bundleId, project) => {
     if (!bundleId) {
         return;
     }
@@ -1045,24 +1018,41 @@ const cleanupBundleIfEmpty = async (bundleId, project, options = {}) => {
     if (isProjectRootBundle(bundle)) {
         return;
     }
-    if (hasActiveBundleCheckWork(project.id, bundle.id)) {
-        throw new HttpError(409, 'Cannot delete a bundle while check work is active');
+    const assertEligible = () => {
+        if (hasActiveBundleCheckWork(project.id, bundle.id)) {
+            throw new BundleDeletionConflict('Cannot delete a bundle while check work is active');
+        }
+        if (hasActiveBundleSpecWork(project.id, bundle.id)) {
+            throw new BundleDeletionConflict('Cannot delete a bundle while Spec work is active');
+        }
+        if (hasActiveBundleRepositoryGraphScan(project.id, bundle.id)) {
+            throw new BundleDeletionConflict('Cannot delete a bundle while a repository graph scan is active');
+        }
+    };
+    const chatSessionIds = listChatSessions(project.id)
+        .filter(session => session.target_bundle_id === bundle.id).map(session => session.id);
+    const specSessionIds = listSpecSessions(project.id)
+        .filter(session => session.target_bundle_id === bundle.id).map(session => session.id);
+    beginBundleDeletion({ project, bundleId: bundle.id, assertEligible });
+    return { projectId: project.id, bundleId: bundle.id, chatSessionIds, specSessionIds };
+};
+const finishAutomaticBundleDeletion = async (cleanup) => {
+    if (!cleanup) {
+        return;
     }
-    if (!options.resourcesAlreadyCleaned) {
-        await cleanupWorktreeExecutionTarget({
-            project,
-            targetKind: 'bundle-worktree',
-            targetKey: createExecutionTargetKey(project.id, {
-                kind: 'bundle-worktree',
-                bundleId: bundle.id,
-                branch: bundle.branch,
-            }),
-            targetLabel: 'bundle worktree',
-            worktreeTarget: 'bundle',
-            branch: bundle.branch,
-        });
+    for (const sessionId of cleanup.chatSessionIds) {
+        const session = getProjectChatSession(cleanup.projectId, sessionId);
+        if (session) {
+            io.emit('chat-session:updated', session);
+        }
+    }
+    for (const sessionId of cleanup.specSessionIds) {
+        const session = getProjectSpecSession(cleanup.projectId, sessionId);
+        if (session) {
+            io.emit('spec-session:updated', session);
+        }
     }
-    deleteBundle(bundle.id, project.id);
+    await attemptBundleDeletion(cleanup.projectId, cleanup.bundleId);
 };
 const asProjectPayload = (body) => {
     if (!body || typeof body !== 'object' || Array.isArray(body)) {
@@ -4223,6 +4213,9 @@ app.post('/bundles', async (req, res) => {
         });
     }
     if (requestedBranch) {
+        if (isBundleDeletionBranchReserved(result.project.id, branch)) {
+            return res.status(409).json({ error: 'This branch is reserved while a deleted bundle is being cleaned up. Please try again after cleanup finishes.' });
+        }
         if (getBundleByBranch(branch, result.project.id) || hasBundleBranchCaseConflict(branch, result.project.id)) {
             return res.status(409).json({ error: 'Bundle branch already exists in this project' });
         }
@@ -4257,76 +4250,24 @@ app.post('/bundles', async (req, res) => {
     }
     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);
-    if ('error' in result) {
-        return res.status(400).json({ error: result.error });
-    }
-    const bundle = getBundle(req.params.id, result.project.id);
-    if (!bundle) {
-        return res.status(404).json({ error: 'Bundle not found' });
-    }
-    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 (hasActiveBundleSpecWork(result.project.id, bundle.id)) {
-        return res.status(409).json({ error: 'Cannot delete a bundle while Spec work is active' });
-    }
-    if (hasActiveBundleRepositoryGraphScan(result.project.id, bundle.id)) {
-        return res.status(409).json({ error: 'Cannot delete a bundle while a repository graph scan 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' });
-    }
-    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);
-    let cleanupResult;
-    try {
-        cleanupResult = await cleanupWorktreeExecutionTarget({
-            project: result.project,
-            targetKind: 'bundle-worktree',
-            targetKey: createExecutionTargetKey(result.project.id, {
-                kind: 'bundle-worktree',
-                bundleId: bundle.id,
-                branch: bundle.branch,
-            }),
-            targetLabel: 'bundle worktree',
-            worktreeTarget: 'bundle',
-            branch: bundle.branch,
-        });
-    }
-    catch (error) {
-        return res.status(error instanceof HttpError ? error.status : 500).json({
-            error: error instanceof Error ? error.message : 'Unable to delete the bundle worktree',
-        });
-    }
-    deleteBundle(bundle.id, result.project.id);
-    affectedChatSessionIds.forEach(chatSessionId => {
-        const updatedChatSession = getProjectChatSession(result.project.id, chatSessionId);
-        if (updatedChatSession) {
-            io.emit('chat-session:updated', updatedChatSession);
+registerBundleCleanupRoutes(app);
+registerBundleDeletionRoutes(app, {
+    getRequiredProject,
+    hasActiveCheckWork: hasActiveBundleCheckWork,
+    hasActiveSpecWork: hasActiveBundleSpecWork,
+    hasActiveGraphScan: hasActiveBundleRepositoryGraphScan,
+    emitChatSessionUpdate: (projectId, sessionId) => {
+        const session = getProjectChatSession(projectId, sessionId);
+        if (session) {
+            io.emit('chat-session:updated', session);
         }
-    });
-    affectedSpecSessionIds.forEach(specSessionId => {
-        const updatedSpecSession = getProjectSpecSession(result.project.id, specSessionId);
-        if (updatedSpecSession) {
-            io.emit('spec-session:updated', updatedSpecSession);
+    },
+    emitSpecSessionUpdate: (projectId, sessionId) => {
+        const session = getProjectSpecSession(projectId, sessionId);
+        if (session) {
+            io.emit('spec-session:updated', session);
         }
-    });
-    if (cleanupResult.branchWarning) {
-        return res.status(200).json({ warning: cleanupResult.branchWarning });
-    }
-    res.status(204).end();
+    },
 });
 app.patch('/bundles/:id', async (req, res) => {
     const result = getRequiredProject(req);
@@ -8532,6 +8473,9 @@ const assertProjectDeletionEligible = (projectId, claimId) => {
     if (projectCount <= 1) {
         throw new ProjectDeletionError(409, 'Cannot delete the last remaining project');
     }
+    if (db.prepare("SELECT 1 FROM bundle_deletion_jobs WHERE project_id = ? AND status IN ('pending', 'blocked') LIMIT 1").get(projectId)) {
+        throw new ProjectDeletionError(409, 'Cannot delete a project while bundle workspace cleanup is pending');
+    }
     if (countInboundProjectLinks(projectId) > 0) {
         throw new ProjectDeletionError(409, 'Cannot delete a project that is linked from another project');
     }
@@ -8634,7 +8578,9 @@ const completeClaimedProjectDeletion = async (projectId, claimId) => {
           SET parent_run_id = NULL, retry_of_run_id = NULL
           WHERE project_id = ?
         `).run(projectId);
+                deleteArchivedAbandonedProjectEnvironments(projectId);
                 db.prepare("DELETE FROM execution_environments WHERE project_id = ? AND lifecycle_state = 'retired'").run(projectId);
+                db.prepare("DELETE FROM bundle_deletion_jobs WHERE project_id = ? AND status = 'completed'").run(projectId);
                 const deleted = db.prepare('DELETE FROM projects WHERE id = ? AND deletion_claim_id = ?').run(projectId, claimId);
                 if (deleted.changes !== 1) {
                     throw new ProjectDeletionError(409, 'Project deletion ownership was lost');
@@ -8900,34 +8846,7 @@ app.patch('/tickets/:id', async (req, res) => {
         }
     }
     const bundleChanged = previousBundleId !== resolvedBundleId || ticket.project_id !== nextProjectId;
-    let previousBundleResourcesCleaned = false;
-    if (bundleChanged && previousBundleId && previousProject) {
-        const previousBundle = getBundle(previousBundleId, previousProject.id);
-        if (previousBundle
-            && !isProjectRootBundle(previousBundle)
-            && countBundleTickets(previousBundle.id, previousProject.id) === 1) {
-            try {
-                await cleanupWorktreeExecutionTarget({
-                    project: previousProject,
-                    targetKind: 'bundle-worktree',
-                    targetKey: createExecutionTargetKey(previousProject.id, {
-                        kind: 'bundle-worktree',
-                        bundleId: previousBundle.id,
-                        branch: previousBundle.branch,
-                    }),
-                    targetLabel: 'bundle worktree',
-                    worktreeTarget: 'bundle',
-                    branch: previousBundle.branch,
-                });
-                previousBundleResourcesCleaned = true;
-            }
-            catch (error) {
-                return res.status(error instanceof HttpError ? error.status : 500).json({
-                    error: error instanceof Error ? error.message : 'Unable to clean up the empty bundle',
-                });
-            }
-        }
-    }
+    let bundleCleanup;
     try {
         db.transaction(() => {
             if (bundleChanged) {
@@ -8937,28 +8856,20 @@ app.patch('/tickets/:id', async (req, res) => {
                 deleteTicketDependenciesForTicket(ticket.id);
             }
             db.prepare('UPDATE tickets SET title = ?, description = ?, model = ?, variant = ?, skills_json = ?, worktree_bundle_id = ?, project_id = ?, updated_at = CURRENT_TIMESTAMP WHERE id = ?').run(title?.trim() ?? ticket.title, description ?? ticket.description, resolvedModel, resolvedVariant, JSON.stringify(resolvedSkills), resolvedBundleId, nextProjectId, req.params.id);
+            if (bundleChanged && previousBundleId && previousProject) {
+                bundleCleanup = cleanupBundleIfEmpty(previousBundleId, previousProject);
+            }
         }).immediate();
     }
     catch (error) {
-        if (error instanceof HttpError) {
-            return res.status(error.status).json({ error: error.message });
+        if (error instanceof HttpError || error instanceof BundleDeletionConflict) {
+            return res.status(error instanceof HttpError ? error.status : 409).json({ error: error.message });
         }
         throw error;
     }
     upsertTicketDescriptionMessage(req.params.id, description ?? ticket.description);
     const updated = getTicket(req.params.id);
-    if (bundleChanged && previousBundleId && previousProject) {
-        try {
-            await cleanupBundleIfEmpty(previousBundleId, previousProject, {
-                resourcesAlreadyCleaned: previousBundleResourcesCleaned,
-            });
-        }
-        catch (error) {
-            return res.status(error instanceof HttpError ? error.status : 500).json({
-                error: error instanceof Error ? error.message : 'Unable to clean up the empty bundle',
-            });
-        }
-    }
+    await finishAutomaticBundleDeletion(bundleCleanup);
     io.emit('ticket:updated', updated);
     res.json(updated);
 });
@@ -10682,6 +10593,7 @@ export const runExecutionArtifactCleanup = (mode) => {
         if (mode === 'periodic') {
             await resumeInterruptedProjectDeletions();
         }
+        await resumeBundleDeletions();
         const orphanedEnvironments = await reconcileOrphanedExecutionEnvironments();
         if (orphanedEnvironments.scanned > 0) {
             console.log(`Reconciled ${orphanedEnvironments.cleaned} orphaned execution environment(s); ${orphanedEnvironments.failed} cleanup(s) retained for retry`);
@@ -10760,6 +10672,7 @@ const runExecutionEnvironmentLifecycleReconciliation = () => {
         isProjectOwnedInMemory: projectId => getActiveRunStatusForProject(projectId) !== null,
     })
         .then(() => reconcileExecutionEnvironmentLifecycleOperations())
+        .then(() => resumeBundleDeletions())
         .then(() => undefined)
         .catch(error => {
         console.error('Failed to reconcile execution environment lifecycle operations', error);