@gotcos/glasses-server 6.51.0 → 6.52.3

package/server/lib/session-stream-events.ts

@@ -37,7 +37,7 @@ export type SessionStreamDraft =
   // ADDITIVE TO A CLOSED SET, AND SAFE BY CONSTRUCTION: the client validates `kind`
   // against its own table and ignores anything it does not know, so a build that
   // predates this renders exactly as it did before rather than breaking.
-  | { kind: 'prompt'; text: string }
+  | { kind: 'prompt'; text: string; turn_started_at?: string }
   | { kind: 'prose'; text: string }
   // 6.49.0: `tool_outcome` rides on a status draft, never on a new kind. A shipped
   // client drops an unknown kind BEFORE seq accounting and paints a gap row for it
@@ -173,6 +173,35 @@ function asRecord(value: unknown): Record<string, unknown> | null {
     : null
 }
 
+/** ISO time the current turn actually started, from the transcript record. */
+export function recordTimestampIso(record: Record<string, unknown>): string | undefined {
+  const nested = asRecord(record.payload)
+  const item = asRecord(record.item)
+  const candidates = [record.timestamp, record.ts, nested?.timestamp, nested?.ts, item?.timestamp]
+  for (const c of candidates) {
+    if (typeof c === 'string' && c.trim()) {
+      const t = Date.parse(c)
+      if (Number.isFinite(t) && t > 0) return new Date(t).toISOString()
+    }
+    if (typeof c === 'number' && Number.isFinite(c) && c > 0) {
+      const ms = c < 1e12 ? c * 1000 : c
+      if (Number.isFinite(ms) && ms > 0) return new Date(ms).toISOString()
+    }
+  }
+  return undefined
+}
+
+function stampPromptTurnStart(drafts: SessionStreamDraft[], record: Record<string, unknown>): SessionStreamDraft[] {
+  const iso = recordTimestampIso(record)
+  if (!iso) return drafts
+  let stamped = false
+  return drafts.map((draft) => {
+    if (draft.kind !== 'prompt' || stamped) return draft
+    stamped = true
+    return { ...draft, turn_started_at: iso }
+  })
+}
+
 function countLines(value: unknown): number {
   if (typeof value !== 'string' || value.length === 0) return 0
   return value.split('\n').length
@@ -579,34 +608,76 @@ function draftsFromClaudeRecord(record: Record<string, unknown>): SessionStreamD
 }
 
 /**
- * Codex, with ONE CHANNEL PER KIND, which is the point.
+ * Codex: three input shapes, and within a ROLLOUT one channel per kind.
+ *
+ * 1. A rollout (`~/.codex/sessions/.../rollout-*.jsonl`, what the transcript watcher
+ *    tails). It writes the same assistant text on more than one channel: as a TurnItem
+ *    (`event_msg/item_completed`, item `AgentMessage`) or, in an older rollout, as the
+ *    legacy `event_msg/agent_message`, AND as `response_item/message` with
+ *    `role:'assistant'` (and, on 0.155, a `response_item/agent_message` as well). It
+ *    writes each command twice too: as the `response_item` call AND as an
+ *    `item_completed` `CommandExecution` / `FileChange` (a 0.155 rollout here: 41 of
+ *    each). Mapping two channels would double every line on the lens. So, for a rollout:
+ *
+ *   prose      event channel only: `item_completed/AgentMessage`, else the legacy
+ *              `agent_message`. Never `response_item/message` or `/agent_message`.
+ *   tools      response-item channel only. Never `CommandExecution` / `FileChange`.
+ *   status     event channel only (task_started / task_complete / turn_aborted).
+ *
+ * 2. The live `codex exec --json` stream (what a COS-driven Continue turn prints, read by
+ *    the attached-turn stream). MEASURED on codex-cli 0.155.0 (2026-09-19, fixture
+ *    `__fixtures__/codex-exec-json-0.155.0.jsonl`): `{type:'thread.started'}`,
+ *    `{type:'turn.started'}`, then `item.started` / `item.completed` wrapping
+ *    `{id, type, ...}` with snake_case item types (`agent_message`, `command_execution`,
+ *    ...), then `{type:'turn.completed', usage}`. Each item appears once per event, keyed
+ *    by its id; there is no second channel. See `draftsFromCodexExecEvent`.
+ *
+ * 3. The `{id, msg:{type,...}}` envelope of older `codex exec` builds, read exactly as
+ *    6.51.0 read it: the legacy events only (task_started, agent_message, task_complete).
  *
- * Codex writes the same assistant text twice, as `event_msg/agent_message` AND as
- * `response_item/message` with `role:'assistant'` (measured on this Mac: 6 of each in
- * one rollout, plus 8 `response_item/agent_message`). Mapping both would double every
- * reply on the lens. So prose comes from the event channel only and tools from the
- * response-item channel only, and the duplication is unrepresentable rather than
- * deduplicated after the fact.
+ * WHY THE TWO PROSE SOURCES CANNOT BOTH FIRE IN ONE ROLLOUT (6.52.0). Codex's rollout
+ * writer (`should_persist_event_msg`, codex-rs/rollout/src/policy.rs) persists the
+ * legacy `AgentMessage` event ONLY when the thread's `history_mode` is `legacy`, and an
+ * `ItemCompleted` AgentMessage ONLY when it is `paginated`; every earlier version of
+ * that policy persisted `ItemCompleted` for plan items alone. `history_mode` is a
+ * property of the thread, stamped on its `session_meta`. Measured on this Mac on
+ * 2026-09-19: 912 rollouts from codex-cli 0.128 to 0.155, 949 of 949 `session_meta`
+ * records say `paginated`, 0 legacy `agent_message` events, 171,606 `item_completed`
+ * events, 0 rollouts with both, and no AgentMessage item id written twice.
  *
- * The honest cost: if a Codex build stops emitting `event_msg/agent_message`, prose
- * goes quiet and the poll fallback carries the text. Quiet is the safe direction;
- * doubled text is not.
+ * Until 6.52.0 prose came from `agent_message` alone, so on every rollout above the
+ * lens said "Working. Nothing written yet." while the Codex app showed paragraphs.
  *
- * `codex exec --json` has also historically wrapped events as `{id, msg:{type,...}}`
- * rather than `{type:'event_msg', payload:{...}}`. Both are accepted.
+ * The older `{id, msg:{type,...}}` exec envelope reads the legacy events alone, exactly as
+ * 6.51.0 did, and never an item: no build on this Mac still writes it, so there is nothing
+ * measured to change that reader against. Today's exec stream is shape 2 above.
  */
 function draftsFromCodexRecord(record: Record<string, unknown>): SessionStreamDraft[] {
   const msg = asRecord(record.msg)
   if (msg && typeof msg.type === 'string') return draftsFromCodexEvent(msg)
 
   const type = typeof record.type === 'string' ? record.type : ''
+  // Shape 2: a live `codex exec --json` event. No rollout row type contains a dot.
+  if (type === 'thread.started' || type.startsWith('turn.') || type.startsWith('item.')) return draftsFromCodexExecEvent(record)
   const payload = asRecord(record.payload)
   if (!payload) return []
-  if (type === 'event_msg') return draftsFromCodexEvent(payload)
+  if (type === 'event_msg') {
+    if (payload.type === 'item_completed') return draftsFromCodexItem(asRecord(payload.item))
+    return draftsFromCodexEvent(payload)
+  }
   if (type !== 'response_item') return []
 
   const kind = typeof payload.type === 'string' ? payload.type : ''
   if (kind === 'function_call' || kind === 'custom_tool_call' || kind === 'local_shell_call') {
+    const name = typeof payload.name === 'string' ? payload.name.trim() : ''
+    // A code-mode cell (6.52.0): `exec` carrying JavaScript that calls the real tools.
+    if (kind === 'custom_tool_call' && name === 'exec' && typeof payload.input === 'string' && isCodeModeCell(payload.input)) {
+      return codeModeDrafts(payload.input, payload.call_id)
+    }
+    if (name === 'apply_patch') {
+      const patch = typeof payload.input === 'string' ? payload.input : patchFromArguments(payload.arguments)
+      if (patch !== null) return [patchDraft(patch, payload.call_id)]
+    }
     // `arguments` is a JSON STRING on function_call; `input` is a raw string on
     // custom_tool_call. Only the parseable one can yield a structured target.
     let input: unknown = payload.input
@@ -619,11 +690,130 @@ function draftsFromCodexRecord(record: Record<string, unknown>): SessionStreamDr
     } else if (typeof input === 'string') {
       input = { command: input }
     }
+    if (kind === 'function_call' && isCodexPoll(name, input)) return []
     return [toolDraft(payload.name, input, payload.call_id)]
   }
   return []
 }
 
