@straiffi/archon 1.8.20 → 1.8.22

package/dist/server/index.js

@@ -11,6 +11,10 @@ import db from './db.js';
 import { pruneAllRepositoryGraphScans } from './lib/repositoryGraphRetention.js';
 import { registerRepositoryGraphRoutes } from './lib/repositoryGraphRoutes.js';
 import { registerExecutionEnvironmentRoutes } from './lib/executionEnvironmentRoutes.js';
+import { registerExecutionProfileRoutes } from './lib/executionProfileRoutes.js';
+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 { deleteSpecSession, getCreatedTicketIdsForSnapshot, getSpecSession, getSpecSnapshot, listSpecSessions } from './lib/specs.js';
@@ -26,7 +30,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, deleteWorktree, getBundleReviewDiffForCwd, getGitDiffDataAsync, getGitDiffFiles, getGitStatus, getGitStatusAsync, getGitUnifiedDiff, getGitUnifiedDiffAsync, getLocalProjectBranch, getProjectBranch, getProjectBranchSuggestions, 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, getGitStatus, getGitStatusAsync, getGitUnifiedDiff, getGitUnifiedDiffAsync, getLocalProjectBranch, getProjectBranch, getProjectBranchSuggestions, 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';
@@ -37,7 +41,8 @@ import { validateDesktopMobileAccessRequest } from './lib/mobileAccessSecurity.j
 import { refreshChatSessionUsageSnapshot, refreshSpecSessionUsageSnapshot, stopAllBuildAgents, stopAllReviewAgents, stopBuildAgent, stopReviewAgent } from './lib/agent.js';
 import { runLightweightPrompt } from './lib/lightweightPrompt.js';
 import { advanceBuildChain, startBuildChain, stopBuildChain } from './lib/buildChains.js';
-import { activateQueuedBuildSequenceTicket, compensateBuildSequenceAcceptance, enqueueBundledBuild, getDependencyOrderedBundleTicketIds, getBuildSequenceIdForTicket, hasActiveSequenceForBundle, removeTicketFromBuildSequence, stopBuildSequence, } from './lib/buildSequences.js';
+import { activateQueuedBuildSequenceTicket, bindBuildSequenceTicketExecutionRun, compensateBuildSequenceAcceptance, enqueueBundledBuild, getDependencyOrderedBundleTicketIds, getBuildSequenceIdForTicket, getBuildSequenceTicketExecutionProfileSelection, hasActiveSequenceForBundle, releaseQueuedBuildSequenceTicketExecutionRunForRetry, removeTicketFromBuildSequence, stopBuildSequence, } from './lib/buildSequences.js';
+import { createExecutionProfileSelection, executionProfileSelectionMetadata, validateExecutionProfileSelection } from './lib/executionRunAuthority.js';
 import { prepareTicketForBuild } from './lib/buildFlow.js';
 import { getActiveBundleRepairBlocker, getBundlePlanMutationBlockerById, shouldBlockPlanForBundleMutationById, } from './lib/bundleActivity.js';
 import { getDiscoveredModels, normalizeModelId, normalizeTicketModelId } from './lib/models.js';
@@ -92,15 +97,16 @@ 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, runSetupCommandsInWorkspace, runTicketInWorkspace, stopAllTickets, stopTicket } from './lib/run.js';
+import { getActiveRunStatus, getActiveRunStatusForProject, getPreviewStatusForProject, hasRunConfig, isRunning, openIde, openTicketIdeInWorkspace, resolveProjectRunContextKey, runTicketInWorkspace, stopAllTickets, stopTicket } from './lib/run.js';
 import { clearAllTestSessions, createTestSession, deleteTestSession, discoverTestsForSession, doesTestFileExistForSession, getTestSession, isTestSelectionSupported, startTestSessionRun, stopTestSessionRun } from './lib/testSessions.js';
