mirror of
https://github.com/paperclipai/paperclip.git
synced 2026-11-18 14:35:55 +01:00
Retry timed-out welcomes and skip superseded queued greetings
Co-Authored-By: Paperclip <noreply@paperclip.ing>
This commit is contained in:
1 parent
760cbf8b39
commit
29f31707a5
3 files changed
+54
-1
No files matched your search
@@ -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);
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -54,7 +54,8 @@ export async function startOnboardingGreeting(db: Db, issue: Parameters<typeof o
|
||||
.leftJoin(heartbeatRuns, eq(heartbeatRuns.id, agentWakeupRequests.runId))
|
||||
.where(and(eq(agentWakeupRequests.companyId, issue.companyId), eq(agentWakeupRequests.agentId, issue.conversationAgentId),
|
||||
eq(agentWakeupRequests.idempotencyKey, key), ne(agentWakeupRequests.status, "skipped"), ne(agentWakeupRequests.status, "failed"),
|
||||
sql`(${heartbeatRuns.status} is null or ${heartbeatRuns.status} not in ('failed', 'cancelled'))`)).limit(1);
|
||||
ne(agentWakeupRequests.status, "timed_out"),
|
||||
sql`(${heartbeatRuns.status} is null or ${heartbeatRuns.status} not in ('failed', 'cancelled', 'timed_out'))`)).limit(1);
|
||||
if (receipt) return true;
|
||||
const run = await wakeup(issue.conversationAgentId, {
|
||||
source: "on_demand", triggerDetail: "manual", reason: ONBOARDING_CHAT_GREETING_REASON,
|
||||
|
||||
Reference in new issue
Block a user