From 29f31707a5dc80fa3fa296316d546a37fe968d15 Mon Sep 17 00:00:00 2001 From: Scott Tong Date: Tue, 17 Nov 2026 13:34:13 -0800 Subject: [PATCH] Retry timed-out welcomes and skip superseded queued greetings Co-Authored-By: Paperclip --- .../__tests__/onboarding-chat-route.test.ts | 36 +++++++++++++++++++ server/src/services/heartbeat/queue.ts | 16 +++++++++ server/src/services/onboarding-chat.ts | 3 +- 3 files changed, 54 insertions(+), 1 deletion(-) diff --git a/server/src/__tests__/onboarding-chat-route.test.ts b/server/src/__tests__/onboarding-chat-route.test.ts index 6e36d727eb0..7bf1fb4bc68 100644 --- a/server/src/__tests__/onboarding-chat-route.test.ts +++ b/server/src/__tests__/onboarding-chat-route.test.ts @@ -11,6 +11,8 @@ import { documentService } from "../services/documents.js"; import { heartbeatService } from "../services/heartbeat.js"; import { ONBOARDING_CHAT_GREETING_REASON } from "../services/onboarding-chat-prompt.js"; import { prepareConversationTurn, settleConversationTurn } from "../services/agent-conversations.js"; +import { createHeartbeatQueue } from "../services/heartbeat/queue.js"; +import { createHeartbeatQueueTestDependencies } from "./helpers/heartbeat-queue.js"; import { describeEmbeddedPostgres, routeApp, seedCompanyWithBoardAccess, useEmbeddedPostgres } from "./helpers/route-test-harness.js"; describeEmbeddedPostgres("onboarding chat", () => { @@ -85,6 +87,40 @@ describeEmbeddedPostgres("onboarding chat", () => { expect(await ctx.db.select().from(issues).where(eq(issues.companyId, companyId))).toHaveLength(1); }); + it.each(["request", "run"])("retries a timed-out welcome recorded on its %s", async timedOutRecord => { + const { companyId, agent, app, path, wakeup } = await setup(); + await request(app).post(path); + await request(app).post(`${path}/greeting`); + const [receipt] = await ctx.db.select().from(agentWakeupRequests).where(eq(agentWakeupRequests.agentId, agent.id)); + const [run] = await ctx.db.insert(heartbeatRuns).values({ companyId, agentId: agent.id, status: "timed_out", + wakeupRequestId: receipt.id, finishedAt: new Date() }).returning(); + await ctx.db.update(agentWakeupRequests).set(timedOutRecord === "request" ? { status: "timed_out" } : { runId: run.id }) + .where(eq(agentWakeupRequests.id, receipt.id)); + expect((await request(app).post(`${path}/greeting`)).status).toBe(200); + expect(wakeup).toHaveBeenCalledTimes(2); + }); + + it.each(["message", "new session"])("skips a queued welcome superseded by a %s before dispatch", async superseding => { + const { companyId, agent, userId, app, path } = await setup(); + const opened = await request(app).post(path); + const [receipt] = await ctx.db.insert(agentWakeupRequests).values({ companyId, agentId: agent.id, + source: "on_demand", reason: ONBOARDING_CHAT_GREETING_REASON, status: "pending" }).returning(); + const [run] = await ctx.db.insert(heartbeatRuns).values({ companyId, agentId: agent.id, status: "queued", + wakeupRequestId: receipt.id, contextSnapshot: { issueId: opened.body.id, wakeReason: ONBOARDING_CHAT_GREETING_REASON } }).returning(); + if (superseding === "message") await issueService(ctx.db).addComment(opened.body.id, "Interview me", { userId }); + else await ctx.db.update(issues).set({ conversationSessionGeneration: 1 }).where(eq(issues.id, opened.body.id)); + const deps = createHeartbeatQueueTestDependencies(ctx.db); + deps.getAgent.mockResolvedValue(agent); + const queue = createHeartbeatQueue(ctx.db, deps); + expect(await queue.claimQueuedRun(run)).toBeNull(); + expect((await ctx.db.select().from(heartbeatRuns).where(eq(heartbeatRuns.id, run.id)))[0]) + .toMatchObject({ status: "cancelled", startedAt: null, errorCode: "onboarding_welcome_superseded" }); + expect(deps.setWakeupStatus).toHaveBeenCalledWith(receipt.id, "skipped", expect.anything()); + expect(deps.releaseIssueExecutionAndPromote).toHaveBeenCalledWith(expect.objectContaining({ id: run.id }), + expect.objectContaining({ suppressImmediateRecovery: true })); + expect(deps.executeRun).not.toHaveBeenCalled(); + }); + it("admits a real greeting run without a synthetic human message", async () => { const { agent, actor, app, path, companyId } = await setup(); const opened = await request(app).post(path); diff --git a/server/src/services/heartbeat/queue.ts b/server/src/services/heartbeat/queue.ts index 3f7eacf9d74..bd67c687e16 100644 --- a/server/src/services/heartbeat/queue.ts +++ b/server/src/services/heartbeat/queue.ts @@ -59,6 +59,8 @@ import { isConversationExecutionWake, isWaitingConversation, } from "../agent-conversations.js"; +import { onboardingGreetingNeeded } from "../onboarding-chat.js"; +import { ONBOARDING_CHAT_GREETING_REASON } from "../onboarding-chat-prompt.js"; import { legacyControllerClaim } from "../legacy-controller-lease.js"; import { admitExplicitNativeContinuation, @@ -1036,6 +1038,20 @@ export function createHeartbeatQueue(db: Db, dependencies: HeartbeatQueueDepende const runContext = parseObject(run.contextSnapshot); const systemContinuationReason = readNonEmptyString(runContext.wakeReason); const continuedIssueId = readNonEmptyString(runContext.issueId); + if (systemContinuationReason === ONBOARDING_CHAT_GREETING_REASON && !run.startedAt) { + const [chat] = continuedIssueId ? await db.select().from(issues) + .where(and(eq(issues.companyId, run.companyId), eq(issues.id, continuedIssueId))) : []; + if (!chat || !(await onboardingGreetingNeeded(db, chat))) { + const errorCode = "onboarding_welcome_superseded"; + const cancelled = await cancelRunIfStillQueued(run.id, { finishedAt: new Date(), errorCode, + error: "The conversation no longer needs an opening welcome." }); + if (cancelled) { + await setWakeupStatus(run.wakeupRequestId, "skipped", { finishedAt: cancelled.finishedAt!, error: errorCode }); + await releaseIssueExecutionAndPromote(cancelled, { suppressImmediateRecovery: true, deferredPostCommitEffects }); + } + return null; + } + } if (systemContinuationReason && SYSTEM_CONTINUATION_WAKE_REASONS.has(systemContinuationReason) && continuedIssueId && runContext.onboardingCompletion !== true) { const [target] = await db.select({ status: issues.status, assigneeAgentId: issues.assigneeAgentId }).from(issues) diff --git a/server/src/services/onboarding-chat.ts b/server/src/services/onboarding-chat.ts index 48c7221ec56..1b57bfe4b67 100644 --- a/server/src/services/onboarding-chat.ts +++ b/server/src/services/onboarding-chat.ts @@ -54,7 +54,8 @@ export async function startOnboardingGreeting(db: Db, issue: Parameters