@zerwiz/ymir 0.1.34 → 0.1.35

package/apps/sessrumnir/src/renderer/src/message-grouping.ts

@@ -0,0 +1,410 @@
+import type { DisplayMessage } from './store'
+// Aliased: every helper below takes its translator as a parameter named `t`
+// (shadowing this import inside the function body) so `i18next-cli`'s
+// static extractor — which looks for calls on an identifier named `t` —
+// still finds and keeps these keys.
+import { t as sharedT, type Translate } from '../../shared/i18n'
+
+// A single chat item to render: either a lone message or a collapsed group of
+// consecutive tool-activity messages.
+export type ChatRenderItem =
+  | { kind: 'message'; message: DisplayMessage }
+  | { kind: 'toolGroup'; id: string; title: string; messages: DisplayMessage[] }
+
+// Group a run only once it holds this many tool calls; a lone call renders as-is.
+const MIN_GROUP_TOOL_CALLS = 2
+
+// "Tool activity" is anything with no user-facing prose: tool results, and
+// assistant turns whose only body is tool calls and/or thinking (no text). A run
+// of these between two prose turns is what gets folded into one group; the
+// thinking turns ride along and render in the expanded body per the setting.
+function isToolActivity(m: DisplayMessage): boolean {
+  if (m.role === 'toolResult') return true
+  if (m.role === 'assistant') return m.content.trim().length === 0
+  return false
+}
+
+/** What a tool call does, independent of the display language. */
+export type ToolKind = 'fetch' | 'read' | 'run' | 'edit' | 'write' | 'search' | 'list'
+type TargetToolKind = Exclude<ToolKind, 'run'>
+// Unknown tools bucket together in group titles.
+type SummaryKind = ToolKind | 'other'
+
+// Keyword matching is shared by toolLabel() and toolCallIconFor() so the label
+// and icon stay in sync.
+export function toolKind(name: string): ToolKind | null {
+  const n = name.toLowerCase()
+  if (n.includes('bash') || n.includes('shell') || n.includes('exec') || n.includes('terminal')) return 'run'
+  if (n.includes('search') || n.includes('grep') || n.includes('find')) return 'search'
+  if (n.includes('web') || n.includes('fetch') || n.includes('http') || n.includes('url')) return 'fetch'
+  if (n.includes('edit') || n.includes('replace') || n.includes('patch')) return 'edit'
+  if (n.includes('write') || n.includes('create')) return 'write'
+  if (n.includes('list') || n.startsWith('ls') || n.includes('tree') || n.includes('dir')) return 'list'
+  if (n.includes('read') || n.includes('view') || n.includes('cat') || n.includes('file')) return 'read'
+  return null
+}
+
+// Friendly label for a tool; custom/unknown tools keep their raw name. Accepts
+// the caller's own `t` (from `useTranslation()`) so a memoized result recomputes
+// on a language change; defaults to the shared translator for non-component use.
+export function toolLabel(name: string, t: Translate = sharedT): string {
+  const kind = toolKind(name)
+  return kind ? t(`tools.${kind}.label`) : name
+}
+
+const PATH_ARG_KEYS = ['path', 'file', 'filename', 'file_path', 'filepath']
+
+// Argument fields a single-op label pulls its shown value from. Commands
+// ('run') show no value.
+const TOOL_ARG_KEYS: Record<TargetToolKind, readonly string[]> = {
+  fetch: ['url', 'uri', 'href', 'link'],
+  read: PATH_ARG_KEYS,
+  edit: PATH_ARG_KEYS,
+  write: PATH_ARG_KEYS,
+  search: ['query', 'pattern', 'text', 'search', 'q', 'regex'],
+  list: ['path', 'dir', 'directory', 'location', 'folder'],
+}
+
+const TOOL_DONE_KEYS = {
+  fetch: 'tools.fetch.done',
+  read: 'tools.read.done',
+  edit: 'tools.edit.done',
+  write: 'tools.write.done',
+  search: 'tools.search.done',
+  list: 'tools.list.done',
+} as const satisfies Record<TargetToolKind, string>
+
+const PATH_KINDS: ReadonlySet<ToolKind> = new Set<ToolKind>(['read', 'edit', 'write', 'list'])
+
+const MAX_ARG_LEN = 60
+
+function hasTarget(kind: ToolKind): kind is TargetToolKind {
+  return kind !== 'run'
+}
+
+function shorten(s: string): string {
+  return s.length > MAX_ARG_LEN ? s.slice(0, MAX_ARG_LEN - 1) + '…' : s
+}
+
+// Pull the value a single-op label should show from the tool call's arguments.
+function extractArg(kind: TargetToolKind, argumentsJson: string): string | null {
+  let parsed: unknown
+  try {
+    parsed = JSON.parse(argumentsJson)
+  } catch {
+    return null
+  }
+  if (!parsed || typeof parsed !== 'object' || Array.isArray(parsed)) return null
+  const obj = parsed as Record<string, unknown>
+  for (const key of TOOL_ARG_KEYS[kind]) {
+    const val = obj[key]
+    if (typeof val === 'string' && val.trim()) return val.trim()
+  }
+  return null
+}
+
+// Path-like args show just the basename; URLs/queries show in full (shortened).
+function displayArg(kind: TargetToolKind, raw: string): string {
+  if (PATH_KINDS.has(kind)) {
+    const base = raw.replace(/[\\/]+$/, '').split(/[\\/]/).pop()
+    return shorten(base || raw)
+  }
+  return shorten(raw)
+}
+
+// Canonical target of a tool call, for counting distinct operands in a group
+// title — the same file read twice, or the same URL fetched twice, is one
+// target. Path args normalize separators + case (so `C:\a\b.ts` and `c:/a/b.ts`
+// match) and compare on the full path, so a same-named file in two dirs stays
+// two targets; other args compare trimmed. A target-less call (a command, an
+// unknown tool, or a tool whose arg can't be read) has no shared identity: it
+// returns null and the caller counts it on its own.
+function toolTarget(kind: ToolKind | null, argumentsJson: string): string | null {
+  if (!kind || !hasTarget(kind)) return null
+  const arg = extractArg(kind, argumentsJson)
+  if (arg === null) return null
+  if (PATH_KINDS.has(kind)) return arg.replace(/[\\/]+/g, '/').replace(/\/+$/, '').toLowerCase()
+  return arg.trim()
+}
+
+/**
+ * Label for a single tool-call badge: past-tense verb plus the operated-on value,
+ * e.g. "Fetched https://…", "Read config.ts", "Ran a command". Falls back to a
+ * value-less "<Verb> a <noun>" when the argument can't be read, and to the raw
+ * name for unknown tools.
+ */
+export function toolCallLabel(name: string, argumentsJson: string, t: Translate = sharedT): string {
+  const kind = toolKind(name)
+  if (!kind) return name
+  const arg = hasTarget(kind) ? extractArg(kind, argumentsJson) : null
+  if (arg === null || !hasTarget(kind)) return t(`tools.${kind}.doneWithoutTarget`)
+  return t(TOOL_DONE_KEYS[kind], { target: displayArg(kind, arg) })
+}
+
+// Combine the per-tool verbs across a run into one title, e.g.
+// "Fetched 4 URLs, read 2 files, edited a file". Counts are bucketed by kind in
+// first-appearance order and count *distinct* targets, so re-reading one file
+// or re-fetching one URL reads "Read a file" / "Fetched a URL", not "2".
+// Target-less calls (commands, unresolved args) each count on their own.
+// Unknown tools bucket together under 'other'.
+function groupTitle(run: DisplayMessage[], t: Translate): string {
+  const order: SummaryKind[] = []
+  const targets = new Map<SummaryKind, Set<string>>()
+  let uniqueSeq = 0 // gives each target-less call its own bucket entry
+  for (const m of run) {
+    for (const tc of m.toolCalls ?? []) {
+      const kind = toolKind(tc.name)
+      const bucket: SummaryKind = kind ?? 'other'
+      if (!targets.has(bucket)) {
+        order.push(bucket)
+        targets.set(bucket, new Set())
+      }
+      targets.get(bucket)!.add(toolTarget(kind, tc.arguments) ?? `\0${uniqueSeq++}`)
+    }
+  }
+
+  return order
+    .map((bucket, i) => {
+      const count = targets.get(bucket)!.size
+      return i === 0
+        ? t(`tools.${bucket}.summaryFirst`, { count })
+        : t(`tools.${bucket}.summaryNext`, { count })
+    })
+    .join(t('tools.summarySeparator'))
+}
+
+/**
+ * Fold consecutive tool-activity messages into collapsible groups. A run that
+ * carries fewer than MIN_GROUP_TOOL_CALLS tool calls is emitted as individual
+ * messages (unchanged rendering); larger runs become a single `toolGroup` item.
+ * Prose turns (assistant text, user, system) always render on their own and act
+ * as run boundaries.
+ */
+export function groupToolMessages(messages: DisplayMessage[], t: Translate = sharedT): ChatRenderItem[] {
+  const items: ChatRenderItem[] = []
+  let run: DisplayMessage[] = []
+
+  const flush = (): void => {
+    if (run.length === 0) return
+    const toolCallCount = run.reduce((n, m) => n + (m.toolCalls?.length ?? 0), 0)
+    if (toolCallCount >= MIN_GROUP_TOOL_CALLS) {
+      items.push({
+        kind: 'toolGroup',
+        id: `group-${run[0].id}`,
+        title: groupTitle(run, t),
+        messages: run,
+      })
+    } else {
+      for (const m of run) items.push({ kind: 'message', message: m })
+    }
+    run = []
+  }
+
+  for (const m of messages) {
+    if (isToolActivity(m)) {
+      run.push(m)
+    } else {
+      flush()
+      items.push({ kind: 'message', message: m })
+    }
+  }
+  flush()
+
+  return items
+}
+
+/** A tool call's run state, as shown next to its badge (e.g. message-bubble.tsx, streaming-bubble.tsx). */
+export type ToolCallStatus = 'running' | 'error' | 'done'
+
+const TOOL_CALL_STATUS_KEYS = {
+  running: 'chat.toolCall.status.running',
+  error: 'chat.toolCall.status.error',
+  done: 'chat.toolCall.status.done',
+} as const satisfies Record<ToolCallStatus, string>
+
+/** Label for a tool call's run state. Accepts the caller's own `t` so it re-renders on a language change. */
+export function toolCallStatusLabel(status: ToolCallStatus | null, t: Translate = sharedT): string {
+  return status ? t(TOOL_CALL_STATUS_KEYS[status]) : ''
+}
+
+/** The file/location a read/write/edit/list tool call operates on, or null. */
+export function toolCallFile(name: string, argumentsJson: string): string | null {
+  const kind = toolKind(name)
+  if (!kind || !PATH_KINDS.has(kind) || !hasTarget(kind)) return null
+  return extractArg(kind, argumentsJson)
+}
+
+/** Edit/write results fold onto the call badge instead of a separate row. */
+function resultFoldsIntoBadge(name: string): boolean {
+  const kind = toolKind(name)
+  return kind === 'edit' || kind === 'write'
+}
+
+// One replacement in an edit tool call: old text swapped for new.
+export interface EditBlock {
+  oldText: string
+  newText: string
+}
+
+/** The edit blocks from an edit tool call's arguments (`{ edits: [...] }`), or null. */
+function stringField(obj: Record<string, unknown>, keys: string[]): string | undefined {
+  for (const key of keys) {
+    const v = obj[key]
+    if (typeof v === 'string') return v
+  }
+  return undefined
+}
+
+/** Edit blocks from tool args ({ edits: [...] } or old_string/new_string). */
+export function parseEdits(argumentsJson: string): EditBlock[] | null {
+  let parsed: unknown
+  try {
+    parsed = JSON.parse(argumentsJson)
+  } catch {
+    return null
+  }
+  if (!parsed || typeof parsed !== 'object' || Array.isArray(parsed)) return null
+  const obj = parsed as Record<string, unknown>
+
+  const edits = obj.edits
+  if (Array.isArray(edits)) {
+    const blocks: EditBlock[] = []
+    for (const e of edits) {
+      if (!e || typeof e !== 'object') continue
+      const block = e as Record<string, unknown>
+      const oldText = stringField(block, ['oldText', 'old_text', 'old_string', 'oldString', 'old_str', 'before'])
+      const newText = stringField(block, ['newText', 'new_text', 'new_string', 'newString', 'new_str', 'after'])
+      if (oldText !== undefined && newText !== undefined) {
+        blocks.push({ oldText, newText })
+      }
+    }
+    if (blocks.length > 0) return blocks
+  }
+
+  const oldText = stringField(obj, ['oldText', 'old_text', 'old_string', 'oldString', 'old_str', 'before'])
+  const newText = stringField(obj, ['newText', 'new_text', 'new_string', 'newString', 'new_str', 'after'])
+  if (oldText !== undefined && newText !== undefined) {
+    return [{ oldText, newText }]
+  }
+  return null
+}
+
+const lineCount = (text: string): number => (text === '' ? 0 : text.split('\n').length)
+
+/** Added/removed line totals across an edit's blocks (old lines out, new lines in). */
+export function editStats(blocks: EditBlock[]): { added: number; removed: number } {
+  let added = 0
+  let removed = 0
+  for (const b of blocks) {
+    removed += lineCount(b.oldText)
+    added += lineCount(b.newText)
+  }
+  return { added, removed }
+}
+
+// Pi appends a footer to a truncated read, e.g.
+// "[262 more lines in file. Use offset=21 to continue.]". Match it so it can be
+// shown as a note rather than syntax-highlighted as code.
+const READ_TRUNCATION_RE = /^\[\d+ more lines? in file\b.*\]$/
+
+/**
+ * Split a read result's trailing truncation footer (if any) from the file
+ * content, so the footer isn't highlighted as code. Trailing blank lines between
+ * the content and the footer are dropped with it.
+ */
+export function splitReadTruncationNote(content: string): { code: string; note: string | null } {
+  const lines = content.split('\n')
+  let last = lines.length - 1
+  while (last >= 0 && lines[last].trim() === '') last--
+  if (last < 0 || !READ_TRUNCATION_RE.test(lines[last].trim())) return { code: content, note: null }
+  const note = lines[last].trim()
+  let end = last - 1
+  while (end >= 0 && lines[end].trim() === '') end--
+  return { code: lines.slice(0, end + 1).join('\n'), note }
+}
+
+/**
+ * Prepare the raw message list for rendering:
+ *  - enrich each toolResult with the paired call's toolName + operated-on toolFile
+ *  - fold edit/write results into the call badge (drop the separate success pill)
+ *  - split prose+tools so tool calls can join an adjacent tool run for grouping
+ *
+ * Pure; reuses message objects when nothing changed so memoized bubbles stay stable.
+ */
+export function prepareChatMessages(messages: DisplayMessage[]): DisplayMessage[] {
+  const calls = new Map<string, { name: string; file: string | null }>()
+  for (const m of messages) {
+    if (m.role === 'assistant' && m.toolCalls) {
+      for (const tc of m.toolCalls) {
+        calls.set(tc.id, { name: tc.name, file: toolCallFile(tc.name, tc.arguments) })
+      }
+    }
+  }
+
+  const results = new Map<string, { content: string; isError?: boolean }>()
+  for (const m of messages) {
+    if (m.role === 'toolResult' && m.toolCallId && !results.has(m.toolCallId)) {
+      results.set(m.toolCallId, { content: m.content, isError: m.isError })
+    }
+  }
+
+  const out: DisplayMessage[] = []
+
+  // Split prose+tools so tools can join a group; pure turns stay as-is.
+  const pushAssistant = (m: DisplayMessage): void => {
+    const hasProse = m.content.trim().length > 0
+    const hasTools = (m.toolCalls?.length ?? 0) > 0
+
+    // Fold result bodies onto edit/write calls only. Read/bash keep a standalone
+    // result pill — putting the body on the badge as well would show it twice.
+    let toolCalls = m.toolCalls
+    if (toolCalls && results.size > 0) {
+      let changed = false
+      const next = toolCalls.map((tc) => {
+        const r = results.get(tc.id)
+        if (!r) return tc
+        const foldIntoBadge = resultFoldsIntoBadge(tc.name)
+        changed = true
+        return {
+          ...tc,
+          result: foldIntoBadge ? (tc.result ?? r.content) : tc.result,
+          isError: tc.isError ?? r.isError ?? false,
+        }
+      })
+      if (changed) toolCalls = next
+    }
+
+    const base = toolCalls !== m.toolCalls ? { ...m, toolCalls } : m
+    if (!hasProse || !hasTools) {
+      out.push(base)
+      return
+    }
+    out.push({ ...base, toolCalls: undefined })
+    out.push({
+      ...base,
+      id: `${m.id}::tools`,
+      content: '',
+      thinking: undefined,
+      cost: undefined,
+      attachments: undefined,
+    })
+  }
+
+  for (const m of messages) {
+    if (m.role === 'assistant') {
+      pushAssistant(m)
+    } else if (m.role === 'toolResult' && m.toolCallId) {
+      const paired = calls.get(m.toolCallId)
+      // Edit/write: result lives on the call badge. Read/bash keep a result row.
+      if (paired) {
+        if (resultFoldsIntoBadge(paired.name)) continue
+        out.push({ ...m, toolName: paired.name, toolFile: paired.file ?? undefined })
+      } else {
+        out.push(m)
+      }
+    } else {
+      out.push(m)
+    }
+  }
+  return out
+}

