@straiffi/archon 1.10.8 → 1.10.10

package/dist/server/index.js

@@ -18,7 +18,7 @@ import { registerApprovalRoutes } from './lib/approvalRoutes.js';
 import { admitForcePush, finalizeGitPushApproval, resumeGitPushApproval } from './lib/gitPushApprovals.js';
 import { reconcileApprovalRequests } from './lib/approvalReconciliation.js';
 import { dockerSandboxAdapter, dockerSandboxRunner, dockerSandboxRuntimeController, } from './lib/dockerSandboxEnvironmentOperations.js';
-import { deleteChatSession, getChatSession, listChatSessions } from './lib/chats.js';
+import { deleteChatSession, getChatSession, hasActiveBundleChatSession, listChatSessions } from './lib/chats.js';
 import { deleteSpecSession, getCreatedTicketIdsForSnapshot, getSpecSession, getSpecSnapshot, listSpecSessions } from './lib/specs.js';
 import { getSpecSnapshotRepositoryEvidenceFreshness } from './lib/specSnapshotEvidence.js';
 import { projectSpecSnapshotForActionPrompt } from './lib/specRepositoryEvidenceFormatting.js';
@@ -32,7 +32,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, createWorktreeAsync, deleteLocalBranch, deleteWorktree, getBundleReviewDiffForCwd, getGitDiffDataAsync, getGitDiffFiles, getGitStatus, getGitStatusAsync, getGitUnifiedDiff, getGitUnifiedDiffAsync, getLocalProjectBranch, getProjectBranch, getProjectBranchSuggestions, getReviewDiffDataAsync, getSelectedGitUnifiedDiff, getUnpushedCommitDiffForCwd, getUnpushedCommitSummaryForCwd, getUnpushedCommitSummaryForCwdAsync, hasKnownBranchRef, listUnpushedCommitsForCwd, pullGitBranch, pushCurrentBranch, rebaseGitBranchOntoBase, resolveExistingWorktreePath, resolveWorktreePath, squashUnpushedCommitsForCwd, summarizeTicketDiffFiles, switchProjectBranch, syncWorktreeFilesAsync, undoLatestUnpushedCommitForCwd, UnpushedCommitDiffSelectionError } from './lib/git.js';
+import { abortGitOperation, branchExistsLocally, commitGitChanges, createWorktreeAsync, deleteLocalBranch, deleteWorktree, getBundleReviewDiffForCwd, getGitDiffDataAsync, getGitDiffFiles, getGitDiffFilesAsync, getGitStatus, getGitStatusAsync, getGitUnifiedDiff, getGitUnifiedDiffAsync, getLocalProjectBranch, getProjectBranch, getProjectBranchAsync, getProjectBranchSuggestions, getReviewDiffDataAsync, getSelectedGitUnifiedDiff, getUnpushedCommitDiffForCwd, getUnpushedCommitSummaryForCwd, getUnpushedCommitSummaryForCwdAsync, hasKnownBranchRef, listUnpushedCommitsForCwd, pullGitBranch, pushCurrentBranch, rebaseGitBranchOntoBase, resolveExistingWorktreePath, resolveWorktreePath, squashUnpushedCommitsForCwd, summarizeTicketDiffFiles, switchProjectBranch, syncWorktreeFilesAsync, undoLatestUnpushedCommitForCwd, UnpushedCommitDiffSelectionError } from './lib/git.js';
 import config from './lib/config.js';
 import { autoConfigProject, ProjectAutoConfigError } from './lib/projectAutoConfig.js';
 import { analyzeRepoPath, createInitialCommit, ensureInitialCommitForWorktrees, initializeGitRepo, isInitialCommitRequiredError, } from './lib/projectRepos.js';