+/** `codex exec` wraps each command in a login shell: `/bin/zsh -lc 'npm test'`. The
+ * command is what ran; the wrapper is how. Shared with the Messages trail's Codex reader. */
+const CODEX_SHELL_WRAPPER_RE = /^\s*(?:\S*\/)?(?:ba|z|da)?sh\s+-l?c\s+(?:'([\s\S]*)'|"([\s\S]*)")\s*$/
+
+export function codexExecCommandText(value: unknown): string {
+  if (Array.isArray(value)) {
+    const parts = value.filter((part): part is string => typeof part === 'string')
+    if (parts.length >= 3 && /(?:^|\/)(?:ba|z|da)?sh$/.test(parts[0]) && /^-l?c$/.test(parts[1])) return parts.slice(2).join(' ')
+    return parts.join(' ')
+  }
+  const text = typeof value === 'string' ? value : ''
+  const match = CODEX_SHELL_WRAPPER_RE.exec(text)
+  return match ? (match[1] ?? match[2] ?? text) : text
+}
+
+function execLineCount(value: unknown): number {
+  if (typeof value !== 'string') return 0
+  const text = value.replace(/\n+$/, '')
+  return text.length === 0 ? 0 : text.split('\n').length
+}
+
+/** A finished `command_execution` item to a derived outcome token. Never output text.
+ * Shared with the Messages trail's Codex reader. */
+export function codexExecCommandOutcome(item: Record<string, unknown>): Omit<ToolOutcome, 'call'> {
+  const exit = item.exit_code
+  if (typeof exit === 'number') {
+    if (exit !== 0) return { ok: false, detail: `exit ${exit}` }
+    const lines = execLineCount(item.aggregated_output)
+    return { ok: true, detail: lines === 0 ? 'no output' : `${lines} line${lines === 1 ? '' : 's'}` }
+  }
+  if (item.status === 'declined') return { ok: false, detail: 'denied' }
+  if (item.status === 'failed') return { ok: false, detail: 'failed' }
+  return { ok: true, detail: '' }
+}
+
+function execOutcome(outcome: Omit<ToolOutcome, 'call'>, call?: string): SessionStreamDraft {
+  return { kind: 'status', state: 'working', tool_outcome: call ? { ...outcome, call } : outcome }
+}
+
+/**
+ * One live `codex exec --json` event (6.52.0 QA round 1: a Continue that runs through
+ * `codex exec` streamed only working and done, because nothing read this shape).
+ *
+ * STATELESS, so each step is emitted exactly once by rule rather than by memory:
+ *   turn.started            status working. turn.completed / turn.failed: status done.
+ *   agent_message           prose, at completion (it arrives complete).
+ *   reasoning               the reasoning headline on a status, at completion; never prose.
+ *   command_execution       the step at START (it has one, measured), its outcome at
+ *                           completion, paired by the item id.
+ *   mcp_tool_call           the same.
+ *   web_search, file_change the step and its outcome at COMPLETION only: a search's query
+ *                           is not known at start, and a file change is reported done.
+ *   thread.started, item.updated, anything newer: nothing.
+ */
+function draftsFromCodexExecEvent(record: Record<string, unknown>): SessionStreamDraft[] {
+  const type = typeof record.type === 'string' ? record.type : ''
+  if (type === 'turn.started') return [{ kind: 'status', state: 'working' }]
+  if (type === 'turn.completed' || type === 'turn.failed') return [{ kind: 'status', state: 'done' }]
+  if (type !== 'item.started' && type !== 'item.completed') return []
+  const item = asRecord(record.item)
+  if (!item) return []
+  const done = type === 'item.completed'
+  const call = callId(item.id)
+  switch (item.type) {
+    case 'agent_message': {
+      if (!done) return []
+      const prose = proseDraft(item.text)
+      return prose ? [prose] : []
+    }
+    case 'reasoning': {
+      if (!done) return []
+      const reasoning = codexReasoningHeadline([item.text])
+      if (!reasoning) return []
+      const draft: CodexReasoningStatus = { kind: 'status', state: 'working', reasoning }
+      return [draft]
+    }
+    case 'command_execution':
+      return done
+        ? [execOutcome(codexExecCommandOutcome(item), call)]
+        : [toolDraft('Bash', { command: codexExecCommandText(item.command) }, item.id)]
+    case 'mcp_tool_call': {
+      if (done) {
+        const failed = item.status === 'failed' || (item.error != null && item.error !== '')
+        return [execOutcome({ ok: !failed, detail: failed ? 'failed' : '' }, call)]
+      }
+      const name = [item.server, item.tool].filter((part): part is string => typeof part === 'string' && part.length > 0).join('.')
+      return [{ kind: 'tool', verb: 'other', target: oneLine(name, TARGET_MAX_CHARS) || 'mcp tool', detail: '', ...(call ? { call } : {}) }]
+    }
+    case 'web_search': {
+      if (!done) return []
+      const query = oneLine(item.query, TARGET_MAX_CHARS)
+      return [
+        { kind: 'tool', verb: 'search', target: query || 'web search', detail: '', ...(call ? { call } : {}) },
+        execOutcome({ ok: true, detail: '' }, call),
+      ]
+    }
+    case 'file_change': {
+      if (!done) return []
+      const failed = item.status === 'failed'
+      const changes = (Array.isArray(item.changes) ? item.changes : [])
+        .map(asRecord)
+        .filter((change): change is Record<string, unknown> => change !== null)
+        .slice(0, 5)
+      const out: SessionStreamDraft[] = []
+      for (const change of changes) {
+        const name = oneLine(basename(change.path), TARGET_MAX_CHARS) || 'file'
+        if (change.kind === 'add') out.push({ kind: 'tool', verb: 'write', target: name, detail: '' })
+        else if (change.kind === 'delete') out.push({ kind: 'tool', verb: 'other', target: oneLine(`delete ${name}`, TARGET_MAX_CHARS), detail: '' })
+        else out.push({ kind: 'tool', verb: 'edit', target: name, detail: '' })
+        out.push(execOutcome({ ok: !failed, detail: failed ? 'failed' : change.kind === 'add' ? 'created' : change.kind === 'delete' ? 'deleted' : 'edited' }))
+      }
+      return out
+    }
+    default:
+      return []
+  }
+}
+
 function draftsFromCodexEvent(payload: Record<string, unknown>): SessionStreamDraft[] {
   const kind = typeof payload.type === 'string' ? payload.type : ''
   if (kind === 'task_started') return [{ kind: 'status', state: 'working' }]
@@ -637,6 +827,427 @@ function draftsFromCodexEvent(payload: Record<string, unknown>): SessionStreamDr
   return []
 }
 