package/apps/sessrumnir/src/renderer/src/message-parsing.test.ts

@@ -0,0 +1,86 @@
+import assert from 'node:assert/strict'
+import { test } from 'node:test'
+import { parseAgentMessage } from './message-parsing'
+
+test('parses user image blocks into named attachments', () => {
+  const parsed = parseAgentMessage({
+    role: 'user',
+    id: 'user-1',
+    timestamp: 123,
+    content: [
+      { type: 'text', text: 'can you see the image?' },
+      { type: 'image', mimeType: 'image/png', data: 'abc123' },
+    ],
+  })
+
+  assert.equal(parsed?.role, 'user')
+  assert.equal(parsed?.content, 'can you see the image?')
+  assert.deepEqual(parsed?.attachments, [
+    { kind: 'image', name: 'Image 1', mimeType: 'image/png', data: 'abc123' },
+  ])
+})
+
+test('keeps a provided attachment name and numbers unnamed ones', () => {
+  const parsed = parseAgentMessage({
+    role: 'user',
+    content: [
+      { type: 'image', mimeType: 'image/png', data: 'a', name: 'shot.png' },
+      { type: 'image', mimeType: 'image/jpeg', data: 'b' },
+    ],
+  })
+
+  assert.deepEqual(parsed?.attachments, [
+    { kind: 'image', name: 'shot.png', mimeType: 'image/png', data: 'a' },
+    { kind: 'image', name: 'Image 2', mimeType: 'image/jpeg', data: 'b' },
+  ])
+})
+
+test('user message without images has no attachments', () => {
+  const parsed = parseAgentMessage({ role: 'user', content: [{ type: 'text', text: 'hi' }] })
+  assert.equal(parsed?.attachments, undefined)
+})
+
+test('ignores image blocks missing mimeType or data', () => {
+  const parsed = parseAgentMessage({
+    role: 'user',
+    content: [
+      { type: 'image', mimeType: 'image/png' },
+      { type: 'image', data: 'no-mime' },
+    ],
+  })
+  assert.equal(parsed?.attachments, undefined)
+})
+
+test('parses assistant text, thinking, tool calls, and model metadata', () => {
+  const parsed = parseAgentMessage({
+    role: 'assistant',
+    model: 'gpt-5.5',
+    provider: 'openai-codex',
+    content: [
+      { type: 'thinking', thinking: 'hmm' },
+      { type: 'text', text: 'answer' },
+      { type: 'toolCall', id: 't1', name: 'bash', arguments: { cmd: 'ls' } },
+    ],
+  })
+
+  assert.equal(parsed?.role, 'assistant')
+  assert.equal(parsed?.content, 'answer')
+  assert.equal(parsed?.thinking, 'hmm')
+  assert.equal(parsed?.model, 'gpt-5.5')
+  assert.equal(parsed?.provider, 'openai-codex')
+  assert.deepEqual(parsed?.toolCalls, [
+    { id: 't1', name: 'bash', arguments: JSON.stringify({ cmd: 'ls' }) },
+  ])
+})
+
+test('parses toolResult text content', () => {
+  const parsed = parseAgentMessage({ role: 'toolResult', content: [{ type: 'text', text: 'output' }] })
+  assert.equal(parsed?.role, 'toolResult')
+  assert.equal(parsed?.content, 'output')
+})
+
+test('returns null for non-objects and unknown roles', () => {
+  assert.equal(parseAgentMessage(null), null)
+  assert.equal(parseAgentMessage('nope'), null)
+  assert.equal(parseAgentMessage({ role: 'mystery' }), null)
+})