@@ -70,8 +70,8 @@ import { abandonAutomationPause, completeAutomationProgression, completeAutomati
 import { reconcileAutomationStage } from './lib/automationReconciliation.js';
 import { runAutomationReviewGateOrPause } from './lib/automationReviewGate.js';
 import { pausedRunBelongsToProgression, resolveAutomationResumeDecision } from './lib/automationResumeDecision.js';
-import { resolveAutomationDeliveryDecision } from './lib/automationDeliveryDecision.js';
-import { isLegacyReviewRepairMigrationPause } from './lib/reviewRepairReconciliation.js';
+import { isLegacyReviewRepairMigrationPause, recoverCompletedReviewRepairVerification } from './lib/reviewRepairReconciliation.js';
+import { overrideNoProgressReviewRepairInTransaction } from './lib/reviewRepairResumeOverride.js';
 import { getAutomationStageDetails, } from './lib/automationStageDetails.js';
 import { buildAutomationFixInstruction, clearAutomationPause, countBlockingFindings, depthAtLeast, getBundleAutomationState, isAutomationActive, isAutomationDepth, recordAutomationPause, resetBundleAutomationLoop, resolveAutomationConfig, } from './lib/ticketAutomation.js';
 import { resolveAutomationCheckGateResume, runAutomationCommitChain, runAutomationCommitOperation } from './lib/ticketAutomationCommit.js';
@@ -80,7 +80,7 @@ import { continueAfterBuildCheckpoint } from './lib/automationBuildContinuation.
 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';
-import { appendReviewRepairIterationDecisionInTransaction, attachReviewRepairResultInTransaction, attachReviewRepairActionEnvelopeInTransaction, attachReviewRepairActionInTransaction, claimReviewRepairIterationInTransaction, assertReviewRepairIterationDeletionEligible, deleteTerminalReviewRepairIterationsForTicketInTransaction, getActiveReviewRepairIteration, getReviewRepairIteration, pauseReviewRepairIteration, rewindStaleReviewRepairVerification, replaceReviewRepairActionEnvelopeRetryInTransaction, replaceReviewRepairActionRetryInTransaction, replaceReviewRepairVerificationRetryInTransaction, resetReviewRepairGateForRetry, resumePausedReviewRepairIteration, terminalizeReviewRepairIteration, terminalizeReviewRepairIterationInTransaction, } from './lib/reviewRepairIterations.js';
+import { appendReviewRepairIterationDecisionInTransaction, attachReviewRepairActionEnvelopeInTransaction, attachReviewRepairActionInTransaction, claimReviewRepairIterationInTransaction, assertReviewRepairIterationDeletionEligible, deleteTerminalReviewRepairIterationsForTicketInTransaction, getActiveReviewRepairIteration, getReviewRepairIteration, pauseReviewRepairIteration, rewindStaleReviewRepairVerification, replaceReviewRepairActionEnvelopeRetryInTransaction, replaceReviewRepairActionRetryInTransaction, replaceReviewRepairVerificationRetryInTransaction, resetReviewRepairGateForRetry, resumePausedReviewRepairIteration, terminalizeReviewRepairIteration, terminalizeReviewRepairIterationInTransaction, } from './lib/reviewRepairIterations.js';
 import { dispatchExecutionRetry, getExecutionRetryEligibility, resolveExecutionRetry } from './lib/executionRetry.js';
 import { listExecutionTimeline } from './lib/executionTimeline.js';
 import { loadReviewAutomationLoopDetails } from './lib/automationLoopProjection.js';
@@ -105,7 +105,9 @@ import { refreshIfNeeded as refreshAssignedIssues, clearCachedAssignedIssues } f
 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 { countInboundProjectLinks, getEffectiveProject, getProjectCheckDefinitions, getProjectById, getProjectTestCommands, getProjectTicketStats, hasProjectRunIde, listInterruptedProjectDeletions, listProjects, releaseInterruptedProjectDeletionClaims, replaceProjectLinks, serializeProject, updateProjectActiveTarget, validateProjectRequiredCheckPolicyReferences, validateProjectPayload, } from './lib/projects.js';
-import { getActiveRunStatus, getActiveRunStatusForProject, getPreviewStatusForProject, hasRunConfig, isRunning, openIde, openTicketIdeInWorkspace, resolveProjectRunContextKey, runTicketInWorkspace, stopAllTickets, stopTicket } from './lib/run.js';
+import { getActiveRunStatus, getActiveRunStatusForProject, getLastRunStatusForProject, getPreviewStatusForProject, hasRunConfig, isRunning, openIde, openTicketIdeInWorkspace, resolveProjectRunContextKey, runTicketInWorkspace, stopAllTickets, stopTicket } from './lib/run.js';
+import { hasActiveProjectServiceRun } from './lib/serviceRuns.js';
+import { projectRunStatus } from './lib/runStatus.js';
 import { clearAllTestSessions, createTestSession, deleteTestSession, discoverTestsForSession, doesTestFileExistForSession, getTestSession, isTestSelectionSupported, startTestSessionRun, stopTestSessionRun } from './lib/testSessions.js';
 import { closeCheckRunnerAdmissions, finalizeProductionCheckApproval, getCheckBatchAttempts, openCheckRunnerAdmissions, rerunCheckBatchAndSchedule, resumeProductionCheckApproval, shutdownCheckRunner, startCheckBatch, stopCheckBatch } from './lib/checkRunner.js';
 import { CheckRepairError, getCheckRepairCandidateState, getCheckRepairDetails, getLatestCheckRepairForBatch, retryCheckRepair, startCheckRepair, stopCheckRepair } from './lib/checkRepair.js';
@@ -421,7 +423,7 @@ const getCheckBatchRerunEligibility = (project, batch, selection) => {
         workspaceAvailable: !('error' in workspace),
     });
 };
