refactor: identify and freeze messages at creation

packages/compact/compact-tool-result-prune/src/index.ts

@@ -6,8 +6,9 @@
 
 import { Context, Service } from 'cordis'
 import z from 'schemastery'
+import { freezeMessage } from '@deepseek-ai/dsh-llm'
 import type { ContentBlock } from '@deepseek-ai/dsh-llm'
-import type { Session, SessionEvent } from '@deepseek-ai/dsh-session'
+import type { Session, SessionEvent, ToolResultMessage } from '@deepseek-ai/dsh-session'
 import { codePointLength, DEFAULTS, PRUNE_MARKER, resolveConfig } from './config.ts'
 import type {
   PrunedEntry,
@@ -132,13 +133,21 @@ export class ToolResultPruneService extends Service {
     const pruned: PrunedEntry[] = []
     let charsRemoved = 0
     for (const { seq, event } of candidates) {
-      const content = this.pruneContent(event.data.content)
+      const result = event.data.message.content[0]
+      const content = this.pruneContent(result.content)
       if (content === null) continue
-      const charsBefore = this.measureContent(event.data.content)
+      const charsBefore = this.measureContent(result.content)
       const charsAfter = this.measureContent(content)
+      const message = freezeMessage<ToolResultMessage>({
+        ...event.data.message,
+        content: [{
+          ...result,
+          content,
+        }] as [typeof result],
+      })
       const replacement = session.append('tool/result', {
         ...event.data,
-        content,
+        message,
       }, {
         surfaceOp: { op: 'replace', start: seq, end: seq },
         sourceEventSeqs: [seq],
@@ -146,7 +155,7 @@ export class ToolResultPruneService extends Service {
       pruned.push({
         originalSeq: seq,
         replacementSeq: replacement.seq,
-        callId: event.data.callId,
+        callId: event.data.message.source.callId,
         charsBefore,
         charsAfter,
       })

packages/compact/compact-tool-result-prune/tests/tool-result-prune.spec.ts

@@ -1,8 +1,11 @@
 import { describe, expect, it } from 'vitest'
 import { Context } from 'cordis'
-import { CallId } from '@deepseek-ai/dsh-llm'
+import { CallId , createMessage, createToolResultMessage } from '@deepseek-ai/dsh-llm'
 import type { ContentBlock } from '@deepseek-ai/dsh-llm'
-import SessionStore, { Session, SessionId } from '@deepseek-ai/dsh-session'
+import SessionStore, {
+  Session,
+  SessionId,
+} from '@deepseek-ai/dsh-session'
 import type { SurfaceEvent } from '@deepseek-ai/dsh-session'
 import * as SessionInvariant from '@deepseek-ai/dsh-session/invariant'
 import InvariantService from '@deepseek-ai/dsh-invariants'
@@ -41,16 +44,20 @@ function appendToolStep(
   session.append('assistant/message', {
     turn,
     step: 1,
-    content: [{ type: 'tool-call', id: callId, name: 'bash', arguments: '{}' }],
-    provenance: { provider: MODEL, model: MODEL },
+    message: createMessage({
+      role: 'assistant',
+      content: [{ type: 'tool-call', id: callId, name: 'bash', arguments: '{}' }],
+      source: {
+        kind: 'model',
+        ...{ provider: MODEL, model: MODEL },
+      },
+    }),
   }, { surfaceOp: 'append' })
   session.append('tool/call', { turn, step: 1, callId, name: 'bash', arguments: '{}' })
   const result = session.append('tool/result', {
     turn,
     step: 1,
-    callId,
-    content,
-    isError: false,
+    message: createToolResultMessage({ callId, content, isError: false }),
     ...extra,
   }, { surfaceOp: 'append' })
   session.append('step/end', { turn, step: 1 })
@@ -172,15 +179,24 @@ describe('ToolResultPruneService session transaction', () => {
     const replacement = session.events[entry.replacementSeq]! as SurfaceEvent
     expect(original).toMatchObject({
       type: 'tool/result',
-      data: { content: [{ type: 'text', text: 'x'.repeat(100) }] },
+      data: {
+        message: {
+          content: [{
+            type: 'tool-result',
+            content: [{ type: 'text', text: 'x'.repeat(100) }],
+          }],
+        },
+      },
     })
     expect(replacement).toMatchObject({
       type: 'tool/result',
       data: {
         turn: 1,
         step: 1,
-        callId: CallId('one'),
         isError: true,
+        message: {
+          source: { kind: 'tool', callId: CallId('one') },
+        },
         error: { name: 'ExitError', code: 'EXIT_1' },
         meta: { diff: ['a', 'b'] },
         futureField: { nested: true },