@evermore.work/server 2026.511.0-canary.2 → 2026.513.0-canary.0

package/dist/routes/issues.js

@@ -2,14 +2,14 @@ import { randomUUID } from "node:crypto";
 import { Router } from "express";
 import multer from "multer";
 import { z } from "zod";
-import { and, desc, eq, inArray } from "drizzle-orm";
-import { activityLog, executionWorkspaces, issueExecutionDecisions, projectWorkspaces } from "@evermore.work/db";
-import { addIssueCommentSchema, acceptIssueThreadInteractionSchema, cancelIssueThreadInteractionSchema, companySearchQuerySchema, createIssueAttachmentMetadataSchema, createIssueThreadInteractionSchema, createIssueWorkProductSchema, createIssueLabelSchema, checkoutIssueSchema, createChildIssueSchema, createIssueSchema, resolveCreateIssueStatusDefault, feedbackTargetTypeSchema, feedbackTraceStatusSchema, feedbackVoteValueSchema, upsertIssueFeedbackVoteSchema, linkIssueApprovalSchema, issueDocumentKeySchema, ISSUE_CONTINUATION_SUMMARY_DOCUMENT_KEY, rejectIssueThreadInteractionSchema, restoreIssueDocumentRevisionSchema, respondIssueThreadInteractionSchema, updateIssueWorkProductSchema, upsertIssueDocumentSchema, updateIssueSchema, getClosedIsolatedExecutionWorkspaceMessage, isClosedIsolatedExecutionWorkspace, normalizeIssueIdentifier as normalizeIssueReferenceIdentifier, } from "@evermore.work/shared";
+import { and, desc, eq, inArray, notInArray } from "drizzle-orm";
+import { activityLog, executionWorkspaces, issueExecutionDecisions, issueRelations, issues as issueRows, projectWorkspaces, } from "@evermore.work/db";
+import { addIssueCommentSchema, acceptIssueThreadInteractionSchema, cancelIssueThreadInteractionSchema, companySearchQuerySchema, createIssueAttachmentMetadataSchema, createIssueThreadInteractionSchema, createIssueWorkProductSchema, createIssueLabelSchema, checkoutIssueSchema, createChildIssueSchema, createIssueSchema, resolveCreateIssueStatusDefault, resolveIssueRecoveryActionSchema, feedbackTargetTypeSchema, feedbackTraceStatusSchema, feedbackVoteValueSchema, upsertIssueFeedbackVoteSchema, linkIssueApprovalSchema, issueDocumentKeySchema, ISSUE_CONTINUATION_SUMMARY_DOCUMENT_KEY, rejectIssueThreadInteractionSchema, restoreIssueDocumentRevisionSchema, respondIssueThreadInteractionSchema, updateIssueWorkProductSchema, upsertIssueDocumentSchema, updateIssueSchema, getClosedIsolatedExecutionWorkspaceMessage, isClosedIsolatedExecutionWorkspace, normalizeIssueIdentifier as normalizeIssueReferenceIdentifier, } from "@evermore.work/shared";
 import { trackAgentTaskCompleted } from "@evermore.work/shared/telemetry";
 import { getTelemetryClient } from "../telemetry.js";
 import { validate } from "../middleware/validate.js";
 import * as serviceIndex from "../services/index.js";
-import { accessService, agentService, companyService, companySearchService, goalService, heartbeatService, issueApprovalService, issueThreadInteractionService, ISSUE_LIST_DEFAULT_LIMIT, ISSUE_LIST_MAX_LIMIT, issueReferenceService, issueService, clampIssueListLimit, documentService, logActivity, projectService, routineService, workProductService, } from "../services/index.js";
+import { accessService, agentService, companyService, companySearchService, goalService, heartbeatService, issueApprovalService, issueRecoveryActionService, issueThreadInteractionService, ISSUE_LIST_DEFAULT_LIMIT, ISSUE_LIST_MAX_LIMIT, issueReferenceService, issueService, clampIssueListLimit, documentService, logActivity, projectService, routineService, workProductService, } from "../services/index.js";
 import { logger } from "../middleware/logger.js";
 import { conflict, forbidden, HttpError, notFound, unauthorized, unprocessable } from "../errors.js";
 import { assertBoard, assertCompanyAccess, getActorInfo } from "./authz.js";
