@straiffi/archon 1.11.2 → 1.11.4

package/dist/server/index.js

@@ -13,7 +13,9 @@ import { registerRepositoryGraphRoutes } from './lib/repositoryGraphRoutes.js';
 import { registerExecutionEnvironmentRoutes } from './lib/executionEnvironmentRoutes.js';
 import { registerExecutionProfileRoutes } from './lib/executionProfileRoutes.js';
 import { executionProfileSupportsChecks, hasConfiguredCheckPolicy } from './lib/executionProfileCheckPolicy.js';
-import { getActiveExecutionProfileRevision } from './lib/executionProfileStore.js';
+import { activateExecutionProfileRevisionInTransaction, getActiveExecutionProfileRevision } from './lib/executionProfileStore.js';
+import { normalizeExecutionProfile } from './lib/executionProfiles.js';
+import { requestExecutionEnvironmentRetirementForProfile } from './lib/executionEnvironments.js';
 import { registerApprovalRoutes } from './lib/approvalRoutes.js';
 import { admitForcePush, finalizeGitPushApproval, resumeGitPushApproval } from './lib/gitPushApprovals.js';
 import { reconcileApprovalRequests } from './lib/approvalReconciliation.js';
@@ -32,7 +34,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, 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 { 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 config from './lib/config.js';
 import { getActiveTool, initializeActiveTool, setActiveTool } from './lib/activeTool.js';
 import { autoConfigProject, ProjectAutoConfigError } from './lib/projectAutoConfig.js';
@@ -45,6 +47,7 @@ import { refreshChatSessionUsageSnapshot, refreshSpecSessionUsageSnapshot, stopA
 import { runTrackedLightweightPrompt } 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';
 import { createExecutionProfileSelection, createServiceExecutionProfileSelection, executionProfileSelectionMetadata, validateExecutionProfileSelection } from './lib/executionRunAuthority.js';
 import { prepareTicketForBuild } from './lib/buildFlow.js';
 import { getActiveBundleRepairBlocker, getBundlePlanMutationBlockerById, shouldBlockPlanForBundleMutationById, } from './lib/bundleActivity.js';
@@ -99,7 +102,7 @@ import { dispatchGitHubWorkflow, getGitHubWorkflowDispatchConfig, getGitHubWorkf
 import { clearAllGitHubActionsSessions, getActiveTrackedRunCount, getTrackedGitHubActionsRuns, startGitHubActionsPolling, trackGitHubActionsRun, } from './lib/integrations/githubActionsSessions.js';
 import { reconcileStartupExecutions } from './lib/executionReconciliation.js';
 import { cleanupProjectExecutionEnvironments, cleanupExecutionEnvironmentsForTarget, ExecutionEnvironmentCleanupError, reconcileOrphanedExecutionEnvironments, reconcileExecutionEnvironments, reconcileExecutionEnvironmentLifecycleOperations, reconcileProductionExecutionEnvironmentBindings, } from './lib/executionEnvironmentReconciliation.js';
-import { createExecutionTargetKey } from './lib/executionTargets.js';
+import { createExecutionTargetKey, resolveExecutionTarget, resolveProjectRootExecutionTarget } from './lib/executionTargets.js';
 import { getExecutionEnvironmentContextForRun } from './lib/executionEnvironmentContexts.js';
 import { PlanningReferenceError, resolveExternalPlanningDescription } from './lib/integrations/planning.js';
 import { refreshIfNeeded as refreshAssignedIssues, clearCachedAssignedIssues } from './lib/integrations/assignedIssuesCache.js';
@@ -1223,12 +1226,13 @@ const resolveTicketGitWorkspaceFromContext = (ticket) => {
 };
 const resolveProjectRootGitWorkspace = (project) => {
     const branchState = getProjectBranch(project, { includeDiffStats: false });
-    if (branchState.status !== 'ready' || !branchState.branch) {
+    const branch = branchState.status === 'ready' ? branchState.branch : getActiveRebaseBranch(project.repo_path);
+    if (!branch) {
         return { error: 'Project root must be on a named branch', status: 409 };
     }
     return {
         project,
-        branch: branchState.branch,
+        branch,
         cwd: project.repo_path,
     };
 };
@@ -3728,6 +3732,63 @@ app.get('/tickets/:id/git-status', async (req, res) => {
     const refreshRemote = req.query.refresh_remote === 'true';
     return res.json(await getGitStatusAsync(workspace.cwd, workspace.branch, workspace.project, { refreshRemote }));
 });
+app.get('/tickets/:id/rebase-staged-diff', (req, res) => {
+    const ticket = getTicketRouteContext(req.params.id);
+    if (!ticket || !matchesTicketProjectContext(ticket, req)) {
+        return res.status(404).json({ error: 'Not found' });
+    }
+    const workspace = resolveTicketGitWorkspaceFromContext(ticket);
+    if ('error' in workspace) {
+        return res.status(workspace.status).json({ error: workspace.error });
+    }
+    return res.json(getRebaseStagedDiff(workspace.cwd));
+});
+app.post('/tickets/:id/git-rebase-continue', async (req, res) => {
+    const ticket = getTicketRouteContext(req.params.id);
+    if (!ticket || !matchesTicketProjectContext(ticket, req)) {
+        return res.status(404).json({ error: 'Not found' });
+    }
+    const workspace = resolveTicketGitWorkspaceFromContext(ticket);
+    if ('error' in workspace) {
+        return res.status(workspace.status).json({ error: workspace.error });
+    }
+    const result = await continueGitRebase(workspace.cwd, workspace.branch, workspace.project, {
+        expectedStepSignature: typeof req.body?.expected_step_signature === 'string' ? req.body.expected_step_signature : '',
+        branch: typeof req.body?.branch === 'string' ? req.body.branch.trim() : '',
+        selectedPaths: Array.isArray(req.body?.selected_paths) ? req.body.selected_paths.filter((path) => typeof path === 'string') : [],
+        acknowledgedPaths: Array.isArray(req.body?.acknowledged_paths) ? req.body.acknowledged_paths.filter((path) => typeof path === 'string') : [],
+    });
+    return res.status(result.outcome === 'stale_step' || result.outcome === 'rejected' ? 409 : 200).json(result);
+});
+app.post('/tickets/:id/git-rebase-skip', async (req, res) => {
+    const ticket = getTicketRouteContext(req.params.id);
+    if (!ticket || !matchesTicketProjectContext(ticket, req)) {
+        return res.status(404).json({ error: 'Not found' });
+    }
+    const workspace = resolveTicketGitWorkspaceFromContext(ticket);
+    if ('error' in workspace) {
+        return res.status(workspace.status).json({ error: workspace.error });
+    }
+    const result = await skipGitRebaseStep(workspace.cwd, workspace.branch, workspace.project, typeof req.body?.expected_step_signature === 'string' ? req.body.expected_step_signature : '', typeof req.body?.branch === 'string' ? req.body.branch.trim() : '');
+    return res.status(result.outcome === 'stale_step' || result.outcome === 'rejected' ? 409 : 200).json(result);
+});
+app.post('/tickets/:id/git-abort', async (req, res) => {
+    const ticket = getTicketRouteContext(req.params.id);
+    if (!ticket || !matchesTicketProjectContext(ticket, req)) {
+        return res.status(404).json({ error: 'Not found' });
+    }
+    const workspace = resolveTicketGitWorkspaceFromContext(ticket);
+    if ('error' in workspace) {
+        return res.status(workspace.status).json({ error: workspace.error });
+    }
+    try {
+        await abortGitOperation(workspace.cwd);
+        return res.json(getGitStatus(workspace.cwd, workspace.branch, workspace.project));
+    }
+    catch (error) {
+        return res.status(409).json({ error: getErrorMessage(error) || 'Unable to abort the current git operation right now.' });
+    }
+});
 app.get('/tickets/:id/git-commits', async (req, res) => {
     const ticket = getTicketRouteContext(req.params.id);
     if (!ticket) {
@@ -4453,6 +4514,24 @@ app.post('/bundles/:id/build', (req, res) => {
     }
     res.status(buildResult.status).json(buildResult.value);
 });
+app.post('/bundles/:id/build/resume', (req, res) => {
+    const result = getRequiredProject(req);
+    if ('error' in result) {
+        return res.status(400).json({ error: result.error });
+    }
+    const resumeResult = resumeRemainingBundleBuilds({
+        projectId: result.project.id,
+        bundleId: req.params.id,
+        broadcaster: io,
+    });
+    if (!resumeResult.ok) {
+        return res.status(resumeResult.status).json({
+            error: resumeResult.error,
+            ...('details' in resumeResult ? resumeResult.details : {}),
+        });
+    }
+    return res.status(resumeResult.status).json(serializeBundleDetails(resumeResult.project, resumeResult.bundle, { target_ticket_id: resumeResult.targetTicketId }));
+});
 app.post('/bundles/:id/review', (req, res) => {
     const result = getRequiredProject(req);
     if ('error' in result) {
@@ -6667,7 +6746,7 @@ app.post('/planning-agent', async (req, res) => {
         if ('error' in requestedBundleSelection) {
             return res.status(requestedBundleSelection.status).json({ error: requestedBundleSelection.error });
         }
-        const bundleSelection = requestedBundleSelection.bundleId === null
+        const bundleSelection = requestedBundleSelection.bundleId === null && !requestedBundleSelection.provided
             ? (() => {
                 const bundle = createAutoPlanningBundle(project.id);
                 autoCreatedBundle = bundle;
@@ -6678,6 +6757,29 @@ app.post('/planning-agent', async (req, res) => {
                 };
             })()
             : requestedBundleSelection;
+        const planningExecutionTarget = autoCreatedBundle
+            ? null
+            : await (async () => {
+                try {
+                    if (bundleSelection.bundleId && bundleSelection.branch) {
+                        return await resolveExecutionTarget({
+                            project,
+                            descriptor: {
+                                kind: 'bundle-worktree',
+                                bundleId: bundleSelection.bundleId,
+                                branch: bundleSelection.branch,
+                            },
+                        });
+                    }
+                    if (bundleSelection.provided && bundleSelection.bundleId === null) {
+                        return await resolveProjectRootExecutionTarget(project);
+                    }
+                }
+                catch {
+                    // Preview context is best-effort and must not fail or redirect planning.
+                }
+                return null;
+            })();
         const plannerOptions = {
             tool,
             model: typeof model === 'string' ? model : null,
@@ -6711,6 +6813,7 @@ app.post('/planning-agent', async (req, res) => {
         const executionPlannerOptions = {
             ...plannerOptions,
             executionContext,
+            executionTarget: planningExecutionTarget ?? undefined,
             agentRunParent: { parentType: 'planning', parentId: project.id, io },
         };
         transitionExecutionRun({
@@ -7734,16 +7837,73 @@ app.post('/projects/:id/git-rebase', async (req, res) => {
         await rebaseGitBranchOntoBase(workspace.cwd, workspace.branch, workspace.project, baseBranch || null);
     }
     catch (error) {
+        const status = getGitStatus(workspace.cwd, workspace.branch, workspace.project);
+        if (status.operation_state === 'rebase' && status.rebase_step) {
+            return res.json({ outcome: 'paused', status });
+        }
         return res.status(409).json({ error: getErrorMessage(error) || 'Unable to rebase the current branch right now.' });
     }
     try {
-        return res.json(getGitStatus(workspace.cwd, workspace.branch, workspace.project));
+        return res.json({
+            outcome: 'completed',
+            status: getGitStatus(workspace.cwd, workspace.branch, workspace.project),
+        });
     }
     catch (error) {
         console.error(`Failed to read branch after rebase for project ${project.id}:`, error);
         return res.status(500).json({ error: 'Unable to determine project branch' });
     }
 });
+app.post('/projects/:id/git-rebase-continue', async (req, res) => {
+    const project = getProjectById(req.params.id);
+    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 expectedStepSignature = typeof req.body?.expected_step_signature === 'string' ? req.body.expected_step_signature : '';
+    const branch = typeof req.body?.branch === 'string' ? req.body.branch.trim() : '';
+    const selectedPaths = Array.isArray(req.body?.selected_paths)
+        ? req.body.selected_paths.filter((path) => typeof path === 'string')
+        : [];
+    const acknowledgedPaths = Array.isArray(req.body?.acknowledged_paths)
+        ? req.body.acknowledged_paths.filter((path) => typeof path === 'string')
+        : [];
+    const result = await continueGitRebase(workspace.cwd, workspace.branch, workspace.project, {
+        expectedStepSignature,
+        branch,
+        selectedPaths,
+        acknowledgedPaths,
+    });
+    return res.status(result.outcome === 'stale_step' || result.outcome === 'rejected' ? 409 : 200).json(result);
+});
+app.get('/projects/:id/rebase-staged-diff', (req, res) => {
+    const project = getProjectById(req.params.id);
+    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 });
+    }
+    return res.json(getRebaseStagedDiff(workspace.cwd));
+});
+app.post('/projects/:id/git-rebase-skip', async (req, res) => {
+    const project = getProjectById(req.params.id);
+    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 expectedStepSignature = typeof req.body?.expected_step_signature === 'string' ? req.body.expected_step_signature : '';
+    const branch = typeof req.body?.branch === 'string' ? req.body.branch.trim() : '';
+    const result = await skipGitRebaseStep(workspace.cwd, workspace.branch, workspace.project, expectedStepSignature, branch);
+    return res.status(result.outcome === 'stale_step' || result.outcome === 'rejected' ? 409 : 200).json(result);
+});
 app.post('/projects/:id/git-abort', async (req, res) => {
     const project = getProjectById(req.params.id);
     if (!project) {
@@ -8174,6 +8334,7 @@ app.patch('/projects/:id', async (req, res) => {
     const nextReviewerVariant = nextReviewerModel
         ? (hasOwn(validation.values, 'reviewer_variant') ? reviewer_variant ?? null : project.reviewer_variant)
         : null;
+    let activatedCheckProfileFingerprint = null;
     const applyUpdate = db.transaction(() => {
         const currentProject = getProjectById(project.id);
         if (!currentProject || JSON.stringify(currentProject) !== JSON.stringify(project)) {
@@ -8208,15 +8369,44 @@ app.patch('/projects/:id', async (req, res) => {
             post_build_check_definition_ids: nextPostBuildCheckDefinitionIds,
             auto_fix_check_definition_ids: nextAutoFixCheckDefinitionIds,
         });
-        if (hasConfiguredChecks && project.active_execution_profile_revision_id) {
+        if (hasConfiguredChecks) {
             const activeProfile = getActiveExecutionProfileRevision(project.id);
-            if (!activeProfile || !executionProfileSupportsChecks(activeProfile.profile)) {
+            if (!activeProfile) {
                 return {
-                    error: 'Configured check policies require an execution profile with an explicit check template',
-                    reason: 'check_template_required',
-                    status: 409,
+                    error: 'Active execution profile is unavailable',
+                    reason: 'profile_unavailable',
+                    status: 500,
                 };
             }
+            if (!executionProfileSupportsChecks(activeProfile.profile)) {
+                const normalizedProfile = normalizeExecutionProfile({
+                    ...activeProfile.profile,
+                    eligible_workloads: [...activeProfile.profile.eligible_workloads, 'check'],
+                    check_template_policy: { mode: 'agent_template', agent: 'opencode' },
+                });
+                if (!normalizedProfile.ok) {
+                    return {
+                        error: normalizedProfile.error,
+                        reason: 'profile_invalid',
+                        status: 500,
+                    };
+                }
+                const activation = activateExecutionProfileRevisionInTransaction({
+                    projectId: project.id,
+                    expectedActiveRevisionId: activeProfile.id,
+                    profile: normalizedProfile.profile,
+                });
+                if (!activation.ok) {
+                    return {
+                        error: 'The active execution profile changed; retry the update',
+                        reason: 'stale_profile_revision',
+                        status: 409,
+                    };
+                }
+                if (activation.revision.id !== activeProfile.id) {
+                    activatedCheckProfileFingerprint = activation.revision.fingerprint;
+                }
+            }
         }
         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, hasOwn(validation.values, 'helper_models_json') ? helper_models_json : project.helper_models_json, nextReviewerModel, nextReviewerVariant, hasOwn(validation.values, 'reviewer_models_json') ? reviewer_models_json : project.reviewer_models_json, 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')) {
@@ -8243,6 +8433,9 @@ app.patch('/projects/:id', async (req, res) => {
             ...('reason' in updateResult ? { reason: updateResult.reason } : {}),
         });
     }
+    if (activatedCheckProfileFingerprint) {
+        requestExecutionEnvironmentRetirementForProfile(project.id, activatedCheckProfileFingerprint);
+    }
     const updated = db.prepare('SELECT * FROM projects WHERE id = ?').get(req.params.id);
     res.json(serializeProject(updated ?? null));
 });