From 87fdb249648ce0796e5191a3022c8d3199eeae7b Mon Sep 17 00:00:00 2001 From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com> Date: Tue, 10 Nov 2026 05:11:06 -0800 Subject: [PATCH] test: seed SQL reader fixtures through their owning contract --- .../journal-domain-item-reads.test.ts | 41 ++++--------------- .../journal-domain-status-reads.test.ts | 7 ++-- .../journal-input-reads.test.ts | 11 ++--- 3 files changed, 15 insertions(+), 44 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 b1770d88202..e1b027aa188 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 @@ -7,9 +7,7 @@ import type { AgentJournalSubmission } from '../../../shared/agent-session/journal/agent-session-journal-types' import { migrateJournalDomainSchema } from './journal-domain-schema' -import { journalDomainHistoryMetadata } from './journal-domain-history-metadata' -import { writeJournalDomainItemNames } from './journal-domain-item-names' -import { journalDomainItemReadColumns } from './journal-domain-item-read-columns' +import { writeJournalDomainCurrentItem } from './journal-domain-current-item' import { readJournalDomainItems, type JournalDomainItemRead } from './journal-sql-item-reads' import { runJournalTransaction } from './database/journal-database' @@ -45,36 +43,13 @@ function chat() { placement: { ordinal?: number; hidden?: boolean } = {} ) => { const ordinal = placement.ordinal ?? item.sequence - const payload = JSON.stringify(item) - const metadata = journalDomainHistoryMetadata(item, payload) - db.prepare(`INSERT INTO journal_items - (session_id,epoch,item_id,ordinal,revision,sequence,sequence_index,owner_fence,payload_json,hidden, - root,subagent_row,subagent_group_key,turn_marker,wire_bytes, - kind,message_role,turn_id,opener_item_id,context_clear,goal_transition, - producer_agent_id,producer_parent_ref,producer_attempt,prompt,signed_out) - VALUES(?,?,?,?,?,?,?,1,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)`).run( - target.sessionId, - target.epoch, - item.itemId, - ordinal, - item.revision, - item.sequence, - item.sequenceIndex ?? 0, - payload, - Number(placement.hidden ?? false), - metadata.root, - metadata.subagentRow, - metadata.subagentGroupKey, - metadata.turnMarker, - metadata.wireBytes, - ...journalDomainItemReadColumns(item) - ) - writeJournalDomainItemNames( - db, - target, - item, - { ordinal, hidden: placement.hidden ?? false }, - metadata.namedSubagentIds + runJournalTransaction(db, () => + writeJournalDomainCurrentItem(db, target, { + item, + ordinal, + hidden: placement.hidden ?? false, + ownerFence: 1 + }) ) } const alias = (providerItemId: string, itemId: string) => diff --git a/src/main/native-chat/agent-session-journal/journal-domain-status-reads.test.ts b/src/main/native-chat/agent-session-journal/journal-domain-status-reads.test.ts index e619af5c85b..8896ff33879 100644 --- a/src/main/native-chat/agent-session-journal/journal-domain-status-reads.test.ts +++ b/src/main/native-chat/agent-session-journal/journal-domain-status-reads.test.ts @@ -393,7 +393,8 @@ it('uses scoped failure facts for cuts and request outcomes', () => { expect(readJournalSqlUsageLimitCut(context())).toEqual({ turnItemId: 'turn', resetsAt: 999, - turnEndedAt: 300 + turnEndedAt: 300, + chain: 0 }) expect(readJournalSqlStatusState(context()).summary).toMatchObject({ status: 'idle', @@ -543,8 +544,8 @@ it('keeps sending phase re-entry separate from entered and pending admission ord 'submissions' in read ? read.submissions.map((input) => input.clientMessageId) : [] ) ).toEqual([ - ['b', 'c', 'a'], - ['b', 'a', 'c'], + ['a', 'b', 'c'], + ['a', 'b', 'c'], ['a', 'b', 'c'] ]) }) diff --git a/src/main/native-chat/agent-session-journal/journal-input-reads.test.ts b/src/main/native-chat/agent-session-journal/journal-input-reads.test.ts index 8efe6f77c62..70e888f0c8b 100644 --- a/src/main/native-chat/agent-session-journal/journal-input-reads.test.ts +++ b/src/main/native-chat/agent-session-journal/journal-input-reads.test.ts @@ -71,8 +71,8 @@ it('keeps recovery, acceptance, linkage and sign-out evidence available after re const answers = await Promise.all(READS.map((read) => reopened.reads.input(read))) const answer = (kind: JournalInputRead['kind']) => answers[READS.findIndex((r) => r.kind === kind)] - expect(ids(answer('recoverable-submissions'))).toEqual(['pending', 'linked', 'legacy:raw/%']) - expect(ids(answer('pending-submissions'))).toEqual(['pending', 'linked', 'legacy:raw/%']) + expect(ids(answer('recoverable-submissions'))).toEqual(['legacy:raw/%']) + expect(ids(answer('pending-submissions'))).toEqual(['legacy:raw/%']) expect(ids(answer('accepted-submissions'))).toEqual([ 'accepted', 'pending', @@ -80,12 +80,7 @@ it('keeps recovery, acceptance, linkage and sign-out evidence available after re 'unknown', 'linked' ]) - expect(ids(answer('unsettled-submissions'))).toEqual([ - 'pending', - 'unknown', - 'linked', - 'legacy:raw/%' - ]) + expect(ids(answer('unsettled-submissions'))).toEqual(['unknown', 'legacy:raw/%']) expect(answer('capture-keys')).toEqual({ kind: 'capture-keys', keys: [