package/apps/sessrumnir/src/renderer/src/message-parsing.ts

@@ -0,0 +1,166 @@
+import { t } from '../../shared/i18n'
+
+export interface DisplayAttachment {
+  kind: 'image'
+  name: string
+  mimeType: string
+  data: string
+}
+
+export interface DisplayMessage {
+  id: string
+  role: 'user' | 'assistant' | 'toolResult' | 'system'
+  content: string
+  timestamp: number
+  isStreaming?: boolean
+  toolCalls?: Array<{
+    id: string
+    name: string
+    arguments: string
+    result?: string
+    isError?: boolean
+    isExecuting?: boolean
+    durationMs?: number
+  }>
+  thinking?: string
+  model?: string
+  provider?: string
+  cost?: number
+  attachments?: DisplayAttachment[]
+  // toolResult only: the id/name of the tool call this result answers. `toolName`
+  // and `toolFile` (the operated-on file) are resolved from the paired call by
+  // prepareChatMessages so the result can render richly (highlight / diff).
+  toolCallId?: string
+  toolName?: string
+  toolFile?: string
+  isError?: boolean
+}
+
+let fallbackMessageCounter = 0
+
+function generateFallbackId(): string {
+  return `msg-${Date.now()}-${++fallbackMessageCounter}`
+}
+
+// Pi's session records store timestamps as ISO strings, but the RPC layer may
+// hand them back as epoch ms (or an ms string). Accept all three so relative-time
+// labels are correct for loaded history — a bare `Number(iso)` would be NaN and
+// silently fall back to "now", making every resumed message read as just-sent.
+function parseTimestamp(raw: unknown): number {
+  if (typeof raw === 'number' && Number.isFinite(raw)) {
+    // Guard against epoch-seconds being read as 1970.
+    return raw < 1e12 ? raw * 1000 : raw
+  }
+  if (typeof raw === 'string' && raw.trim()) {
+    const asNumber = Number(raw)
+    if (Number.isFinite(asNumber)) return asNumber < 1e12 ? asNumber * 1000 : asNumber
+    const asDate = Date.parse(raw)
+    if (!Number.isNaN(asDate)) return asDate
+  }
+  return Date.now()
+}
+
+function extractTextContent(content: unknown): string {
+  if (typeof content === 'string') return content
+  if (Array.isArray(content)) {
+    return content
+      .filter((block: unknown) => {
+        if (typeof block !== 'object' || block === null) return false
+        const b = block as Record<string, unknown>
+        return b.type === 'text' && typeof b.text === 'string'
+      })
+      .map((block) => (block as { text: string }).text)
+      .join('')
+  }
+  return ''
+}
+
+function extractImageAttachments(content: unknown): DisplayAttachment[] | undefined {
+  if (!Array.isArray(content)) return undefined
+
+  let imageIndex = 0
+  const images = content.flatMap((block: unknown) => {
+    if (typeof block !== 'object' || block === null) return []
+    const b = block as Record<string, unknown>
+    if (b.type !== 'image' || typeof b.mimeType !== 'string' || typeof b.data !== 'string') return []
+    imageIndex += 1
+    return [{
+      kind: 'image' as const,
+      name: typeof b.name === 'string' && b.name.trim() ? b.name : t('store.messages.imageFallbackName', { index: imageIndex }),
+      mimeType: b.mimeType,
+      data: b.data,
+    }]
+  })
+
+  return images.length > 0 ? images : undefined
+}
+
+export function parseAgentMessage(msg: unknown): DisplayMessage | null {
+  if (!msg || typeof msg !== 'object') return null
+
+  const m = msg as Record<string, unknown>
+  const role = m.role as string
+
+  if (role === 'user') {
+    return {
+      id: String(m.id ?? generateFallbackId()),
+      role: 'user',
+      content: extractTextContent(m.content),
+      timestamp: parseTimestamp(m.timestamp),
+      attachments: extractImageAttachments(m.content),
+    }
+  }
+
+  if (role === 'assistant') {
+    const content = Array.isArray(m.content) ? m.content : []
+    const textParts = content
+      .filter((c: unknown) => typeof c === 'object' && c !== null && (c as Record<string, unknown>).type === 'text')
+      .map((c: unknown) => ((c as Record<string, unknown>).text as string) ?? '')
+
+    const thinkingParts = content
+      .filter((c: unknown) => typeof c === 'object' && c !== null && (c as Record<string, unknown>).type === 'thinking')
+      .map((c: unknown) => ((c as Record<string, unknown>).thinking as string) ?? '')
+
+    const toolCalls = content
+      .filter((c: unknown) => typeof c === 'object' && c !== null && (c as Record<string, unknown>).type === 'toolCall')
+      .map((c: unknown) => {
+        const tc = c as Record<string, unknown>
+        return {
+          id: String(tc.id ?? ''),
+          name: String(tc.name ?? ''),
+          arguments: JSON.stringify(tc.arguments ?? {}),
+        }
+      })
+
+    return {
+      id: String(m.id ?? generateFallbackId()),
+      role: 'assistant',
+      content: textParts.join(''),
+      timestamp: parseTimestamp(m.timestamp),
+      thinking: thinkingParts.length > 0 ? thinkingParts.join('') : undefined,
+      toolCalls: toolCalls.length > 0 ? toolCalls : undefined,
+      model: typeof m.model === 'string' ? m.model : undefined,
+      provider: typeof m.provider === 'string' ? m.provider : undefined,
+    }
+  }
+
+  if (role === 'toolResult') {
+    const content = Array.isArray(m.content) ? m.content : []
+    const text = content
+      .filter((c: unknown) => typeof c === 'object' && c !== null && (c as Record<string, unknown>).type === 'text')
+      .map((c: unknown) => ((c as Record<string, unknown>).text as string) ?? '')
+      .join('')
+
+    return {
+      id: String(m.id ?? generateFallbackId()),
+      role: 'toolResult',
+      content: text,
+      timestamp: parseTimestamp(m.timestamp),
+      toolCallId: typeof m.toolCallId === 'string' ? m.toolCallId : undefined,
+      toolName: typeof m.toolName === 'string' ? m.toolName : undefined,
+      isError: typeof m.isError === 'boolean' ? m.isError : undefined,
+    }
+  }
+
+  return null
+}