From c04582a4414df573ebefc12beb0e51d893d8564e Mon Sep 17 00:00:00 2001 From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com> Date: Wed, 18 Nov 2026 11:25:07 -0800 Subject: [PATCH] fix(chat): answer the export from one reader snapshot again Paging across replies let main join an unbounded context and could mix chat states. The read again answers in one reply from one snapshot, so the reply limit bounds the whole context as before; large tool outputs and patches still count only as their excerpts. --- .../journal-domain-item-reads.test.ts | 13 +-- .../journal-sql-continuation-context.ts | 81 ++++++++----------- .../journal-sql-reads.ts | 6 +- 3 files changed, 39 insertions(+), 61 deletions(-) diff --git a/src/main/native-chat/agent-session-journal/journal-domain-item-reads.test.ts b/src/main/native-chat/agent-session-journal/journal-domain-item-reads.test.ts index 244655dfadb..4875954e4ca 100644 --- a/src/main/native-chat/agent-session-journal/journal-domain-item-reads.test.ts +++ b/src/main/native-chat/agent-session-journal/journal-domain-item-reads.test.ts @@ -9,10 +9,7 @@ import type { import { migrateJournalDomainSchema } from './journal-domain-schema' import { writeJournalDomainCurrentItem } from './journal-domain-current-item' import { readJournalDomainItems, type JournalDomainItemRead } from './journal-sql-item-reads' -import { - JOURNAL_CONTINUED_CHUNK_BYTES, - joinContinuationPages -} from './journal-sql-continuation-context' +import { JOURNAL_CONTINUED_CHUNK_BYTES } from './journal-sql-continuation-context' import { runJournalTransaction } from './database/journal-database' import { @@ -251,7 +248,7 @@ it('selects producer identities and the roster from scalars, skipping hidden row expect(snapshot.subagents).toEqual(['agent-a']) }) -it('exports visible rows and sends after the newest clear across bounded query pages', async () => { +it('exports visible rows and sends after the newest clear across bounded query pages', () => { const { seed, send, read } = chat() const submission = ( id: string, @@ -279,9 +276,7 @@ it('exports visible rows and sends after the newest clear across bounded query p seed(row('orca:rejected', 401, user('rejected')), { hidden: true }) send(submission('rejected', 4, 401), 4) - const context = await joinContinuationPages( - async (from) => read({ kind: 'continuation-context', from }).page - ) + const { context } = read({ kind: 'continuation-context' }) expect(context.cursor).toEqual({ epoch: 'epoch', sequence: 900 }) expect(context.items.map((item) => item.itemId)).toEqual([...tail, 'orca:after']) expect(context.submissions.map((entry) => entry.clientMessageId)).toEqual(['after', 'rejected']) @@ -301,7 +296,7 @@ it('exports a large tool output as an excerpt plus byte chunks that rejoin it ex }) ) - const { page: context } = read({ kind: 'continuation-context' }) + const { context } = read({ kind: 'continuation-context' }) expect(context.continued).toEqual([ { index: 0, itemId: 'tool', revision: 1, field: 'output', bytes: 34_100_020 } ]) diff --git a/src/main/native-chat/agent-session-journal/journal-sql-continuation-context.ts b/src/main/native-chat/agent-session-journal/journal-sql-continuation-context.ts index acb9e5b2bee..96247fd38b5 100644 --- a/src/main/native-chat/agent-session-journal/journal-sql-continuation-context.ts +++ b/src/main/native-chat/agent-session-journal/journal-sql-continuation-context.ts @@ -60,18 +60,18 @@ export function journalDomainContextHead( } /** Where the next export page starts: items in visible order, then the chat's sends. */ -export type JournalContinuationFrom = { part: 'items' | 'sends'; after: SqliteBindings } +type JournalContinuationFrom = { part: 'items' | 'sends'; after: SqliteBindings } -export type JournalContinuationPage = JournalContinuationContext & { +type JournalContinuationPage = JournalContinuationContext & { next: JournalContinuationFrom | null } export type JournalContinuationRead = - | { kind: 'continuation-context'; from?: JournalContinuationFrom } + | { kind: 'continuation-context' } | { kind: 'continuation-chunk'; read: JournalContinuationChunkRead } export type JournalContinuationReadResult = - | { kind: 'continuation-context'; page: JournalContinuationPage } + | { kind: 'continuation-context'; context: JournalContinuationContext } | { kind: 'continuation-chunk'; bytes: Uint8Array | null } export function readJournalDomainContinuation( @@ -80,15 +80,39 @@ export function readJournalDomainContinuation( operation: JournalContinuationRead ): JournalContinuationReadResult { return operation.kind === 'continuation-context' - ? { - kind: 'continuation-context', - page: readJournalDomainContinuationPage(db, target, operation.from) - } + ? { kind: 'continuation-context', context: readJournalDomainContinuationContext(db, target) } : readJournalDomainContinuationChunk(db, target, operation.read) } -/** One bounded page of an explicit export; the caller joins pages that share a cursor. */ -export function readJournalDomainContinuationPage( +/** + * An explicit export, one reader snapshot answered in one reply, so the reply limit bounds the + * whole context; a large tool output or patch counts only as its excerpt. + */ +function readJournalDomainContinuationContext( + db: Database.Database, + target: { sessionId: string; epoch: string } +): JournalContinuationContext { + const context = { + items: [] as AgentJournalRenderItem[], + submissions: [] as AgentJournalSubmission[], + continued: [] as JournalContinuedPayload[] + } + let page = readJournalDomainContinuationPage(db, target) + for (;;) { + for (const part of page.continued) { + context.continued.push({ ...part, index: part.index + context.items.length }) + } + context.items.push(...page.items) + context.submissions.push(...page.submissions) + if (!page.next) { + return { cursor: page.cursor, ...context } + } + page = readJournalDomainContinuationPage(db, target, page.next) + } +} + +/** One query page of an export, in visible order and then the chat's sends. */ +function readJournalDomainContinuationPage( db: Database.Database, target: { sessionId: string; epoch: string }, from: JournalContinuationFrom = { part: 'items', after: [] } @@ -190,40 +214,3 @@ function nextPage(rows: readonly SqliteRow[], columns: readonly string[]): Sqlit const last = rows.at(-1) return last && rows.length === PAGE ? columns.map((column) => last[column]) : [] } - -const CONTINUATION_ATTEMPTS = 3 - -/** - * Joins export pages read at one cursor; a chat that moves between pages restarts the export, - * and one that keeps moving is joined as read, under its first page's cursor. - */ -export async function joinContinuationPages( - readPage: (from: JournalContinuationFrom | undefined) => Promise -): Promise { - for (let attempt = 1; ; attempt++) { - const items: AgentJournalRenderItem[] = [] - const submissions: AgentJournalSubmission[] = [] - const continued: JournalContinuedPayload[] = [] - let page = await readPage(undefined) - const { cursor } = page - let moved = false - for (;;) { - continued.push( - ...page.continued.map((part) => ({ ...part, index: part.index + items.length })) - ) - items.push(...page.items) - submissions.push(...page.submissions) - if (!page.next) { - break - } - page = await readPage(page.next) - moved ||= page.cursor.epoch !== cursor.epoch || page.cursor.sequence !== cursor.sequence - if (moved && attempt < CONTINUATION_ATTEMPTS) { - break - } - } - if (!moved || attempt >= CONTINUATION_ATTEMPTS) { - return { cursor, items, submissions, continued } - } - } -} diff --git a/src/main/native-chat/agent-session-journal/journal-sql-reads.ts b/src/main/native-chat/agent-session-journal/journal-sql-reads.ts index 7866e68bfdb..4db2d207c83 100644 --- a/src/main/native-chat/agent-session-journal/journal-sql-reads.ts +++ b/src/main/native-chat/agent-session-journal/journal-sql-reads.ts @@ -9,7 +9,6 @@ import type { JournalRewindTarget } from './journal-domain-rewind-target' import type { JournalObserverRead, JournalObserverResult } from './journal-observer-read' import type { JournalSqlWorkRead, JournalSqlWorkResult } from './journal-work-read' import type { AgentSessionJournalReads } from './journal-reads' -import { joinContinuationPages } from './journal-sql-continuation-context' import type { JournalSqlPointRead, JournalSqlPointReadResult } from './journal-sql-point-read' import type { JournalSqlReaderPool } from './journal-sql-reader-pool' import type { BotMemorySources } from '../../../shared/bots/bot-memory-source' @@ -207,10 +206,7 @@ export function journalSqlReads( namedTurn: async (turnId) => (await read({ kind: 'named-turn', turnId })).turn, messageOptions: async (clientMessageId) => (await read({ kind: 'message-options', clientMessageId })).options, - continuationContext: () => - joinContinuationPages( - async (from) => (await read({ kind: 'continuation-context', from })).page - ), + continuationContext: async () => (await read({ kind: 'continuation-context' })).context, continuationChunk: async (chunk) => (await read({ kind: 'continuation-chunk', read: chunk })).bytes, latestPrompt: async () => (await read({ kind: 'latest-prompt' })).prompt,