-import { closeCheckRunnerAdmissions, getCheckBatchAttempts, openCheckRunnerAdmissions, rerunCheckBatchAndSchedule, shutdownCheckRunner, startCheckBatch, stopCheckBatch } from './lib/checkRunner.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';
 import { getCheckAutoFixDetails, stopCheckAutoFix } from './lib/checkAutoFix.js';
 import { findActiveCheckAutoFixForTarget, findActiveCheckBatchForTarget, getCheckAttemptDetails, getCheckBatchDetails, getLatestCheckBatchRunIdForTarget, hasActiveProjectCheckBatch, isCheckAttemptCurrent, resolveCheckBatchRerunEligibility } from './lib/checkRuns.js';
 import { getCheckAttemptDiagnosticResponse, getCheckBatchDiagnosticResponse } from './lib/checkDiagnostics.js';
 import { getCheckDefinitionFingerprint } from './lib/checkDefinitions.js';
 import { getCheckGateEvaluation, hydrateCheckGatePresentApplicability } from './lib/checkGateEvaluations.js';
+import { getBuildSetupEvidenceForRun } from './lib/buildSetupAuthority.js';
 import { captureCheckWorkspaceIdentity } from './lib/checkWorkspaceIdentity.js';
 import { hasActiveBundleRepositoryGraphScan, hasActiveProjectRepositoryGraphScan } from './lib/repositoryGraphStore.js';
 import { resolveEffectiveRequiredCheckPolicyMembership, resolveRequiredCheckPolicy } from './lib/requiredCheckPolicy.js';
@@ -231,6 +237,7 @@ const parseMultiValueQuery = (value, allowedValues, fieldName) => {
     };
 };
 const EXECUTION_RUN_STATUSES = ['queued', 'running', 'waiting', 'completed', 'failed', 'cancelled', 'interrupted'];
