@straiffi/archon 1.11.8 → 1.11.10

package/dist/server/index.js

@@ -8,8 +8,16 @@ 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';
+import { getWorkspaceDiffAsync } from './lib/workspaceDiff.js';
+import { registerDiffExplanationRoutes, registerDiffExplanationSocketHandlers, } from './lib/diffExplanationRoutes.js';
+import { openDiffExplanationJobAdmissions, shutdownDiffExplanationJobs, } from './lib/diffExplanationJobs.js';
 import { registerExecutionEnvironmentRoutes } from './lib/executionEnvironmentRoutes.js';
 import { registerExecutionProfileRoutes } from './lib/executionProfileRoutes.js';
 import { executionProfileSupportsChecks, hasConfiguredCheckPolicy } from './lib/executionProfileCheckPolicy.js';
@@ -34,7 +42,7 @@ 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';
-import { abortGitOperation, branchExistsLocally, commitGitChanges, continueGitRebase, createWorktreeAsync, deleteLocalBranch, deleteWorktree, getActiveRebaseBranch, getBundleReviewDiffForCwd, getGitDiffDataAsync, getGitDiffFiles, getGitDiffFilesAsync, getGitStatus, getGitStatusAsync, getGitUnifiedDiff, getGitUnifiedDiffAsync, getLocalProjectBranch, getProjectBranch, getProjectBranchAsync, getProjectBranchSuggestions, getRebaseStagedDiff, getReviewDiffDataAsync, getSelectedGitUnifiedDiff, getUnpushedCommitDiffForCwd, getUnpushedCommitSummaryForCwd, getUnpushedCommitSummaryForCwdAsync, hasKnownBranchRef, listUnpushedCommitsForCwd, pullGitBranch, pushCurrentBranch, rebaseGitBranchOntoBase, resolveExistingWorktreePath, resolveWorktreePath, skipGitRebaseStep, squashUnpushedCommitsForCwd, summarizeTicketDiffFiles, switchProjectBranch, syncWorktreeFilesAsync, undoLatestUnpushedCommitForCwd, UnpushedCommitDiffSelectionError } from './lib/git.js';
+import { abortGitOperation, branchExistsLocally, commitGitChanges, continueGitRebase, createWorktreeAsync, deleteLocalBranch, deleteWorktree, getActiveRebaseBranch, getGitDiffFiles, getGitDiffFilesAsync, getGitStatus, getGitStatusAsync, getGitUnifiedDiff, getLocalProjectBranch, getProjectBranch, getProjectBranchAsync, getProjectBranchSuggestions, getRebaseStagedDiff, getSelectedGitUnifiedDiff, getUnpushedCommitDiffForCwd, getUnpushedCommitSummaryForCwd, getUnpushedCommitSummaryForCwdAsync, hasKnownBranchRef, listUnpushedCommitsForCwd, pullGitBranch, pushCurrentBranch, rebaseGitBranchOntoBase, resolveExistingWorktreePath, resolveWorktreePath, skipGitRebaseStep, squashUnpushedCommitsForCwd, summarizeTicketDiffFiles, switchProjectBranch, syncWorktreeFilesAsync, undoLatestUnpushedCommitForCwd, UnpushedCommitDiffSelectionError } from './lib/git.js';
 import config from './lib/config.js';
 import { getActiveTool, initializeActiveTool, setActiveTool } from './lib/activeTool.js';
 import { autoConfigProject, ProjectAutoConfigError } from './lib/projectAutoConfig.js';
@@ -44,7 +52,7 @@ import { resolveDesktopServerHost } from './lib/desktopServerHost.js';
 import { emitMobileRealtime, getMobileAccessStatus, regenerateMobilePairingChallenge, revokeMobileSession, setMobileAccessStatusChangeListener, startMobileAccess, stopMobileAccess, } from './lib/mobileAccess.js';
 import { validateDesktopMobileAccessRequest } from './lib/mobileAccessSecurity.js';
 import { refreshChatSessionUsageSnapshot, refreshSpecSessionUsageSnapshot, stopAllBuildAgents, stopAllReviewAgents, stopBuildAgent, stopReviewAgent } from './lib/agent.js';
