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

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

@@ -172,13 +172,14 @@ export function apply(ctx: Context, config: Config): void {
     const previous = step === 1
       ? precedingMessageTime(agent)
       : precedingStepContextTime(agent, turn)
+    const text = renderText(now, turn, step, previous, formatter, resolvedTimeZone)
     return {
       kind: 'enter',
       messages: [
         ...decision.messages,
         createUserMessage({
-          content: [{ type: 'text', text: renderText(now, turn, step, previous, formatter, resolvedTimeZone) }],
-          source: { kind: 'plugin', plugin: name },
+          content: [{ type: 'text', text }],
+          source: { kind: 'plugin', plugin: name, form: 'snapshot', sections: [{ name, text }] },
         }),
       ],
     }

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

@@ -56,7 +56,14 @@ describe('time-context through a real headless cordis.yml', () => {
     for (let index = 0; index < contexts.length; index += 1) {
       expect(contexts[index]!.seq).toBeGreaterThan(starts[index]!.seq)
       expect(contexts[index]!.surfaceOp).toBe('append')
-      expect(contexts[index]!.data.source).toEqual({ kind: 'plugin', plugin: 'time-context' })
+      // `snapshot` form: one named contribution whose text is exactly what the
+      // model read, so a consumer attributes it without re-splitting prose.
+      expect(contexts[index]!.data.source).toMatchObject({
+        kind: 'plugin',
+        plugin: 'time-context',
+        form: 'snapshot',
+        sections: [{ name: 'time-context' }],
+      })
     }
     const contextText = contexts.map(event => event.data.content
       .filter(block => block.type === 'text')

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

@@ -160,7 +160,19 @@ describe('durable step context', () => {
     const event = session.events.at(-1)
     expect(event?.type).toBe('user/message')
     if (event?.type !== 'user/message') throw new Error('missing time context')
-    expect(event.data.source).toEqual({ kind: 'plugin', plugin: 'time-context' })
+    // The reading is a `snapshot`-form context: one named contribution whose
+    // text is exactly what the model read, so a consumer attributes it without
+    // re-splitting prose.
+    expect(event.data.source).toEqual({
+      kind: 'plugin',
+      plugin: 'time-context',
+      form: 'snapshot',
+      sections: [{
+        name: 'time-context',
+        text: 'Time sampled while preparing turn 1, step 1: 2026-07-15T09:01:01+08:00[Asia/Shanghai]\n'
+          + 'Elapsed since the preceding model-visible message: 1d 1h 1m 1s.',
+      }],
+    })
     expect(event.surfaceOp).toBe('append')
   })