+/**
+ * A `status: working` draft carrying Codex's reasoning headline (6.52.0).
+ *
+ * AN EXTRA FIELD ON AN EXISTING KIND, NEVER A NEW KIND, for the reason `tool_outcome`
+ * rides a status draft: a shipped client drops an unknown `kind` BEFORE its seq
+ * accounting and paints a gap row, while it takes a repeated `status: working` as a
+ * no-op and strips the fields it does not know. So an old lens renders exactly what
+ * it did before, and a client that learns `reasoning` can show the line. It is never
+ * prose: it is the model's summary of what it is thinking, not something it wrote.
+ */
+export type CodexReasoningStatus = { kind: 'status'; state: 'working'; reasoning: string }
+
+export function isCodexReasoningStatus(draft: SessionStreamDraft): boolean {
+  return draft.kind === 'status' && typeof (draft as { reasoning?: unknown }).reasoning === 'string'
+}
+
+/**
+ * One completed Codex TurnItem (`event_msg/item_completed`, paginated rollouts).
+ *
+ * Measured item types on this Mac: AgentMessage, Reasoning, UserMessage,
+ * CommandExecution, FileChange, WebSearch, McpToolCall, ContextCompaction, Plan,
+ * SubAgentActivity, ImageView. Only the first three map; the tool items are the
+ * response-item channel's job (see `draftsFromCodexRecord`).
+ */
+function draftsFromCodexItem(item: Record<string, unknown> | null): SessionStreamDraft[] {
+  if (!item) return []
+  if (item.type === 'AgentMessage') {
+    // `content: [{type:'Text', text}]`, `phase: 'commentary' | 'final_answer'`. Both are
+    // what Codex wrote to the person, so both are prose.
+    const prose = proseDraft(codexItemText(item.content))
+    return prose ? [prose] : []
+  }
+  if (item.type === 'Reasoning') {
+    const reasoning = codexReasoningHeadline(item.summary_text)
+    if (!reasoning) return []
+    const draft: CodexReasoningStatus = { kind: 'status', state: 'working', reasoning }
+    return [draft]
+  }
+  if (item.type === 'UserMessage') {
+    // Codex already leaves AGENTS.md, `<environment_context>` and skill bodies out of
+    // this item (they are response_item rows only), so what is left is what the person
+    // sent, less automation wrappers and attached-file scaffolding.
+    const blocks = Array.isArray(item.content)
+      ? item.content.map(block => asRecord(block)?.text)
+      : []
+    const ask = codexUserAsk(blocks)
+    const text = ask === null ? '' : oneLine(ask, PROMPT_MAX_CHARS)
+    return text ? [{ kind: 'prompt', text }] : []
+  }
+  return []
+}
+
+function codexItemText(content: unknown): string {
+  if (!Array.isArray(content)) return ''
+  return content
+    .map(block => asRecord(block)?.text)
+    .filter((text): text is string => typeof text === 'string' && text.trim().length > 0)
+    .join('\n\n')
+}
+
+/**
+ * The reasoning line: the headline of the newest summary section, markdown bold out.
+ *
+ * `summary_text` is a list of sections, each `**Title**` or `**Title**\n\nbody`
+ * (415,343 sections measured, no other form). The newest is what the model is
+ * thinking about now; its title is the glanceable part. An empty list (reasoning that
+ * was encrypted, 4,988 items) yields nothing rather than a placeholder.
+ */
+export function codexReasoningHeadline(summary: unknown): string {
+  if (!Array.isArray(summary)) return ''
+  for (let k = summary.length - 1; k >= 0; k--) {
+    const section = summary[k]
+    if (typeof section !== 'string' || section.trim().length === 0) continue
+    // The first line IS the title (`**Title**`); a body, when there is one, follows a
+    // blank line.
+    const plain = oneLine(section.trim().split('\n')[0].replace(/\*\*/g, ''), TARGET_MAX_CHARS)
+    if (plain) return plain
+  }
+  return ''
+}
+
+/**
+ * What the person asked, out of the text blocks of one Codex user message, or null.
+ *
+ * Shared by the stream (the `prompt` line) and the session detail (title, first
+ * prompt, DISCUSSION, recent turns), so the two can never disagree about what a user
+ * said. Per BLOCK, because a Codex user message is a list of blocks and one record can
+ * hold a wrapper block next to typed text (`<image>` then the words; 5 records here).
+ *
+ * DROPPED, measured over this Mac's rollouts on 2026-09-19:
+ *  - `# AGENTS.md instructions for <dir>`: Codex writes the repo's AGENTS.md as a user
+ *    message. It is the FIRST user row in 469 rollouts, so it became the session's
+ *    title and opening DISCUSSION line.
+ *  - any block that opens with a tag: `<environment_context>`, `<skill>`,
+ *    `<subagent_notification>`, `<recommended_plugins>`, `<heartbeat>`, `<image ...>`,
+ *    `</image>`, `<turn_aborted>` and the rest. The same rule `isWrapperPrompt` uses.
+ *
+ * KEPT, because it is real: an attached-file message (`# Files mentioned by the user:`,
+ * `# Files pasted by the user:`, `# In app browser:`) is reduced to the words after its
+ * `## My request for Codex:` / `## My request:` heading, which is what was typed
+ * (1,648 of 1,760 such messages). One without that heading is kept whole.
+ */
+export function codexUserAsk(blocks: readonly unknown[]): string | null {
+  const kept: string[] = []
+  for (const block of blocks) {
+    if (typeof block !== 'string') continue
+    let text = block.trim()
+    if (!text || text.startsWith('<') || CODEX_AGENTS_MD.test(text)) continue
+    if (CODEX_ATTACHMENT_HEADER.test(text)) {
+      const request = CODEX_REQUEST_HEADING.exec(text)
+      if (request) text = text.slice(request.index + request[0].length).trim()
+    }
+    if (text) kept.push(text)
+  }
+  return kept.length > 0 ? kept.join('\n\n') : null
+}
+
+const CODEX_AGENTS_MD = /^#\s*AGENTS\.md instructions\b/
+const CODEX_ATTACHMENT_HEADER = /^#\s*(?:Files mentioned by the user|Files pasted by the user|In app browser)\b/
+const CODEX_REQUEST_HEADING = /^##\s*My request(?: for Codex)?:/m
+
+/**
+ * A poll, which is not a step (6.52.0).
+ *
+ * Code mode runs a command in a cell and then WAITS on it: `wait` with a `cell_id`, or
+ * `write_stdin` with no characters to read more output (10,828 of 11,041 `write_stdin`
+ * calls measured). Each rendered as a step ("other wait", "other write_stdin"), so the
+ * lens counted and listed waiting as work. A `write_stdin` that TYPES something is an
+ * action and stays a step.
+ */
+function isCodexPoll(name: string, input: unknown): boolean {
+  if (name === 'wait') return true
+  if (name !== 'write_stdin') return false
+  const chars = asRecord(input)?.chars
+  return chars === undefined || chars === null || chars === ''
+}
+
+/** Steps one code-mode cell may add. A cell that loops over calls is still one glance. */
+export const CODE_MODE_MAX_STEPS = 3
+
+/**
+ * Is this `exec` input a code-mode JavaScript cell rather than a shell command?
+ *
+ * Every `exec` custom tool call on this Mac (48,706, codex-cli 0.129 to 0.155) is
+ * JavaScript: it calls `tools.<fn>(...)`, or opens with a declaration, `text(`,
+ * `ALL_TOOLS`, a loop, a comment or an array. Anything else keeps the old reading,
+ * a shell command, so an older build's plain `exec` renders exactly as before.
+ */
+function isCodeModeCell(input: string): boolean {
+  if (/^\s*(?:(?:const|let|var|await)\b|text\s*\(|ALL_TOOLS\b|for\s*\(|\/\/|\/\*|\[\s*["'`\d[{])/.test(input)) return true
+  return lexCodeModeCell(input).calls.length > 0
+}
+
+interface CodeModeCall { fn: string; args: string | null }
+
+function isIdentChar(ch: string | undefined): boolean {
+  return ch !== undefined && /[\w$]/.test(ch)
+}
+
+function skipSpace(src: string, i: number): number {
+  while (i < src.length && /\s/.test(src[i])) i++
+  return i
+}
+
+/** Index just past the string literal opening at `i` (or the end, if it never closes). */
+function skipStringLiteral(src: string, i: number): number {
+  const quote = src[i]
+  let j = i + 1
+  while (j < src.length) {
+    const ch = src[j]
+    if (ch === '\\') { j += 2; continue }
+    if (ch === quote) return j + 1
+    j++
+  }
+  return src.length
+}
+
+/** Index of the bracket closing the one at `open`, skipping strings; the end if none. */
+function matchBracket(src: string, open: number): number {
+  let depth = 0
+  let j = open
+  while (j < src.length) {
+    const ch = src[j]
+    if (ch === '"' || ch === "'" || ch === '`') { j = skipStringLiteral(src, j); continue }
+    if (ch === '(' || ch === '[' || ch === '{') depth++
+    else if (ch === ')' || ch === ']' || ch === '}') {
+      depth--
+      if (depth === 0) return j
+    }
+    j++
+  }
+  return src.length
+}
+
+const JS_SIMPLE_ESCAPES: Readonly<Record<string, string>> = { n: '\n', t: '\t', r: '\r', b: '\b', f: '\f', v: '\v', '0': '\0' }
+
+/** The value of a JS string literal (quotes included in `literal`), or null. */
+function decodeJsString(literal: string): string | null {
+  if (literal.length < 2) return null
+  const quote = literal[0]
+  if ((quote !== '"' && quote !== "'" && quote !== '`') || literal[literal.length - 1] !== quote) return null
+  // One reading for all three quote styles (JSON's escapes are a subset of these).
+  return literal.slice(1, -1).replace(/\\(u\{[0-9a-fA-F]+\}|u[0-9a-fA-F]{4}|x[0-9a-fA-F]{2}|[\s\S])/g, (_, esc: string) => {
+    const simple = JS_SIMPLE_ESCAPES[esc]
+    if (simple !== undefined) return simple
+    if (esc.startsWith('u{')) return String.fromCodePoint(parseInt(esc.slice(2, -1), 16))
+    if (esc.length > 1) return String.fromCharCode(parseInt(esc.slice(1), 16))
+    return esc
+  })
+}
+
+/**
+ * The tool calls and string literals of a code-mode cell.
+ *
+ * A small lexer rather than a pattern over the source: a command string that itself
+ * mentions `tools.apply_patch(` (a search for it, say) must not count as a call, and a
+ * call's arguments end at ITS closing parenthesis, not at the first one in a string.
+ */
+function lexCodeModeCell(src: string): { calls: CodeModeCall[]; literals: string[] } {
+  const calls: CodeModeCall[] = []
+  const literals: string[] = []
+  let i = 0
+  while (i < src.length) {
+    const ch = src[i]
+    if (ch === '"' || ch === "'" || ch === '`') {
+      const end = skipStringLiteral(src, i)
+      const value = decodeJsString(src.slice(i, end))
+      if (value !== null) literals.push(value)
+      i = end
+      continue
+    }
+    if (ch === '/' && src[i + 1] === '/') {
+      const nl = src.indexOf('\n', i)
+      i = nl < 0 ? src.length : nl + 1
+      continue
+    }
+    if (ch === '/' && src[i + 1] === '*') {
+      const close = src.indexOf('*/', i + 2)
+      i = close < 0 ? src.length : close + 2
+      continue
+    }
+    if (src.startsWith('tools', i) && !isIdentChar(src[i - 1]) && src[i - 1] !== '.' && !isIdentChar(src[i + 5])) {
+      let j = skipSpace(src, i + 5)
+      let fn: string | null = null
+      if (src[j] === '.') {
+        j = skipSpace(src, j + 1)
+        const name = /^[A-Za-z_$][\w$]*/.exec(src.slice(j))
+        if (name) { fn = name[0]; j += name[0].length }
+      } else if (src[j] === '[') {
+        j = skipSpace(src, j + 1)
+        if (src[j] === '"' || src[j] === "'" || src[j] === '`') {
+          const end = skipStringLiteral(src, j)
+          const name = decodeJsString(src.slice(j, end))
+          j = skipSpace(src, end)
+          if (name && src[j] === ']') { fn = name; j += 1 }
+        }
+      }
+      if (fn !== null) {
+        j = skipSpace(src, j)
+        let args: string | null = null
+        if (src[j] === '(') {
+          const close = matchBracket(src, j)
+          args = src.slice(j + 1, close)
+          // The argument literals are scanned by the main loop too, so a patch passed
+          // inline is found the same way as one passed through a variable.
+          i = j + 1
+        } else {
+          i = j
+        }
+        calls.push({ fn, args })
+        continue
+      }
+    }
+    i++
+  }
+  return { calls, literals }
+}
+
+/**
+ * The string-valued top-level properties of an object literal (`{cmd:"ls", ...}` or
+ * `{"cmd":"ls"}`), or null when the argument is not one (a variable, a call).
+ */
+function objectLiteralStrings(args: string): Record<string, string> | null {
+  const src = args.trim()
+  if (!src.startsWith('{')) return null
+  const out: Record<string, string> = {}
+  const end = matchBracket(src, 0)
+  let i = 1
+  while (i < end) {
+    i = skipSpace(src, i)
+    if (src[i] === ',') { i++; continue }
+    if (i >= end) break
+    let key = ''
+    if (src[i] === '"' || src[i] === "'" || src[i] === '`') {
+      const close = skipStringLiteral(src, i)
+      key = decodeJsString(src.slice(i, close)) ?? ''
+      i = close
+    } else {
+      const name = /^[A-Za-z_$][\w$]*/.exec(src.slice(i))
+      if (name) { key = name[0]; i += key.length }
+    }
+    i = skipSpace(src, i)
+    if (key && src[i] === ':') {
+      i = skipSpace(src, i + 1)
+      if (src[i] === '"' || src[i] === "'" || src[i] === '`') {
+        const close = skipStringLiteral(src, i)
+        const value = decodeJsString(src.slice(i, close))
+        if (value !== null) out[key] = value
+        i = close
+        continue
+      }
+    }
+    // Any other value (a number, a nested object, an expression): skip to the next
+    // top-level comma.
+    while (i < end && src[i] !== ',') {
+      const ch = src[i]
+      if (ch === '"' || ch === "'" || ch === '`') i = skipStringLiteral(src, i)
+      else if (ch === '(' || ch === '[' || ch === '{') i = matchBracket(src, i) + 1
+      else i++
+    }
+  }
+  return out
+}
+
+function isCodeModePoll(call: CodeModeCall): boolean {
+  if (call.fn === 'wait') return true
+  if (call.fn !== 'write_stdin') return false
+  // Only a provable poll is dropped: an argument that is not a literal might type.
+  const args = call.args === null ? null : objectLiteralStrings(call.args)
+  if (args === null) return false
+  return args.chars === undefined || args.chars === ''
+}
+
+/** The patch text a code-mode `apply_patch` call applied, from the cell's literals. */
+function patchFromLiterals(literals: readonly string[]): string | null {
+  return literals.find(value => CODEX_PATCH_FILE.test(value)) ?? null
+}
+
+function patchFromArguments(argumentsJson: unknown): string | null {
+  if (typeof argumentsJson !== 'string') return null
+  try {
+    const parsed = asRecord(JSON.parse(argumentsJson))
+    const patch = parsed?.input ?? parsed?.patch
+    return typeof patch === 'string' ? patch : null
+  } catch {
+    return null
+  }
+}
+
+const CODEX_PATCH_FILE = /^\*\*\* (?:Add|Update|Delete) File: /m
+
+/**
+ * One `apply_patch` as a step: `write` when it only adds files, else `edit`; the
+ * basenames it touched; `+added -removed` counted from the hunks, the same arithmetic
+ * an Edit step shows.
+ */
+function patchDraft(patch: string, id?: unknown): SessionStreamDraft {
+  const names: string[] = []
+  let onlyAdds = true
+  let added = 0
+  let removed = 0
+  for (const line of patch.split('\n')) {
+    const header = /^\*\*\* (Add|Update|Delete) File: (.+)$/.exec(line.trimEnd())
+    if (header) {
+      if (header[1] !== 'Add') onlyAdds = false
+      const name = basename(header[2].trim())
+      if (name && !names.includes(name)) names.push(name)
+      continue
+    }
+    // Hunk lines. Every other line of the format (`*** Begin Patch`, `@@`, context)
+    // starts with something else.
+    if (line.startsWith('+')) added++
+    else if (line.startsWith('-')) removed++
+  }
+  const call = callId(id)
+  return {
+    kind: 'tool',
+    verb: names.length > 0 && onlyAdds ? 'write' : 'edit',
+    target: names.length > 0 ? oneLine(names.join(', '), TARGET_MAX_CHARS) : 'apply_patch',
+    detail: added + removed > 0 ? oneLine(`+${added} -${removed}`, DETAIL_MAX_CHARS) : '',
+    ...(call ? { call } : {}),
+  }
+}
+
+/**
+ * A code-mode cell as the steps it took (6.52.0).
+ *
+ * Code mode wraps every tool in JavaScript: `const r = await
+ * tools.exec_command({"cmd":"sed -n '1,55p' ..."}); text(r.output);`. Until 6.52.0 the
+ * whole cell was the "command", so the lens printed `bash let{output,...rest}=awai...`.
+ * Now each real call is a step: `exec_command` is `bash` with its `cmd`, `apply_patch`
+ * is `edit`/`write` with the file, anything else names itself. Polls are not steps. A
+ * cell that calls no tool is `other exec`. The call id rides the first step only, so it
+ * still names exactly one step.
+ */
+function codeModeDrafts(input: string, id?: unknown): SessionStreamDraft[] {
+  const { calls, literals } = lexCodeModeCell(input)
+  const call = callId(id)
+  if (calls.length === 0) {
+    return [{ kind: 'tool', verb: 'other', target: 'exec', detail: '', ...(call ? { call } : {}) }]
+  }
+  const steps: SessionStreamDraft[] = []
+  for (const c of calls) {
+    if (isCodeModePoll(c)) continue
+    steps.push(codeModeStep(c, literals))
+    if (steps.length >= CODE_MODE_MAX_STEPS) break
+  }
+  return steps.map((step, index) => (index === 0 && call && step.kind === 'tool' ? { ...step, call } : step))
+}
+
+function codeModeStep(call: CodeModeCall, literals: readonly string[]): SessionStreamDraft {
+  if (call.fn === 'apply_patch') {
+    const inline = call.args === null ? null : decodeJsString(call.args.trim())
+    const patch = inline !== null && CODEX_PATCH_FILE.test(inline) ? inline : patchFromLiterals(literals)
+    if (patch !== null) return patchDraft(patch)
+    return { kind: 'tool', verb: 'edit', target: 'apply_patch', detail: '' }
+  }
+  const args = call.args === null ? null : objectLiteralStrings(call.args)
+  return toolDraft(call.fn, args ?? {})
+}
+
 /**
  * One parsed provider record to zero or more events.
  *
@@ -651,9 +1262,8 @@ export function draftsFromRecord(
   const obj = asRecord(record)
   if (!obj) return []
   try {
-    if (provider === 'codex') return draftsFromCodexRecord(obj)
-    // Cursor shares Claude's content-block shape, keyed off `role` instead of `type`.
-    return draftsFromClaudeRecord(obj)
+    const drafts = provider === 'codex' ? draftsFromCodexRecord(obj) : draftsFromClaudeRecord(obj)
+    return stampPromptTurnStart(drafts, obj)
   } catch {
     // A malformed record costs one line of the trail. It must never cost the stream.
     return []
@@ -712,7 +1322,8 @@ export function turnFromTail(provider: SessionStreamProvider, lines: readonly st
 
     if (provider === 'codex') {
       for (const draft of draftsFromRecord('codex', r)) {
-        if (draft.kind === 'status') verdict = draft.state === 'done' ? { ended: true, reason: 'codex_complete' } : { ended: false, reason: 'prompt_open' }
+        // 6.52.0: a reasoning line is narration, not a turn event. It never moves the verdict.
+        if (draft.kind === 'status' && !isCodexReasoningStatus(draft)) verdict = draft.state === 'done' ? { ended: true, reason: 'codex_complete' } : { ended: false, reason: 'prompt_open' }
       }
       continue
     }