@@ -235,6 +235,34 @@ async function listSuccessfulRunHandoffStates(db, companyId, issueIds) {
     }
     return states;
 }
+async function relationRecoveryActionMap(recoveryActionsSvc, companyId, relations) {
+    const candidates = [];
+    const visit = (summary) => {
+        candidates.push(summary);
+        for (const terminal of summary.terminalBlockers ?? []) {
+            visit(terminal);
+        }
+    };
+    for (const blocker of relations.blockedBy)
+        visit(blocker);
+    for (const blocking of relations.blocks)
+        visit(blocking);
+    if (candidates.length === 0)
+        return new Map();
+    const ids = [...new Set(candidates.map((summary) => summary.id))];
+    return recoveryActionsSvc.listActiveForIssues(companyId, ids);
+}
+function withRecoveryActionsOnRelationSummaries(relations, recoveryActionByIssueId) {
+    const augment = (summary) => ({
+        ...summary,
+        activeRecoveryAction: recoveryActionByIssueId.get(summary.id) ?? summary.activeRecoveryAction ?? null,
+        terminalBlockers: summary.terminalBlockers?.map(augment),
+    });
+    return {
+        blockedBy: relations.blockedBy.map(augment),
+        blocks: relations.blocks.map(augment),
+    };
+}
 const ACTIVE_REVIEW_APPROVAL_STATUSES = new Set(["pending", "revision_requested"]);
 const INVALID_AGENT_IN_REVIEW_DISPOSITION_MESSAGE = "invalid_issue_disposition: Agent-authored updates that move an issue to in_review must include a real review path. " +
     "This request would leave the issue in_review without anyone or anything owning the next action. " +
@@ -512,6 +540,7 @@ export function issueRoutes(db, storage, opts = {}) {
     const projectsSvc = projectService(db);
     const goalsSvc = goalService(db);
     const issueApprovalsSvc = issueApprovalService(db);
+    const recoveryActionsSvc = issueRecoveryActionService(db);
     const executionWorkspacesSvc = executionWorkspaceServiceDirect(db);
     const workProductsSvc = workProductService(db);
     const documentsSvc = documentService(db);
@@ -1082,10 +1111,15 @@ export function issueRoutes(db, storage, opts = {}) {
             limit,
             offset,
         });
