Merge master into codex/simp-session-log-representation

packages/compact/compact/README.md

@@ -35,7 +35,7 @@ The private per-session cache is keyed by `session.surface.replaceGeneration` an
 
 1. appends `compact/start` (log-only) — acquires the lock,
 2. summarizes the range,
-3. appends `compact/summary` (log-only) — provenance: summary, range, shadowed seqs, token count,
+3. appends `compact/summary` (log-only) — provenance: summary, range, shadowed seqs, token count, and provider/model call envelope,
 4. appends a single `user/message` with `surfaceOp: { op: 'replace', start, end }` carrying the summary — **the only surface mutation**,
 5. appends `compact/end` (log-only) — releases the lock.
 

packages/compact/compact/src/types.ts

@@ -24,6 +24,8 @@ declare module '@deepseek-ai/dsh-session' {
       shadowedRange: { start: number; end: number }
       shadowedSeqs: number[]
       shadowedTokenCount: number
+      /** The provider route that wrote the summary. */
+      provider: string
       /**
        * The model that wrote the summary — the summarize call's envelope,
        * reported by the backend that made the call, logged so the one-shot

packages/compact/compact/tests/compact.spec.ts

@@ -41,6 +41,7 @@ class StubCompactService extends CompactService {
       shadowedRange: { start, end },
       shadowedSeqs: [],
       shadowedTokenCount: 0,
+      provider: 'mock',
       model: 'stub',
     })
     const endEvent = session.append('compact/end', { turn: 0 })

packages/compact/compact/tests/render.spec.ts

@@ -54,7 +54,7 @@ describe('renderTranscript', () => {
       content: [{ type: 'text', text: 'fix the bug' }],
       source: { kind: 'user' },
     }, { surfaceOp: 'append' })
-    const assistant = s.append('assistant/message', {
+    const assistant = s.append('assistant/message', { provenance: { provider: 'mock', model: 'mock' },
       turn: 0, step: 0,
       content: [{ type: 'text', text: 'looking' }],
     }, { surfaceOp: 'append' })
@@ -111,7 +111,7 @@ describe('renderTranscript', () => {
       content: [{ type: 'text', text: '' }],
       source: { kind: 'user' },
     }, { surfaceOp: 'append' })
-    const emptyAssistant = s.append('assistant/message', {
+    const emptyAssistant = s.append('assistant/message', { provenance: { provider: 'mock', model: 'mock' },
       turn: 0, step: 0,
       content: [{ type: 'text', text: '' }],
     }, { surfaceOp: 'append' })

packages/compact/compact/tests/tool-pairing.spec.ts

@@ -34,6 +34,7 @@ function closedToolStep(): Session {
     turn: 1,
     step: 1,
     content: [{ type: 'tool-call', id: CallId('c1'), name: 'bash', arguments: '{}' }],
+    provenance: { provider: 'mock', model: 'mock' },
   }, SURFACE)
   session.append('tool/result', {
     turn: 1,
@@ -60,6 +61,7 @@ describe('tool-pairing boundaries', () => {
       turn: 1,
       step: 1,
       content: [{ type: 'tool-call', id: CallId('open'), name: 'bash', arguments: '{}' }],
+      provenance: { provider: 'mock', model: 'mock' },
     }, SURFACE)
     expect(toolPairingBalancedAfter(open, open.surface.nodes[0]!)).toBe(false)
   })
@@ -73,6 +75,7 @@ describe('tool-pairing boundaries', () => {
         { type: 'tool-call', id: CallId('c1'), name: 'one', arguments: '{}' },
         { type: 'tool-call', id: CallId('c2'), name: 'two', arguments: '{}' },
       ],
+      provenance: { provider: 'mock', model: 'mock' },
     }, SURFACE)
     session.append('tool/result', {
       turn: 1, step: 1, callId: CallId('c1'), content: [], isError: false,
@@ -91,6 +94,7 @@ describe('tool-pairing boundaries', () => {
       turn: 1,
       step: 1,
       content: [{ type: 'tool-call', id: CallId('c1'), name: 'bash', arguments: '{}' }],
+      provenance: { provider: 'mock', model: 'mock' },
     }, SURFACE)
     midStep.append('context/message', {
       content: [{ type: 'text', text: 'background update' }],
@@ -165,7 +169,12 @@ describe('tool-pairing cache refresh', () => {
       },
       {
         type: 'assistant/message', seq: 1, time: 1,
-        data: { turn: 1, step: 1, content: [{ type: 'tool-call', id: CallId('c1'), name: 'one', arguments: '{}' }] },
+        data: {
+          turn: 1,
+          step: 1,
+          content: [{ type: 'tool-call', id: CallId('c1'), name: 'one', arguments: '{}' }],
+          provenance: { provider: 'mock', model: 'mock' },
+        },
         surfaceOp: 'append',
       },
       {
@@ -226,7 +235,12 @@ describe('tool-pairing cache refresh', () => {
     events.push(
       {
         type: 'assistant/message', seq: 5, time: 5,
-        data: { turn: 2, step: 1, content: [{ type: 'tool-call', id: CallId('c2'), name: 'two', arguments: '{}' }] },
+        data: {
+          turn: 2,
+          step: 1,
+          content: [{ type: 'tool-call', id: CallId('c2'), name: 'two', arguments: '{}' }],
+          provenance: { provider: 'mock', model: 'mock' },
+        },
         surfaceOp: 'append',
       },
       {