@evermore.work/server 2026.520.0-canary.0 → 2026.522.0-canary.1

package/dist/routes/issues.js

@@ -375,6 +375,15 @@ function shouldImplicitlyMoveCommentedIssueToTodo(input) {
         return false;
     return true;
 }
+function shouldHumanCommentResumeInProgressScheduledRetry(input) {
+    if (!input.hasComment)
+        return false;
+    if (input.actorType !== "user")
+        return false;
+    if (input.issueStatus !== "in_progress")
+        return false;
+    return typeof input.assigneeAgentId === "string" && input.assigneeAgentId.length > 0;
+}
 function isExplicitResumeCapableStatus(status) {
     return status === "done" || status === "blocked" || status === "todo" || status === "in_progress";
 }
@@ -561,6 +570,34 @@ export function issueRoutes(db, storage, opts = {}) {
     };
     const feedbackExportService = opts?.feedbackExportService;
     const environmentsSvc = environmentService(db);
+    async function cancelScheduledRetrySupersededByComment(input) {
+        const scheduledRetryRunId = readNonEmptyString(input.scheduledRetryRunId);
+        if (!scheduledRetryRunId)
+            return null;
+        try {
+            const cancelled = await heartbeat.cancelRun(scheduledRetryRunId);
+            const cancelledRunId = cancelled?.id ?? scheduledRetryRunId;
+            await logActivity(db, {
+                companyId: input.issue.companyId,
+                actorType: input.actor.actorType,
+                actorId: input.actor.actorId,
+                agentId: input.actor.agentId,
+                runId: input.actor.runId,
+                action: "heartbeat.cancelled",
+                entityType: "heartbeat_run",
+                entityId: cancelledRunId,
+                details: {
+                    source: "issue_comment_scheduled_retry_superseded",
+                    issueId: input.issue.id,
+                },
+            });
+            return cancelledRunId;
+        }
+        catch (err) {
+            logger.error({ err, issueId: input.issue.id, runId: scheduledRetryRunId }, "failed to cancel scheduled retry superseded by issue comment");
+            throw err;
+        }
+    }
     async function classifySourceRecoveryRevalidation(input) {
         const { issue } = input;
         if (issue.status === "done" || issue.status === "cancelled") {
@@ -1298,6 +1335,8 @@ export function issueRoutes(db, storage, opts = {}) {
             ? Number.parseInt(rawOffset, 10)
             : null;
         const attention = req.query.attention;
+        const sortField = req.query.sortField;
+        const sortDir = req.query.sortDir;
         if (assigneeUserFilterRaw === "me" && (!assigneeUserId || req.actor.type !== "board")) {
             res.status(403).json({ error: "assigneeUserId=me requires board authentication" });
             return;
@@ -1326,6 +1365,14 @@ export function issueRoutes(db, storage, opts = {}) {
             res.status(400).json({ error: "offset must be a non-negative integer" });
             return;
         }
+        if (sortField !== undefined && sortField !== "updated") {
+            res.status(400).json({ error: "sortField must be 'updated' when provided" });
+            return;
+        }
+        if (sortDir !== undefined && sortDir !== "asc" && sortDir !== "desc") {
+            res.status(400).json({ error: "sortDir must be 'asc' or 'desc' when provided" });
+            return;
+        }
         const offset = parsedOffset ?? 0;
         const result = await svc.list(companyId, {
             attention: attention === "blocked" ? "blocked" : undefined,
@@ -1353,6 +1400,8 @@ export function issueRoutes(db, storage, opts = {}) {
             q: req.query.q,
             limit,
             offset,
+            sortField: sortField === "updated" ? "updated" : undefined,
+            sortDir: sortDir === "asc" || sortDir === "desc" ? sortDir : undefined,
         });
         const issueIds = result.map((issue) => issue.id);
         const [handoffStates, recoveryActionByIssue] = await Promise.all([
@@ -2736,6 +2785,16 @@ export function issueRoutes(db, storage, opts = {}) {
             !(await assertRecoveryActionAuthority(req, res, existing, activeRecoveryActionBeforeUpdate, { source: "issue_update" }))) {
             return;
         }
+        const scheduledRetryForHumanComment = shouldHumanCommentResumeInProgressScheduledRetry({
+            hasComment: !!commentBody,
+            issueStatus: existing.status,
+            assigneeAgentId: requestedAssigneeAgentId,
+            actorType: actor.actorType,
+        })
+            ? await svc.getCurrentScheduledRetry(existing.id)
+            : null;
+        const shouldResumeInProgressScheduledRetry = !!scheduledRetryForHumanComment &&
+            scheduledRetryForHumanComment.agentId === requestedAssigneeAgentId;
         const effectiveMoveToTodoRequested = explicitMoveToTodoRequested ||
             (!!commentBody &&
                 shouldImplicitlyMoveCommentedIssueToTodo({
@@ -2743,7 +2802,8 @@ export function issueRoutes(db, storage, opts = {}) {
                     assigneeAgentId: requestedAssigneeAgentId,
                     actorType: actor.actorType,
                     actorId: actor.actorId,
-                }));
+                })) ||
+            shouldResumeInProgressScheduledRetry;
         const updateReferenceSummaryBefore = titleOrDescriptionChanged
             ? await issueReferencesSvc.listIssueReferenceSummary(existing.id)
             : null;
@@ -2797,10 +2857,20 @@ export function issueRoutes(db, storage, opts = {}) {
         }
         if (commentBody &&
             effectiveMoveToTodoRequested &&
-            (isClosed || (isBlocked && !hasUnresolvedFirstClassBlockers)) &&
+            (isClosed || (isBlocked && !hasUnresolvedFirstClassBlockers) || shouldResumeInProgressScheduledRetry) &&
             updateFields.status === undefined) {
             updateFields.status = "todo";
         }
+        let cancelledScheduledRetryRunId = null;
+        if (commentBody &&
+            shouldResumeInProgressScheduledRetry &&
+            updateFields.status === "todo") {
+            cancelledScheduledRetryRunId = await cancelScheduledRetrySupersededByComment({
+                scheduledRetryRunId: scheduledRetryForHumanComment?.runId,
+                issue: existing,
+                actor,
+            });
+        }
         if (req.body.executionPolicy !== undefined) {
             updateFields.executionPolicy = applyActorMonitorScheduledBy(normalizeIssueExecutionPolicy(req.body.executionPolicy), actor.actorType);
         }
@@ -3023,6 +3093,10 @@ export function issueRoutes(db, storage, opts = {}) {
             previous.status !== undefined &&
             issue.status === "todo";
         const reopenFromStatus = reopened ? existing.status : null;
+        const scheduledRetrySupersededByComment = shouldResumeInProgressScheduledRetry &&
+            previous.status !== undefined &&
+            existing.status === "in_progress" &&
+            issue.status === "todo";
         const statusChangedFromBlockedToTodo = existing.status === "blocked" &&
             issue.status === "todo" &&
             (req.body.status !== undefined || reopened);
@@ -3062,6 +3136,13 @@ export function issueRoutes(db, storage, opts = {}) {
                 ...(commentBody ? { source: "comment" } : {}),
                 ...(resumeRequested === true ? { resumeIntent: true, followUpRequested: true } : {}),
                 ...(reopened ? { reopened: true, reopenedFrom: reopenFromStatus } : {}),
+                ...(scheduledRetrySupersededByComment
+                    ? {
+                        scheduledRetrySupersededByComment: true,
+                        scheduledRetryRunId: scheduledRetryForHumanComment?.runId ?? null,
+                        ...(cancelledScheduledRetryRunId ? { cancelledScheduledRetryRunId } : {}),
+                    }
+                    : {}),
                 ...(interruptedRunId ? { interruptedRunId } : {}),
                 ...(cancelledStatusRunId ? { cancelledStatusRunId } : {}),
                 ...(workspaceChange ? { workspaceChange } : {}),
@@ -3266,6 +3347,13 @@ export function issueRoutes(db, storage, opts = {}) {
                     issueTitle: issue.title,
                     ...(resumeRequested === true ? { resumeIntent: true, followUpRequested: true } : {}),
                     ...(reopened ? { reopened: true, reopenedFrom: reopenFromStatus, source: "comment" } : {}),
+                    ...(scheduledRetrySupersededByComment
+                        ? {
+                            scheduledRetrySupersededByComment: true,
+                            scheduledRetryRunId: scheduledRetryForHumanComment?.runId ?? null,
+                            ...(cancelledScheduledRetryRunId ? { cancelledScheduledRetryRunId } : {}),
+                        }
+                        : {}),
                     ...(interruptedRunId ? { interruptedRunId } : {}),
                     ...(hasFieldChanges ? { updated: true } : {}),
                     ...summarizeIssueReferenceActivityDetails({
@@ -3709,7 +3797,16 @@ export function issueRoutes(db, storage, opts = {}) {
             return;
         }
         assertCompanyAccess(req, issue.companyId);
-        const interactions = await issueThreadInteractionService(db).listForIssue(id);
+        const actor = getActorInfo(req);
+        const interactionSvc = issueThreadInteractionService(db);
+        const expiredInteractions = await interactionSvc.expireRequestConfirmationsSupersededByHistoricalComments(issue);
+        await logExpiredRequestConfirmations({
+            issue,
+            interactions: expiredInteractions,
+            actor,
+            source: "issue.interactions.catchup_superseded_by_comment",
+        });
+        const interactions = await interactionSvc.listForIssue(id);
         res.json(interactions);
     });
     router.post("/issues/:id/interactions", validate(createIssueThreadInteractionSchema), async (req, res) => {
@@ -4155,13 +4252,24 @@ export function issueRoutes(db, storage, opts = {}) {
         const isClosed = isClosedIssueStatus(issue.status);
         const isBlocked = issue.status === "blocked";
         const explicitMoveToTodoRequested = reopenRequested || resumeRequested === true;
+        const scheduledRetryForHumanComment = shouldHumanCommentResumeInProgressScheduledRetry({
+            hasComment: true,
+            issueStatus: issue.status,
+            assigneeAgentId: issue.assigneeAgentId,
+            actorType: actor.actorType,
+        })
+            ? await svc.getCurrentScheduledRetry(issue.id)
+            : null;
+        const shouldResumeInProgressScheduledRetry = !!scheduledRetryForHumanComment &&
+            scheduledRetryForHumanComment.agentId === issue.assigneeAgentId;
         const effectiveMoveToTodoRequested = explicitMoveToTodoRequested ||
             shouldImplicitlyMoveCommentedIssueToTodo({
                 issueStatus: issue.status,
                 assigneeAgentId: issue.assigneeAgentId,
                 actorType: actor.actorType,
                 actorId: actor.actorId,
-            });
+            }) ||
+            shouldResumeInProgressScheduledRetry;
         const hasUnresolvedFirstClassBlockers = isBlocked && effectiveMoveToTodoRequested
             ? (await svc.getDependencyReadiness(issue.id)).unresolvedBlockerCount > 0
             : false;
@@ -4174,14 +4282,25 @@ export function issueRoutes(db, storage, opts = {}) {
         let interruptedRunId = null;
         let currentIssue = issue;
         const commentReferenceSummaryBefore = await issueReferencesSvc.listIssueReferenceSummary(issue.id);
-        if (effectiveMoveToTodoRequested && (isClosed || (isBlocked && !hasUnresolvedFirstClassBlockers))) {
+        let scheduledRetrySupersededByComment = false;
+        let cancelledScheduledRetryRunId = null;
+        if (effectiveMoveToTodoRequested &&
+            (isClosed || (isBlocked && !hasUnresolvedFirstClassBlockers) || shouldResumeInProgressScheduledRetry)) {
+            scheduledRetrySupersededByComment = shouldResumeInProgressScheduledRetry && issue.status === "in_progress";
+            cancelledScheduledRetryRunId = scheduledRetrySupersededByComment
+                ? await cancelScheduledRetrySupersededByComment({
+                    scheduledRetryRunId: scheduledRetryForHumanComment?.runId,
+                    issue,
+                    actor,
+                })
+                : null;
             const reopenedIssue = await svc.update(id, { status: "todo" });
             if (!reopenedIssue) {
                 res.status(404).json({ error: "Issue not found" });
                 return;
             }
-            reopened = true;
-            reopenFromStatus = issue.status;
+            reopened = isClosed || (isBlocked && !hasUnresolvedFirstClassBlockers);
+            reopenFromStatus = reopened ? issue.status : null;
             currentIssue = reopenedIssue;
             await logActivity(db, {
                 companyId: currentIssue.companyId,
@@ -4194,8 +4313,14 @@ export function issueRoutes(db, storage, opts = {}) {
                 entityId: currentIssue.id,
                 details: {
                     status: "todo",
-                    reopened: true,
-                    reopenedFrom: reopenFromStatus,
+                    ...(reopened ? { reopened: true, reopenedFrom: reopenFromStatus } : {}),
+                    ...(scheduledRetrySupersededByComment
+                        ? {
+                            scheduledRetrySupersededByComment: true,
+                            scheduledRetryRunId: scheduledRetryForHumanComment?.runId ?? null,
+                            ...(cancelledScheduledRetryRunId ? { cancelledScheduledRetryRunId } : {}),
+                        }
+                        : {}),
                     source: "comment",
                     ...(resumeRequested === true ? { resumeIntent: true, followUpRequested: true } : {}),
                     identifier: currentIssue.identifier,
@@ -4257,6 +4382,13 @@ export function issueRoutes(db, storage, opts = {}) {
                 issueTitle: currentIssue.title,
                 ...(resumeRequested === true ? { resumeIntent: true, followUpRequested: true } : {}),
                 ...(reopened ? { reopened: true, reopenedFrom: reopenFromStatus, source: "comment" } : {}),
+                ...(scheduledRetrySupersededByComment
+                    ? {
+                        scheduledRetrySupersededByComment: true,
+                        scheduledRetryRunId: scheduledRetryForHumanComment?.runId ?? null,
+                        ...(cancelledScheduledRetryRunId ? { cancelledScheduledRetryRunId } : {}),
+                    }
+                    : {}),
                 ...(interruptedRunId ? { interruptedRunId } : {}),
                 ...summarizeIssueReferenceActivityDetails({
                     addedReferencedIssues: commentReferenceDiff.addedReferencedIssues.map(summarizeIssueRelationForActivity),
@@ -4279,7 +4411,7 @@ export function issueRoutes(db, storage, opts = {}) {
             issue: currentIssue,
             trigger: "comment",
             actor,
-            statusChanged: reopened,
+            statusChanged: reopened || scheduledRetrySupersededByComment,
             resumeRequested: resumeRequested === true,
             reopened,
             blockedToTodoRecovery: reopened && reopenFromStatus === "blocked" && currentIssue.status === "todo",