refactor: identify and freeze messages at creation

packages/context/time-context/src/index.ts

@@ -8,6 +8,7 @@
 import type { Context } from 'cordis'
 import z from 'schemastery'
 import type { Agent } from '@deepseek-ai/dsh-agent'
+import { createUserMessage } from '@deepseek-ai/dsh-llm'
 
 /** Cordis plugin name used by loader diagnostics. */
 export const name = 'time-context'
@@ -173,6 +174,6 @@ export function apply(ctx: Context, config: Config): void {
     const previous = step === 1
       ? precedingMessageTime(agent)
       : precedingStepContextTime(agent, turn)
-    agent.inject({ content: [{ type: 'text', text: renderText(now, turn, step, previous, formatter, resolvedTimeZone) }], source: { kind: 'plugin', plugin: name } })
+    agent.inject(createUserMessage({ content: [{ type: 'text', text: renderText(now, turn, step, previous, formatter, resolvedTimeZone) }], source: { kind: 'plugin', plugin: name } }))
   }, { prepend: true })
 }

packages/context/time-context/tests/invariant.spec.ts

@@ -1,3 +1,4 @@
+import { createUserMessage } from '@deepseek-ai/dsh-llm'
 import { describe, expect, it } from 'vitest'
 import { Context } from 'cordis'
 import type { ContentBlock } from '@deepseek-ai/dsh-llm'
@@ -15,15 +16,20 @@ async function setup(): Promise<Context> {
   return ctx
 }
 
