From 4380f2dce6baccccfa7d6ed4f684c86c6ea83b42 Mon Sep 17 00:00:00 2001 From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com> Date: Tue, 10 Nov 2026 04:17:20 -0800 Subject: [PATCH] test: adopt saved snapshots in direct Claude sinks --- src/main/claude/claude-api-retry-row.test.ts | 2 ++ .../claude/claude-background-wake-retention.test.ts | 2 ++ src/main/claude/claude-context-usage-restart.test.ts | 10 ++++++---- .../claude-context-usage-unloaded-turn.test.ts | 10 ++++++---- .../claude/claude-stream-json-connection.test.ts | 2 ++ ...uctured-agent-session-direct-sink.test-fixture.ts | 12 ++++++++++++ 6 files changed, 30 insertions(+), 8 deletions(-) create mode 100644 src/main/native-chat/agent-session-wire/host/testing/structured-agent-session-direct-sink.test-fixture.ts diff --git a/src/main/claude/claude-api-retry-row.test.ts b/src/main/claude/claude-api-retry-row.test.ts index b5df79b7ed1..6e25a0acacc 100644 --- a/src/main/claude/claude-api-retry-row.test.ts +++ b/src/main/claude/claude-api-retry-row.test.ts @@ -1,3 +1,4 @@ +import { followTestSinkSnapshots } from '../native-chat/agent-session-wire/host/testing/structured-agent-session-direct-sink.test-fixture' import { readTestJournalItems } from '../native-chat/agent-session-journal/journal-observation.test-support' import { openTestAgentSessionDatabase } from '../runtime/agent-session/records/agent-session-record-store-test-harness' import { mkdtemp, rm } from 'node:fs/promises' @@ -55,6 +56,7 @@ async function statusRowsFor(frames: Record[]) { mintEpoch: () => 'epoch-1' }) const deferred = createDeferredStructuredAgentSessionEventSink(testEventSinkLogging()) + await followTestSinkSnapshots(deferred, journal) deferred.bind({ journal, fence: 1, publish: vi.fn() }) const translator = createClaudeJournalTranslator({ sink: deferred.sink, fallbackIdPrefix: '1' }) for (const frame of frames) { diff --git a/src/main/claude/claude-background-wake-retention.test.ts b/src/main/claude/claude-background-wake-retention.test.ts index 77bd8715a42..c0c684c8f2d 100644 --- a/src/main/claude/claude-background-wake-retention.test.ts +++ b/src/main/claude/claude-background-wake-retention.test.ts @@ -1,3 +1,4 @@ +import { followTestSinkSnapshots } from '../native-chat/agent-session-wire/host/testing/structured-agent-session-direct-sink.test-fixture' import { mkdtemp, rm } from 'node:fs/promises' import { tmpdir } from 'node:os' import { join } from 'node:path' @@ -80,6 +81,7 @@ async function wiredSession() { const deferred = createDeferredStructuredAgentSessionEventSink( testEventSinkLogging(parent.sessionId) ) + await followTestSinkSnapshots(deferred, journal) deferred.bind({ journal, fence: 7, publish: () => void publish() }) const run = await producer(host, deferred.sink) const describe = (views: ReturnType) => diff --git a/src/main/claude/claude-context-usage-restart.test.ts b/src/main/claude/claude-context-usage-restart.test.ts index 305db337b74..90e1f0b93e2 100644 --- a/src/main/claude/claude-context-usage-restart.test.ts +++ b/src/main/claude/claude-context-usage-restart.test.ts @@ -1,3 +1,4 @@ +import { followTestSinkSnapshots } from '../native-chat/agent-session-wire/host/testing/structured-agent-session-direct-sink.test-fixture' import { readTestJournalItems } from '../native-chat/agent-session-journal/journal-observation.test-support' import { mkdtemp, rm } from 'node:fs/promises' import { tmpdir } from 'node:os' @@ -114,9 +115,10 @@ async function openJournal(): Promise { }) } -function acquire(journal: AgentSessionJournal) { +async function acquire(journal: AgentSessionJournal) { const deferred = createDeferredStructuredAgentSessionEventSink(testEventSinkLogging()) const translator = createClaudeJournalTranslator({ sink: deferred.sink, coalesceMs: 0 }) + await followTestSinkSnapshots(deferred, journal) deferred.bind({ journal, fence: 1, publish: () => {} }) const answers: ((value: unknown) => void)[] = [] const unbind = bindClaudeContextUsageCapture( @@ -148,7 +150,7 @@ const ring = async (journal: AgentSessionJournal) => describe('context usage across a restart', () => { it('resets the ring at a /compact that is the first thing after a restart, then reads the fresh report', async () => { const journal = await openJournal() - const before = acquire(journal) + const before = await acquire(journal) before.translator.handle(initFrame(900)) before.translator.handle(userFrame('turn-a', 1_000)) before.translator.handle(assistantFrame('reply-a', 2_000, 150_000)) @@ -157,7 +159,7 @@ describe('context usage across a restart', () => { expect(await ring(journal)).toMatchObject({ usedTokens: 150_000, windowTokens: 1_000_000 }) before.release() - const after = acquire(journal) + const after = await acquire(journal) after.translator.handle(compactBoundary(10_000)) await after.settle() expect(await ring(journal)).toBeNull() @@ -178,7 +180,7 @@ describe('context usage across a restart', () => { it('never brings a settled turn back to running with a context write that ran late', async () => { const journal = await openJournal() - const live = acquire(journal) + const live = await acquire(journal) live.translator.handle(initFrame(900)) live.translator.handle(userFrame('turn-a', 1_000)) live.translator.handle(assistantFrame('reply-a', 2_000, 20_000)) diff --git a/src/main/claude/claude-context-usage-unloaded-turn.test.ts b/src/main/claude/claude-context-usage-unloaded-turn.test.ts index 721d084ba1a..a3a66b047f9 100644 --- a/src/main/claude/claude-context-usage-unloaded-turn.test.ts +++ b/src/main/claude/claude-context-usage-unloaded-turn.test.ts @@ -1,3 +1,4 @@ +import { followTestSinkSnapshots } from '../native-chat/agent-session-wire/host/testing/structured-agent-session-direct-sink.test-fixture' import { readTestJournalItems } from '../native-chat/agent-session-journal/journal-observation.test-support' import { agentSessionConversationView } from '../../shared/agent-session/lifecycle/agent-session-conversation-view' import { @@ -62,9 +63,10 @@ async function openJournal(): Promise { }) } -function translate(journal: AgentSessionJournal) { +async function translate(journal: AgentSessionJournal) { const deferred = createDeferredStructuredAgentSessionEventSink(testEventSinkLogging()) const translator = createClaudeJournalTranslator({ sink: deferred.sink, coalesceMs: 0 }) + await followTestSinkSnapshots(deferred, journal) deferred.bind({ journal, fence: 1, publish: () => {} }) const settle = async (): Promise => { await expect(deferred.drained()).resolves.toEqual({ ok: true }) @@ -73,7 +75,7 @@ function translate(journal: AgentSessionJournal) { } function runTurn( - translator: ReturnType['translator'], + translator: Awaited>['translator'], turnId: string, at: number, sizes: number[] @@ -178,7 +180,7 @@ async function catchUp( describe('context usage for a turn row outside the loaded page', () => { it('marks a live context write on a turn row the window cannot take, and the host answer carries it', async () => { const journal = await openJournal() - const { translator, settle } = translate(journal) + const { translator, settle } = await translate(journal) runTurn(translator, 'turn-a', 1_000, [120_000, 130_000, 140_000, 150_000]) translator.handle(resultFrame(2_000, { 'claude-fable-5-1[1m]': { contextWindow: 1_000_000 } })) runTurn(translator, 'turn-b', 3_000, [200_000, 210_000, 220_000, 230_000]) @@ -201,7 +203,7 @@ describe('context usage for a turn row outside the loaded page', () => { it('keeps the ring on the newest facts while a live turn outgrows the retained window', async () => { const journal = await openJournal() - const { translator, settle } = translate(journal) + const { translator, settle } = await translate(journal) runTurn(translator, 'turn-a', 1_000, [120_000]) translator.handle(resultFrame(2_000, { 'claude-fable-5-1[1m]': { contextWindow: 1_000_000 } })) runTurn(translator, 'turn-b', 3_000, []) diff --git a/src/main/claude/claude-stream-json-connection.test.ts b/src/main/claude/claude-stream-json-connection.test.ts index 7a0db5c23b2..cdb6c0ab119 100644 --- a/src/main/claude/claude-stream-json-connection.test.ts +++ b/src/main/claude/claude-stream-json-connection.test.ts @@ -1,3 +1,4 @@ +import { followTestSinkSnapshots } from '../native-chat/agent-session-wire/host/testing/structured-agent-session-direct-sink.test-fixture' import { readTestJournalItems } from '../native-chat/agent-session-journal/journal-observation.test-support' import { openTestAgentSessionDatabase } from '../runtime/agent-session/records/agent-session-record-store-test-harness' import { execFileSync, type ChildProcess } from 'node:child_process' @@ -281,6 +282,7 @@ describe('Claude stream-json connection', () => { mintEpoch: () => 'epoch-1' }) const deferred = createDeferredStructuredAgentSessionEventSink(testEventSinkLogging()) + await followTestSinkSnapshots(deferred, journal) deferred.bind({ journal, fence: 1, publish: vi.fn() }) const translator = createClaudeJournalTranslator({ sink: deferred.sink }) let settled = false diff --git a/src/main/native-chat/agent-session-wire/host/testing/structured-agent-session-direct-sink.test-fixture.ts b/src/main/native-chat/agent-session-wire/host/testing/structured-agent-session-direct-sink.test-fixture.ts new file mode 100644 index 00000000000..2a2bec4ad2c --- /dev/null +++ b/src/main/native-chat/agent-session-wire/host/testing/structured-agent-session-direct-sink.test-fixture.ts @@ -0,0 +1,12 @@ +import type { SqlAgentSessionJournal } from '../../../agent-session-journal/journal-sql-store' +import type { DeferredStructuredAgentSessionEventSink } from '../../journal-ingress/structured-agent-session-event-sink' +import { StructuredAgentSessionSnapshotRoutes } from '../structured-agent-session-snapshot-routes' +import { testEventSinkLogging } from './structured-agent-session-logger.test-fixture' + +export async function followTestSinkSnapshots( + sink: DeferredStructuredAgentSessionEventSink, + journal: SqlAgentSessionJournal +): Promise { + const routes = new StructuredAgentSessionSnapshotRoutes(testEventSinkLogging().logger) + await sink.followSnapshots(routes.observe(journal.identity.sessionId, journal)) +}