-import { runTrackedLightweightPrompt } from './lib/lightweightPrompt.js';
+import { openLightweightPromptAdmissions, runTrackedLightweightPrompt, shutdownLightweightPrompts, } from './lib/lightweightPrompt.js';
 import { advanceBuildChain, startBuildChain, stopBuildChain } from './lib/buildChains.js';
 import { activateQueuedBuildSequenceTicket, bindBuildSequenceTicketExecutionRun, compensateBuildSequenceAcceptance, enqueueBundledBuild, getDependencyOrderedBundleTicketIds, getBuildSequenceIdForTicket, getBuildSequenceTicketExecutionProfileSelection, hasActiveSequenceForBundle, releaseQueuedBuildSequenceTicketExecutionRunForRetry, removeTicketFromBuildSequence, stopBuildSequence, } from './lib/buildSequences.js';
 import { resumeRemainingBundleBuilds } from './lib/bundleBuildRecovery.js';
@@ -101,13 +109,14 @@ 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';
 import { PlanningReferenceError, resolveExternalPlanningDescription } from './lib/integrations/planning.js';
 import { refreshIfNeeded as refreshAssignedIssues, clearCachedAssignedIssues } from './lib/integrations/assignedIssuesCache.js';
 import { buildCommitMessagePrompt, normalizeGeneratedCommitMessage } from './lib/commitMessage.js';
-import { BUNDLE_PULL_REQUEST_SYNC_TTL_MS, getBundlePullRequestRecord, hasOpenBundlePullRequest, serializeBundlePullRequest, shouldSyncBundlePullRequest, syncTrackedBundlePullRequestIfNeeded, upsertBundlePullRequest, upsertBundlePullRequestFromGitHub, } from './lib/bundlePullRequests.js';
+import { BUNDLE_PULL_REQUEST_SYNC_TTL_MS, getBundlePullRequestRecord, hasOpenBundlePullRequest, hasTerminalBundlePullRequest, serializeBundlePullRequest, shouldSyncBundlePullRequest, syncTrackedBundlePullRequestIfNeeded, upsertBundlePullRequest, upsertBundlePullRequestFromGitHub, } from './lib/bundlePullRequests.js';
 import { countInboundProjectLinks, getEffectiveProject, getProjectCheckDefinitions, getProjectById, getProjectTestCommands, getProjectTicketStats, hasProjectRunIde, listInterruptedProjectDeletions, listProjects, releaseInterruptedProjectDeletionClaims, replaceProjectLinks, serializeProject, updateProjectActiveTarget, validateProjectRequiredCheckPolicyReferences, validateProjectPayload, } from './lib/projects.js';
 import { forceReleaseProjectRunCleanup, getActiveRunStatus, getActiveRunStatusForProject, getLastRunStatusForProject, getPreviewStatusForProject, hasRunConfig, isRunning, openIde, openTicketIdeInWorkspace, resolveProjectRunContextKey, runTicketInWorkspace, stopAllTickets, stopTicket } from './lib/run.js';
 import { deleteProjectServiceRunLogs, getServiceRunLogs } from './lib/serviceRunLogs.js';
@@ -653,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) {
@@ -714,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 };
 };
@@ -976,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;
@@ -1030,7 +1007,7 @@ const createAutoBundleForName = (name, projectId, baseBranch = null) => {
     }
     return bundle;
 };
-const cleanupBundleIfEmpty = async (bundleId, project, options = {}) => {
+const cleanupBundleIfEmpty = (bundleId, project) => {
     if (!bundleId) {
         return;
     }
@@ -1041,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);
+        }
     }
