diff --git a/packages/client/src/solid/data.ts b/packages/client/src/solid/data.ts index 6e727d44262..d128dac68ef 100644 --- a/packages/client/src/solid/data.ts +++ b/packages/client/src/solid/data.ts @@ -1841,7 +1841,14 @@ export function createData(config: CreateDataInput) { (item) => !ids.has(item.id) && (outbox.has(item.id) || admitted.has(item.id)), ) const messages = local.length === 0 ? fetched : [...fetched, ...local] + // The transcript only holds delivered input, so a pending row it contains missed its + // inbox.delivered event (and maybe its enqueued echo) while the event stream was down. + const delivered = [...admitted].filter((id) => ids.has(id)) batch(() => { + delivered.forEach((id) => { + outbox.delete(id) + removePending(sessionID, id) + }) messageIndex.set(sessionID, new Map(messages.map((message, index) => [message.id, index]))) setStore("session", "message", sessionID, reconcile(messages)) setStore("session", "messageCursor", sessionID, response.cursor.next ?? undefined) diff --git a/packages/client/test/solid-inbox-race.test.ts b/packages/client/test/solid-inbox-race.test.ts index 0e3415266da..0efa3812294 100644 --- a/packages/client/test/solid-inbox-race.test.ts +++ b/packages/client/test/solid-inbox-race.test.ts @@ -160,3 +160,44 @@ test("hydration coalesces a concurrent optimistic compaction even if its POST fa setup.dispose() } }) + +const transcript = { + data: [{ id: item.id, type: "user", text: "Check the remote preview", time: { created: 2 } }], + cursor: {}, +} + +test("a transcript read clears a prompt whose delivery event was missed", async () => { + const setup = fixture(async (request) => + new URL(request.url).pathname.endsWith("/message") ? Response.json(transcript) : Response.json({ data: [] }), + ) + try { + setup.emit(enqueued) + expect(setup.data.session.input.has(item.sessionID, item.id)).toBe(true) + await setup.data.session.message.sync(item.sessionID) + expect(setup.data.session.input.has(item.sessionID, item.id)).toBe(false) + expect(setup.data.session.message.get(item.sessionID, item.id)?.time.created).toBe(2) + } finally { + setup.dispose() + } +}) + +test("a transcript read clears an accepted prompt whose events were all missed", async () => { + const setup = fixture(async (request) => { + if (request.method === "POST") return Response.json({ data: { id: item.id } }) + if (new URL(request.url).pathname.endsWith("/message")) return Response.json(transcript) + return Response.json({ data: [] }) + }) + try { + await setup.data.session.prompt({ sessionID: item.sessionID, id: item.id, text: item.payload.text }) + // An inbox read cannot see a prompt the server already delivered, so it keeps the outbox row. + await setup.data.session.pending.sync(item.sessionID) + expect(setup.data.session.input.has(item.sessionID, item.id)).toBe(true) + await setup.data.session.message.sync(item.sessionID) + expect(setup.data.session.input.has(item.sessionID, item.id)).toBe(false) + // Later inbox reads no longer resurrect it from the outbox. + await setup.data.session.pending.sync(item.sessionID) + expect(setup.data.session.input.has(item.sessionID, item.id)).toBe(false) + } finally { + setup.dispose() + } +}) diff --git a/packages/tui/test/app-lifecycle.test.tsx b/packages/tui/test/app-lifecycle.test.tsx index 959bdfa8fb4..ae6f6415b50 100644 --- a/packages/tui/test/app-lifecycle.test.tsx +++ b/packages/tui/test/app-lifecycle.test.tsx @@ -1847,7 +1847,6 @@ test("free usage limit offers OpenCode Go once per 24h, transitions Subscribe to if (url.pathname === `/api/session/${session.id}/message`) return json({ data: [ - { id: "msg_queued_user", type: "user", text: "Queued follow-up", time: { created: 3 } }, { id: "msg_free_assistant", type: "assistant",