-const buildExecutionRunDetailResponse = async (project, run) => {
+const buildExecutionRunDetailResponse = async (project, run, scope) => {
     const checkBatch = run.kind === 'check_batch' ? getCheckBatchDetails(project.id, run.id) : null;
     const retryEligibility = checkBatch
         ? getCheckBatchRerunEligibility(project, checkBatch)
@@ -463,7 +465,7 @@ const buildExecutionRunDetailResponse = async (project, run) => {
                         ? {
                             kind: 'check_auto_fix',
                             available: true,
-                            check_auto_fix: getCheckAutoFixDetails(project.id, run.id),
+                            check_auto_fix: getCheckAutoFixDetails(project.id, run.id, scope),
                             retry_eligibility: retryEligibility,
                             action_kind: null,
                         }
@@ -490,7 +492,7 @@ const buildExecutionRunDetailResponse = async (project, run) => {
         ...artifacts,
         environment_context: getExecutionEnvironmentContextForRun(project.id, run.id),
         automation_loops: run.kind === 'automation_progression'
-            ? loadReviewAutomationLoopDetails(project.id, run.id)
+            ? loadReviewAutomationLoopDetails(project.id, run.id, scope)
             : [],
     };
 };
@@ -576,7 +578,26 @@ const cleanupWorktreeExecutionTarget = async ({ project, targetKind, targetKey,
     }
     return { branchWarning: buildBranchCleanupWarning(branch, deleteLocalBranch(branch, project)) };
 };
+const assertTicketServiceTargetMutable = (ticketId) => {
+    db.transaction(() => {
+        const authority = db.prepare(`SELECT 1 FROM active_project_service_authorities active
+      JOIN execution_runs run ON run.id = active.execution_run_id
+      WHERE run.source_kind = 'ticket' AND run.source_id = ? LIMIT 1`).get(ticketId);
+        if (authority) {
+            throw new HttpError(409, 'Ticket has active service authority. Stop the service session and verify cleanup before changing or deleting its target.');
+        }
+    }).immediate();
+};
 const deleteTicketRecord = async (ticket) => {
+    try {
+        assertTicketServiceTargetMutable(ticket.id);
+    }
+    catch (error) {
+        if (error instanceof HttpError) {
+            return { ok: false, status: error.status, error: error.message };
+        }
+        throw error;
+    }
     if (ticket.project_id) {
         try {
             assertReviewRepairIterationDeletionEligible(ticket.project_id, ticket.id);
@@ -667,6 +688,7 @@ const deleteTicketRecord = async (ticket) => {
     }
     try {
         withExecutionRunTransaction(transaction => {
+            assertTicketServiceTargetMutable(ticket.id);
             if (ticket.project_id) {
                 deleteTerminalReviewRepairIterationsForTicketInTransaction(transaction, ticket.project_id, ticket.id);
             }
@@ -1467,8 +1489,8 @@ const getWorkspaceFileTargetUnavailableMessage = (targetKind) => {
     const targetName = targetKind === 'repo_root' ? 'Repository' : targetKind === 'bundle' ? 'Bundle' : 'Ticket';
     return `${targetName} target is unavailable`;
 };
-const getProjectBranchStateForFooter = (project, options = {}) => {
-    const branchState = getProjectBranch(project, {
+const getProjectBranchStateForFooter = async (project, options = {}) => {
+    const branchState = await getProjectBranchAsync(project, {
         refreshRemote: options.refreshRemote,
         includeDiffStats: project.active_target_kind !== 'bundle',
     });
@@ -1484,7 +1506,7 @@ const getProjectBranchStateForFooter = (project, options = {}) => {
     }
     return {
         ...branchState,
-        diff_stats: summarizeTicketDiffFiles(getGitDiffFiles(workspace.cwd)),
+        diff_stats: summarizeTicketDiffFiles(await getGitDiffFilesAsync(workspace.cwd)),
     };
 };
 const listBundleTickets = (projectId, bundleId) => {
@@ -1613,22 +1635,20 @@ const getBundleReviewState = (projectId, tickets) => {
             has_completed_review: false,
             has_follow_up_since_last_review: false,
             can_re_review: false,
+            re_review_eligibility_reason: 'no_completed_review',
         };
     }
-    const reviewState = buildReviewFindingsResponse({
-        context: {
-            ticketId: representativeTicket.id,
-            projectId,
-            worktreeBundleId: representativeTicket.worktree_bundle_id,
-        },
-        isContextRunning: tickets.some(ticket => ticket.agent_status === 'running'),
-        currentWorkspaceSignature: null,
-        currentDiffSignature: null,
-    });
+    const activityRunning = tickets.some(ticket => ticket.agent_status === 'running') || Boolean(representativeTicket.worktree_bundle_id
+        && hasActiveBundleChatSession(projectId, representativeTicket.worktree_bundle_id));
+    const eligibleTicket = tickets.find(ticket => ticket.can_re_review === true);
+    const fallbackReason = tickets.find(ticket => ticket.re_review_eligibility_reason)?.re_review_eligibility_reason;
     return {
-        has_completed_review: reviewState.has_completed_review,
-        has_follow_up_since_last_review: reviewState.has_follow_up_since_last_review,
-        can_re_review: reviewState.can_re_review,
+        has_completed_review: tickets.some(ticket => ticket.has_completed_review === true),
+        has_follow_up_since_last_review: tickets.some(ticket => ticket.has_follow_up_since_last_review === true),
+        can_re_review: !activityRunning && Boolean(eligibleTicket),
+        re_review_eligibility_reason: activityRunning
+            ? 'activity_running'
+            : eligibleTicket?.re_review_eligibility_reason ?? fallbackReason ?? 'no_completed_review',
     };
 };
 const BUNDLE_PULL_REQUEST_DISCOVERY_MISS_COOLDOWN_MS = 10 * 60 * 1000;
@@ -1977,6 +1997,7 @@ const serializeBundleDetails = (project, bundle, extras = {}) => {
         has_completed_review: bundleReviewState.has_completed_review,
         has_follow_up_since_last_review: bundleReviewState.has_follow_up_since_last_review,
         can_re_review: bundleReviewState.can_re_review,
+        re_review_eligibility_reason: bundleReviewState.re_review_eligibility_reason,
         review_recovery_available: getBundleAutomationState(project.id, bundle.id)?.automation_paused_reason
             ? false
             : getBundleReviewRecovery(project.id, bundle.id) !== null,
@@ -2071,7 +2092,7 @@ const rerunTicketReview = (ticketId) => {
         return { ok: false, status: 409, error: 'Ticket is already running' };
     }
     if (!ticket.can_re_review) {
-        return { ok: false, status: 409, error: 'Review can only be re-run after a follow-up finishes' };
+        return { ok: false, status: 409, error: 'Review can only be re-run after the workspace changes' };
     }
     const scheduling = rerunTicketReviewOperation(ticket, io);
     if (!scheduling.ok) {
@@ -2296,6 +2317,7 @@ const getBundleReviewFindings = async (projectId, bundleId) => {
             isContextRunning: false,
             currentWorkspaceSignature: null,
             currentDiffSignature: null,
+            isBundleChatRunning: hasActiveBundleChatSession(projectId, bundleId),
         });
     }
     const context = {
@@ -2319,6 +2341,7 @@ const getBundleReviewFindings = async (projectId, bundleId) => {
             : null,
         currentDiffText: currentDiffState?.diffText ?? null,
         currentChangeScope: currentDiffState?.changeScope ?? null,
+        isBundleChatRunning: hasActiveBundleChatSession(projectId, bundleId),
     });
 };
 const getTicketReviewFindings = async (ticketId) => {
@@ -2347,6 +2370,9 @@ const getTicketReviewFindings = async (ticketId) => {
             : null,
         currentDiffText: currentDiffState?.diffText ?? null,
         currentChangeScope: currentDiffState?.changeScope ?? null,
+        isBundleChatRunning: Boolean(ticket.project_id
+            && ticket.worktree_bundle_id
+            && hasActiveBundleChatSession(ticket.project_id, ticket.worktree_bundle_id)),
     });
 };
 const undoBundleReviewTickets = (projectId, bundleId) => {
@@ -2795,11 +2821,9 @@ app.get('/run-config', (req, res) => {
 });
 app.get('/run-status', (req, res) => {
     const requestedProjectId = getRequestedProjectId(req);
-    return res.json({
-        active_run: requestedProjectId
-            ? getActiveRunStatusForProject(requestedProjectId)
-            : getActiveRunStatus(),
-    });
+    const activeRun = requestedProjectId ? getActiveRunStatusForProject(requestedProjectId) : getActiveRunStatus();
+    const durableAuthority = hasActiveProjectServiceRun(requestedProjectId);
+    return res.json(projectRunStatus(activeRun, requestedProjectId ? getLastRunStatusForProject(requestedProjectId) : null, durableAuthority));
 });
 app.get('/preview-status', (req, res) => {
     const projectId = getRequestedProjectId(req);
@@ -4588,7 +4612,25 @@ app.post('/bundles/:id/undo-review', (req, res) => {
     }
     return res.json(undoResult.details);
 });
-const parseServiceExecutionProviderChoice = (body) => {
+const parseServiceRunControl = (body) => {
+    if (body === undefined) {
+        return {};
+    }
+    if (!body || typeof body !== 'object' || Array.isArray(body)) {
+        return { error: 'Run control body must be an object' };
+    }
+    const input = body;
+    for (const field of ['service_id', 'session_id']) {
+        if (input[field] !== undefined && (typeof input[field] !== 'string' || !input[field].trim())) {
+            return { error: `${field} must be a non-empty string` };
+        }
+    }
+    return {
+        serviceId: typeof input.service_id === 'string' ? input.service_id.trim() : undefined,
+        sessionId: typeof input.session_id === 'string' ? input.session_id.trim() : undefined,
+    };
+};
+const parseServiceExecutionProviderChoice = (body, allowServiceControl = false) => {
     if (body === undefined || body === null) {
         return 'project_default';
     }
@@ -4596,7 +4638,8 @@ const parseServiceExecutionProviderChoice = (body) => {
         return null;
     }
     const request = body;
-    if (Object.keys(request).some(key => key !== 'execution_provider')) {
+    if (Object.keys(request).some(key => key !== 'execution_provider'
+        && !(allowServiceControl && (key === 'service_id' || key === 'session_id')))) {
         return null;
     }
     if (request.execution_provider === undefined || request.execution_provider === 'project_default') {
@@ -4655,8 +4698,17 @@ app.post('/bundles/:id/run', (req, res) => {
         return res.status(409).json(activeRunConflict);
     }
     const profileSelection = createServiceExecutionProfileSelection(project.id, executionProvider);
+    try {
+        void runTicketInWorkspace(targetTicket, io, project, workspace.cwd, profileSelection)
+            .catch(error => console.error('[run] admitted bundle service startup failed:', error));
+    }
+    catch (error) {
+        return res.status(409).json({
+            error: error instanceof Error ? error.message : String(error),
+            code: error instanceof Error && 'code' in error ? error.code : 'service_start_rejected',
+        });
+    }
     emitRunStateForContext(targetTicket, true);
-    runTicketInWorkspace(targetTicket, io, project, workspace.cwd, profileSelection);
     return res.json(serializeBundleDetails(result.project, bundle));
 });
 app.post('/bundles/:id/stop', async (req, res) => {
@@ -4696,52 +4748,6 @@ app.post('/bundles/:id/follow-up', (req, res) => {
 });
 const AUTOMATION_SIDE_EFFECT_KINDS = new Set(['automation_commit', 'automation_push', 'automation_pull_request']);
 const AUTOMATION_WORKER_PAUSE_KINDS = new Set(['build', 'review', 'build_follow_up', 'automation_review_fix', 'check_auto_fix', 'check_repair', 'check_batch']);
-app.post('/bundles/:id/continue-delivery', 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' });
-    }
-    const state = getBundleAutomationState(result.project.id, bundle.id);
-    const tickets = listDetailedBundleTickets(result.project.id, bundle.id);
-    if (!state) {
-        return res.status(409).json({ error: 'Bundle delivery is not ready to continue' });
-    }
-    const automationConfig = resolveAutomationConfig(bundle, result.project);
-    const decision = resolveAutomationDeliveryDecision({
-        projectId: result.project.id,
-        bundleId: bundle.id,
-        state,
-        config: automationConfig,
-        tickets,
-    });
-    if (!decision) {
-        return res.status(409).json({ error: 'Bundle delivery is not ready to continue' });
-    }
-    const owner = tickets.find(ticket => ticket.id === decision.owner_ticket_id);
-    const reviewStageRunId = state.automation_delivery_ready_stage_run_id;
-    if (!owner || !reviewStageRunId) {
-        return res.status(409).json({ error: 'Bundle delivery owner is no longer available' });
-    }
-    try {
-        const progression = ensureAutomationProgression({
-            projectId: result.project.id,
-            bundleId: bundle.id,
-            ticketId: owner.id,
-            ticketTitle: owner.title,
-            parentRunId: reviewStageRunId,
-            broadcaster: io,
-        });
-        await runAutomationCommitChain(owner, result.project, owner.bundle ?? bundle, automationConfig, io, progression.runId, undefined, reviewStageRunId);
-    }
-    catch (error) {
-        return res.status(409).json({ error: error instanceof Error ? error.message : String(error) });
-    }
-    return res.json(serializeBundleDetails(result.project, bundle));
-});
 app.post('/bundles/:id/resume-automation', async (req, res) => {
     const result = getRequiredProject(req);
     if ('error' in result) {
@@ -4781,7 +4787,7 @@ app.post('/bundles/:id/resume-automation', async (req, res) => {
                     : 'Bundle automation cannot be resumed in its current state';
         return res.status(409).json({ error, automation_resume_decision: initialDecision });
     }
-    let decision = initialDecision;
+    const decision = initialDecision;
     const revalidateDecision = () => {
         const current = resolveCurrentDecision();
         return current?.status === 'enabled'
@@ -4997,9 +5003,21 @@ app.post('/bundles/:id/resume-automation', async (req, res) => {
     }
     const automationConfig = resolveAutomationConfig(owner.bundle ?? null, project);
     const legacyReviewRepairPause = isLegacyReviewRepairMigrationPause(result.project.id, bundle.id, progressionRunId);
-    let completedVerificationIteration = getActiveReviewRepairIteration(result.project.id, progressionRunId);
-    let reconciledSourceReviewRunId = null;
-    if (completedVerificationIteration?.phase === 'paused') {
+    const completedVerificationIteration = getActiveReviewRepairIteration(result.project.id, progressionRunId);
+    if (completedVerificationIteration
+        && ['paused', 'verification_active'].includes(completedVerificationIteration.phase)
+        && completedVerificationIteration.stop_reason !== 'no_progress'
+        && completedVerificationIteration.resulting_review_execution_run_id
+        && getExecutionRun(result.project.id, completedVerificationIteration.resulting_review_execution_run_id)?.status === 'completed') {
+        try {
+            await recoverCompletedReviewRepairVerification(result.project.id, completedVerificationIteration.id, io, { resume: true });
+            return res.json(serializeBundleDetails(result.project, bundle));
+        }
+        catch (error) {
+            return res.status(409).json({ error: error instanceof Error ? error.message : String(error) });
+        }
+    }
+    if (completedVerificationIteration?.phase === 'paused' && completedVerificationIteration.stop_reason !== 'no_progress') {
         withExecutionRunTransaction(transaction => {
             appendReviewRepairIterationDecisionInTransaction(transaction, {
                 projectId: result.project.id,
@@ -5010,165 +5028,6 @@ app.post('/bundles/:id/resume-automation', async (req, res) => {
             });
         }, io, 'immediate');
     }
-    if (completedVerificationIteration?.phase === 'paused') {
-        const verificationRunId = completedVerificationIteration.resulting_review_execution_run_id;
-        const verificationRun = verificationRunId ? getExecutionRun(result.project.id, verificationRunId) : null;
-        if (verificationRun?.status === 'completed') {
-            try {
-                completedVerificationIteration = resumePausedReviewRepairIteration({
-                    projectId: result.project.id,
-                    iterationId: completedVerificationIteration.id,
-                    expectedCurrentRunId: verificationRunId,
-                    broadcaster: io,
-                });
-            }
-            catch (error) {
-                const current = getReviewRepairIteration(result.project.id, completedVerificationIteration.id);
-                if (current?.resulting_review_execution_run_id === verificationRunId
-                    && ['verification_active', 'terminal'].includes(current.phase)) {
-                    return res.json(serializeBundleDetails(result.project, bundle));
-                }
-                return res.status(409).json({ error: error instanceof Error ? error.message : String(error) });
-            }
-        }
-    }
-    if (completedVerificationIteration?.phase === 'verification_active'
-        && completedVerificationIteration.resulting_review_execution_run_id) {
-        const verificationRunId = completedVerificationIteration.resulting_review_execution_run_id;
-        const verificationRun = getExecutionRun(result.project.id, verificationRunId);
-        const resultingReview = verificationRun?.status === 'completed'
-            ? db.prepare(`
-          SELECT review.id
-          FROM review_runs review
-          JOIN execution_run_links result_link
-            ON result_link.execution_run_id = ?
-            AND result_link.project_id = review.project_id
-            AND result_link.entity_type = 'review_run'
-            AND result_link.entity_id = review.id
-            AND result_link.relationship = 'result'
-          WHERE review.project_id = ? AND review.ticket_id = ?
-            AND review.worktree_bundle_id = ? AND review.status = 'completed'
-          LIMIT 1
-        `).get(verificationRunId, result.project.id, owner.id, bundle.id)
-            : undefined;
-        if (resultingReview) {
-            reconciledSourceReviewRunId = resultingReview.id;
-            const blockingCount = countBlockingFindings(listReviewFindings(resultingReview.id), automationConfig);
-            const terminal = !isAutomationActive(automationConfig)
-                ? { outcome: 'interrupted', stopReason: 'configuration_changed' }
-                : blockingCount === 0
-                    ? { outcome: 'repaired', stopReason: 'no_blocking_findings' }
-                    : automationConfig.reviewFixEnabled
-                        ? completedVerificationIteration.ordinal < automationConfig.reviewMaxIterations
-                            ? { outcome: 'continuing', stopReason: null }
-                            : { outcome: 'exhausted', stopReason: 'max_iterations' }
-                        : { outcome: 'interrupted', stopReason: 'automation_disabled' };
-            try {
-                withExecutionRunTransaction(transaction => {
-                    if (!completedVerificationIteration.resulting_review_run_id) {
-                        attachReviewRepairResultInTransaction(transaction, {
-                            projectId: result.project.id,
-                            iterationId: completedVerificationIteration.id,
-                            expectedPhase: 'verification_active',
-                            expectedVerificationRunId: verificationRunId,
-                            resultingReviewRunId: resultingReview.id,
-                        });
-                    }
-                    appendReviewRepairIterationDecisionInTransaction(transaction, {
-                        projectId: result.project.id,
-                        iterationId: completedVerificationIteration.id,
-                        decisionPoint: 'verification_completion',
-                        effectiveAutomationConfig: automationConfig,
-                        decisionCode: 'verification_reconciled_on_resume',
-                        operationRunId: verificationRunId,
-                    });
-                    terminalizeReviewRepairIterationInTransaction(transaction, {
-                        projectId: result.project.id,
-                        iterationId: completedVerificationIteration.id,
-                        expectedPhase: 'verification_active',
-                        expectedCurrentRunId: verificationRunId,
-                        outcome: terminal.outcome,
-                        stopReason: terminal.stopReason,
-                        resultingBlockingCount: blockingCount,
-                    });
-                    if (automationConfig.depth === 'manual') {
-                        completeAutomationProgressionInTransaction(transaction, {
-                            projectId: result.project.id,
-                            bundleId: bundle.id,
-                            progressionRunId,
-                            domainStatus: 'manual_boundary_reached',
-                        });
-                    }
-                    if (terminal.outcome === 'continuing') {
-                        claimReviewRepairIterationInTransaction(transaction, {
-                            projectId: result.project.id,
-                            worktreeBundleId: bundle.id,
-                            ownerTicketId: owner.id,
-                            automationProgressionRunId: progressionRunId,
-                            triggeringReviewExecutionRunId: verificationRunId,
-                            triggeringReviewRunId: resultingReview.id,
-                            triggeringBlockingCount: blockingCount,
-                            effectiveAutomationConfig: automationConfig,
-                            decisionCode: 'resume_verification_repair_admitted',
-                        });
-                    }
-                }, io, 'immediate');
-            }
-            catch (error) {
-                const current = getReviewRepairIteration(result.project.id, completedVerificationIteration.id);
-                if (current?.phase === 'terminal'
-                    && current.resulting_review_execution_run_id === verificationRunId
-                    && current.resulting_review_run_id === resultingReview.id) {
-                    return res.json(serializeBundleDetails(result.project, bundle));
-                }
-                return res.status(409).json({ error: error instanceof Error ? error.message : String(error) });
-            }
-            if (terminal.outcome === 'continuing') {
-                const continuationDecision = resolveCurrentDecision();
-                if (!continuationDecision || continuationDecision.status !== 'enabled') {
-                    return res.status(409).json({ error: 'Bundle automation state changed before repair continuation could start' });
-                }
-                decision = continuationDecision;
-            }
-            else if (terminal.outcome === 'repaired') {
-                resetBundleAutomationLoop(result.project.id, bundle.id);
-                runAutomationProgression({
-                    projectId: result.project.id,
-                    bundleId: bundle.id,
-                    progressionRunId,
-                    broadcaster: io,
-                });
-                if (depthAtLeast(automationConfig.depth, 'auto_commit')) {
-                    await runAutomationCommitChain(owner, project, owner.bundle ?? null, automationConfig, io, progressionRunId, undefined, verificationRunId);
-                }
-                else {
-                    completeAutomationProgression({
-                        projectId: result.project.id,
-                        bundleId: bundle.id,
-                        progressionRunId,
-                        broadcaster: io,
-                    });
-                }
-                return res.json(serializeBundleDetails(result.project, bundle));
-            }
-            else if (automationConfig.depth !== 'manual') {
-                waitAutomationProgression({
-                    projectId: result.project.id,
-                    bundleId: bundle.id,
-                    progressionRunId,
-                    pauseCode: 'review',
-                    pauseReason: 'Blocking Review findings remain after repair verification.',
-                    reasonCode: 'precondition_failed',
-                    pausedStageRunId: verificationRunId,
-                    broadcaster: io,
-                });
-                return res.json(serializeBundleDetails(result.project, bundle));
-            }
-            else {
-                return res.json(serializeBundleDetails(result.project, bundle));
-            }
-        }
-    }
     const restoreWaitingProgression = () => {
         waitAutomationProgression({
             projectId: result.project.id,
@@ -5361,7 +5220,16 @@ app.post('/bundles/:id/resume-automation', async (req, res) => {
                 }
                 const workflowContext = validateWorkflowContext(progression.metadata);
                 let existingIteration = getActiveReviewRepairIteration(result.project.id, progressionRunId);
-                const sourceReviewRunId = reconciledSourceReviewRunId ?? existingIteration?.triggering_review_run_id ?? null;
+                const overridingNoProgress = existingIteration?.phase === 'paused' && existingIteration.stop_reason === 'no_progress';
+                if (overridingNoProgress) {
+                    existingIteration = withExecutionRunTransaction(transaction => {
+                        if (!revalidateDecision()) {
+                            throw new Error('Bundle automation state changed before Resume override could start');
+                        }
+                        return overrideNoProgressReviewRepairInTransaction(transaction, result.project.id, existingIteration.id, io);
+                    }, io, 'immediate');
+                }
+                const sourceReviewRunId = existingIteration?.triggering_review_run_id ?? null;
                 if (!sourceReviewRunId) {
                     throw new Error('The completed review findings to resume are unavailable');
                 }
@@ -5370,12 +5238,14 @@ app.post('/bundles/:id/resume-automation', async (req, res) => {
                     review_finding_run_id: sourceReviewRunId,
                     review_severity: automationConfig.reviewSeverity,
                 });
-                runAutomationProgression({
-                    projectId: result.project.id,
-                    bundleId: bundle.id,
-                    progressionRunId,
-                    broadcaster: io,
-                });
+                if (!overridingNoProgress) {
+                    runAutomationProgression({
+                        projectId: result.project.id,
+                        bundleId: bundle.id,
+                        progressionRunId,
+                        broadcaster: io,
+                    });
+                }
                 if (existingIteration?.phase === 'paused') {
                     existingIteration = resumePausedReviewRepairIteration({
                         projectId: result.project.id,
@@ -5646,9 +5516,7 @@ app.post('/bundles/:id/resume-automation', async (req, res) => {
                             });
                         }, io, 'immediate');
                     }
-                    if (bundleState.fix_loop_active === 1) {
-                        resetBundleAutomationLoop(result.project.id, bundle.id);
-                    }
+                    resetBundleAutomationLoop(result.project.id, bundle.id);
                 }
                 runAutomationProgression({
                     projectId: result.project.id,
@@ -7677,7 +7545,7 @@ app.post('/projects/:id/memory/suggestions/:suggestionId/supersede', (req, res)
     }
     return res.json(superseded);
 });
-app.get('/projects/:id/branch', (req, res) => {
+app.get('/projects/:id/branch', async (req, res) => {
     const project = getProjectById(req.params.id);
     if (!project) {
         return res.status(404).json({ error: 'Not found' });
@@ -7685,7 +7553,7 @@ app.get('/projects/:id/branch', (req, res) => {
     ensureProjectRootBundle(project.id);
     try {
         const refreshRemote = req.query.refresh_remote === 'true';
-        return res.json(getProjectBranchStateForFooter(project, { refreshRemote }));
+        return res.json(await getProjectBranchStateForFooter(project, { refreshRemote }));
     }
     catch (error) {
         console.error(`Failed to read branch for project ${project.id}:`, error);
@@ -8197,14 +8065,6 @@ app.patch('/projects/:id', async (req, res) => {
     if ('error' in roleModelValidation) {
         return res.status(400).json({ error: roleModelValidation.error });
     }
-    if (hasOwn(validation.values, 'repo_path') && validation.values.repo_path !== project.repo_path) {
-        const stats = getProjectTicketStats(project.id);
-        if (stats.ticketCount > 0 || stats.worktreeCount > 0 || stats.bundleCount > 0) {
-            return res.status(409).json({
-                error: 'repo_path cannot be changed after tickets, bundles, or worktrees exist for this project',
-            });
-        }
-    }
     const { name, repo_path, linked_project_ids, run_setup, run_services, check_definitions, required_check_definition_ids, pre_review_check_definition_ids, post_build_check_definition_ids, auto_fix_check_definition_ids, test_commands, run_ide, preview_service_name, preview_path, preview_capability_mode, helper_model, helper_variant, helper_models_json, reviewer_model, reviewer_variant, reviewer_models_json, commit_message_rules, commit_after_each_ticket, auto_park_stale_tickets, memory_enabled, scan_include_globs_json, scan_exclude_globs_json, worktree_sync, spec_aware_code_review_enabled, automation_depth, automation_review_fix_enabled, automation_pause_on_open_questions, automation_review_severity, automation_review_max_iterations, } = validation.values;
     const updateProject = db.prepare(`
     UPDATE projects SET
@@ -8262,7 +8122,7 @@ app.patch('/projects/:id', async (req, res) => {
     const nextReviewerVariant = nextReviewerModel
         ? (hasOwn(validation.values, 'reviewer_variant') ? reviewer_variant ?? null : project.reviewer_variant)
         : null;
-    const updateResult = db.transaction(() => {
+    const applyUpdate = db.transaction(() => {
         const currentProject = getProjectById(project.id);
         if (!currentProject || JSON.stringify(currentProject) !== JSON.stringify(project)) {
             return {
@@ -8270,6 +8130,15 @@ app.patch('/projects/:id', async (req, res) => {
                 status: 409,
             };
         }
+        if (hasOwn(validation.values, 'repo_path') && repo_path !== currentProject.repo_path) {
+            if (currentProject.deletion_started_at || hasActiveProjectServiceRun(project.id) || getActiveRunStatusForProject(project.id)) {
+                return { error: 'Cannot change project repository while service authority or deletion is active', status: 409 };
+            }
+            const stats = getProjectTicketStats(project.id);
+            if (stats.ticketCount > 0 || stats.worktreeCount > 0 || stats.bundleCount > 0) {
+                return { error: 'repo_path cannot be changed after tickets, bundles, or worktrees exist for this project', status: 409 };
+            }
+        }
         const policyReferences = validateProjectRequiredCheckPolicyReferences({
             projectId: project.id,
             checkDefinitionsJson: nextCheckDefinitions,
@@ -8301,7 +8170,17 @@ app.patch('/projects/:id', async (req, res) => {
             replaceProjectLinks(project.id, linked_project_ids ?? []);
         }
         return { ok: true };
-    }).immediate();
+    });
+    let updateResult;
+    try {
+        updateResult = applyUpdate.immediate();
+    }
+    catch (error) {
+        if (error instanceof Error && 'code' in error && error.code === 'SQLITE_CONSTRAINT_TRIGGER') {
+            return res.status(409).json({ error: error.message });
+        }
+        throw error;
+    }
     if ('error' in updateResult) {
         const status = 'status' in updateResult && typeof updateResult.status === 'number'
             ? updateResult.status
@@ -8312,6 +8191,9 @@ app.patch('/projects/:id', async (req, res) => {
     res.json(serializeProject(updated ?? null));
 });
 const assertProjectDeletionEligible = (projectId, claimId) => {
+    if (hasActiveProjectServiceRun(projectId) || getActiveRunStatusForProject(projectId)) {
+        throw new ProjectDeletionError(409, 'Cannot delete a project while services are active');
+    }
     const project = db.prepare('SELECT * FROM projects WHERE id = ?').get(projectId);
     if (!project) {
         throw new ProjectDeletionError(404, 'Not found');
@@ -8359,6 +8241,7 @@ const assertProjectDeletionEligible = (projectId, claimId) => {
     }
 };
 const completeClaimedProjectDeletion = async (projectId, claimId) => {
+    assertProjectDeletionEligible(projectId, claimId);
     const marked = db.prepare(`
     UPDATE projects
     SET deletion_cleanup_started_at = COALESCE(deletion_cleanup_started_at, CURRENT_TIMESTAMP)
@@ -8595,6 +8478,17 @@ app.patch('/tickets/:id', async (req, res) => {
     const nextProjectId = hasProjectField ? project_id : ticket.project_id;
     const isProjectChanging = nextProjectId !== ticket.project_id;
     const hasStandaloneWorktree = typeof ticket.branch === 'string' && ticket.branch.trim() !== '';
+    if (isProjectChanging || (hasBundleField && req.body.worktree_bundle_id !== ticket.worktree_bundle_id)) {
+        try {
+            assertTicketServiceTargetMutable(ticket.id);
+        }
+        catch (error) {
+            if (error instanceof HttpError) {
+                return res.status(error.status).json({ error: error.message });
+            }
+            throw error;
+        }
+    }
     if (isProjectChanging && hasStandaloneWorktree) {
         return res.status(409).json({ error: 'project_id cannot be changed after a worktree has been created' });
     }
@@ -8704,10 +8598,23 @@ app.patch('/tickets/:id', async (req, res) => {
             }
         }
     }
-    if (isProjectChanging) {
-        deleteTicketDependenciesForTicket(ticket.id);
+    try {
+        db.transaction(() => {
+            if (bundleChanged) {
+                assertTicketServiceTargetMutable(ticket.id);
+            }
+            if (isProjectChanging) {
+                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);
+        }).immediate();
+    }
+    catch (error) {
+        if (error instanceof HttpError) {
+            return res.status(error.status).json({ error: error.message });
+        }
+        throw error;
     }
-    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);
     upsertTicketDescriptionMessage(req.params.id, description ?? ticket.description);
     const updated = getTicket(req.params.id);
     if (bundleChanged && previousBundleId && previousProject) {
@@ -9129,7 +9036,12 @@ app.post('/tickets/:id/undo', (req, res) => {
     return res.json(result.ticket);
 });
 app.post('/tickets/:id/run', (req, res) => {
+    const control = parseServiceRunControl(req.body);
+    if ('error' in control) {
+        return res.status(400).json({ error: control.error });
+    }
     const result = runTicketRun({
+        ...control,
         ticketId: req.params.id,
         requestedProjectId: getRequestedProjectId(req),
         broadcaster: io,
@@ -9390,11 +9302,16 @@ app.post('/projects/:id/open-ide', (req, res) => {
     return res.json({ ok: true });
 });
 app.post('/projects/:id/run', (req, res) => {
-    const executionProvider = parseServiceExecutionProviderChoice(req.body);
+    const control = parseServiceRunControl(req.body);
+    if ('error' in control) {
+        return res.status(400).json({ error: control.error });
+    }
+    const executionProvider = parseServiceExecutionProviderChoice(req.body, true);
     if (!executionProvider) {
         return res.status(400).json({ error: 'execution_provider must be project_default or host' });
     }
     const result = runProjectTarget({
+        ...control,
         projectId: req.params.id,
         executionProvider,
     });
@@ -9879,7 +9796,7 @@ app.get('/projects/:id/execution-timeline/:runId', async (req, res) => {
     if (scope.scopeEntity && !links.some(link => link.entity_type === scope.scopeEntity?.type && link.entity_id === scope.scopeEntity.id)) {
         return res.status(404).json({ error: 'Execution run not found' });
     }
-    return res.json(await buildExecutionRunDetailResponse(project, run));
+    return res.json(await buildExecutionRunDetailResponse(project, run, scope.scopeEntity));
 });
 app.get('/projects/:id/execution-runs/:runId', async (req, res) => {
     const project = getProjectById(req.params.id);
@@ -10127,7 +10044,12 @@ app.post('/terminals/:sessionId/destroy', (req, res) => {
     return res.status(204).send();
 });
 app.post('/tickets/:id/stop', async (req, res) => {
+    const control = parseServiceRunControl(req.body);
+    if ('error' in control) {
+        return res.status(400).json({ error: control.error });
+    }
     const result = await stopTicketRun({
+        ...control,
         ticketId: req.params.id,
         requestedProjectId: getRequestedProjectId(req),
         broadcaster: io,
@@ -10138,7 +10060,12 @@ app.post('/tickets/:id/stop', async (req, res) => {
     return res.status(result.status).json(result.value);
 });
 app.post('/projects/:id/stop-run', async (req, res) => {
+    const control = parseServiceRunControl(req.body);
+    if ('error' in control) {
+        return res.status(400).json({ error: control.error });
+    }
     const result = await stopProjectTargetRun({
+        ...control,
         projectId: req.params.id,
     });
     if (!result.ok) {