Merge live assistant stream into embedded stream migration

# Conflicts:
#	apps/web/tests/scaffold.ts

apps/web/tests/navigation-panes.e2e.ts

@@ -28,7 +28,7 @@ const SEARCH_EXPECTED = join(SNAPSHOT_DIR, 'search-results.expected.md')
 const TERMINAL_EXPECTED = join(SNAPSHOT_DIR, 'terminal-card.expected.md')
 const MODE = webSnapshotMode()
 const SEED_ID = 'navigation-panes-web-e2e'
-const EXPORTED_LOG_FILE = `session.v${String(SESSION_FORMAT_VERSION)}.jsonl`
+const EXPORTED_LOG_FILE = 'session.jsonl'
 
 // Turn 1 leads with a distinctive word: the session-title fallback takes the
 // first words of the first message, so the sidebar-search scenario has a

apps/web/tests/question-composer.e2e.ts

@@ -107,7 +107,6 @@ function cancelledFixture(fixture: string): string {
     message.content[0].isError = true
     data.error = {
       name: 'UserQuestionError',
-      message: 'the user cancelled ask_user_question',
       code: 'ASK_CANCELLED',
     }
     replaced = true

apps/web/tests/scaffold.ts

@@ -719,7 +719,7 @@ export async function launchWebScaffold(options: LaunchOptions = {}): Promise<We
       if (headerType !== 'session') {
         throw new Error('replayProvidersOnly fixture must open with a session header row')
       }
-      const recorded = parseSessionLog(fixtureText)
+      const recorded = parseSessionLogForReplay(fixtureText, options.replayFixture)
       const hasModelCall = recorded.some(event => (
         event.type === 'assistant/message' || event.type === 'assistant/attempt'
           || event.type === 'request/header' || event.type === 'tool/call'

apps/web/tests/schedule-after.e2e.ts

@@ -608,7 +608,7 @@ describe.skipIf(MODE === 'record')('web e2e: active Schedule catalog', () => {
     scaffold = await launchWebScaffold({
       extraOverlayPath: OVERLAY,
     })
-    await seedSession(scaffold, fixture, CATALOG_SESSION_ID, 'standard')
+    await seedSession(scaffold, fixture, CATALOG_SESSION_ID, 'standard', CATALOG_FIXTURE)
     const workspace = await scaffold.ctx.workspaceRegistry.create(scaffold.workspaceCwd)
     await workspace.attachSession(CATALOG_SESSION_ID)
 

packages/session/session-persistence-jsonl/tests/jsonl.spec.ts

@@ -682,7 +682,7 @@ describe('JsonlSessionPersistence: immutable format generations', () => {
     const highest = generationLogPath(root, header.cwd, header.id, 4, 'zstd')
     await writeFile(highest, 'newer')
 
-    await expect(ctx.sessionPersistence.list()).rejects.toThrow(highest)
+    await expect(ctx.sessionPersistence.list()).rejects.toThrow(JSON.stringify(highest))
   })
 
   it('surfaces a file occupying the targeted Session-directory path', async () => {