diff --git a/server/src/modules/run-dispatch/adapters/postgres.test.ts b/server/src/modules/run-dispatch/adapters/postgres.test.ts index 1529eca1f79..e4b5ca41e92 100644 --- a/server/src/modules/run-dispatch/adapters/postgres.test.ts +++ b/server/src/modules/run-dispatch/adapters/postgres.test.ts @@ -1242,6 +1242,33 @@ describeEmbeddedPostgres("run-dispatch postgres adapter", () => { }); describe("cancelStaleQueuedRun", () => { + it("withholds a never-started assignment run once its task moves to backlog", async () => { + const { companyId, agentId } = await seedCompanyAndAgent(); + const issueId = randomUUID(); + await seedIssue({ companyId, issueId, assigneeAgentId: agentId, status: "todo" }); + const runId = await seedRun({ companyId, agentId, contextSnapshot: { issueId, taskId: issueId, wakeReason: "issue_assigned", source: "assignment" } }); + await db.update(issues).set({ status: "backlog" }).where(eq(issues.id, issueId)); + const adapter = createPostgresRunDispatchAdapter(db); + + expect(await adapter.cancelStaleQueuedRun({ companyId, runId, expectedStatus: "queued", now: new Date() })) + .toMatchObject({ outcome: "cancelled", errorCode: "issue_in_backlog" }); + const [run] = await db.select().from(heartbeatRuns).where(eq(heartbeatRuns.id, runId)); + expect(run).toMatchObject({ status: "cancelled", errorCode: "issue_in_backlog", startedAt: null }); + expect(run!.error).toContain("backlog"); + expect((await db.select().from(issues).where(eq(issues.id, issueId)))[0]!.status).toBe("backlog"); + }); + + it("still starts a comment wake on a backlog task", async () => { + const { companyId, agentId } = await seedCompanyAndAgent(); + const issueId = randomUUID(); + await seedIssue({ companyId, issueId, assigneeAgentId: agentId, status: "backlog" }); + const runId = await seedRun({ companyId, agentId, contextSnapshot: { issueId, wakeReason: "issue_commented", wakeCommentId: randomUUID() } }); + const adapter = createPostgresRunDispatchAdapter(db); + + expect(await adapter.cancelStaleQueuedRun({ companyId, runId, expectedStatus: "queued", now: new Date() })) + .toMatchObject({ outcome: "not_stale" }); + }); + it.each([ { label: "chat source", source: "chat:slack", expected: "chat:slack" }, { diff --git a/server/src/modules/run-dispatch/domain/policy.ts b/server/src/modules/run-dispatch/domain/policy.ts index d1aa1426806..720d0651203 100644 --- a/server/src/modules/run-dispatch/domain/policy.ts +++ b/server/src/modules/run-dispatch/domain/policy.ts @@ -118,7 +118,8 @@ export type QueuedRunStalenessErrorCode = | "issue_execution_lock_changed" | "issue_blocked" | "issue_review_participant_changed" - | "issue_continuation_waiting_on_review"; + | "issue_continuation_waiting_on_review" + | "issue_in_backlog"; export type StalenessDecision = | { stale: false } @@ -603,6 +604,15 @@ export function decideQueuedRunStaleness( }; } + if (facts.wakeReason === "issue_assigned" && facts.issueStatus === "backlog") { + return { + stale: true, + errorCode: "issue_in_backlog", + reason: "Cancelled because the task moved to backlog before its assignment run could start", + details: { issueId: facts.issueId, currentStatus: facts.issueStatus }, + }; + } + if (facts.retryReasonKind === "native_safe_replacement" && facts.dependenciesBlocked) { return { stale: true, errorCode: "issue_dependencies_blocked", reason: "Cancelled because issue dependencies became blocked before replacement dispatch", diff --git a/server/src/services/pre-dispatch-review-wait.ts b/server/src/services/pre-dispatch-review-wait.ts index 68454275e1e..69d9a0a0998 100644 --- a/server/src/services/pre-dispatch-review-wait.ts +++ b/server/src/services/pre-dispatch-review-wait.ts @@ -21,6 +21,7 @@ const staleDispatchReconciliationExemptions = { issue_execution_lock_changed: true, issue_terminal_status: true, issue_review_participant_changed: true, + issue_in_backlog: true, // This code requires its own executionWait receipt in pre-dispatch-execution-wait.ts. execution_reconciliation_required: false, } satisfies Record;