diff --git a/server/src/__tests__/issue-queued-comments-routes.test.ts b/server/src/__tests__/issue-queued-comments-routes.test.ts index 973aa0df559..b7fa23db6e7 100644 --- a/server/src/__tests__/issue-queued-comments-routes.test.ts +++ b/server/src/__tests__/issue-queued-comments-routes.test.ts @@ -692,6 +692,39 @@ describeEmbeddedPostgres("issue queued-comment routes", () => { expect(steerNativeSessionMock.mock.calls).toHaveLength(calls); }); + it("keeps a fresh-session approval and its Interrupt in view when another agent's comment queues after it", async () => { + const seeded = await seedResponseQueue(true); + const [receipt] = await db.select().from(agentWakeupRequests).where(eq(agentWakeupRequests.id, seeded.wakeId)); + await db.update(agentWakeupRequests).set({ payload: { ...receipt.payload, + _paperclipWakeContext: { ...seeded.context, forceFreshSession: true } } }).where(eq(agentWakeupRequests.id, seeded.wakeId)); + const [ceo] = await db.insert(agents).values({ companyId: seeded.companyId, name: "CEO", role: "ceo", status: "idle", + adapterType: "paperclip_runner", adapterConfig: {}, runtimeConfig: {}, permissions: {} }).returning(); + const directionId = randomUUID(), later = new Date(Date.now() + 60_000); + await db.insert(issueComments).values({ id: directionId, companyId: seeded.companyId, issueId: seeded.issueId, + authorType: "agent", authorAgentId: ceo.id, body: "CEO direction: restart with the approved layout", + createdAt: later, updatedAt: later }); + const [agentWake] = await db.insert(agentWakeupRequests).values({ companyId: seeded.companyId, agentId: seeded.agentId, + source: "issue_comment", reason: "issue_commented", status: "deferred_issue_execution", + requestedByActorType: "agent", requestedByActorId: ceo.id, requestedAt: later, + payload: { issueId: seeded.issueId, commentId: directionId, + _paperclipWakeContext: { commentId: directionId, wakeCommentId: directionId, wakeCommentIds: [directionId] } } }).returning(); + const client = app(seeded.companyId); + + const queue = await request(client).get(`/api/issues/${seeded.issueId}/queued-comments`).expect(200); + expect(queue.body.queueId).toBe(seeded.wakeId); + expect(queue.body.entries).toEqual([expect.objectContaining({ + source: expect.objectContaining({ interactionId: seeded.interactionId, requiresFreshSession: true }) })]); + + const personId = randomUUID(), latest = new Date(Date.now() + 120_000); + await db.insert(issueComments).values({ id: personId, companyId: seeded.companyId, issueId: seeded.issueId, + authorType: "user", authorUserId: "queue-owner", body: "Also keep the signup button", createdAt: latest, updatedAt: latest }); + await db.update(agentWakeupRequests).set({ payload: { issueId: seeded.issueId, commentId: personId, + _paperclipWakeContext: { commentId: personId, wakeCommentId: personId, wakeCommentIds: [directionId, personId] } } }) + .where(eq(agentWakeupRequests.id, agentWake.id)); + const withPersonMessage = await request(client).get(`/api/issues/${seeded.issueId}/queued-comments`).expect(200); + expect(withPersonMessage.body.queueId).toBe(agentWake.id); + }); + it("does not steer a plan approval that requires a fresh execution session", async () => { const seeded = await seedResponseQueue(true); const [wake] = await db.select().from(agentWakeupRequests).where(eq(agentWakeupRequests.id, seeded.wakeId)); diff --git a/server/src/routes/issues.ts b/server/src/routes/issues.ts index cc09510deab..b1443ab04f6 100644 --- a/server/src/routes/issues.ts +++ b/server/src/routes/issues.ts @@ -7746,6 +7746,21 @@ export function issueRoutes( // is a read-only receipt. It must never hide the user's own later // messages, which are separately queued and remain editable and sendable. let receipt: IssueQueueState | null = null; + let agentOnly: IssueQueueState | null = null; + const hasPersonMessage = async (wake: { payload: unknown }) => { + const ids = queuedCommentIdsFromWakePayload(wake.payload); + if (ids.length === 0) return false; + const [row] = await executor.select({ id: issueComments.id }).from(issueComments).where(and( + eq(issueComments.companyId, issue.companyId), eq(issueComments.issueId, issue.id), + inArray(issueComments.id, ids), eq(issueComments.authorType, "user"), isNull(issueComments.deletedAt), + )).limit(1); + return Boolean(row); + }; + const pendingMessages = async (state: IssueQueueState) => { + if (await hasPersonMessage(state.wake)) return state; + agentOnly = state; + return null; + }; for (const wake of rows) { if ( readObject(wake.payload).issueId !== issue.id || @@ -7754,16 +7769,17 @@ export function issueRoutes( continue; const isReceipt = Boolean(queuedInteractionId(wake.payload)); if (isReceipt && receipt) continue; - // A receipt a run already received is not pending; a later one may be. + if (!isReceipt && agentOnly) continue; const readReceipt = () => readQueuedInteractionResponse(executor as Db, wake.companyId, issue.id, wake.payload); if (wake.status === "deferred_issue_execution") { if (isReceipt) { const response = await readReceipt(); - // A tool action's outcome is delivered, never listed (approve = run). if (response && !response.toolActionOutcome) receipt = { wake, state: "deferred", queueRun: null, response }; continue; } - return { wake, state: "deferred", queueRun: null }; + const messages = await pendingMessages({ wake, state: "deferred", queueRun: null }); + if (messages) return messages; + continue; } if (!wake.runId) continue; const queueRun = await executor @@ -7784,9 +7800,12 @@ export function issueRoutes( const response = await readReceipt(); if (response && !response.toolActionOutcome) receipt = { wake, state: "queued", queueRun, response }; } - else if (queueRun) return { wake, state: "queued", queueRun }; + else if (queueRun) { + const messages = await pendingMessages({ wake, state: "queued", queueRun }); + if (messages) return messages; + } } - return receipt; + return receipt ?? agentOnly; } async function queueCommentsForWake(