refactor: identify and freeze messages at creation

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

@@ -11,6 +11,7 @@
 
 import type { Context } from 'cordis'
 import type { Agent } from '@deepseek-ai/dsh-agent'
+import { createUserMessage } from '@deepseek-ai/dsh-llm'
 import type { PostToolDecision, ToolExecution, ToolExecutionResult, ToolExecutionToken } from '@deepseek-ai/dsh-tools'
 import { Config, resolveConfig, type ResolvedConfig } from './config.ts'
 import { loadBaselineInstructionSet } from './files.ts'
@@ -115,20 +116,20 @@ export function apply(ctx: Context, config: Config): void {
       { includeBaselineScopes: false, signal },
     )
     if (update !== undefined) {
-      agent.inject({ content: update.context.content, source: update.context.source })
+      agent.inject(update.context)
       applyInstructionVersionUpdates(agent.session, update.versionUpdates, instructionVersions)
     }
     const keepVisibleBaseline = !lifecycleWitnessed.has(agent.session) && hasVisibleBaseline(agent)
     if (!keepVisibleBaseline && instructions !== undefined && instructions.rendered.text.length > 0) {
       const baselineMessage = workspaceContextMessage(instructions.rendered.text)
-      agent.inject({
+      agent.inject(createUserMessage({
         content: baselineMessage.content,
         source: {
           kind: 'workspace-instructions',
           baseline: true,
           changes: [...baseline.changes.values()],
         },
-      })
+      }))
     }
     baselineLoaded.add(agent.session)
   })

packages/context/workspace-context/src/state.ts

@@ -5,8 +5,9 @@
  */
 
 import type { Agent } from '@deepseek-ai/dsh-agent'
+import { createUserMessage } from '@deepseek-ai/dsh-llm'
 import type { Message } from '@deepseek-ai/dsh-llm'
-import type { Session, SessionEvent, UserMessageData } from '@deepseek-ai/dsh-session'
+import type { Session, SessionEvent, UserMessage } from '@deepseek-ai/dsh-session'
 import type { FileSystem, FsVersion } from '@deepseek-ai/dsh-fs'
 import type { ToolExecution, ToolExecutionResult } from '@deepseek-ai/dsh-tools'
 import type { ResolvedConfig } from './config.ts'
@@ -79,15 +80,15 @@ export interface InstructionVersionUpdate {
 
 /** Rendered reconciliation plus cache transitions awaiting final policy. */
 export interface ReconciledInstructionContext {
-  context: UserMessageData
+  context: UserMessage
   versionUpdates: InstructionVersionUpdate[]
 }
 
-function workspaceContextHook(text: string, changes: WorkspaceInstructionChange[]): UserMessageData {
-  return {
+function workspaceContextHook(text: string, changes: WorkspaceInstructionChange[]): UserMessage {
+  return createUserMessage({
     content: [{ type: 'text', text }],
     source: { kind: 'workspace-instructions', changes },
-  }
+  })
 }
 
 /**
@@ -96,7 +97,10 @@ function workspaceContextHook(text: string, changes: WorkspaceInstructionChange[
  * @returns a user-role prefix message.
  */
 export function workspaceContextMessage(text: string): Message {
-  return { role: 'user', content: [{ type: 'text', text }] }
+  return createUserMessage({
+    content: [{ type: 'text', text }],
+    source: { kind: 'plugin', plugin: name },
+  })
 }
 
 function filePathFromExecution(exec: ToolExecution): string | undefined {
@@ -327,7 +331,7 @@ export function observeInstructionSessionEvent(
  */
 export function commitPendingInstructionContexts(
   agent: Agent,
-  contexts: readonly UserMessageData[] | undefined,
+  contexts: readonly UserMessage[] | undefined,
   pendingBySession: WeakMap<object, Map<string, PendingInstructionChange>>,
 ): WorkspaceInstructionChange[] {
   const committed: WorkspaceInstructionChange[] = []