+const EXECUTION_RUN_DOMAIN_STATUS_FILTERS = ['approval_required'];
 const parseLifecycleListQuery = (query) => {
     const kind = parseMultiValueQuery(query.kind, EXECUTION_RUN_KINDS, 'kind');
     if ('error' in kind) {
@@ -243,6 +250,13 @@ const parseLifecycleListQuery = (query) => {
     if ('error' in status) {
         return status;
     }
+    const domainStatus = parseMultiValueQuery(query.domain_status, EXECUTION_RUN_DOMAIN_STATUS_FILTERS, 'domain_status');
+    if ('error' in domainStatus) {
+        return domainStatus;
+    }
+    if (domainStatus.values.length > 1) {
+        return { error: 'domain_status must include at most one value' };
+    }
     if (query.cursor != null && typeof query.cursor !== 'string') {
         return { error: 'cursor must be a string' };
     }
@@ -253,6 +267,7 @@ const parseLifecycleListQuery = (query) => {
     return {
         kind: kind.values[0],
         statuses: status.values,
+        domainStatus: domainStatus.values[0],
         cursor: typeof query.cursor === 'string' && query.cursor !== '' ? query.cursor : null,
         limit,
     };
@@ -446,9 +461,16 @@ const buildExecutionRunDetailResponse = async (project, run) => {
                         }
                         : run.kind === 'github_actions'
                             ? { ...serializeGitHubActionsExecutionDetail(getGitHubActionsExecutionDetails(project.id, run.id)), retry_eligibility: retryEligibility }
-                            : ['automation_commit', 'automation_push', 'automation_pull_request'].includes(run.kind)
-                                ? { kind: run.kind, available: true, automation_stage: getAutomationStageDetails(project.id, run.id), retry_eligibility: retryEligibility }
-                                : { kind: run.kind, available: true, retry_eligibility: retryEligibility };
+                            : run.kind === 'build'
+                                ? {
+                                    kind: 'build',
+                                    available: true,
+                                    setup_authority: getBuildSetupEvidenceForRun(project.id, run.id),
+                                    retry_eligibility: retryEligibility,
+                                }
+                                : ['automation_commit', 'automation_push', 'automation_pull_request'].includes(run.kind)
+                                    ? { kind: run.kind, available: true, automation_stage: getAutomationStageDetails(project.id, run.id), retry_eligibility: retryEligibility }
+                                    : { kind: run.kind, available: true, retry_eligibility: retryEligibility };
     const artifacts = loadExecutionArtifactSummariesForRuns(project.id, [run.id], MAX_ARTIFACTS_PER_RUN).get(run.id)
         ?? { artifacts: [], artifact_count: 0 };
     return {
@@ -467,17 +489,16 @@ const formatWorktreeDeleteError = (target, branch, error) => {
 const prepareBundleWorkspace = async (bundle, project, options = {}) => {
     const branch = bundle.branch;
     const workspacePath = resolveWorktreePath(branch, project);
-    let setupCompleted = false;
+    let workspacePrepared = false;
     try {
         ensureInitialCommitForWorktrees(project.repo_path);
         await createWorktreeAsync(branch, project, { baseBranch: options.baseBranch ?? null });
         await syncWorktreeFilesAsync(branch, project);
-        await runSetupCommandsInWorkspace(project, workspacePath);
-        setupCompleted = true;
+        workspacePrepared = true;
         return workspacePath;
     }
     finally {
-        if (!setupCompleted) {
+        if (!workspacePrepared) {
             deleteWorktree(branch, project);
         }
     }
@@ -512,6 +533,18 @@ const getBundlePlanBlockerError = () => {
 const hasActiveBundleCheckWork = (projectId, bundleId) => Boolean(getActiveBundleRepairBlocker(bundleId)
     || findActiveCheckBatchForTarget(projectId, 'bundle', bundleId)
     || findActiveCheckAutoFixForTarget(projectId, 'bundle', bundleId));
+const buildBranchCleanupWarning = (branch, result) => {
+    if (result === 'unmerged') {
+        return `Git branch "${branch}" was kept because it contains commits that are not merged into its base branch.`;
+    }
+    if (result === 'checked-out') {
+        return `Git branch "${branch}" was kept because it is still checked out in another worktree.`;
+    }
+    if (result === 'failed') {
+        return `Git branch "${branch}" could not be deleted automatically.`;
+    }
+    return null;
+};
 const cleanupWorktreeExecutionTarget = async ({ project, targetKind, targetKey, targetLabel, worktreeTarget, branch, }) => {
     try {
         await cleanupExecutionEnvironmentsForTarget({
@@ -530,6 +563,7 @@ const cleanupWorktreeExecutionTarget = async ({ project, targetKind, targetKey,
     catch (error) {
         throw new HttpError(500, formatWorktreeDeleteError(worktreeTarget, branch, error));
     }
+    return { branchWarning: buildBranchCleanupWarning(branch, deleteLocalBranch(branch, project)) };
 };
 const deleteTicketRecord = async (ticket) => {
     if (ticket.project_id
@@ -1471,6 +1505,14 @@ const resolveBundleLatestBuiltTicket = (tickets) => {
         return right.id.localeCompare(left.id);
     })[0] ?? null;
 };
+const resolveBundleNewestEligibleTicket = (tickets) => {
+    const eligibleTickets = tickets.filter(ticket => ticket.state !== 'plan' && ticket.parked_at === null);
+    const latestBuiltTicket = resolveBundleLatestBuiltTicket(eligibleTickets);
+    if (latestBuiltTicket) {
+        return latestBuiltTicket;
+    }
+    return sortBundleTicketsByExecutionOrder(eligibleTickets).at(-1) ?? null;
+};
 const resolveBundleTargetTicket = (tickets, options = {}) => {
     const explicitTargetTicket = options.targetTicketId
         ? tickets.find(ticket => ticket.id === options.targetTicketId) ?? null
@@ -1479,6 +1521,7 @@ const resolveBundleTargetTicket = (tickets, options = {}) => {
         ? tickets.find(ticket => ticket.id === options.reviewOwnerTicketId) ?? null
         : null;
     const runningTicket = tickets.find(ticket => ticket.agent_status === 'running') ?? null;
+    const newestEligibleTicket = resolveBundleNewestEligibleTicket(tickets);
     const latestBuiltTicket = resolveBundleLatestBuiltTicket(tickets);
     const latestSessionTicket = options.latestSessionTicketId
         ? tickets.find(ticket => ticket.id === options.latestSessionTicketId && ticket.session_id) ?? null
@@ -1488,6 +1531,7 @@ const resolveBundleTargetTicket = (tickets, options = {}) => {
         : null;
     return explicitTargetTicket
         ?? reviewOwnerTicket
+        ?? newestEligibleTicket
         ?? runningTicket
         ?? latestBuiltTicket
         ?? latestSessionTicket
@@ -2556,6 +2600,8 @@ registerExecutionEnvironmentRoutes(app, {
     adapter: dockerSandboxAdapter,
     runtimeController: dockerSandboxRuntimeController,
 });
+registerExecutionProfileRoutes(app);
+registerApprovalRoutes(app, { emitter: io });
 const requireDesktopMobileAccessRequest = (req, res) => {
     const rejectionReason = validateDesktopMobileAccessRequest(req);
     if (!rejectionReason) {
@@ -3957,8 +4003,9 @@ app.delete('/bundles/:id', async (req, res) => {
     const affectedSpecSessionIds = listSpecSessions(result.project.id)
         .filter(specSession => specSession.target_bundle_id === bundle.id)
         .map(specSession => specSession.id);
+    let cleanupResult;
     try {
-        await cleanupWorktreeExecutionTarget({
+        cleanupResult = await cleanupWorktreeExecutionTarget({
             project: result.project,
             targetKind: 'bundle-worktree',
             targetKey: createExecutionTargetKey(result.project.id, {
@@ -3989,6 +4036,9 @@ app.delete('/bundles/:id', async (req, res) => {
             io.emit('spec-session:updated', updatedSpecSession);
         }
     });
+    if (cleanupResult.branchWarning) {
+        return res.status(200).json({ warning: cleanupResult.branchWarning });
+    }
     res.status(204).end();
 });
 app.patch('/bundles/:id', (req, res) => {
@@ -7279,8 +7329,28 @@ app.post('/projects/:id/git-push', async (req, res) => {
         return res.status(workspace.status).json({ error: workspace.error });
     }
     const forceWithLease = req.body?.force_with_lease === true;
+    if (forceWithLease) {
+        try {
+            const admission = await admitForcePush({
+                project: workspace.project,
+                cwd: workspace.cwd,
+                branch: workspace.branch,
+                source: {
+                    kind: 'project',
+                    id: project.id,
+                    targetKind: workspace.target_kind,
+                    bundleId: workspace.target_bundle_id,
+                },
+                emitter: io,
+            });
+            return res.status(202).json(admission);
+        }
+        catch (error) {
+            return res.status(409).json({ error: getErrorMessage(error) || 'Unable to request force-push approval right now.' });
+        }
+    }
     try {
-        await pushCurrentBranch(workspace.cwd, workspace.branch, { forceWithLease });
+        await pushCurrentBranch(workspace.cwd, workspace.branch, { forceWithLease: false });
     }
     catch (error) {
         return res.status(409).json({ error: getErrorMessage(error) || 'Unable to push the branch right now.' });
@@ -7345,6 +7415,12 @@ app.patch('/projects/:id', (req, res) => {
     if (!project) {
         return res.status(404).json({ error: 'Not found' });
     }
+    if (Object.hasOwn(req.body ?? {}, 'build_execution_provider')) {
+        return res.status(409).json({
+            error: 'Build execution provider changes must use the execution profile endpoint',
+            reason: 'execution_profile_required',
+        });
+    }
     const validation = validateProjectPayload(asProjectPayload(req.body), { partial: true, currentProjectId: project.id });
     if ('error' in validation) {
         return res.status(400).json({ error: validation.error });
@@ -7357,7 +7433,7 @@ app.patch('/projects/:id', (req, res) => {
             });
         }
     }
-    const { name, repo_path, build_execution_provider, 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, reviewer_model, reviewer_variant, 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 { 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, reviewer_model, reviewer_variant, 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
       name = ?,
@@ -7424,7 +7500,7 @@ app.patch('/projects/:id', (req, res) => {
         if ('error' in policyReferences) {
             return policyReferences;
         }
-        updateProject.run(name ?? project.name, repo_path ?? project.repo_path, hasOwn(validation.values, 'build_execution_provider') ? build_execution_provider : project.build_execution_provider, hasOwn(validation.values, 'run_setup') ? run_setup : project.run_setup, hasOwn(validation.values, 'run_services') ? run_services : project.run_services, nextCheckDefinitions, nextRequiredCheckDefinitionIds, nextPreReviewCheckDefinitionIds, nextPostBuildCheckDefinitionIds, nextAutoFixCheckDefinitionIds, hasOwn(validation.values, 'test_commands') ? test_commands : project.test_commands, hasOwn(validation.values, 'run_ide') ? run_ide : project.run_ide, hasOwn(validation.values, 'preview_service_name') ? preview_service_name : project.preview_service_name, hasOwn(validation.values, 'preview_path') ? preview_path : project.preview_path, hasOwn(validation.values, 'preview_capability_mode') ? preview_capability_mode : project.preview_capability_mode, hasOwn(validation.values, 'helper_model') ? helper_model : project.helper_model, hasOwn(validation.values, 'helper_variant') ? helper_variant : project.helper_variant, nextReviewerModel, nextReviewerVariant, hasOwn(validation.values, 'commit_message_rules') ? commit_message_rules : project.commit_message_rules, hasOwn(validation.values, 'commit_after_each_ticket') ? commit_after_each_ticket : project.commit_after_each_ticket, hasOwn(validation.values, 'auto_park_stale_tickets') ? auto_park_stale_tickets : project.auto_park_stale_tickets, hasOwn(validation.values, 'memory_enabled') ? memory_enabled : project.memory_enabled, hasOwn(validation.values, 'scan_include_globs_json') ? scan_include_globs_json : project.scan_include_globs_json, hasOwn(validation.values, 'scan_exclude_globs_json') ? scan_exclude_globs_json : project.scan_exclude_globs_json, hasOwn(validation.values, 'worktree_sync') ? worktree_sync : project.worktree_sync, hasOwn(validation.values, 'spec_aware_code_review_enabled') ? spec_aware_code_review_enabled : project.spec_aware_code_review_enabled, hasOwn(validation.values, 'automation_depth') ? automation_depth : project.automation_depth, hasOwn(validation.values, 'automation_review_fix_enabled') ? automation_review_fix_enabled : project.automation_review_fix_enabled, hasOwn(validation.values, 'automation_pause_on_open_questions') ? automation_pause_on_open_questions : project.automation_pause_on_open_questions, hasOwn(validation.values, 'automation_review_severity') ? automation_review_severity : project.automation_review_severity, hasOwn(validation.values, 'automation_review_max_iterations') ? automation_review_max_iterations : project.automation_review_max_iterations, req.params.id);
+        updateProject.run(name ?? project.name, repo_path ?? project.repo_path, project.build_execution_provider, hasOwn(validation.values, 'run_setup') ? run_setup : project.run_setup, hasOwn(validation.values, 'run_services') ? run_services : project.run_services, nextCheckDefinitions, nextRequiredCheckDefinitionIds, nextPreReviewCheckDefinitionIds, nextPostBuildCheckDefinitionIds, nextAutoFixCheckDefinitionIds, hasOwn(validation.values, 'test_commands') ? test_commands : project.test_commands, hasOwn(validation.values, 'run_ide') ? run_ide : project.run_ide, hasOwn(validation.values, 'preview_service_name') ? preview_service_name : project.preview_service_name, hasOwn(validation.values, 'preview_path') ? preview_path : project.preview_path, hasOwn(validation.values, 'preview_capability_mode') ? preview_capability_mode : project.preview_capability_mode, hasOwn(validation.values, 'helper_model') ? helper_model : project.helper_model, hasOwn(validation.values, 'helper_variant') ? helper_variant : project.helper_variant, nextReviewerModel, nextReviewerVariant, hasOwn(validation.values, 'commit_message_rules') ? commit_message_rules : project.commit_message_rules, hasOwn(validation.values, 'commit_after_each_ticket') ? commit_after_each_ticket : project.commit_after_each_ticket, hasOwn(validation.values, 'auto_park_stale_tickets') ? auto_park_stale_tickets : project.auto_park_stale_tickets, hasOwn(validation.values, 'memory_enabled') ? memory_enabled : project.memory_enabled, hasOwn(validation.values, 'scan_include_globs_json') ? scan_include_globs_json : project.scan_include_globs_json, hasOwn(validation.values, 'scan_exclude_globs_json') ? scan_exclude_globs_json : project.scan_exclude_globs_json, hasOwn(validation.values, 'worktree_sync') ? worktree_sync : project.worktree_sync, hasOwn(validation.values, 'spec_aware_code_review_enabled') ? spec_aware_code_review_enabled : project.spec_aware_code_review_enabled, hasOwn(validation.values, 'automation_depth') ? automation_depth : project.automation_depth, hasOwn(validation.values, 'automation_review_fix_enabled') ? automation_review_fix_enabled : project.automation_review_fix_enabled, hasOwn(validation.values, 'automation_pause_on_open_questions') ? automation_pause_on_open_questions : project.automation_pause_on_open_questions, hasOwn(validation.values, 'automation_review_severity') ? automation_review_severity : project.automation_review_severity, hasOwn(validation.values, 'automation_review_max_iterations') ? automation_review_max_iterations : project.automation_review_max_iterations, req.params.id);
         if (hasOwn(validation.values, 'linked_project_ids')) {
             replaceProjectLinks(project.id, linked_project_ids ?? []);
         }
@@ -7471,6 +7547,17 @@ const assertProjectDeletionEligible = (projectId, claimId) => {
     if (!claimId && hasActiveProjectRepositoryGraphScan(projectId)) {
         throw new ProjectDeletionError(409, 'Cannot delete a project while a repository graph scan is active');
     }
+    if (db.prepare("SELECT 1 FROM sqlite_master WHERE type = 'table' AND name = 'approval_requests'").get() && db.prepare(`
+    SELECT 1 FROM approval_requests request
+    JOIN execution_runs run
+      ON run.id = request.execution_run_id AND run.project_id = request.project_id
+    WHERE request.project_id = ?
+      AND request.status IN ('pending', 'approved', 'consumed')
+      AND run.status IN ('queued', 'running', 'waiting')
+    LIMIT 1
+  `).get(projectId)) {
+        throw new ProjectDeletionError(409, 'Cannot delete a project while consequential action approval is active');
+    }
 };
 const completeClaimedProjectDeletion = async (projectId, claimId) => {
     const marked = db.prepare(`
@@ -8025,7 +8112,7 @@ app.post('/tickets/:id/retry', (req, res) => {
           LIMIT 1
         `).get(ticket.project_id, ticket.id)
             : undefined;
-        const acceptRetry = () => {
+        const acceptRetry = (selection) => {
             db.prepare('UPDATE tickets SET agent_status = NULL, agent_log = NULL, agent_message_id = NULL, previous_agent_log = NULL, previous_agent_message_id = NULL, streaming_response = NULL, build_completed_at = NULL, auto_park_dismissed_at = NULL, updated_at = CURRENT_TIMESTAMP WHERE id = ?').run(req.params.id);
             const updated = getTicket(req.params.id);
             if (!updated) {
@@ -8038,6 +8125,7 @@ app.post('/tickets/:id/retry', (req, res) => {
                     projectId: updated.project_id,
                     worktreeBundleId: updated.worktree_bundle_id,
                     activate: shouldStartBundleBuildNow(updated),
+                    selection,
                 }).sequenceId;
             }
             return {
@@ -8049,7 +8137,19 @@ app.post('/tickets/:id/retry', (req, res) => {
         if (ticket.project_id && ticket.worktree_bundle_id && hasActiveSequenceForBundle(ticket.project_id, ticket.worktree_bundle_id)) {
             try {
                 withExecutionRunTransaction(transaction => {
-                    const acceptance = acceptRetry();
+                    releaseQueuedBuildSequenceTicketExecutionRunForRetry({
+                        projectId: ticket.project_id,
+                        worktreeBundleId: ticket.worktree_bundle_id,
+                        ticketId: ticket.id,
+                        cancelExecutionRun: runId => transaction.transitionExecutionRun({
+                            projectId: ticket.project_id,
+                            runId,
+                            status: 'cancelled',
+                            domainStatus: 'cancelled',
+                            eventType: 'retry_superseded',
+                        }),
+                    });
+                    const acceptance = acceptRetry(createExecutionProfileSelection(ticket.project_id));
                     if (!acceptance.sequenceId) {
                         throw new Error('Build sequence no longer exists');
                     }
@@ -8057,7 +8157,9 @@ app.post('/tickets/:id/retry', (req, res) => {
                     if (!project) {
                         throw new Error('Build project no longer exists');
                     }
-                    transaction.createExecutionRun({
+                    const selection = getBuildSequenceTicketExecutionProfileSelection(acceptance.sequenceId, acceptance.ticket.id);
+                    const profileRevision = validateExecutionProfileSelection(ticket.project_id, selection);
+                    const executionRun = transaction.createExecutionRun({
                         projectId: ticket.project_id,
                         kind: 'build',
                         domainStatus: 'queued',
@@ -8067,12 +8169,14 @@ app.post('/tickets/:id/retry', (req, res) => {
                             { entityType: 'build_sequence', entityId: acceptance.sequenceId, relationship: 'context' },
                         ],
                         metadata: {
-                            build_execution_provider: project.build_execution_provider ?? 'host',
+                            build_execution_provider: profileRevision.profile.provider_preference,
+                            ...executionProfileSelectionMetadata(selection),
                         },
                         initiatedBy: 'user',
                         retryOfRunId: retrySource?.id ?? null,
                         eventType: 'build_created',
                     });
+                    bindBuildSequenceTicketExecutionRun(acceptance.sequenceId, acceptance.ticket.id, executionRun.id);
                 }, io);
             }
             catch (error) {
@@ -8353,8 +8457,32 @@ app.post('/tickets/:id/git-push', async (req, res) => {
     }
     const previousTickets = listTicketsInRunContext(ticket);
     const forceWithLease = req.body?.force_with_lease === true;
+    if (forceWithLease) {
+        try {
+            const admission = await admitForcePush({
+                project: workspace.project,
+                cwd: workspace.cwd,
+                branch: workspace.branch,
+                source: {
+                    kind: 'ticket',
+                    id: ticket.id,
+                    targetKind: workspace.kind === 'project_root'
+                        ? 'repo_root'
+                        : ticket.worktree_bundle_id
+                            ? 'bundle'
+                            : 'ticket',
+                    bundleId: ticket.worktree_bundle_id ?? null,
+                },
+                emitter: io,
+            });
+            return res.status(202).json(admission);
+        }
+        catch (error) {
+            return res.status(409).json({ error: getErrorMessage(error) || 'Unable to request force-push approval right now.' });
+        }
+    }
     try {
-        await pushCurrentBranch(workspace.cwd, workspace.branch, { forceWithLease });
+        await pushCurrentBranch(workspace.cwd, workspace.branch, { forceWithLease: false });
     }
     catch (error) {
         return res.status(409).json({ error: getErrorMessage(error) || 'Unable to push the branch right now.' });
@@ -8836,6 +8964,7 @@ app.get('/projects/:id/execution-runs', (req, res) => {
             projectId: project.id,
             kind: query.kind,
             statuses: query.statuses,
+            domainStatus: query.domainStatus,
             cursor: query.cursor,
             limit: query.limit,
         }));
@@ -8905,6 +9034,7 @@ app.get('/projects/:id/execution-timeline', (req, res) => {
             project,
             kind: query.kind,
             statuses: query.statuses,
+            domainStatus: query.domainStatus,
             cursor: query.cursor,
             limit: query.limit,
             scope: scope.scopeEntity,
@@ -9364,8 +9494,11 @@ io.on('connection', (socket) => {
     registerTerminalSocketHandlers(io, socket);
 });
 const DEFAULT_PORT = 3001;
+const APPROVAL_RECONCILIATION_INTERVAL_MS = 30_000;
 let executionEvidenceCleanupTimer = null;
 let executionArtifactCleanupTimer = null;
+let approvalReconciliationTimer = null;
+let approvalReconciliationPromise = null;
 let executionArtifactCleanupPromise = null;
 let startServerPromise = null;
 let shutdownServerPromise = null;
@@ -9441,6 +9574,45 @@ const startExecutionArtifactCleanupTimer = () => {
     }, resolveArtifactCleanupIntervalMs());
     executionArtifactCleanupTimer.unref();
 };
+const runApprovalReconciliation = () => {
+    if (approvalReconciliationPromise) {
+        return approvalReconciliationPromise;
+    }
+    approvalReconciliationPromise = reconcileApprovalRequests({
+        emitter: io,
+        includeConsumed: false,
+        resumeApproved: async (request) => {
+            if (request.action_kind === 'git_push') {
+                await resumeGitPushApproval(request.project_id, request.id, io);
+            }
+            else {
+                await resumeProductionCheckApproval(request.project_id, request.id, io);
+            }
+        },
+        resolveTerminal: async (request) => {
+            if (request.action_kind === 'git_push') {
+                await finalizeGitPushApproval(request.project_id, request.id, io);
+            }
+            else {
+                finalizeProductionCheckApproval(request.project_id, request.id, io);
+            }
+        },
+    }).then(() => undefined).catch(error => {
+        console.error('Failed to reconcile approval requests', error);
+    }).finally(() => {
+        approvalReconciliationPromise = null;
+    });
+    return approvalReconciliationPromise;
+};
+const startApprovalReconciliationTimer = () => {
+    if (approvalReconciliationTimer) {
+        return;
+    }
+    approvalReconciliationTimer = setInterval(() => {
+        void runApprovalReconciliation();
+    }, APPROVAL_RECONCILIATION_INTERVAL_MS);
+    approvalReconciliationTimer.unref();
+};
 const resolveStartResult = (host) => {
     const address = httpServer.address();
     const { displayHost } = resolveDesktopServerHost(host);
@@ -9510,6 +9682,7 @@ export const startServer = ({ port = DEFAULT_PORT, host } = {}) => {
         throwIfShutdownRequested();
         startExecutionEvidenceCleanupTimer();
         startExecutionArtifactCleanupTimer();
+        startApprovalReconciliationTimer();
         return resolveStartResult(host);
     })().finally(() => {
         startServerPromise = null;
@@ -9538,6 +9711,11 @@ export const shutdownServer = async (signal) => {
             clearInterval(executionArtifactCleanupTimer);
             executionArtifactCleanupTimer = null;
         }
+        if (approvalReconciliationTimer) {
+            clearInterval(approvalReconciliationTimer);
+            approvalReconciliationTimer = null;
+        }
+        await approvalReconciliationPromise;
         await executionArtifactCleanupPromise;
         await stopMobileAccess();
         const repositoryGraphSchemaExists = db.prepare(`