-        const handoffStates = await listSuccessfulRunHandoffStates(db, companyId, result.map((issue) => issue.id));
+        const issueIds = result.map((issue) => issue.id);
+        const [handoffStates, recoveryActionByIssue] = await Promise.all([
+            listSuccessfulRunHandoffStates(db, companyId, issueIds),
+            recoveryActionsSvc.listActiveForIssues(companyId, issueIds),
+        ]);
         res.json(result.map((issue) => ({
             ...issue,
             successfulRunHandoff: handoffStates.get(issue.id) ?? null,
+            activeRecoveryAction: recoveryActionByIssue.get(issue.id) ?? null,
         })));
     });
     router.get("/companies/:companyId/labels", async (req, res) => {
@@ -1153,7 +1187,7 @@ export function issueRoutes(db, storage, opts = {}) {
         const currentExecutionWorkspacePromise = issue.executionWorkspaceId
             ? executionWorkspacesSvc.getById(issue.executionWorkspaceId)
             : Promise.resolve(null);
-        const [{ project, goal }, ancestors, commentCursor, wakeComment, relations, blockerAttention, productivityReview, scheduledRetry, attachments, continuationSummary, currentExecutionWorkspace,] = await Promise.all([
+        const [{ project, goal }, ancestors, commentCursor, wakeComment, relations, blockerAttention, productivityReview, scheduledRetry, attachments, continuationSummary, currentExecutionWorkspace, activeRecoveryAction,] = await Promise.all([
             resolveIssueProjectAndGoal(issue),
             svc.getAncestors(issue.id),
             svc.getCommentCursor(issue.id),
@@ -1165,7 +1199,10 @@ export function issueRoutes(db, storage, opts = {}) {
             svc.listAttachments(issue.id),
             documentsSvc.getIssueDocumentByKey(issue.id, ISSUE_CONTINUATION_SUMMARY_DOCUMENT_KEY),
             currentExecutionWorkspacePromise,
+            recoveryActionsSvc.getActiveForIssue(issue.companyId, issue.id),
         ]);
+        const recoveryActionsByRelationIssue = await relationRecoveryActionMap(recoveryActionsSvc, issue.companyId, relations);
+        const relationsWithRecoveryActions = withRecoveryActionsOnRelationSummaries(relations, recoveryActionsByRelationIssue);
         res.json({
             issue: {
                 id: issue.id,
@@ -1177,12 +1214,13 @@ export function issueRoutes(db, storage, opts = {}) {
                 ...(blockerAttention ? { blockerAttention } : {}),
                 productivityReview,
                 scheduledRetry,
+                activeRecoveryAction,
                 priority: issue.priority,
                 projectId: issue.projectId,
                 goalId: goal?.id ?? issue.goalId,
                 parentId: issue.parentId,
-                blockedBy: relations.blockedBy,
-                blocks: relations.blocks,
+                blockedBy: relationsWithRecoveryActions.blockedBy,
+                blocks: relationsWithRecoveryActions.blocks,
                 assigneeAgentId: issue.assigneeAgentId,
                 assigneeUserId: issue.assigneeUserId,
                 originKind: issue.originKind,
@@ -1246,7 +1284,7 @@ export function issueRoutes(db, storage, opts = {}) {
             return;
         }
         assertCompanyAccess(req, issue.companyId);
-        const [{ project, goal }, ancestors, mentionedProjectIds, documentPayload, relations, blockerAttention, productivityReview, referenceSummary, successfulRunHandoffStates, scheduledRetry,] = await Promise.all([
+        const [{ project, goal }, ancestors, mentionedProjectIds, documentPayload, relations, blockerAttention, productivityReview, referenceSummary, successfulRunHandoffStates, scheduledRetry, activeRecoveryAction,] = await Promise.all([
             resolveIssueProjectAndGoal(issue),
             svc.getAncestors(issue.id),
             svc.findMentionedProjectIds(issue.id, { includeCommentBodies: false }),
@@ -1257,7 +1295,10 @@ export function issueRoutes(db, storage, opts = {}) {
             issueReferencesSvc.listIssueReferenceSummary(issue.id),
             listSuccessfulRunHandoffStates(db, issue.companyId, [issue.id]),
             svc.getCurrentScheduledRetry(issue.id),
+            recoveryActionsSvc.getActiveForIssue(issue.companyId, issue.id),
         ]);
+        const recoveryActionsByRelationIssue = await relationRecoveryActionMap(recoveryActionsSvc, issue.companyId, relations);
+        const relationsWithRecoveryActions = withRecoveryActionsOnRelationSummaries(relations, recoveryActionsByRelationIssue);
         const mentionedProjects = mentionedProjectIds.length > 0
             ? await projectsSvc.listByIds(issue.companyId, mentionedProjectIds)
             : [];
@@ -1273,8 +1314,9 @@ export function issueRoutes(db, storage, opts = {}) {
             productivityReview,
             successfulRunHandoff: successfulRunHandoffStates.get(issue.id) ?? null,
             scheduledRetry,
-            blockedBy: relations.blockedBy,
-            blocks: relations.blocks,
+            activeRecoveryAction,
+            blockedBy: relationsWithRecoveryActions.blockedBy,
+            blocks: relationsWithRecoveryActions.blocks,
             relatedWork: referenceSummary,
             referencedIssueIdentifiers: referenceSummary.outbound.map((item) => item.issue.identifier ?? item.issue.id),
             ...documentPayload,
@@ -1285,6 +1327,125 @@ export function issueRoutes(db, storage, opts = {}) {
             workProducts,
         });
     });
+    router.get("/issues/:id/recovery-actions", async (req, res) => {
+        const id = req.params.id;
+        const issue = await svc.getById(id);
+        if (!issue) {
+            res.status(404).json({ error: "Issue not found" });
+            return;
+        }
+        assertCompanyAccess(req, issue.companyId);
+        const active = await recoveryActionsSvc.getActiveForIssue(issue.companyId, issue.id);
+        res.json({
+            active,
+            actions: active ? [active] : [],
+        });
+    });
+    router.post("/issues/:id/recovery-actions/resolve", validate(resolveIssueRecoveryActionSchema), async (req, res) => {
+        const id = req.params.id;
+        const existing = await svc.getById(id);
+        if (!existing) {
+            res.status(404).json({ error: "Issue not found" });
+            return;
+        }
+        assertCompanyAccess(req, existing.companyId);
+        if (!(await assertAgentIssueMutationAllowed(req, res, existing)))
+            return;
+        const { actionId, outcome, sourceIssueStatus, resolutionNote } = req.body;
+        if (outcome === "false_positive" || outcome === "cancelled") {
+            assertBoard(req);
+        }
+        const actor = getActorInfo(req);
+        const updateFields = sourceIssueStatus ? { status: sourceIssueStatus } : {};
+        await assertAgentInReviewReviewPath({
+            existing,
+            updateFields,
+            actorType: req.actor.type,
+        });
+        const actionStatus = outcome === "cancelled" ? "cancelled" : "resolved";
+        const result = await db.transaction(async (tx) => {
+            let issue = existing;
+            if (outcome === "blocked") {
+                const unresolvedBlockers = await tx
+                    .select({ id: issueRows.id })
+                    .from(issueRelations)
+                    .innerJoin(issueRows, eq(issueRelations.issueId, issueRows.id))
+                    .where(and(eq(issueRelations.companyId, existing.companyId), eq(issueRelations.relatedIssueId, existing.id), eq(issueRelations.type, "blocks"), notInArray(issueRows.status, ["done", "cancelled"])))
+                    .limit(1);
+                if (unresolvedBlockers.length === 0) {
+                    throw unprocessable("Blocked recovery resolution requires an unresolved first-class blocker on the source issue");
+                }
+            }
+            if (sourceIssueStatus) {
+                const updatedIssue = await svc.update(id, {
+                    status: sourceIssueStatus,
+                    actorAgentId: actor.agentId ?? null,
+                    actorUserId: actor.actorType === "user" ? actor.actorId : null,
+                }, tx);
+                if (!updatedIssue)
+                    throw notFound("Issue not found");
+                issue = updatedIssue;
+            }
+            const recoveryAction = await recoveryActionsSvc.resolveActiveForIssue({
+                companyId: existing.companyId,
+                sourceIssueId: existing.id,
+                actionId: actionId ?? null,
+                status: actionStatus,
+                outcome,
+                resolutionNote: resolutionNote ?? null,
+            }, tx);
+            if (!recoveryAction)
+                throw notFound("Active recovery action not found");
+            return { issue, recoveryAction };
+        });
+        await routinesSvc.syncRunStatusForIssue(result.issue.id);
+        if (sourceIssueStatus && existing.status !== result.issue.status) {
+            await logActivity(db, {
+                companyId: result.issue.companyId,
+                actorType: actor.actorType,
+                actorId: actor.actorId,
+                agentId: actor.agentId,
+                runId: actor.runId,
+                action: "issue.updated",
+                entityType: "issue",
+                entityId: result.issue.id,
+                details: {
+                    identifier: result.issue.identifier,
+                    status: result.issue.status,
+                    source: "recovery_action_resolution",
+                    recoveryActionId: result.recoveryAction.id,
+                    _previous: {
+                        status: existing.status,
+                    },
+                },
+            });
+        }
+        await logActivity(db, {
+            companyId: result.issue.companyId,
+            actorType: actor.actorType,
+            actorId: actor.actorId,
+            agentId: actor.agentId,
+            runId: actor.runId,
+            action: "issue.recovery_action_resolved",
+            entityType: "issue",
+            entityId: result.issue.id,
+            details: {
+                identifier: result.issue.identifier,
+                recoveryActionId: result.recoveryAction.id,
+                recoveryActionStatus: result.recoveryAction.status,
+                outcome: result.recoveryAction.outcome,
+                sourceIssueStatus: sourceIssueStatus ?? null,
+                resolutionNote: result.recoveryAction.resolutionNote,
+            },
+        });
+        res.json({
+            issue: {
+                ...result.issue,
+                activeRecoveryAction: null,
+            },
+            recoveryAction: result.recoveryAction,
+        });
+    });
     router.get("/issues/:id/work-products", async (req, res) => {
         const id = req.params.id;
         const issue = await svc.getById(id);