time-context: durable per-step history (round 1)

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

@@ -4,7 +4,7 @@ import { tmpdir } from 'node:os'
 import { join } from 'node:path'
 import { fileURLToPath } from 'node:url'
 import { afterEach, describe, expect, it } from 'vitest'
-import { foldRequestHeader, type SessionEvent } from '@deepseek-ai/dsh-session'
+import type { SessionEvent } from '@deepseek-ai/dsh-session'
 
 const binScript = fileURLToPath(new URL('../../../examples/stdio-demo/src/bin.ts', import.meta.url))
 const configPath = fileURLToPath(new URL('./fixtures/cordis.yml', import.meta.url))
@@ -12,7 +12,8 @@ const repoTsconfig = fileURLToPath(new URL('../../../../tsconfig.json', import.m
 const tsxLoader = fileURLToPath(import.meta.resolve('tsx'))
 const PROCESS_TIMEOUT_MS = 30_000
 const TEST_TIMEOUT_MS = PROCESS_TIMEOUT_MS + 15_000
-const FIRST_REPLY = 'You said: "first". Try "echo <something>" to see a tool call.'
+const FIRST_REPLY = '[main turn 1] You said: "Time recorded before turn 1, step 1:'
+const SECOND_REPLY = '[main turn 2] You said: "Time recorded before turn 2, step 1:'
 
 let child: ChildProcessWithoutNullStreams | undefined
 let workdir: string | undefined
@@ -60,7 +61,7 @@ async function runTwoTurns(): Promise<{ stdout: string; stderr: string }> {
     proc.stdout.setEncoding('utf8')
     proc.stdout.on('data', (chunk: string) => {
       stdout += chunk
-      if (!sentSecond && stdout.includes(`${FIRST_REPLY}\n> `)) {
+      if (!sentSecond && stdout.includes(FIRST_REPLY) && stdout.includes('Try "echo <something>" to see a tool call.\n> ')) {
         sentSecond = true
         proc.stdin.end('second\n')
       }
@@ -84,12 +85,12 @@ async function runTwoTurns(): Promise<{ stdout: string; stderr: string }> {
 }
 
 describe('time-context through a real cordis.yml and stdio process', () => {
-  it('uses the process zone and persists both first-turn and elapsed-time request context', async () => {
+  it('uses the process zone and persists one ordered context event per request', async () => {
     const { stdout, stderr } = await runTwoTurns()
     expect(stderr).not.toContain('UNHANDLED')
     expect(stdout).toContain('time-context e2e ready.')
     expect(stdout).toContain(FIRST_REPLY)
-    expect(stdout).toContain('You said: "second".')
+    expect(stdout).toContain(SECOND_REPLY)
 
     const logs = await jsonlFiles(join(workdir as string, '.sessions'))
     expect(logs).toHaveLength(1)
@@ -97,19 +98,29 @@ describe('time-context through a real cordis.yml and stdio process', () => {
     const events = lines.slice(1).map(line => JSON.parse(line) as SessionEvent)
     expect(events.filter(event => event.type === 'turn/end')).toHaveLength(2)
 
-    const firstHeader = events.find(event => event.type === 'request/header')
-    if (firstHeader?.type !== 'request/header') throw new Error('missing initial request/header event')
-    expect(firstHeader.data.header.system).toMatch(
-      /Current time: \d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\+08:00\[Asia\/Shanghai\]/,
+    const contexts = events.filter(event => event.type === 'context/message')
+    const starts = events.filter(event => event.type === 'step/start')
+    expect(contexts).toHaveLength(2)
+    expect(starts).toHaveLength(2)
+    for (let index = 0; index < contexts.length; index += 1) {
+      expect(contexts[index]!.seq).toBeLessThan(starts[index]!.seq)
+      expect(contexts[index]!.surfaceOp).toBe('append')
+      expect(contexts[index]!.data.source).toEqual({ kind: 'plugin', plugin: 'time-context' })
+    }
+    const contextText = contexts.map(event => event.data.content
+      .filter(block => block.type === 'text')
+      .map(block => block.text)
+      .join('\n'))
+    expect(contextText[0]).toMatch(
+      /Time recorded before turn 1, step 1: \d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\+08:00\[Asia\/Shanghai\]/,
     )
-    expect(firstHeader.data.header.system).toContain(
-      'Time since previous message: unavailable (no earlier message in this session).',
+    expect(contextText[0]).toMatch(
+      /Elapsed since the preceding model-visible message: (?:\d+d )?(?:\d+h )?(?:\d+m )?\d+s\./,
     )
+    expect(contextText[1]).toMatch(/Time recorded before turn 2, step 1:/)
 
-    const finalSystem = foldRequestHeader(events)?.system
-    expect(finalSystem).toContain('[Asia/Shanghai]')
-    expect(finalSystem).toMatch(
-      /Time since previous message: (?:\d+d )?(?:\d+h )?(?:\d+m )?\d+s\./,
-    )
+    const headers = events.filter(event => event.type === 'request/header'
+      || event.type === 'request/header-delta')
+    expect(JSON.stringify(headers)).not.toContain('Time recorded before')
   }, TEST_TIMEOUT_MS)
 })