@straiffi/archon 1.11.8 → 1.11.9

package/dist/server/index.js

@@ -10,6 +10,10 @@ import { adjectives, animals, uniqueNamesGenerator } from 'unique-names-generato
 import db from './db.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 +38,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 +48,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';
@@ -107,7 +111,7 @@ import { getExecutionEnvironmentContextForRun } from './lib/executionEnvironment
 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';
@@ -1130,6 +1134,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 +2302,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 +2758,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 +3074,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 +3713,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 +3752,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 +3855,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 +3921,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 +3933,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);
@@ -7964,16 +7992,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 +8026,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 +8038,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 +8071,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 +8241,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 +8285,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 +8311,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' });
@@ -9399,7 +9442,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 +9518,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 +9571,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 +9602,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 +10627,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;
@@ -10746,6 +10799,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 +10836,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 +10871,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);