Merge branch 'codex/tool-json-schema-dsl' into codex/canonical-tool-output

# Conflicts: # docs/event-producer-consumer.md # packages/context/time-context/tests/time-context.spec.ts # packages/context/workspace-context/tests/workspace-context.spec.ts
2026-07-21 19:56:43 +08:00
parent 5b36be339d 6a45e6e16b
commit 72a48fede6
509 changed files with 12825 additions and 2596 deletions
--- a/packages/ui/tui/tests/harness.ts
+++ b/packages/ui/tui/tests/harness.ts
@@ -1,7 +1,7 @@
 import { Context } from 'cordis'
 import type { Terminal } from '@earendil-works/pi-tui'
 import AgentRegistry, { type Agent, type AgentOptions, type AgentStatus } from '@deepseek-ai/dsh-agent'
-import type { ContentBlock, LlmModelInfo, LlmProviderInfo } from '@deepseek-ai/dsh-llm'
+import type { ContentBlock, LlmModelContext, LlmModelInfo, LlmProviderInfo } from '@deepseek-ai/dsh-llm'
 import CommandService from '@deepseek-ai/dsh-commands'
 import SessionStore, { SessionId, type Session } from '@deepseek-ai/dsh-session'
 import SystemPrompt from '@deepseek-ai/dsh-system-prompt'
@@ -31,6 +31,7 @@ export interface TuiHarnessOptions {
    providers: LlmProviderInfo[]
    models: LlmModelInfo[]
    listModels?: (provider: string) => Promise<LlmModelInfo[]>
+    resolveModelContext?: (provider: string, model: string) => Promise<LlmModelContext | undefined>
  }
 }

@@ -75,9 +76,12 @@ export async function createTuiTestHarness<TerminalType extends Terminal, Exit e
      return catalog.listModels?.(provider)
        ?? Promise.resolve(catalog.models.filter(model => model.provider === provider).map(model => ({ ...model })))
    },
