Merge remote-tracking branch 'github/master' into feat/agent-event-payload

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

@@ -28,7 +28,7 @@ import type { Scope, Scoped } from '@deepseek-ai/dsh-scope'
 import { createScope } from '@deepseek-ai/dsh-scope'
 import type { EpochHeader, RequestContext, Session, SessionId, TurnEndReason, UserMessage } from '@deepseek-ai/dsh-session'
 import { canonicalHeader, headerEquals } from '@deepseek-ai/dsh-session'
-import { renderContextSnapshot, renderPrompt } from '@deepseek-ai/dsh-system-prompt'
+import { joinContextSections, renderContextSections, renderPrompt } from '@deepseek-ai/dsh-system-prompt'
 import type { PromptAssembly } from '@deepseek-ai/dsh-system-prompt'
 import type { Context } from 'cordis'
 import { RuntimeContextProjection } from './runtime-context.ts'
@@ -207,7 +207,8 @@ export class ReactLoopAgent implements Agent {
     const claimed = this.inbox.claim(target, position.turn)
     const assembly = await this.loopCtx.systemPrompt.assemble(assembleContextFor(this, signal))
     signal.throwIfAborted()
-    const context = this.runtimeContext.project(renderContextSnapshot(assembly))
+    const sections = renderContextSections(assembly)
+    const context = this.runtimeContext.project(joinContextSections(sections), sections)
     const decision = await this.loopCtx.waterfall(
       this.carrier, 'agent/pre-step', { agent: this, messages: claimed, ...position, signal },
       (): Promise<PreStepDecision> => Promise.resolve<PreStepDecision>({

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

@@ -4,6 +4,7 @@
  */
 
 import { createUserMessage } from '@deepseek-ai/dsh-llm'
+import type { ContextSnapshotSection } from '@deepseek-ai/dsh-llm'
 import type { Session, UserMessage } from '@deepseek-ai/dsh-session'
 import { isReplacementSurfaceEvent } from '@deepseek-ai/dsh-session'
 import type { Context } from 'cordis'
@@ -57,15 +58,19 @@ export class RuntimeContextProjection {
   /**
    * Create an uncommitted snapshot only when the retained value differs.
    * @param current - fully rendered dynamic context.
+   * @param sections - named contributions that formed the current snapshot.
    * @returns a candidate user message, or `undefined` when no update is needed.
    */
-  project(current: string): UserMessage | undefined {
+  project(current: string, sections: readonly ContextSnapshotSection[]): UserMessage | undefined {
     if (this.retained === undefined && current.length === 0) return
     const snapshot = current.length === 0 ? CLEARED : current
     if (this.retained?.text === snapshot) return
     return createUserMessage({
       content: [{ type: 'text', text: snapshot }],
-      source: { kind: 'plugin', plugin: SOURCE },
+      // The cleared marker has no contributions left to attribute.
+      source: sections.length === 0
+        ? { kind: 'plugin', plugin: SOURCE }
+        : { kind: 'plugin', plugin: SOURCE, form: 'snapshot', sections },
     })
   }
 }