-    deleteBundle(bundle.id, project.id);
+    for (const sessionId of cleanup.specSessionIds) {
+        const session = getProjectSpecSession(cleanup.projectId, sessionId);
+        if (session) {
+            io.emit('spec-session:updated', session);
+        }
+    }
+    await attemptBundleDeletion(cleanup.projectId, cleanup.bundleId);
 };
 const asProjectPayload = (body) => {
     if (!body || typeof body !== 'object' || Array.isArray(body)) {
@@ -1130,6 +1124,22 @@ const matchesTicketProjectContext = (ticket, req) => {
     }
     return ticket.project_id === requestedProjectId;
 };
+const isTerminalBundleTarget = (projectId, bundleId) => {
+    return Boolean(bundleId
+        && hasTerminalBundlePullRequest(getBundlePullRequestRecord(bundleId, projectId)));
+};
+const normalizeTerminalBundleGitStatus = (status, projectId, bundleId) => {
+    if (!isTerminalBundleTarget(projectId, bundleId)) {
+        return status;
+    }
+    return {
+        ...status,
+        ahead: 0,
+        can_push: false,
+        can_force_push_with_lease: false,
+    };
+};
+const TERMINAL_BUNDLE_BRANCH_ERROR = 'This bundle pull request is already merged or closed. Start follow-up work on a new branch instead.';
 const getTicketRouteContext = (ticketId) => {
     return getTicketRouteContextStatement.get(ticketId);
 };
@@ -2282,29 +2292,27 @@ const getCurrentReviewWorkspaceSignature = async (ticket) => {
     return (await getGitStatusAsync(workspace.cwd, workspace.branch, workspace.project)).workspace_signature ?? null;
 };
 const getCurrentReviewDiffState = async (ticket) => {
-    if (!ticket) {
+    if (!ticket?.project_id) {
         return null;
     }
-    const workspace = resolveTicketDiffWorkspaceFromContext(ticket);
-    if ('error' in workspace) {
+    const target = { kind: 'ticket', ticket_id: ticket.id };
+    const reviewDiff = await getWorkspaceDiffAsync({
+        projectId: ticket.project_id,
+        target,
+        scope: 'review',
+    });
+    const uncommittedDiff = await getWorkspaceDiffAsync({
+        projectId: ticket.project_id,
+        target,
+        scope: 'uncommitted',
+    });
+    if (!reviewDiff.available || !uncommittedDiff.available) {
         return null;
     }
-    const trackedPullRequest = ticket.project_id && ticket.worktree_bundle_id
-        ? getBundlePullRequestRecord(ticket.worktree_bundle_id, ticket.project_id)
-        : null;
-    const [reviewDiff, uncommittedDiff] = await Promise.all([
-        getReviewDiffDataAsync({
-            cwd: workspace.cwd,
-            branch: workspace.branch,
-            project: workspace.project,
-            pullRequestBaseBranch: trackedPullRequest?.baseBranch ?? null,
-        }),
-        getGitUnifiedDiffAsync(workspace.cwd),
-    ]);
     return {
         diffText: reviewDiff.diff,
-        uncommittedDiffSignature: computeDiffSignature(uncommittedDiff),
-        changeScope: (reviewDiff.diff === uncommittedDiff ? 'uncommitted' : 'branch_diff'),
+        uncommittedDiffSignature: computeDiffSignature(uncommittedDiff.diff),
+        changeScope: (reviewDiff.diff === uncommittedDiff.diff ? 'uncommitted' : 'branch_diff'),
     };
 };
 const getBundleReviewFindings = async (projectId, bundleId) => {
@@ -2740,6 +2748,8 @@ const emitRunStateForContext = (ticket, isRunningValue) => {
 };
 app.use(express.json({ limit: '5mb' }));
 registerRepositoryGraphRoutes(app, { emitter: io });
+registerWorkspaceDiffRoutes(app);
+registerDiffExplanationRoutes(app);
 registerExecutionEnvironmentRoutes(app, {
     emitter: io,
     runner: dockerSandboxRunner,
@@ -3054,16 +3064,15 @@ app.get('/projects/:id/chat-sessions/:sessionId/diff', async (req, res) => {
     if (!chatSession) {
         return res.status(404).json({ error: 'Not found' });
     }
-    const workspace = resolveChatSessionTarget(chatSession, project);
-    if (!workspace.target_available || !workspace.cwd) {
-        return res.status(409).json({ error: workspace.target_unavailable_reason ?? 'Chat target is unavailable.' });
-    }
-    const diffData = await getGitDiffDataAsync(workspace.cwd);
-    return res.json({
-        stats: summarizeTicketDiffFiles(diffData.files),
-        files: diffData.files,
-        diff: diffData.diff,
+    const diff = await getWorkspaceDiffAsync({
+        projectId: project.id,
+        target: { kind: 'chat_session', chat_session_id: chatSession.id },
+        scope: 'uncommitted',
     });
+    if (!diff.available) {
+        return res.status(diff.reason === 'target_not_found' ? 404 : 409).json({ ...diff, error: diff.message });
+    }
+    return res.json({ stats: diff.stats, files: diff.files, diff: diff.diff });
 });
 app.get('/projects/:id/chat-sessions/:sessionId/git-status', async (req, res) => {
     const project = getProjectById(req.params.id);
@@ -3694,15 +3703,17 @@ app.get('/tickets/:id/diff', async (req, res) => {
     }
     const workspace = resolveTicketDiffWorkspaceFromContext(ticket);
     if ('error' in workspace) {
-        const { status, error } = workspace;
-        return res.status(status).json({ error });
+        return res.status(workspace.status).json({ error: workspace.error });
     }
-    const diffData = await getGitDiffDataAsync(workspace.cwd);
-    return res.json({
-        stats: summarizeTicketDiffFiles(diffData.files),
-        files: diffData.files,
-        diff: diffData.diff,
+    const diff = await getWorkspaceDiffAsync({
+        projectId: ticket.project_id,
+        target: { kind: 'ticket', ticket_id: ticket.id },
+        scope: 'uncommitted',
     });
+    if (!diff.available) {
+        return res.status(diff.reason === 'target_not_found' ? 404 : 409).json({ ...diff, error: diff.message });
+    }
+    return res.json({ stats: diff.stats, files: diff.files, diff: diff.diff });
 });
 app.get('/tickets/:id/committed-diff', (req, res) => {
     const ticket = getTicketRouteContext(req.params.id);
@@ -3731,7 +3742,8 @@ app.get('/tickets/:id/git-status', async (req, res) => {
         return res.status(workspace.status).json({ error: workspace.error });
     }
     const refreshRemote = req.query.refresh_remote === 'true';
-    return res.json(await getGitStatusAsync(workspace.cwd, workspace.branch, workspace.project, { refreshRemote }));
+    const status = await getGitStatusAsync(workspace.cwd, workspace.branch, workspace.project, { refreshRemote });
+    return res.json(normalizeTerminalBundleGitStatus(status, workspace.project.id, ticket.worktree_bundle_id));
 });
 app.get('/tickets/:id/rebase-staged-diff', (req, res) => {
     const ticket = getTicketRouteContext(req.params.id);
@@ -3833,6 +3845,9 @@ app.get('/tickets/:id/git-commits', async (req, res) => {
     if ('error' in workspace) {
         return res.status(workspace.status).json({ error: workspace.error });
     }
+    if (isTerminalBundleTarget(workspace.project.id, ticket.worktree_bundle_id)) {
+        return res.json({ commits: [], total_count: 0 });
+    }
     const summary = await getUnpushedCommitSummaryForCwdAsync(workspace.cwd, workspace.branch, workspace.project);
     return res.json({ commits: summary.commits, total_count: summary.totalCount });
 });
@@ -3896,7 +3911,7 @@ app.get('/bundles/:id/review-findings', async (req, res) => {
     }
     return res.json(response);
 });
-app.get('/bundles/:id/review-diff', (req, res) => {
+app.get('/bundles/:id/review-diff', async (req, res) => {
     const result = getRequiredProject(req);
     if ('error' in result) {
         return res.status(400).json({ error: result.error });
@@ -3908,21 +3923,24 @@ app.get('/bundles/:id/review-diff', (req, res) => {
     if (isProjectRootBundle(bundle)) {
         return res.status(409).json({ error: 'Bundle diff is not available for the project root bundle.' });
     }
-    const worktreePath = resolveWorktreePath(bundle.branch, result.project);
-    if (!existsSync(worktreePath)) {
-        return res.status(409).json({ error: 'The bundle worktree is not ready yet.' });
-    }
-    const trackedPullRequest = getBundlePullRequestRecord(bundle.id, result.project.id);
-    const reviewDiff = getBundleReviewDiffForCwd({
-        cwd: worktreePath,
-        branch: bundle.branch,
-        project: result.project,
-        pullRequestBaseBranch: trackedPullRequest?.baseBranch ?? null,
+    const reviewDiff = await getWorkspaceDiffAsync({
+        projectId: result.project.id,
+        target: { kind: 'bundle', bundle_id: bundle.id },
+        scope: 'review',
     });
-    if (!reviewDiff) {
-        return res.status(409).json({ error: 'Bundle diff is not available until Archon can resolve a review base for this bundle.' });
+    if (!reviewDiff.available) {
+        return res.status(409).json({ ...reviewDiff, error: reviewDiff.message });
     }
-    return res.json(reviewDiff);
+    return res.json({
+        stats: reviewDiff.stats,
+        files: reviewDiff.files,
+        diff: reviewDiff.diff,
+        diff_signature: reviewDiff.diff_signature,
+        head_branch: reviewDiff.workspace.branch,
+        base_branch: reviewDiff.base.branch,
+        base_commit: reviewDiff.base.commit,
+        source: 'worktree_base',
+    });
 });
 app.get('/bundles/:id/pull-request/comments', async (req, res) => {
     const result = getRequiredProject(req);
@@ -4195,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' });
         }
@@ -4229,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);
@@ -7964,16 +7933,18 @@ app.get('/projects/:id/diff', async (req, res) => {
     if (!project) {
         return res.status(404).json({ error: 'Not found' });
     }
-    const workspace = resolveProjectTargetGitWorkspace(project);
-    if ('error' in workspace) {
-        return res.status(workspace.status).json({ error: workspace.error });
-    }
-    const diffData = await getGitDiffDataAsync(workspace.cwd);
-    return res.json({
-        stats: summarizeTicketDiffFiles(diffData.files),
-        files: diffData.files,
-        diff: diffData.diff,
+    const target = project.active_target_kind === 'bundle' && project.active_target_bundle_id
+        ? { kind: 'bundle', bundle_id: project.active_target_bundle_id }
+        : { kind: 'repo_root' };
+    const diff = await getWorkspaceDiffAsync({
+        projectId: project.id,
+        target,
+        scope: 'uncommitted',
     });
+    if (!diff.available) {
+        return res.status(diff.reason === 'target_not_found' ? 404 : 409).json({ ...diff, error: diff.message });
+    }
+    return res.json({ stats: diff.stats, files: diff.files, diff: diff.diff });
 });
 app.get('/projects/:id/committed-diff', (req, res) => {
     const project = getProjectById(req.params.id);
@@ -7996,7 +7967,8 @@ app.get('/projects/:id/git-status', async (req, res) => {
         return res.status(workspace.status).json({ error: workspace.error });
     }
     const refreshRemote = req.query.refresh_remote === 'true';
-    return res.json(await getGitStatusAsync(workspace.cwd, workspace.branch, workspace.project, { refreshRemote }));
+    const status = await getGitStatusAsync(workspace.cwd, workspace.branch, workspace.project, { refreshRemote });
+    return res.json(normalizeTerminalBundleGitStatus(status, workspace.project.id, workspace.target_bundle_id));
 });
 app.get('/projects/:id/git-commits', async (req, res) => {
     const project = getProjectById(req.params.id);
@@ -8007,6 +7979,9 @@ app.get('/projects/:id/git-commits', async (req, res) => {
     if ('error' in workspace) {
         return res.status(workspace.status).json({ error: workspace.error });
     }
+    if (isTerminalBundleTarget(workspace.project.id, workspace.target_bundle_id)) {
+        return res.json({ commits: [], total_count: 0 });
+    }
     const summary = await getUnpushedCommitSummaryForCwdAsync(workspace.cwd, workspace.branch, workspace.project);
     return res.json({ commits: summary.commits, total_count: summary.totalCount });
 });
@@ -8037,7 +8012,7 @@ app.post('/projects/:id/git-commit', async (req, res) => {
     }
     return res.json({
         ticket: null,
-        git_status: getGitStatus(workspace.cwd, workspace.branch, workspace.project),
+        git_status: normalizeTerminalBundleGitStatus(getGitStatus(workspace.cwd, workspace.branch, workspace.project), workspace.project.id, workspace.target_bundle_id),
     });
 });
 app.post('/projects/:id/git-commit-message', async (req, res) => {
@@ -8207,6 +8182,9 @@ app.post('/projects/:id/git-push', async (req, res) => {
     if ('error' in workspace) {
         return res.status(workspace.status).json({ error: workspace.error });
     }
+    if (isTerminalBundleTarget(workspace.project.id, workspace.target_bundle_id)) {
+        return res.status(409).json({ error: TERMINAL_BUNDLE_BRANCH_ERROR });
+    }
     const forceWithLease = req.body?.force_with_lease === true;
     if (forceWithLease) {
         try {
@@ -8248,6 +8226,9 @@ app.post('/projects/:id/git-undo-latest', async (req, res) => {
     if ('error' in workspace) {
         return res.status(workspace.status).json({ error: workspace.error });
     }
+    if (isTerminalBundleTarget(workspace.project.id, workspace.target_bundle_id)) {
+        return res.status(409).json({ error: TERMINAL_BUNDLE_BRANCH_ERROR });
+    }
     try {
         await undoLatestUnpushedCommitForCwd(workspace.cwd, workspace.branch, workspace.project);
     }
@@ -8271,6 +8252,9 @@ app.post('/projects/:id/git-squash', async (req, res) => {
     if ('error' in workspace) {
         return res.status(workspace.status).json({ error: workspace.error });
     }
+    if (isTerminalBundleTarget(workspace.project.id, workspace.target_bundle_id)) {
+        return res.status(409).json({ error: TERMINAL_BUNDLE_BRANCH_ERROR });
+    }
     const message = typeof req.body?.message === 'string' ? req.body.message.trim() : '';
     if (!message) {
         return res.status(400).json({ error: 'message is required' });
@@ -8489,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');
     }
@@ -8591,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');
@@ -8857,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) {
@@ -8894,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);
 });
@@ -9399,7 +9353,7 @@ app.post('/tickets/:id/git-commit', async (req, res) => {
     const updated = reconcileRunContextTickets(previousTickets, ticket.id);
     return res.json({
         ticket: updated,
-        git_status: getGitStatus(workspace.cwd, workspace.branch, workspace.project),
+        git_status: normalizeTerminalBundleGitStatus(getGitStatus(workspace.cwd, workspace.branch, workspace.project), workspace.project.id, ticket.worktree_bundle_id),
     });
 });
 app.post('/tickets/:id/git-commit-message', async (req, res) => {
@@ -9475,6 +9429,9 @@ app.post('/tickets/:id/git-push', async (req, res) => {
     if ('error' in workspace) {
         return res.status(workspace.status).json({ error: workspace.error });
     }
+    if (isTerminalBundleTarget(workspace.project.id, ticket.worktree_bundle_id)) {
+        return res.status(409).json({ error: TERMINAL_BUNDLE_BRANCH_ERROR });
+    }
     const previousTickets = listTicketsInRunContext(ticket);
     const forceWithLease = req.body?.force_with_lease === true;
     if (forceWithLease) {
@@ -9525,6 +9482,9 @@ app.post('/tickets/:id/git-undo-latest', async (req, res) => {
     if ('error' in workspace) {
         return res.status(workspace.status).json({ error: workspace.error });
     }
+    if (isTerminalBundleTarget(workspace.project.id, ticket.worktree_bundle_id)) {
+        return res.status(409).json({ error: TERMINAL_BUNDLE_BRANCH_ERROR });
+    }
     const previousTickets = listTicketsInRunContext(ticket);
     try {
         await undoLatestUnpushedCommitForCwd(workspace.cwd, workspace.branch, workspace.project);
@@ -9553,6 +9513,9 @@ app.post('/tickets/:id/git-squash', async (req, res) => {
     if ('error' in workspace) {
         return res.status(workspace.status).json({ error: workspace.error });
     }
+    if (isTerminalBundleTarget(workspace.project.id, ticket.worktree_bundle_id)) {
+        return res.status(409).json({ error: TERMINAL_BUNDLE_BRANCH_ERROR });
+    }
     const message = typeof req.body?.message === 'string' ? req.body.message.trim() : '';
     if (!message) {
         return res.status(400).json({ error: 'message is required' });
@@ -10575,6 +10538,7 @@ app.use((error, _req, res, next) => {
 io.on('connection', (socket) => {
     console.log('client connected:', socket.id);
     registerTerminalSocketHandlers(io, socket);
+    registerDiffExplanationSocketHandlers(socket);
 });
 const DEFAULT_PORT = 3001;
 const APPROVAL_RECONCILIATION_INTERVAL_MS = 30_000;
@@ -10629,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`);
@@ -10707,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);
@@ -10746,6 +10712,8 @@ export const startServer = ({ port = DEFAULT_PORT, host } = {}) => {
         return Promise.reject(new Error('Server startup was cancelled by shutdown'));
     }
     if (httpServer.listening) {
+        openLightweightPromptAdmissions();
+        openDiffExplanationJobAdmissions();
         return Promise.resolve(resolveStartResult(host));
     }
     if (startServerPromise) {
@@ -10781,11 +10749,15 @@ export const startServer = ({ port = DEFAULT_PORT, host } = {}) => {
                 };
                 httpServer.once('error', handleError);
                 const { bindHost } = resolveDesktopServerHost(host);
+                openLightweightPromptAdmissions();
+                openDiffExplanationJobAdmissions();
                 openCheckRunnerAdmissions();
                 httpServer.listen(port, bindHost, handleListening);
             });
         }
         catch (error) {
+            await shutdownDiffExplanationJobs();
+            await shutdownLightweightPrompts();
             await clearAllGitHubActionsSessions();
             throw error;
         }
@@ -10812,9 +10784,11 @@ export const shutdownServer = async (signal) => {
     void httpServerClosePromise?.catch(() => undefined);
     const pendingStartup = startServerPromise;
     shutdownServerPromise = (async () => {
+        await shutdownDiffExplanationJobs();
         await Promise.all([
             pendingStartup?.catch(() => undefined),
             stopAllPlanAgents(),
+            shutdownLightweightPrompts(),
         ]);
         if (executionEvidenceCleanupTimer) {
             clearInterval(executionEvidenceCleanupTimer);