Adapt workspace context to session prefixes

packages/core/agent-loop/src/agent.ts

@@ -7,7 +7,7 @@
  */
 
 import type { Context } from 'cordis'
-import type { AgentId, AgentOptions, AgentStatus, SendOptions } from '@deepseek-ai/dsh-agent'
+import type { AgentId, AgentOptions, AgentStatus, InjectOptions, SendOptions } from '@deepseek-ai/dsh-agent'
 import type { Agent } from '@deepseek-ai/dsh-agent'
 import type { ContentBlock, MessageSource } from '@deepseek-ai/dsh-llm'
 import type { Session } from '@deepseek-ai/dsh-session'
@@ -123,14 +123,20 @@ export class ReactLoopAgent implements Agent {
     this.ctx.emit('agent/queued', this, content, { source, steering: true })
   }
 
-  inject(content: ContentBlock[], options?: SendOptions): void {
+  inject(content: ContentBlock[], options?: InjectOptions): void {
     if (this._status === 'disposed') throw new Error(`agent "${this.id}" is disposed`)
     const source = this.resolveSource(options)
+    const context = {
+      content,
+      source,
+      ...options?.envelope !== undefined ? { envelope: options.envelope } : {},
+      ...options?.meta !== undefined ? { meta: options.meta } : {},
+    }
     if (isTurnOpen(this.session)) {
       // A turn is open in the LOG (decided from the log, not agent status —
       // status can be `running` with no turn open): the context/message is
       // turn-enclosed by that turn, so append it directly.
-      this.session.append('context/message', { content, source }, { surfaceOp: 'append' })
+      this.session.append('context/message', context, { surfaceOp: 'append' })
       return
     }
     // No turn open: wrap the injection in a one-shot turn so every event stays
@@ -147,7 +153,7 @@ export class ReactLoopAgent implements Agent {
     // can't happen for our fixed trigger — no turn was opened and none is owed.)
     try {
       this.session.append('turn/start', { turn, trigger: { kind: 'injection', source } })
-      this.session.append('context/message', { content, source }, { surfaceOp: 'append' })
+      this.session.append('context/message', context, { surfaceOp: 'append' })
     } finally {
       // Close the turn if turn/start made it into the log. Contain a throwing
       // turn/end listener: Session.append pushes before notifying, so a throw

packages/core/agent-loop/src/loop.ts

@@ -425,7 +425,11 @@ async function runTurn(
       // `allow.additionalContext` is a SEPARATE context/message the next request
       // also sees. The turn is open, so inject() appends it into THIS turn.
       if (decision.additionalContext) {
-        agent.inject(decision.additionalContext.content, { source: decision.additionalContext.source })
+        agent.inject(decision.additionalContext.content, {
+          source: decision.additionalContext.source,
+          ...decision.additionalContext.envelope !== undefined ? { envelope: decision.additionalContext.envelope } : {},
+          ...decision.additionalContext.meta !== undefined ? { meta: decision.additionalContext.meta } : {},
+        })
       }
     }
 
@@ -929,7 +933,11 @@ async function runStep(
   // tool-call/result adjacency across the whole batch. inject() appends into the
   // open turn (a context/message at its chronological position).
   for (const context of pendingContext) {
-    agent.inject(context.content, { source: context.source })
+    agent.inject(context.content, {
+      source: context.source,
+      ...context.envelope !== undefined ? { envelope: context.envelope } : {},
+      ...context.meta !== undefined ? { meta: context.meta } : {},
+    })
   }
 
   return { hadToolCalls: toolCalls.length > 0, finish: assembler.finish }