@straiffi/archon 1.8.5 → 1.8.6

package/dist/server/index.js

@@ -19,7 +19,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, getGitDiffData, getGitDiffFiles, getGitStatus, getGitUnifiedDiff, getLocalProjectBranch, getProjectBranch, getProjectBranchSuggestions, getSelectedGitUnifiedDiff, getUnpushedCommitDiffForCwd, hasKnownBranchRef, listUnpushedCommitsForCwd, pullGitBranch, pushCurrentBranch, rebaseGitBranchOntoBase, resolveExistingWorktreePath, resolveWorktreePath, summarizeTicketDiffFiles, switchProjectBranch, syncWorktreeFilesAsync, undoLatestUnpushedCommitForCwd, UnpushedCommitDiffSelectionError } from './lib/git.js';
+import { abortGitOperation, branchExistsLocally, commitGitChanges, createWorktreeAsync, deleteWorktree, getBundleReviewDiffForCwd, getGitDiffData, getGitDiffFiles, getGitStatus, getGitUnifiedDiff, getLocalProjectBranch, getProjectBranch, getProjectBranchSuggestions, getSelectedGitUnifiedDiff, getUnpushedCommitDiffForCwd, getUnpushedCommitSummaryForCwd, 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';
@@ -98,7 +98,8 @@ import { closePendingTicketPlanQuestionSet, listPendingTicketPlanQuestionSetMess
 import { hasPendingAskQuestionSet } from './lib/planQuestions.js';
 import { canUseBuildControls, formatActiveRunConflict, getTicketRunReadinessError, resumeBuildTicketRun, runProjectTarget, runTicketRun, stopBuildTicketRun, stopReviewTicketRun, stopProjectTargetRun, stopTicketRun, } from './lib/ticketRunOperations.js';
 import { isTicketAgentSettingsPayload, updateTicketAgentSettings, } from './lib/ticketSettingsOperations.js';
-import { rerunTicketReviewOperation, resolveBundleReviewOwner, transitionBundleToReview } from './lib/bundleReviewOperations.js';
+import { getBundleReviewRecovery, recoverBundleReview, rerunTicketReviewOperation, resolveBundleReviewOwner, transitionBundleToReview } from './lib/bundleReviewOperations.js';
+import { resolveReviewContinuation } from './workers/review.js';
 import { clearTicketStageSnapshots, getActiveBundleStageChangeHead, reconcileStageSnapshots, undoTicketStage } from './lib/ticketUndo.js';
 import { closeAllTerminalSessions, createProjectTerminalSession, createTerminalSessionForWorkspace, destroyTerminalSessionById, registerTerminalSocketHandlers, } from './lib/terminal.js';
 import { countBundleTickets, createTicketRecord, createBundle, deleteBundle, ensureProjectRootBundle, autoParkTicketIfStale, autoParkSettledBundleTicket, isBundleSettledForAutoPark, clearAutoParkDismissalIfNeeded, assignTicketDoneOrder, assignTicketLaneOrder, getBundle, getBundleByName, getBundleByBranch, getBundleRepresentativeTicketContext, isProjectRootBundle, getTicket, isBundledTicket, listTicketsInRunContext, listBundles, listBoardTicketEnrichment, listTickets, resolveTicketBranch, resolveTicketTool, updateBundleAutomationConfig, updateBundleIdentity, } from './lib/tickets.js';
@@ -1738,6 +1739,9 @@ 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,
+        review_recovery_available: getBundleAutomationState(project.id, bundle.id)?.automation_paused_reason
+            ? false
+            : getBundleReviewRecovery(project.id, bundle.id) !== null,
         has_helper_model: Boolean(project.helper_model),
         recent_commit_subjects: getBundleRecentCommitSubjects(project, bundle),
     };
@@ -3103,13 +3107,17 @@ app.post('/projects/:id/spec-sessions/:sessionId/snapshots/:snapshotId/create-ti
         }
         const target = targetResult.target;
         const bundleName = specSession.external_source?.external_key ?? '';
-        const bundle = bundleName
-            ? createAutoBundleForName(bundleName, project.id, target.branch)
-            : createAutoPlanningBundle(project.id, target.branch);
+        const bundle = target.target_kind === 'bundle'
+            ? target.target_bundle_id ? getBundle(target.target_bundle_id, project.id) : null
+            : bundleName
+                ? createAutoBundleForName(bundleName, project.id, target.branch)
+                : createAutoPlanningBundle(project.id, target.branch);
         if (!bundle || isProjectRootBundle(bundle)) {
             throw new HttpError(409, 'Unable to create a bundle for this Spec snapshot.');
         }
-        generatedBundleId = bundle.id;
+        if (target.target_kind === 'repo_root') {
+            generatedBundleId = bundle.id;
+        }
         const ticketsForMaterialization = snapshot.tickets.map(ticket => {
             const appendices = [
                 buildVisualizationAppendix(ticket.relevant_visualizations ?? [], snapshot),
@@ -3412,7 +3420,8 @@ app.get('/tickets/:id/git-commits', (req, res) => {
     if ('error' in workspace) {
         return res.status(workspace.status).json({ error: workspace.error });
     }
-    return res.json({ commits: listUnpushedCommitsForCwd(workspace.cwd, workspace.branch, workspace.project) });
+    const summary = getUnpushedCommitSummaryForCwd(workspace.cwd, workspace.branch, workspace.project);
+    return res.json({ commits: summary.commits, total_count: summary.totalCount });
 });
 app.get('/bundles', async (req, res) => {
     const result = getRequiredProject(req);
@@ -4011,6 +4020,23 @@ app.post('/bundles/:id/review', (req, res) => {
     }
     return res.json(reviewResult.details);
 });
+app.post('/bundles/:id/review/continue', (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 recovered = recoverBundleReview(result.project.id, bundle.id, io);
+    if (!recovered.ok) {
+        return res.status(recovered.status).json({ error: recovered.error });
+    }
+    return res.status(recovered.status).json(serializeBundleDetails(result.project, bundle, {
+        target_ticket_id: recovered.value?.id ?? null,
+    }));
+});
 app.post('/bundles/:id/build-open-questions/resolve', async (req, res) => {
     const result = getRequiredProject(req);
     if ('error' in result) {
@@ -4698,6 +4724,24 @@ app.post('/bundles/:id/resume-automation', async (req, res) => {
                 return res.status(409).json({ error: error instanceof Error ? error.message : String(error) });
             }
         }
+        else if (decision.outcome === 'resume_review') {
+            if (!revalidateDecision()) {
+                return res.status(409).json({ error: 'Bundle automation state changed before Resume could start' });
+            }
+            const sourceRunId = bundleState.automation_paused_stage_run_id;
+            const reviewResult = rerunTicketReviewOperation(owner, io, {
+                automatic: true,
+                initiation: {
+                    causalParentRunId: progressionRunId,
+                    retrySourceRunId: sourceRunId,
+                },
+                continuation: sourceRunId ? resolveReviewContinuation(sourceRunId) : undefined,
+                accept: acceptResumedReview,
+            });
+            if (!reviewResult.ok) {
+                return res.status(reviewResult.status).json({ error: reviewResult.error });
+            }
+        }
         else if (decision.outcome === 'rerun_review') {
             if (!revalidateDecision()) {
                 return res.status(409).json({ error: 'Bundle automation state changed before Resume could start' });
@@ -6847,7 +6891,8 @@ app.get('/projects/:id/git-commits', (req, res) => {
     if ('error' in workspace) {
         return res.status(workspace.status).json({ error: workspace.error });
     }
-    return res.json({ commits: listUnpushedCommitsForCwd(workspace.cwd, workspace.branch, workspace.project) });
+    const summary = getUnpushedCommitSummaryForCwd(workspace.cwd, workspace.branch, workspace.project);
+    return res.json({ commits: summary.commits, total_count: summary.totalCount });
 });
 app.post('/projects/:id/git-commit', async (req, res) => {
     const project = getProjectById(req.params.id);
@@ -7059,10 +7104,39 @@ app.post('/projects/:id/git-undo-latest', async (req, res) => {
     catch (error) {
         return res.status(409).json({ error: getErrorMessage(error) || 'Unable to undo the latest local commit right now.' });
     }
+    const summary = getUnpushedCommitSummaryForCwd(workspace.cwd, workspace.branch, workspace.project);
     return res.json({
         ticket: null,
         git_status: getGitStatus(workspace.cwd, workspace.branch, workspace.project),
-        commits: listUnpushedCommitsForCwd(workspace.cwd, workspace.branch, workspace.project),
+        commits: summary.commits,
+        total_count: summary.totalCount,
+    });
+});
+app.post('/projects/:id/git-squash', 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 message = typeof req.body?.message === 'string' ? req.body.message.trim() : '';
+    if (!message) {
+        return res.status(400).json({ error: 'message is required' });
+    }
+    try {
+        await squashUnpushedCommitsForCwd(workspace.cwd, workspace.branch, workspace.project, message);
+    }
+    catch (error) {
+        return res.status(409).json({ error: getErrorMessage(error) || 'Unable to squash local commits right now.' });
+    }
+    const summary = getUnpushedCommitSummaryForCwd(workspace.cwd, workspace.branch, workspace.project);
+    return res.json({
+        ticket: null,
+        git_status: getGitStatus(workspace.cwd, workspace.branch, workspace.project),
+        commits: summary.commits,
+        total_count: summary.totalCount,
     });
 });
 app.patch('/projects/:id', (req, res) => {
@@ -8032,11 +8106,45 @@ app.post('/tickets/:id/git-undo-latest', async (req, res) => {
     catch (error) {
         return res.status(409).json({ error: getErrorMessage(error) || 'Unable to undo the latest local commit right now.' });
     }
+    const summary = getUnpushedCommitSummaryForCwd(workspace.cwd, workspace.branch, workspace.project);
+    const updated = reconcileRunContextTickets(previousTickets, ticket.id);
+    return res.json({
+        ticket: updated,
+        git_status: getGitStatus(workspace.cwd, workspace.branch, workspace.project),
+        commits: summary.commits,
+        total_count: summary.totalCount,
+    });
+});
+app.post('/tickets/:id/git-squash', async (req, res) => {
+    const ticket = getTicket(req.params.id);
+    if (!ticket) {
+        return res.status(404).json({ error: 'Not found' });
+    }
+    if (!matchesTicketProjectContext(ticket, req)) {
+        return res.status(404).json({ error: 'Not found' });
+    }
+    const workspace = resolveTicketGitWorkspace(ticket);
+    if ('error' in workspace) {
+        return res.status(workspace.status).json({ error: workspace.error });
+    }
+    const message = typeof req.body?.message === 'string' ? req.body.message.trim() : '';
+    if (!message) {
+        return res.status(400).json({ error: 'message is required' });
+    }
+    const previousTickets = listTicketsInRunContext(ticket);
+    try {
+        await squashUnpushedCommitsForCwd(workspace.cwd, workspace.branch, workspace.project, message);
+    }
+    catch (error) {
+        return res.status(409).json({ error: getErrorMessage(error) || 'Unable to squash local commits right now.' });
+    }
+    const summary = getUnpushedCommitSummaryForCwd(workspace.cwd, workspace.branch, workspace.project);
     const updated = reconcileRunContextTickets(previousTickets, ticket.id);
     return res.json({
         ticket: updated,
         git_status: getGitStatus(workspace.cwd, workspace.branch, workspace.project),
-        commits: listUnpushedCommitsForCwd(workspace.cwd, workspace.branch, workspace.project),
+        commits: summary.commits,
+        total_count: summary.totalCount,
     });
 });
 app.post('/projects/:id/open-ide', (req, res) => {