-function event(text: string, time = SECOND + 456, content?: unknown[]): SessionEvent {
+function event(
+  text: string,
+  time = SECOND + 456,
+  content?: unknown[],
+  plugin = 'time-context',
+): SessionEvent<'user/message'> {
   return {
     type: 'user/message',
     seq: 0,
     time,
-    data: {
+    data: createUserMessage({
       content: (content ?? [{ type: 'text', text }]) as ContentBlock[],
-      source: { kind: 'plugin', plugin: 'time-context' },
-    },
+      source: { kind: 'plugin', plugin },
+    }),
   }
 }
 
@@ -44,10 +50,10 @@ function preparing(turn: number, step: number): Session {
     session.append('turn/end', { turn: priorTurn, reason: { kind: 'completed' } })
   }
   session.append('turn/start', { turn, trigger: { kind: 'message', source: { kind: 'user' } } })
-  session.append('user/message', {
+  session.append('user/message', createUserMessage({
     content: [{ type: 'text', text: `turn ${turn}` }],
     source: { kind: 'user' },
-  }, { surfaceOp: 'append' })
+  }), { surfaceOp: 'append' })
   for (let priorStep = 1; priorStep < step; priorStep += 1) {
     session.append('step/start', { turn, step: priorStep })
     session.append('step/end', { turn, step: priorStep })
@@ -56,10 +62,10 @@ function preparing(turn: number, step: number): Session {
 }
 
 function appendReading(session: Session, text: string): void {
-  session.append('user/message', {
+  session.append('user/message', createUserMessage({
     content: [{ type: 'text', text }],
     source: { kind: 'plugin', plugin: 'time-context' },
-  }, { surfaceOp: 'append' })
+  }), { surfaceOp: 'append' })
 }
 
 describe('time-context invariants', () => {
@@ -82,10 +88,10 @@ describe('time-context invariants', () => {
     await ctx.plugin(SessionStore)
     const session = ctx.sessions.create(SessionId('time-invariant-late-valid'))
     session.append('turn/start', { turn: 1, trigger: { kind: 'message', source: { kind: 'user' } } })
-    session.append('user/message', {
+    session.append('user/message', createUserMessage({
       content: [{ type: 'text', text: 'prepare' }],
       source: { kind: 'user' },
-    }, { surfaceOp: 'append' })
+    }), { surfaceOp: 'append' })
     appendReading(session, reading())
     session.append('step/start', { turn: 1, step: 1 })
 
@@ -98,10 +104,10 @@ describe('time-context invariants', () => {
     await ctx.plugin(SessionStore)
     const session = ctx.sessions.create(SessionId('time-invariant-late-invalid'))
     session.append('turn/start', { turn: 1, trigger: { kind: 'message', source: { kind: 'user' } } })
-    session.append('user/message', {
+    session.append('user/message', createUserMessage({
       content: [{ type: 'text', text: 'prepare' }],
       source: { kind: 'user' },
-    }, { surfaceOp: 'append' })
+    }), { surfaceOp: 'append' })
     appendReading(session, reading('1', '2', 'step context'))
 
     await ctx.plugin(InvariantService, { enabled: true })
@@ -162,11 +168,16 @@ describe('time-context invariants', () => {
 
   it('ignores context messages owned by another package', async () => {
     const ctx = await setup()
-    const other = event('unrelated') as SessionEvent<'user/message'>
-    other.data.source = { kind: 'plugin', plugin: 'other' }
-    expect(() => { ctx.emit('session/event', preparing(1, 1), other) }).not.toThrow()
-    other.data.source = { kind: 'user' }
+    const other = event('unrelated', SECOND + 456, undefined, 'other')
     expect(() => { ctx.emit('session/event', preparing(1, 1), other) }).not.toThrow()
+    const user: SessionEvent<'user/message'> = {
+      ...event('unrelated'),
+      data: createUserMessage({
+        content: [{ type: 'text', text: 'unrelated' }],
+        source: { kind: 'user' },
+      }),
+    }
+    expect(() => { ctx.emit('session/event', preparing(1, 1), user) }).not.toThrow()
     expect(() => {
       ctx.emit('session/event', preparing(1, 1), {
         type: 'turn/start', seq: 0, time: 0, data: { turn: 1, trigger: { kind: 'message', source: { kind: 'user' } } },

packages/context/time-context/tests/time-context.spec.ts

@@ -1,10 +1,10 @@
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 import { Context } from 'cordis'
 import Loader from '@cordisjs/plugin-loader'
-import { CallId, LlmAdapter } from '@deepseek-ai/dsh-llm'
+import { createUserMessage, CallId, LlmAdapter } from '@deepseek-ai/dsh-llm'
 import type { GenerateOptions, StreamChunk } from '@deepseek-ai/dsh-llm'
 import { Session, SessionId, type SessionEvent } from '@deepseek-ai/dsh-session'
-import AgentRegistry, { agentEvents, AgentMessageId, type Agent } from '@deepseek-ai/dsh-agent'
+import AgentRegistry, { agentEvents, type Agent } from '@deepseek-ai/dsh-agent'
 import { defineContentToolFixture } from '@deepseek-ai/dsh-tools'
 import AgentLoop from '@deepseek-ai/dsh-agent-loop'
 import { mountAgentLoopTestDependencies } from '@deepseek-ai/dsh-agent-loop-testkit'
@@ -43,13 +43,12 @@ function sessionAgent(session: Session, id = 'agent'): Agent {
     status: 'running',
     acceptsNextStep: true,
     ctx: new Context(),
-    followup: () => AgentMessageId('stub'),
-    steer: () => AgentMessageId('stub'),
+    followup: () => {},
+    steer: () => {},
     inject(input) {
       session.append('user/message', input, { surfaceOp: 'append' })
-      return AgentMessageId('stub')
     },
-    send: () => AgentMessageId('stub'),
+    send: () => {},
     cancel() {},
     whenIdle: () => Promise.resolve(),
   }
@@ -57,10 +56,10 @@ function sessionAgent(session: Session, id = 'agent'): Agent {
 
 function openMessageTurn(session: Session, turn: number): void {
   session.append('turn/start', { turn, trigger: { kind: 'message', source: { kind: 'user' } } })
-  session.append('user/message', {
+  session.append('user/message', createUserMessage({
     content: [{ type: 'text', text: `turn ${turn}` }],
     source: { kind: 'user' },
-  }, { surfaceOp: 'append' })
+  }), { surfaceOp: 'append' })
 }
 
 function contextTexts(session: Session): string[] {
@@ -233,10 +232,10 @@ describe('durable step context', () => {
     const user = original.events.find(event => event.type === 'user/message' && event.data.source.kind === 'user')
     const reading = original.events.find(event => event.type === 'user/message' && event.data.source.kind === 'plugin')
     if (user === undefined || reading === undefined) throw new Error('missing source surface events')
-    original.append('user/message', {
+    original.append('user/message', createUserMessage({
       content: [{ type: 'text', text: 'compacted history' }],
       source: { kind: 'plugin', plugin: 'compact-basic' },
-    }, {
+    }), {
       surfaceOp: { op: 'replace', start: user.seq, end: reading.seq },
       sourceEventSeqs: [user.seq, reading.seq],
     })
@@ -371,7 +370,7 @@ describe('real agent-loop request history', () => {
     })
     const agent = ctx.agentLoop.create(SessionId(`late-${mode}`), { provider: 'mock', model: 'mock' })
 
-    agent.followup({ content: [{ type: 'text', text: 'start' }], source: { kind: 'user' } })
+    agent.followup(createUserMessage({ content: [{ type: 'text', text: 'start' }], source: { kind: 'user' } }))
     await agent.whenIdle()
 
     expect(laterSawReading).toBe(false)
@@ -397,7 +396,7 @@ describe('real agent-loop request history', () => {
     }))
     const agent = ctx.agentLoop.create(SessionId('loop'), { provider: 'mock', model: 'mock' })
 
-    agent.followup({ content: [{ type: 'text', text: 'start' }], source: { kind: 'user' } })
+    agent.followup(createUserMessage({ content: [{ type: 'text', text: 'start' }], source: { kind: 'user' } }))
     await agent.whenIdle()
 
     expect(adapter.requests).toHaveLength(2)