+    resolveModelContext(provider: string, model: string) {
+      return catalog.resolveModelContext?.(provider, model)
+        ?? Promise.resolve({ contextWindow: options.contextWindow ?? 128_000 })
+    },
  } as never)
  ctx.provide('tokenMeter', {
-    contextWindow: options.contextWindow ?? 128_000,
    measure() {
      return { totalTokens: options.contextTokens ?? 0 }
    },
@@ -98,6 +102,11 @@ export async function createTuiTestHarness<TerminalType extends Terminal, Exit e
    sessionId,
    options.cwd === null ? undefined : { meta: { cwd: options.cwd ?? '/workspace' } },
  )
+  session.append('turn/start', {
+    turn: 1,
+    trigger: { kind: 'message', source: { kind: 'user' } },
+  })
+  session.append('step/start', { turn: 1, step: 1 })
  options.beforeMount?.(session)
  const sent: ContentBlock[][] = []
  const steered: ContentBlock[][] = []
@@ -155,11 +164,10 @@ export function appendAssistant(
  session: Session,
  content: ContentBlock[],
  usage?: { inputTokens: number; outputTokens: number },
-  position: { turn: number; step: number } = { turn: 1, step: 0 },
+  position: { turn: number; step: number } = { turn: 1, step: 1 },
 ): void {
  session.append('assistant/message', {
-    turn: position.turn,
-    step: position.step,
+    ...position,
    provenance: { provider: 'mock', model: 'deepseek-v4-flash' },
    content,
    ...usage === undefined ? {} : { usage },
--- a/packages/ui/tui/tests/tui.snapshot.ts
+++ b/packages/ui/tui/tests/tui.snapshot.ts
@@ -3,6 +3,7 @@ import { dirname, join } from 'node:path'
 import { fileURLToPath } from 'node:url'
 import { afterAll, describe, expect, it } from 'vitest'
 import type { Context } from 'cordis'
+import { agentEvents } from '@deepseek-ai/dsh-agent'
 import { CallId, type ContentBlock } from '@deepseek-ai/dsh-llm'
 import type {} from '@deepseek-ai/dsh-llm-retry'
 import type { JsonValue, Session } from '@deepseek-ai/dsh-session'
@@ -100,7 +101,7 @@ async function disposeSnapshot(harness: SnapshotHarness): Promise<void> {
 async function configureAdvancedTools(ctx: Context): Promise<void> {
  await ctx.plugin(SystemPrompt)
  await ctx.plugin(ToolRegistry, { mode: 'code' })
-  ctx.provide('workflows', {} as never)
+  ctx.provide('workflows', { start() {} } as never)
  await ctx.plugin(ToolWorkflow, { toolName: 'workflow', maxResultChars: 50_000 })
  await ctx.plugin(ToolCordis, { vmTimeoutMs: 5_000 })
 }
@@ -121,7 +122,7 @@ function appendToolCalls(session: Session, calls: readonly ToolCallFixture[]): v
  for (const call of calls) {
    session.append('tool/call', {
      turn: 1,
-      step: 0,
+      step: 1,
      callId: CallId(call.id),
      name: call.name,
      arguments: JSON.stringify(call.arguments),
@@ -137,7 +138,7 @@ function appendToolResult(
 ): void {
  session.append('tool/result', {
    turn: 1,
-    step: 0,
+    step: 1,
    callId: CallId(id),
    content,
    isError: options.isError ?? false,
@@ -208,23 +209,23 @@ describe('TUI terminal-state snapshots', () => {
      harness.ctx.emit('agent/status', harness.agent, 'running')
      appendUser(harness.session, 'Show the live update.')
      harness.session.append('assistant/chunk', {
-        turn: 2,
-        step: 0,
+        turn: 1,
+        step: 1,
        chunk: { type: 'block-start', index: 0, blockType: 'reasoning' },
      })
      harness.session.append('assistant/chunk', {
-        turn: 2,
-        step: 0,
+        turn: 1,
+        step: 1,
        chunk: { type: 'reasoning-delta', index: 0, text: 'Inspecting width and styles.' },
      })
      harness.session.append('assistant/chunk', {
-        turn: 2,
-        step: 0,
+        turn: 1,
+        step: 1,
        chunk: { type: 'block-start', index: 1, blockType: 'text' },
      })
      harness.session.append('assistant/chunk', {
-        turn: 2,
-        step: 0,
+        turn: 1,
+        step: 1,
        chunk: { type: 'text-delta', index: 1, text: 'Streaming **visible state**…' },
      })
    })
@@ -431,9 +432,10 @@ describe('TUI terminal-state snapshots', () => {
          source: { kind: 'user' },
          reason: `Unsafe policy ${CONTROL_PROBE}`,
        })
+        session.append('step/end', { turn: 1, step: 1 })
        session.append('turn/end', {
-          turn: 7,
-          reason: { kind: 'error', step: 2, message: `Unsafe turn error ${CONTROL_PROBE}` },
+          turn: 1,
+          reason: { kind: 'error', step: 1, message: `Unsafe turn error ${CONTROL_PROBE}` },
        })
      },
    }, { columns: 100, rows: 34 })
@@ -455,7 +457,7 @@ describe('TUI terminal-state snapshots', () => {
    const rejected = expect(answer).rejects.toMatchObject({ code: 'ASK_ABORTED' })
    await harness.terminal.waitForFrame(beforeQuestion)
    await renderAfter(harness, () => {
-      harness.ctx.emit('agent/error', harness.agent, 8, 3, new Error(`Unsafe live error ${CONTROL_PROBE}`))
+      agentEvents(harness.ctx, harness.agent).emit('agent/error', 8, 3, new Error(`Unsafe live error ${CONTROL_PROBE}`))
    })
    await checkpoint('untrusted-controls', harness.terminal, { includeScrollback: true })

@@ -517,14 +519,14 @@ describe('TUI terminal-state snapshots', () => {
        }, { surfaceOp: 'append' })
        const assistant = session.append('assistant/message', {
          turn: 1,
-          step: 0,
+          step: 1,
          provenance: { provider: 'mock', model: 'deepseek-v4-flash' },
          content: [{ type: 'tool-call', id: CallId('old-tool'), name: 'bash', arguments: '{}' }],
        }, { surfaceOp: 'append' })
-        session.append('tool/call', { turn: 1, step: 0, callId: CallId('old-tool'), name: 'bash', arguments: '{}' })
+        session.append('tool/call', { turn: 1, step: 1, callId: CallId('old-tool'), name: 'bash', arguments: '{}' })
        const result = session.append('tool/result', {
          turn: 1,
-          step: 0,
+          step: 1,
          callId: CallId('old-tool'),
          content: [{ type: 'text', text: 'obsolete output that must disappear' }],
          isError: false,
@@ -560,13 +562,15 @@ describe('TUI terminal-state snapshots', () => {
      harness.terminal.send('\r')
      harness.terminal.send('/unknown-advanced-command')
      harness.terminal.send('\r')
-      harness.ctx.emit('agent/error', harness.agent, 3, 1, new Error('provider stream failed after partial output'))
+      agentEvents(harness.ctx, harness.agent).emit('agent/error', 1, 1, new Error('provider stream failed after partial output'))
+      harness.session.append('step/end', { turn: 1, step: 1 })
      harness.session.append('turn/end', {
-        turn: 3,
+        turn: 1,
        reason: { kind: 'error', step: 1, message: 'provider stream failed after partial output' },
      })
+      harness.session.append('turn/start', { turn: 2, trigger: { kind: 'message', source: { kind: 'user' } } })
      harness.session.append('turn/end', {
-        turn: 4,
+        turn: 2,
        reason: { kind: 'interrupted' },
      })
    })
--- a/packages/ui/tui/tests/tui.spec.ts
+++ b/packages/ui/tui/tests/tui.spec.ts
@@ -120,7 +120,6 @@ async function dispose(setupResult: Awaited<ReturnType<typeof setup>>): Promise<

 function provideTokenMeter(ctx: Context): void {
  ctx.provide('tokenMeter', {
-    contextWindow: 128_000,
    measure() {
      return { totalTokens: 0 }
    },
@@ -213,7 +212,7 @@ describe('pi-tui chat lifecycle and transcript', () => {
    await tick()

    result.agent.status = 'running'
-    result.ctx.emit('agent/status', result.agent, 'running')
+    agentEvents(result.ctx, result.agent).emit('agent/status', 'running')
    now = 8_000
    result.session.append('user/message', { content: [{ type: 'text', text: '   ' }], source: { kind: 'user' } }, { surfaceOp: 'append' })
    result.session.append('steering/message', { turn: 2, content: [{ type: 'text', text: 'steering note' }], source: { kind: 'user' } }, { surfaceOp: 'append' })
@@ -222,62 +221,65 @@ describe('pi-tui chat lifecycle and transcript', () => {
    result.session.append('context/message', { content: [{ type: 'text', text: '' }], source: { kind: 'user' } }, { surfaceOp: 'append' })
    result.session.append('prompt/blocked', { content: [{ type: 'text', text: 'blocked' }], source: { kind: 'user' }, reason: 'test policy' })
    appendAssistant(result.session, [])
-    result.session.append('turn/end', { turn: 9, reason: { kind: 'aborted' } })
-    result.session.append('turn/end', { turn: 10, reason: { kind: 'completed' } })
-    result.session.append('step/start', { turn: 11, step: 0 })
+    result.session.append('step/end', { turn: 1, step: 1 })
+    result.session.append('turn/end', { turn: 1, reason: { kind: 'aborted' } })
+    result.session.append('turn/start', { turn: 2, trigger: { kind: 'message', source: { kind: 'user' } } })
+    result.session.append('turn/end', { turn: 2, reason: { kind: 'completed' } })
+    result.session.append('turn/start', { turn: 3, trigger: { kind: 'message', source: { kind: 'user' } } })
+    result.session.append('step/start', { turn: 3, step: 1 })
    result.session.append('assistant/chunk', {
-      turn: 2,
-      step: 0,
+      turn: 3,
+      step: 1,
      chunk: { type: 'block-start', index: 0, blockType: 'reasoning' },
    })
    result.session.append('assistant/chunk', {
-      turn: 2,
-      step: 0,
+      turn: 3,
+      step: 1,
      chunk: { type: 'reasoning-delta', index: 0, text: 'live thought' },
    })
    result.session.append('assistant/chunk', {
-      turn: 2,
-      step: 0,
+      turn: 3,
+      step: 1,
      chunk: { type: 'reasoning-delta', index: 9, text: 'unannounced thought' },
    })
    result.session.append('assistant/chunk', {
-      turn: 2,
-      step: 0,
+      turn: 3,
+      step: 1,
      chunk: { type: 'block-end', index: 0, block: { type: 'reasoning', text: 'live thought complete' } },
    })
    result.session.append('assistant/chunk', {
-      turn: 2,
-      step: 0,
+      turn: 3,
+      step: 1,
      chunk: { type: 'block-start', index: 1, blockType: 'text' },
    })
    result.session.append('assistant/chunk', {
-      turn: 2,
-      step: 0,
+      turn: 3,
+      step: 1,
      chunk: { type: 'text-delta', index: 1, text: 'live answer' },
    })
    result.session.append('assistant/chunk', {
-      turn: 2,
-      step: 0,
+      turn: 3,
+      step: 1,
      chunk: { type: 'block-end', index: 1, block: { type: 'text', text: 'live answer done' } },
    })
    result.session.append('assistant/chunk', {
-      turn: 2,
-      step: 0,
+      turn: 3,
+      step: 1,
      chunk: { type: 'block-start', index: 2, blockType: 'tool-call' },
    })
    result.session.append('assistant/chunk', {
-      turn: 2,
-      step: 0,
+      turn: 3,
+      step: 1,
      chunk: { type: 'block-end', index: 2, block: { type: 'tool-call', id: 'stream-tool' as never, name: 'tool', arguments: '{}' } },
    })
    result.session.append('assistant/chunk', {
-      turn: 2,
-      step: 0,
+      turn: 3,
+      step: 1,
      chunk: { type: 'tool-call-delta', index: 2, id: 'stream-tool' as never, argumentsDelta: '{}' },
    })
    result.session.append('assistant/chunk', {
-      turn: 2,
-      step: 0,
+      turn: 3,
+      step: 1,
      chunk: { type: 'usage', usage: { inputTokens: 1, outputTokens: 2 } },
    })
    await tick()
@@ -288,7 +290,7 @@ describe('pi-tui chat lifecycle and transcript', () => {
      result.session,
      [{ type: 'text', text: 'final live answer' }],
      { inputTokens: 500, outputTokens: 8 },
-      { turn: 2, step: 0 },
+      { turn: 3, step: 1 },
    )
    await tick()

@@ -303,17 +305,17 @@ describe('pi-tui chat lifecycle and transcript', () => {

    result.session.append('assistant/chunk', {
      turn: 3,
-      step: 0,
+      step: 1,
      chunk: { type: 'text-delta', index: 0, text: 'cleared stream' },
    })
    result.terminal.send('/clear')
    result.terminal.send('\r')
-    appendAssistant(result.session, [{ type: 'text', text: 'answer after clear' }])
+    appendAssistant(result.session, [{ type: 'text', text: 'answer after clear' }], undefined, { turn: 3, step: 1 })
    await tick()
    expect(result.terminal.output).toContain('answer after clear')

    result.agent.status = 'idle'
-    result.ctx.emit('agent/status', result.agent, 'idle')
+    agentEvents(result.ctx, result.agent).emit('agent/status', 'idle')
    await tick()
    expect(result.terminal.output).toContain('↑1.8k ↓50')
    expect(result.terminal.output).toContain('deepseek-v4-flash(reasoning:off)')
@@ -433,8 +435,8 @@ describe('pi-tui chat lifecycle and transcript', () => {
        appendUser(session, 'first prompt')
        appendUser(session, 'second prompt')
        session.append('assistant/chunk', {
-          turn: 2,
-          step: 0,
+          turn: 1,
+          step: 1,
          chunk: { type: 'text-delta', index: 0, text: 'stale partial response' },
        })
      },
@@ -542,8 +544,10 @@ describe('pi-tui chat lifecycle and transcript', () => {
  })

  it('opens a keyboard selector and switches the session model without sending slash text to the agent', async () => {
+    const initialContext = Promise.withResolvers<{ contextWindow: number }>()
    const result = await setup({
      agentOptions: { provider: 'alpha', model: 'a1' },
+      contextTokens: 50,
      catalog: {
        providers: [{ id: 'alpha', name: 'Alpha' }, { id: 'beta', name: 'Beta' }],
        models: [
@@ -552,6 +556,9 @@ describe('pi-tui chat lifecycle and transcript', () => {
          { provider: 'beta', id: 'b1', name: 'Beta One' },
          { provider: 'beta', id: 'shared', name: 'Beta Shared' },
        ],
+        resolveModelContext: (provider, model) => provider === 'alpha' && model === 'a1'
+          ? initialContext.promise
+          : Promise.resolve({ contextWindow: 200 }),
      },
    })

@@ -579,6 +586,9 @@ describe('pi-tui chat lifecycle and transcript', () => {
    expect(result.terminal.output).toContain('Model selected: beta/b1')
    expect(result.agent.sent).toEqual([])
    expect(result.agent.steered).toEqual([])
+    initialContext.resolve({ contextWindow: 100 })
+    await tick()
+    expect(result.terminal.output).not.toContain('50% context  tools:compact  b1(reasoning:on)')

    result.terminal.send('/model')
    result.terminal.send('\r')
@@ -589,7 +599,7 @@ describe('pi-tui chat lifecycle and transcript', () => {
    result.agent.status = 'idle'
    result.ctx.emit('agent/status', result.agent, 'idle')
    await tick()
-    expect(result.terminal.output).toContain('tools:compact  b1(reasoning:on)')
+    expect(result.terminal.output).toContain('25% context  tools:compact  b1(reasoning:on)')

    const assembly = await result.ctx.systemPrompt.assemble(assembleContextFor(result.agent))
    expect(assembly.variables).toMatchObject({ provider: 'beta', model: 'b1' })
@@ -625,6 +635,7 @@ describe('pi-tui chat lifecycle and transcript', () => {
      catalog: {
        providers: [{ id: 'alpha', name: 'Alpha' }],
        models: [{ provider: 'alpha', id: 'a1', name: 'Alpha One' }],
+        resolveModelContext: () => Promise.resolve(undefined),
      },
    })
    unset.terminal.send('/model')
@@ -633,6 +644,7 @@ describe('pi-tui chat lifecycle and transcript', () => {
    unset.terminal.send('\r')
    await tick()
    expect(unset.terminal.output).toContain('Model selected: alpha/a1')
+    expect(unset.terminal.output).toContain('context unknown  tools:compact  a1(reasoning:on)')
    await dispose(unset)

    const empty = await setup({ agentOptions: {}, catalog: { providers: [], models: [] } })
@@ -654,12 +666,14 @@ describe('pi-tui chat lifecycle and transcript', () => {
        providers: [{ id: 'deepseek', name: 'DeepSeek' }],
        models: [],
        listModels: () => Promise.reject(new Error('catalog offline')),
+        resolveModelContext: () => Promise.reject(new Error('capacity offline')),
      },
    })
    failed.terminal.send('/model')
    failed.terminal.send('\r')
    await tick()
    expect(failed.terminal.output).toContain('Could not read the model catalog: catalog offline')
+    expect(failed.terminal.output).toContain('Could not resolve model context: capacity offline')
    await dispose(failed)
  })

@@ -695,6 +709,21 @@ describe('pi-tui chat lifecycle and transcript', () => {
    await tick()
    expect(rejectedResult.terminal.output).not.toContain('late catalog failure')
    await rejectedResult.ctx.fiber.dispose()
+
+    const context = Promise.withResolvers<{ contextWindow: number }>()
+    const contextResult = await setup({
+      contextTokens: 99,
+      catalog: {
+        providers: [{ id: 'deepseek', name: 'DeepSeek' }],
+        models: [],
+        resolveModelContext: () => context.promise,
+      },
+    })
+    await contextResult.controller.dispose()
+    context.resolve({ contextWindow: 100 })
+    await tick()
+    expect(contextResult.terminal.output).not.toContain('99% context')
+    await contextResult.ctx.fiber.dispose()
  })

  it('discovers and executes plugin commands, then removes TUI-local commands on disposal', async () => {
@@ -810,22 +839,30 @@ describe('pi-tui chat lifecycle and transcript', () => {
    const events = await setup()
    const unrelatedSession = events.ctx.sessions.create(SessionId('unrelated-session'))
    const unrelatedAgent = { ...events.agent, id: unrelatedSession.id, session: unrelatedSession }
+    unrelatedSession.append('turn/start', { turn: 1, trigger: { kind: 'message', source: { kind: 'user' } } })
    unrelatedSession.append('todo/write', { todos: [{ content: 'hidden', status: 'pending' }] })
-    events.ctx.emit('agent/status', unrelatedAgent, 'running')
-    events.ctx.emit('agent/error', unrelatedAgent, 1, 1, new Error('hidden error'))
-    events.ctx.emit('agent/disposed', unrelatedAgent)
-    events.ctx.emit('agent/error', events.agent, 3, 2, new Error('live failure'))
-    events.session.append('turn/end', { turn: 3, reason: { kind: 'error', step: 2, message: 'live failure' } })
-    events.session.append('turn/end', { turn: 4, reason: { kind: 'error', step: 1, message: 'durable failure' } })
-    events.session.append('turn/end', { turn: 5, reason: { kind: 'aborted', reason: 'stopped' } })
-    events.session.append('turn/end', { turn: 6, reason: { kind: 'max-tokens' } })
-    events.session.append('turn/end', { turn: 7, reason: { kind: 'rejected', reason: 'policy' } })
-    events.session.append('turn/end', { turn: 8, reason: { kind: 'interrupted' } })
+    agentEvents(events.ctx, unrelatedAgent).emit('agent/status', 'running')
+    agentEvents(events.ctx, unrelatedAgent).emit('agent/error', 1, 1, new Error('hidden error'))
+    agentEvents(events.ctx, unrelatedAgent).emit('agent/disposed')
+    agentEvents(events.ctx, events.agent).emit('agent/error', 1, 1, new Error('live failure'))
+    events.session.append('step/end', { turn: 1, step: 1 })
+    events.session.append('turn/end', { turn: 1, reason: { kind: 'error', step: 1, message: 'live failure' } })
+    events.session.append('turn/start', { turn: 2, trigger: { kind: 'message', source: { kind: 'user' } } })
+    events.session.append('turn/end', { turn: 2, reason: { kind: 'error', step: 1, message: 'durable failure' } })
+    events.session.append('turn/start', { turn: 3, trigger: { kind: 'message', source: { kind: 'user' } } })
+    events.session.append('turn/end', { turn: 3, reason: { kind: 'aborted', reason: 'stopped' } })
+    events.session.append('turn/start', { turn: 4, trigger: { kind: 'message', source: { kind: 'user' } } })
+    events.session.append('turn/end', { turn: 4, reason: { kind: 'max-tokens' } })
+    events.session.append('turn/start', { turn: 5, trigger: { kind: 'message', source: { kind: 'user' } } })
+    events.session.append('turn/end', { turn: 5, reason: { kind: 'rejected', reason: 'policy' } })
+    events.session.append('turn/start', { turn: 6, trigger: { kind: 'message', source: { kind: 'user' } } })
+    events.session.append('turn/end', { turn: 6, reason: { kind: 'interrupted' } })
+    events.session.append('turn/start', { turn: 7, trigger: { kind: 'message', source: { kind: 'user' } } })
    events.session.append('turn/end', {
-      turn: 9,
+      turn: 7,
      reason: { kind: 'error', step: 1, failure: { message: 'structured provider failure', code: 'SERVER' } },
    })
-    events.ctx.emit('agent/disposed', events.agent)
+    agentEvents(events.ctx, events.agent).emit('agent/disposed')
    await tick()
    expect(events.terminal.output).toContain('live failure')
    expect(events.terminal.output).toContain('durable failure')
@@ -919,7 +956,7 @@ describe('tool cards and surface replay', () => {
      })),
    ])
    for (const [id, name, args] of calls) {
-      result.session.append('tool/call', { turn: 1, step: 0, callId: id as never, name, arguments: args })
+      result.session.append('tool/call', { turn: 1, step: 1, callId: id as never, name, arguments: args })
    }
    await tick()
    expect(result.terminal.output).toContain('$ raw command')
@@ -929,23 +966,23 @@ describe('tool cards and surface replay', () => {
    expect(result.terminal.output).toContain('call presenter boom')
    expect(result.terminal.output).toContain('Symbol(input)')
    result.session.append('tool/result', {
-      turn: 1, step: 0, callId: 'c1' as never, content: [{ type: 'text', text: 'raw bash' }], isError: false,
+      turn: 1, step: 1, callId: 'c1' as never, content: [{ type: 'text', text: 'raw bash' }], isError: false,
    }, { surfaceOp: 'append' })
    result.session.append('tool/result', {
-      turn: 1, step: 0, callId: 'c2' as never, content: [{ type: 'text', text: 'stopped' }], isError: true,
+      turn: 1, step: 1, callId: 'c2' as never, content: [{ type: 'text', text: 'stopped' }], isError: true,
    }, { surfaceOp: 'append' })
    result.session.append('tool/result', {
-      turn: 1, step: 0, callId: 'c3' as never, content: [{ type: 'text', text: 'done' }], isError: false,
+      turn: 1, step: 1, callId: 'c3' as never, content: [{ type: 'text', text: 'done' }], isError: false,
    }, { surfaceOp: 'append' })
    result.session.append('tool/result', {
-      turn: 1, step: 0, callId: 'c4' as never, content: [{ type: 'text', text: 'raw generic' }], isError: false,
+      turn: 1, step: 1, callId: 'c4' as never, content: [{ type: 'text', text: 'raw generic' }], isError: false,
    }, { surfaceOp: 'append' })
    result.session.append('tool/result', {
-      turn: 1, step: 0, callId: 'c5' as never, content: [{ type: 'text', text: 'raw throwing' }], isError: false,
+      turn: 1, step: 1, callId: 'c5' as never, content: [{ type: 'text', text: 'raw throwing' }], isError: false,
      meta: { value: 1 },
    }, { surfaceOp: 'append' })
    result.session.append('tool/result', {
-      turn: 1, step: 0, callId: 'c7' as never,
+      turn: 1, step: 1, callId: 'c7' as never,
      content: [
        { type: 'tool-call', id: 'inner' as never, name: 'inner', arguments: '{}' },
        { type: 'tool-result', toolCallId: 'inner' as never, content: [{ type: 'text', text: 'nested output' }] },
@@ -954,13 +991,18 @@ describe('tool cards and surface replay', () => {
      isError: false,
    }, { surfaceOp: 'append' })
    result.session.append('tool/result', {
-      turn: 1, step: 0, callId: 'c8' as never, content: [{ type: 'text', text: '\nundefined presenter output\n\nkept tail\n' }], isError: false,
+      turn: 1, step: 1, callId: 'c8' as never, content: [{ type: 'text', text: '\nundefined presenter output\n\nkept tail\n' }], isError: false,
    }, { surfaceOp: 'append' })
    result.session.append('tool/result', {
-      turn: 1, step: 0, callId: 'c11' as never, content: [{ type: 'text', text: '\nconverted terminal\n\nfinished\n' }], isError: false,
+      turn: 1, step: 1, callId: 'c11' as never, content: [{ type: 'text', text: '\nconverted terminal\n\nfinished\n' }], isError: false,
    }, { surfaceOp: 'append' })
    result.session.append('tool/result', {
-      turn: 1, step: 0, callId: 'orphan' as never, content: [{ type: 'text', text: 'orphan result' }], isError: false,
+      turn: 1,
+      step: 1,
+      callId: 'orphan' as never,
+      content: [{ type: 'text', text: 'orphan result' }],
+      isError: true,
+      error: { name: 'InterruptedError', code: 'interrupted' },
    }, { surfaceOp: 'append' })
    await tick()

@@ -1001,15 +1043,15 @@ describe('tool cards and surface replay', () => {
    appendUser(result.session, 'old prompt')
    const assistant = result.session.append('assistant/message', {
      turn: 1,
-      step: 0,
+      step: 1,
      provenance: { provider: 'mock', model: 'deepseek-v4-flash' },
      content: [{ type: 'tool-call', id: 'old-call' as never, name: 'bash', arguments: '{}' }],
    }, { surfaceOp: 'append' })
    result.session.append('tool/call', {
-      turn: 1, step: 0, callId: 'old-call' as never, name: 'bash', arguments: '{}',
+      turn: 1, step: 1, callId: 'old-call' as never, name: 'bash', arguments: '{}',
    })
    const toolResult = result.session.append('tool/result', {
-      turn: 1, step: 0, callId: 'old-call' as never, content: [{ type: 'text', text: 'old output' }], isError: false,
+      turn: 1, step: 1, callId: 'old-call' as never, content: [{ type: 'text', text: 'old output' }], isError: false,
    }, { surfaceOp: 'append' })
    const start = result.session.surface.nodes[0] as number
    result.session.append('context/message', {
@@ -1295,6 +1337,8 @@ describe('terminal mounting', () => {
    await ctx.plugin(UserInteractionService)
    ctx.provide('tools', { get: () => undefined } as never)
    const session = ctx.sessions.create(SessionId('failed-start-session'))
+    session.append('turn/start', { turn: 1, trigger: { kind: 'message', source: { kind: 'user' } } })
+    session.append('step/start', { turn: 1, step: 1 })
    ctx.agents.register({
      id: session.id, options: {}, session, status: 'running', ctx,
      send() {}, steer() {}, inject() {}, cancel() {}, whenIdle: () => Promise.resolve(),
@@ -1312,7 +1356,7 @@ describe('terminal mounting', () => {
      .rejects.toMatchObject({ code: 'NO_PROVIDER' })
    session.append('assistant/chunk', {
      turn: 1,
-      step: 0,
+      step: 1,
      chunk: { type: 'text-delta', index: 0, text: 'must not render' },
    })
    await tick()