* feat(desktop): session-scoped status stack + kill new-window theme flash Stack subagents, background tasks, and the queue into one collapsible "sink" above the composer, reusing the queue's chrome so every status reads as one piece. Extracts shared StatusSection / StatusRow / TerminalOutput primitives and a unified $statusItemsBySession store (subagents mirrored, background owned here, merged + grouped for render). Renames BrailleSpinner → GlyphSpinner now that it drives more than braille. Separately, fix the white flash on every new/cmd-clicked window: macOS `vibrancy` paints an NSVisualEffectView that follows the OS appearance and ignores `backgroundColor`, so a dark app on a light-mode Mac flashed white until the renderer painted over it. Pin `nativeTheme.themeSource` to the app theme (persisted to userData so cold launches paint right before the renderer loads), hold windows with `show:false` until `ready-to-show`, and pre-paint the themed background via an inline script before the bundle runs. * feat(desktop): dock the slash popover to the composer via one shared fill var The slash·@ popover (and ? help) now docks onto the composer's edge with the same chrome as the queue/status stack — rounded outer corners, fused borderless edge, no shadow — but keeps its own narrow width. Surface + drawer paint a single --composer-fill var; the state ladder (rest / scrolled / focused / drawer-open) lives once in styles.css on [data-slot='composer-root']. The :has() drawer-open rule is last and forces an opaque fill, since translucent glass sampling different backdrops (thread vs fade gradient) can never match. This replaces the focus-within !important override that repainted the surface behind every previous matching attempt. Also drop the chevron column from the project file tree — the folder open/closed icon already carries the expand state. * feat(desktop): base inset for file tree rows (post-chevron alignment) * feat(desktop): wire the status stack's background tasks to the real process registry The background group was UI-only (dev-mock seeded). Now it's live e2e: - tui_gateway: new session-scoped `process.list` (registry snapshot filtered by the session's session_key, plus a 4KB output tail for the inline terminal viewer) and `process.kill` (single process, ownership-checked — unlike process.stop's kill_all). - Renderer: `reconcileBackgroundProcesses` syncs snapshots into the store layout-stably — rows keep their position when state flips (never re-sort), new processes append, unchanged rows keep object identity so memoised rows skip re-rendering, and a dismissed-set stops the registry's retained finished procs from resurrecting X-ed rows. - Refresh triggers: session open, terminal/process tool.complete, status.update(kind=process) from the gateway's notification poller, and a 5s poll armed only while a running row is visible (catches silent exits). - Stop = real `process.kill` + optimistic dismiss; Dismiss = client-side with resurrection guard. - Re-keyed the stack to the RUNTIME session id: it was keyed by the stored session id, where neither subagent events nor process.list would ever land. - Deleted dev-status-mocks.ts (__hermesStatusMocks) — no more seed shit. Reconcile invariants covered in store/composer-status.test.ts. * feat(desktop): todos + openable subagents in the status stack, self-healing file tree - todo lists move out of the inline chat panel into the composer status stack (checklist icon, dashed ring = pending, spinner = in progress, check = done), fed live from todo tool events and seeded from history on session open - subagent rows carry the child's real session id end-to-end (delegate_tool → gateway → renderer) so clicking one opens ITS session window - status stack publishes its measured height so the thread's bottom clearance grows with it; card paints the shared --composer-fill so focused/scrolled states match the composer exactly - file tree self-heals: ENOENT roots retry on a 3s cadence + Try again button, and the main process expands ~ in IPC paths (gateway cwds arrive as ~/...) - composer drag-drop of tree entries inserts inline refs instead of attachments * fix(desktop): file tree falls back to the workspace dir when a session's cwd is gone Sessions record their launch cwd; deleted worktrees leave that path dead, so opening such a session swapped the tree from the default workspace to a directory that ENOENTs forever — the 3s retry just spun on it. On a root read error the tree now asks main to sanitize the cwd (prefers the configured default project dir), displays that fallback, and quietly re-probes the original path so it switches back if the dir reappears. * feat(desktop): working restore-checkpoint button on past user prompts The discard icon on hover of a past user bubble was decorative — clicking did nothing. It's now a real control: a confirmation dialog explains that everything after the prompt is removed, then the session rewinds to that turn and reruns the same prompt (prompt.submit with truncate_before_user_ordinal, the same mechanism the edit composer uses). Failures rethrow into the dialog's inline error instead of toasting. * fix(desktop): show the restore-checkpoint button on the latest user prompt too Restoring the most recent prompt is just 'retry this turn' — no reason to exclude it. Stop still takes the slot while the turn is running. * fix(desktop): finished todo lists clear themselves out of the status stack A list whose every item is completed/cancelled lingers ~4s so the final checkmark is visible, then the todo group drops out of the stack. A fresh active list arriving within the linger cancels the scheduled clear. * chore(desktop): drop dead editableCheckpoint copy, terser restore confirm * fix(desktop): rewind clears the abandoned timeline's todos + background Restoring to (or editing) an earlier prompt rewinds the conversation, but the todos and background processes spawned by the now-discarded turns kept showing in the status stack — and the real background processes kept running. Both rewind paths now clear the session's todo rows and kill + drop its background processes before the fresh run repopulates them. Also drops the click-to-edit clamp transition, which flashed a half-expanded bubble on the way into the edit composer. * feat(desktop): user messages are always editable; edit/restore revert mid-stream The bubble is now always click-to-edit — even while a turn streams — instead of going inert during a run. Sending an edit acts like restore: it rewinds to that prompt and re-runs with the new text. Both edit and restore can fire mid-stream now; the gateway refuses prompt.submit while a turn runs (4009 "session busy"), so they interrupt the live turn first and retry the submit until the cooperative interrupt winds it down. Restore (re-run as-is) shows on every prompt except the latest running one, which keeps the Stop button. * fix(desktop): label preview-pane ⌘L selections with the filename, not "zsh" The terminal owns a global ⌘/Ctrl+L "send selection to composer" shortcut, so selecting text in the file preview pane and hitting it fell through to the terminal handler — which imported the right text but labelled the composer ref "zsh:N lines" off the shell name. When the selection isn't an xterm selection, label it with the previewed file instead. * fix(desktop): ⌘L on a preview line selection inserts the @line ref, like dragging The source preview lets you select lines in the gutter and drag them into the composer as an @line:path:start-end ref. ⌘/Ctrl+L now does the same when a line selection is active — it drops the identical ref instead of falling through to the terminal's global handler (which grabbed the native text selection and sent a bogus terminal block). Capture-phase + stopPropagation so it wins; with a line selection there's no native selection, so the terminal handler stays out of it. * chore: gitignore apps/desktop/demo/ scratch output The desktop demo prompt writes demo/*.txt during recorded walkthroughs; it's throwaway, never part of the app. Ignore it so it stops cluttering git status. * feat(desktop): subagent watch windows, hard stop, sidebar hygiene Child-session mirror for live subagent windows, delegate sessions tagged and excluded from the sidebar, composer focus/stop polish, and WS stall resilience on the gateway transport. * refactor: DRY delegate SQL + trim status-stack noise Extract shared listable-child and delegate-delete helpers in hermes_state, collapse cancelRun busy release, and cut comment bloat in resume/status paths. * fix(desktop): hide orphaned subagent sessions in sidebar Cascade-delete all ephemeral children on parent delete (not just tagged rows), run v16 backfill to tag legacy orphans, and record new delegates as source=subagent. * fix: restore orphan contract for untagged children + lazy session eviction Cascade-delete only _delegate_from-tagged rows (v16 backfill covers legacy), walk marker chains recursively with FK-safe orphaning, gate lazy watch sessions out of the still-starting eviction exemption via an explicit flag, pass session_id to _make_agent only when resuming, and hide source=subagent from session search. * fix(gateway): gate child mirror off upgraded sessions + age out stale run entries Review findings: the mirror could interleave synthetic events with a real native stream once a watch window upgrades (prompt.submit builds an agent), and a lost subagent.complete left _active_child_runs pinning running=true forever. Mirror now stops when the live session owns an agent; liveness reads ignore entries older than an hour. * fix(gateway): reject prompt.submit into a watch session while its child runs A lazy watch session's running flag is False (the run lives in the parent turn), so typing mid-run sailed past the busy guard and built a second agent racing the in-flight child on the same stored session. Busy error until the run completes; afterwards the submit upgrades into a normal conversation. * refactor(gateway): DRY watch-resume payload + compose listable-child SQL Fold the duplicated child-run busy overlay into one _reuse_live_payload helper across both resume reuse paths, collapse the twin mirror early-returns, and build _LISTABLE_CHILD_SQL from _BRANCH_CHILD_SQL instead of restating it. * fix(desktop): clip horizontal overflow on sidebar scroll areas Add overflow-x-hidden alongside overflow-y-auto on session list scrollers and the shared SidebarContent primitive — vertical scroll unchanged.
893 lines
25 KiB
TypeScript
893 lines
25 KiB
TypeScript
import type { ThreadMessageLike } from '@assistant-ui/react'
|
|
|
|
import { mediaDisplayLabel, mediaMarkdownHref } from '@/lib/media'
|
|
import { parseTodos } from '@/lib/todos'
|
|
import type { SessionMessage, UsageStats } from '@/types/hermes'
|
|
|
|
export type ChatMessagePart = Exclude<ThreadMessageLike['content'], string>[number]
|
|
|
|
export type ChatMessage = {
|
|
id: string
|
|
role: SessionMessage['role']
|
|
parts: ChatMessagePart[]
|
|
timestamp?: number
|
|
pending?: boolean
|
|
error?: string
|
|
branchGroupId?: string
|
|
hidden?: boolean
|
|
/** Composer attachment ref strings (`@file:...`, `@image:...`) sent with this user message. */
|
|
attachmentRefs?: string[]
|
|
}
|
|
|
|
export type GatewayEventPayload = {
|
|
text?: string
|
|
rendered?: string
|
|
status?: string
|
|
message?: string
|
|
id?: string
|
|
name?: string
|
|
tool_id?: string
|
|
tool_call_id?: string
|
|
args?: unknown
|
|
arguments?: unknown
|
|
context?: string
|
|
input?: unknown
|
|
preview?: string
|
|
result?: unknown
|
|
summary?: string
|
|
error?: string | boolean
|
|
inline_diff?: string
|
|
duration_s?: number
|
|
todos?: unknown
|
|
model?: string
|
|
provider?: string
|
|
reasoning_effort?: string
|
|
service_tier?: string
|
|
fast?: boolean
|
|
yolo?: boolean
|
|
running?: boolean
|
|
cwd?: string
|
|
branch?: string
|
|
credential_warning?: string
|
|
personality?: string
|
|
usage?: Partial<UsageStats>
|
|
// clarify.request
|
|
request_id?: string
|
|
question?: string
|
|
choices?: string[] | null
|
|
// approval.request (dangerous command / execute_code) — session-keyed
|
|
command?: string
|
|
description?: string
|
|
// False when a tirith content-security warning forbids a permanent allow.
|
|
allow_permanent?: boolean
|
|
// secret.request (skill credential capture)
|
|
env_var?: string
|
|
prompt?: string
|
|
// terminal.read.request (GUI agent reading the in-app terminal pane)
|
|
start?: number
|
|
count?: number
|
|
// status.update (kind=process → background process completion/watch-match)
|
|
kind?: string
|
|
}
|
|
|
|
export function textPart(text: string): ChatMessagePart {
|
|
return { type: 'text', text }
|
|
}
|
|
|
|
export function reasoningPart(text: string): ChatMessagePart {
|
|
return { type: 'reasoning', text }
|
|
}
|
|
|
|
const MEDIA_LINE_RE = /(^|\n)[\t ]*[`"']?MEDIA:\s*(?<line>`[^`\n]+`|"[^"\n]+"|'[^'\n]+'|\S+)[`"']?[\t ]*(\n|$)/g
|
|
|
|
const MEDIA_TAG_RE = /[`"']?MEDIA:\s*(?<inline>`[^`\n]+`|"[^"\n]+"|'[^'\n]+'|\S+)[`"']?/g
|
|
|
|
function unquoteMediaPath(value: string): string {
|
|
const trimmed = value.trim()
|
|
const quote = trimmed[0]
|
|
|
|
return quote && quote === trimmed.at(-1) && ['"', "'", '`'].includes(quote) ? trimmed.slice(1, -1) : trimmed
|
|
}
|
|
|
|
function mediaLink(value: string): string {
|
|
const path = unquoteMediaPath(value)
|
|
|
|
return `[${mediaDisplayLabel(path)}](${mediaMarkdownHref(path)})`
|
|
}
|
|
|
|
export function renderMediaTags(text: string): string {
|
|
return text
|
|
.replace(
|
|
MEDIA_LINE_RE,
|
|
(_match, lead: string, value: string, trailer: string) => `${lead}${mediaLink(value)}${trailer}`
|
|
)
|
|
.replace(MEDIA_TAG_RE, (_match, value: string) => mediaLink(value))
|
|
.replace(/[ \t]+\n/g, '\n')
|
|
.replace(/\n{3,}/g, '\n\n')
|
|
}
|
|
|
|
export function assistantTextPart(text: string): ChatMessagePart {
|
|
return textPart(renderMediaTags(text))
|
|
}
|
|
|
|
export function chatMessageText(message: ChatMessage): string {
|
|
return message.parts
|
|
.filter((part): part is Extract<ChatMessagePart, { type: 'text' }> => part.type === 'text')
|
|
.map(part => part.text)
|
|
.join('')
|
|
}
|
|
|
|
const ATTACHED_CONTEXT_MARKER_RE = /(?:^|\n)--- Attached Context ---\s*\n/
|
|
const CONTEXT_WARNINGS_MARKER_RE = /(?:^|\n)--- Context Warnings ---[\s\S]*$/
|
|
const CONTEXT_REF_RE = /@(file|folder|url|image|tool|terminal):(?:"[^"\n]+"|'[^'\n]+'|`[^`\n]+`|\S+)/g
|
|
|
|
function textFromUnknown(value: unknown, depth = 0): string {
|
|
if (typeof value === 'string') {
|
|
return value
|
|
}
|
|
|
|
if (value === null || value === undefined) {
|
|
return ''
|
|
}
|
|
|
|
if (depth > 2) {
|
|
return ''
|
|
}
|
|
|
|
if (Array.isArray(value)) {
|
|
return value.map(item => textFromUnknown(item, depth + 1)).join('')
|
|
}
|
|
|
|
if (typeof value === 'object') {
|
|
const row = value as Record<string, unknown>
|
|
const textValue = row.text ?? row.output_text ?? row.content ?? row.message
|
|
const nestedText = textFromUnknown(textValue, depth + 1)
|
|
|
|
if (nestedText) {
|
|
return nestedText
|
|
}
|
|
|
|
try {
|
|
return JSON.stringify(value)
|
|
} catch {
|
|
return ''
|
|
}
|
|
}
|
|
|
|
return String(value)
|
|
}
|
|
|
|
function displayContentForMessage(role: SessionMessage['role'], content: unknown): string {
|
|
const textContent = textFromUnknown(content)
|
|
|
|
if (role !== 'user') {
|
|
return textContent
|
|
}
|
|
|
|
const marker = textContent.match(ATTACHED_CONTEXT_MARKER_RE)
|
|
|
|
if (!marker || marker.index === undefined) {
|
|
return textContent.replace(CONTEXT_WARNINGS_MARKER_RE, '').trim()
|
|
}
|
|
|
|
const visibleText = textContent.slice(0, marker.index).replace(CONTEXT_WARNINGS_MARKER_RE, '').trim()
|
|
const attachedContext = textContent.slice(marker.index + marker[0].length)
|
|
const refs = [...new Set(Array.from(attachedContext.matchAll(CONTEXT_REF_RE)).map(match => match[0]))]
|
|
|
|
return [refs.join('\n'), visibleText].filter(Boolean).join('\n\n') || visibleText
|
|
}
|
|
|
|
export function appendTextPart(parts: ChatMessagePart[], delta: string): ChatMessagePart[] {
|
|
const next = [...parts]
|
|
const last = next.at(-1)
|
|
|
|
if (last?.type === 'text') {
|
|
next[next.length - 1] = { ...last, text: `${last.text}${delta}` }
|
|
|
|
return next
|
|
}
|
|
|
|
next.push(textPart(delta))
|
|
|
|
return next
|
|
}
|
|
|
|
export function appendAssistantTextPart(parts: ChatMessagePart[], delta: string): ChatMessagePart[] {
|
|
const next = appendTextPart(parts, delta)
|
|
const last = next.at(-1)
|
|
|
|
if (last?.type === 'text') {
|
|
const current = last.text
|
|
|
|
const deltaMayContainMedia =
|
|
delta.includes('MEDIA:') || delta.includes('DIA:') || delta.includes('EDIA:') || delta.includes('IA:')
|
|
|
|
const needsMediaPass = deltaMayContainMedia || current.includes('MEDIA:')
|
|
const nextText = needsMediaPass ? renderMediaTags(current) : current
|
|
next[next.length - 1] = nextText === current ? last : { ...last, text: nextText }
|
|
}
|
|
|
|
return next
|
|
}
|
|
|
|
export function appendReasoningPart(parts: ChatMessagePart[], delta: string): ChatMessagePart[] {
|
|
const next = [...parts]
|
|
const last = next.at(-1)
|
|
|
|
if (last?.type === 'reasoning') {
|
|
next[next.length - 1] = { ...last, text: `${last.text}${delta}` }
|
|
|
|
return next
|
|
}
|
|
|
|
next.push(reasoningPart(delta))
|
|
|
|
return next
|
|
}
|
|
|
|
export function hasToolPart(message: ChatMessage): boolean {
|
|
return message.parts.some(part => part.type === 'tool-call')
|
|
}
|
|
|
|
function toolId(payload: GatewayEventPayload | undefined): string {
|
|
return payload?.tool_id || payload?.tool_call_id || payload?.id || ''
|
|
}
|
|
|
|
let liveToolCounter = 0
|
|
|
|
function nextLiveToolId(name: string): string {
|
|
liveToolCounter += 1
|
|
|
|
return `live-tool:${name}:${liveToolCounter}`
|
|
}
|
|
|
|
function firstStringField(record: Record<string, unknown>, keys: readonly string[]): string {
|
|
for (const key of keys) {
|
|
const value = record[key]
|
|
|
|
if (typeof value === 'string' && value.trim()) {
|
|
return value.trim()
|
|
}
|
|
}
|
|
|
|
return ''
|
|
}
|
|
|
|
function normalizeToolMatchValue(value: string): string {
|
|
return value.trim().toLowerCase()
|
|
}
|
|
|
|
function collectToolMatchValues(query: string, context: string, preview: string): string[] {
|
|
return [...new Set([query, context, preview].map(normalizeToolMatchValue).filter(Boolean))]
|
|
}
|
|
|
|
function toolPayloadMatchValues(payload: GatewayEventPayload | undefined): string[] {
|
|
const payloadArgs = liveToolArgs(payload)
|
|
const query = firstStringField(payloadArgs, ['search_term', 'query'])
|
|
const context = typeof payload?.context === 'string' ? payload.context.trim() : ''
|
|
const preview = typeof payload?.preview === 'string' ? payload.preview.trim() : ''
|
|
|
|
return collectToolMatchValues(query, context, preview)
|
|
}
|
|
|
|
function toolPartMatchValues(part: ChatMessagePart): string[] {
|
|
if (part.type !== 'tool-call' || !part.args || typeof part.args !== 'object') {
|
|
return []
|
|
}
|
|
|
|
const args = part.args as Record<string, unknown>
|
|
const query = firstStringField(args, ['search_term', 'query'])
|
|
const context = typeof args.context === 'string' ? args.context.trim() : ''
|
|
const preview = typeof args.preview === 'string' ? args.preview.trim() : ''
|
|
|
|
return collectToolMatchValues(query, context, preview)
|
|
}
|
|
|
|
function hasToolMatchOverlap(left: string[], right: string[]): boolean {
|
|
if (!left.length || !right.length) {
|
|
return false
|
|
}
|
|
|
|
const rightSet = new Set(right)
|
|
|
|
return left.some(value => rightSet.has(value))
|
|
}
|
|
|
|
function findToolPartIndex(
|
|
parts: ChatMessagePart[],
|
|
name: string,
|
|
stableId: string,
|
|
payload: GatewayEventPayload | undefined,
|
|
phase: 'running' | 'complete'
|
|
): number {
|
|
const matchValues = toolPayloadMatchValues(payload)
|
|
const overlaps = (index: number) => hasToolMatchOverlap(matchValues, toolPartMatchValues(parts[index]))
|
|
|
|
if (stableId) {
|
|
const stableIndex = parts.findIndex(part => part.type === 'tool-call' && part.toolCallId === stableId)
|
|
|
|
if (stableIndex >= 0) {
|
|
return stableIndex
|
|
}
|
|
|
|
// Some live streams start without an id, then complete with one. Fall
|
|
// through to pending same-name/context matching so the completion updates
|
|
// the synthetic live row instead of appending a duplicate completed row.
|
|
if (phase === 'running' && !matchValues.length) {
|
|
return -1
|
|
}
|
|
}
|
|
|
|
const pendingIndices = parts
|
|
.map((part, index) => ({ part, index }))
|
|
.filter(({ part }) => part.type === 'tool-call' && part.toolName === name && part.result === undefined)
|
|
.map(({ index }) => index)
|
|
|
|
if (pendingIndices.length === 0) {
|
|
return -1
|
|
}
|
|
|
|
if (matchValues.length) {
|
|
const contextualIndex = pendingIndices.find(overlaps)
|
|
|
|
if (contextualIndex !== undefined) {
|
|
return contextualIndex
|
|
}
|
|
}
|
|
|
|
if (pendingIndices.length === 1) {
|
|
const [singlePendingIndex] = pendingIndices
|
|
|
|
if (phase === 'running' && matchValues.length && !overlaps(singlePendingIndex)) {
|
|
return stableId ? singlePendingIndex : -1
|
|
}
|
|
|
|
return singlePendingIndex
|
|
}
|
|
|
|
// Completion events without stable IDs frequently arrive after multiple
|
|
// same-name starts (parallel tool calls). Resolve them oldest-first so we
|
|
// don't collapse an entire burst into a single row.
|
|
if (phase === 'complete') {
|
|
return pendingIndices[0]
|
|
}
|
|
|
|
if (stableId) {
|
|
return pendingIndices[0]
|
|
}
|
|
|
|
// For progress/running events with no stable id, update the most-recent
|
|
// pending same-name tool instead of creating a phantom extra row.
|
|
return pendingIndices.at(-1) ?? -1
|
|
}
|
|
|
|
// Carry todo state across sparse progress payloads: if this todo event lacks
|
|
// a `todos` field, fall back to whatever we previously stored on the part.
|
|
function carryTodos(payload: GatewayEventPayload | undefined, ...prev: unknown[]): { todos: unknown } | undefined {
|
|
if (payload && Object.hasOwn(payload, 'todos')) {
|
|
const next = parseTodos(payload.todos)
|
|
|
|
return next === null ? undefined : { todos: next }
|
|
}
|
|
|
|
if (payload?.name !== 'todo') {
|
|
return undefined
|
|
}
|
|
|
|
for (const p of prev) {
|
|
const carried = parseTodos(recordFromUnknown(p)?.todos)
|
|
|
|
if (carried !== null) {
|
|
return { todos: carried }
|
|
}
|
|
}
|
|
|
|
return undefined
|
|
}
|
|
|
|
function toolArgs(payload: GatewayEventPayload | undefined, prevArgs?: unknown): Record<string, unknown> {
|
|
const prev = parseMaybeJsonObject(prevArgs)
|
|
const eventArgs = liveToolArgs(payload)
|
|
|
|
return {
|
|
...prev,
|
|
...eventArgs,
|
|
...(payload?.context ? { context: payload.context } : {}),
|
|
...(payload?.preview ? { preview: payload.preview } : {}),
|
|
...carryTodos(payload, prevArgs)
|
|
}
|
|
}
|
|
|
|
function toolResult(
|
|
payload: GatewayEventPayload | undefined,
|
|
prevResult?: unknown,
|
|
prevArgs?: unknown
|
|
): Record<string, unknown> {
|
|
const parsedResult = parseMaybeJsonObject(payload?.result)
|
|
|
|
return {
|
|
...parsedResult,
|
|
...(payload?.inline_diff ? { inline_diff: payload.inline_diff } : {}),
|
|
...(payload?.summary ? { summary: payload.summary } : {}),
|
|
...(payload?.message ? { message: payload.message } : {}),
|
|
...(payload?.preview ? { preview: payload.preview } : {}),
|
|
...(payload?.duration_s !== undefined ? { duration_s: payload.duration_s } : {}),
|
|
...carryTodos(payload, prevResult, prevArgs),
|
|
...(payload?.error ? { error: payload.error } : {})
|
|
}
|
|
}
|
|
|
|
export function upsertToolPart(
|
|
parts: ChatMessagePart[],
|
|
payload: GatewayEventPayload | undefined,
|
|
phase: 'running' | 'complete'
|
|
): ChatMessagePart[] {
|
|
const stableId = toolId(payload)
|
|
const name = payload?.name || 'tool'
|
|
const next = [...parts]
|
|
|
|
const index = findToolPartIndex(next, name, stableId, payload, phase)
|
|
|
|
const prev = index >= 0 ? next[index] : null
|
|
const prevArgs = prev && 'args' in prev ? prev.args : undefined
|
|
const prevResult = prev && 'result' in prev ? prev.result : undefined
|
|
const args = toolArgs(payload, prevArgs)
|
|
|
|
const id =
|
|
stableId ||
|
|
(prev && 'toolCallId' in prev && typeof prev.toolCallId === 'string' ? prev.toolCallId : '') ||
|
|
nextLiveToolId(name)
|
|
|
|
const base = {
|
|
type: 'tool-call' as const,
|
|
toolCallId: id,
|
|
toolName: name,
|
|
args: args as never,
|
|
argsText: JSON.stringify(args),
|
|
...(phase === 'complete' && { result: toolResult(payload, prevResult, prevArgs), isError: Boolean(payload?.error) })
|
|
} satisfies ChatMessagePart
|
|
|
|
if (index === -1) {
|
|
return [...next, base]
|
|
}
|
|
|
|
next[index] = { ...next[index], ...base }
|
|
|
|
return next
|
|
}
|
|
|
|
function recordFromUnknown(value: unknown): Record<string, unknown> | null {
|
|
return value && typeof value === 'object' ? (value as Record<string, unknown>) : null
|
|
}
|
|
|
|
function parseMaybeJsonObject(value: unknown): Record<string, unknown> {
|
|
if (value && typeof value === 'object' && !Array.isArray(value)) {
|
|
return value as Record<string, unknown>
|
|
}
|
|
|
|
if (typeof value !== 'string' || !value.trim()) {
|
|
return {}
|
|
}
|
|
|
|
try {
|
|
const parsed = JSON.parse(value)
|
|
|
|
return parsed && typeof parsed === 'object' && !Array.isArray(parsed) ? (parsed as Record<string, unknown>) : {}
|
|
} catch {
|
|
return {}
|
|
}
|
|
}
|
|
|
|
function firstNonEmptyObject(...values: unknown[]): Record<string, unknown> {
|
|
for (const value of values) {
|
|
const parsed = parseMaybeJsonObject(value)
|
|
|
|
if (Object.keys(parsed).length > 0) {
|
|
return parsed
|
|
}
|
|
}
|
|
|
|
return {}
|
|
}
|
|
|
|
function liveToolArgs(payload: GatewayEventPayload | undefined): Record<string, unknown> {
|
|
const direct = firstNonEmptyObject(payload?.args, payload?.arguments)
|
|
const input = firstNonEmptyObject(payload?.input)
|
|
const fn = recordFromUnknown(input.function)
|
|
|
|
const nested = firstNonEmptyObject(
|
|
input.args,
|
|
input.arguments,
|
|
input.parameters,
|
|
input.input,
|
|
fn?.arguments,
|
|
fn?.args,
|
|
fn?.parameters
|
|
)
|
|
|
|
return {
|
|
...input,
|
|
...nested,
|
|
...direct
|
|
}
|
|
}
|
|
|
|
function parseStoredToolResult(content: unknown): unknown {
|
|
if (content && typeof content === 'object') {
|
|
return content
|
|
}
|
|
|
|
const textContent = textFromUnknown(content)
|
|
|
|
if (!textContent.trim()) {
|
|
return ''
|
|
}
|
|
|
|
try {
|
|
return JSON.parse(textContent)
|
|
} catch {
|
|
return textContent
|
|
}
|
|
}
|
|
|
|
function toolPartFromStoredCall(call: unknown, fallbackIndex: number): ChatMessagePart {
|
|
const row = recordFromUnknown(call) ?? {}
|
|
const fn = recordFromUnknown(row.function)
|
|
const id = String(row.id || row.tool_call_id || `stored-tool-${fallbackIndex}`)
|
|
|
|
const toolName = String(
|
|
row.name || row.tool_name || fn?.name || (recordFromUnknown(row.input)?.name as string | undefined) || 'tool'
|
|
)
|
|
|
|
const args = firstNonEmptyObject(fn?.arguments, row.arguments, row.args, row.input)
|
|
|
|
return {
|
|
type: 'tool-call',
|
|
toolCallId: id,
|
|
toolName,
|
|
args: args as never,
|
|
argsText: Object.keys(args).length ? JSON.stringify(args) : ''
|
|
}
|
|
}
|
|
|
|
function applyStoredToolResult(messages: ChatMessage[], toolMessage: SessionMessage): boolean {
|
|
const toolCallId = toolMessage.tool_call_id || undefined
|
|
const toolName = toolMessage.tool_name || toolMessage.name || 'tool'
|
|
const content = toolMessage.content || toolMessage.text || toolMessage.context || toolMessage.name
|
|
|
|
for (let i = messages.length - 1; i >= 0; i -= 1) {
|
|
const message = messages[i]
|
|
|
|
if (message.role !== 'assistant') {
|
|
continue
|
|
}
|
|
|
|
const partIndex = message.parts.findIndex(
|
|
part =>
|
|
part.type === 'tool-call' &&
|
|
((toolCallId && part.toolCallId === toolCallId) || (!toolCallId && part.toolName === toolName))
|
|
)
|
|
|
|
if (partIndex < 0) {
|
|
continue
|
|
}
|
|
|
|
const parts = [...message.parts]
|
|
const existing = parts[partIndex]
|
|
parts[partIndex] = {
|
|
...existing,
|
|
result: parseStoredToolResult(content),
|
|
isError: false
|
|
} as ChatMessagePart
|
|
messages[i] = { ...message, parts }
|
|
|
|
return true
|
|
}
|
|
|
|
return false
|
|
}
|
|
|
|
function applyStoredToolResultToParts(parts: ChatMessagePart[], toolMessage: SessionMessage): ChatMessagePart[] | null {
|
|
const toolCallId = toolMessage.tool_call_id || undefined
|
|
const toolName = toolMessage.tool_name || toolMessage.name || 'tool'
|
|
const content = toolMessage.content || toolMessage.text || toolMessage.context || toolMessage.name
|
|
|
|
const partIndex = parts.findIndex(
|
|
part =>
|
|
part.type === 'tool-call' &&
|
|
((toolCallId && part.toolCallId === toolCallId) || (!toolCallId && part.toolName === toolName))
|
|
)
|
|
|
|
if (partIndex < 0) {
|
|
return null
|
|
}
|
|
|
|
const next = [...parts]
|
|
const existing = next[partIndex]
|
|
next[partIndex] = {
|
|
...existing,
|
|
result: parseStoredToolResult(content),
|
|
isError: false
|
|
} as ChatMessagePart
|
|
|
|
return next
|
|
}
|
|
|
|
function storedToolMessagePart(toolMessage: SessionMessage, fallbackIndex: number): ChatMessagePart {
|
|
const name = toolMessage.tool_name || toolMessage.name || 'tool'
|
|
const context = textFromUnknown(toolMessage.context || toolMessage.text || toolMessage.content || '')
|
|
const args = context ? { context } : {}
|
|
|
|
return {
|
|
type: 'tool-call',
|
|
toolCallId: toolMessage.tool_call_id || `stored-tool-message-${fallbackIndex}`,
|
|
toolName: name,
|
|
args: args as never,
|
|
argsText: Object.keys(args).length ? JSON.stringify(args) : '',
|
|
result: context ? { context } : {},
|
|
isError: false
|
|
}
|
|
}
|
|
|
|
function withUniqueToolCallIds(messages: ChatMessage[]): ChatMessage[] {
|
|
const seen = new Set<string>()
|
|
|
|
return messages.map(message => {
|
|
let changed = false
|
|
|
|
const parts = message.parts.map((part, index) => {
|
|
if (part.type !== 'tool-call') {
|
|
return part
|
|
}
|
|
|
|
const id = part.toolCallId || `${message.id}-tool-${index}`
|
|
|
|
if (!seen.has(id)) {
|
|
seen.add(id)
|
|
|
|
if (part.toolCallId) {
|
|
return part
|
|
}
|
|
|
|
changed = true
|
|
|
|
return { ...part, toolCallId: id } as ChatMessagePart
|
|
}
|
|
|
|
changed = true
|
|
const uniqueId = `${id}-${message.id}-${index}`
|
|
seen.add(uniqueId)
|
|
|
|
return { ...part, toolCallId: uniqueId } as ChatMessagePart
|
|
})
|
|
|
|
return changed ? { ...message, parts } : message
|
|
})
|
|
}
|
|
|
|
export function toChatMessages(messages: SessionMessage[]): ChatMessage[] {
|
|
const result: ChatMessage[] = []
|
|
let pendingToolParts: ChatMessagePart[] = []
|
|
let pendingToolTimestamp: number | undefined
|
|
let activeAssistantIndex: null | number = null
|
|
|
|
const clearPendingTools = () => {
|
|
pendingToolParts = []
|
|
pendingToolTimestamp = undefined
|
|
}
|
|
|
|
const appendPartsToActiveAssistant = (parts: ChatMessagePart[], timestamp?: number): boolean => {
|
|
if (activeAssistantIndex === null) {
|
|
return false
|
|
}
|
|
|
|
const active = result[activeAssistantIndex]
|
|
|
|
if (!active || active.role !== 'assistant') {
|
|
activeAssistantIndex = null
|
|
|
|
return false
|
|
}
|
|
|
|
active.parts = [...active.parts, ...parts]
|
|
active.timestamp = timestamp ?? active.timestamp
|
|
|
|
return true
|
|
}
|
|
|
|
const flushPendingTools = (index: number) => {
|
|
if (!pendingToolParts.length) {
|
|
return
|
|
}
|
|
|
|
if (!appendPartsToActiveAssistant(pendingToolParts, pendingToolTimestamp)) {
|
|
result.push({
|
|
id: `${pendingToolTimestamp || Date.now()}-${index}-tools`,
|
|
role: 'assistant',
|
|
parts: pendingToolParts,
|
|
timestamp: pendingToolTimestamp
|
|
})
|
|
activeAssistantIndex = result.length - 1
|
|
}
|
|
|
|
clearPendingTools()
|
|
}
|
|
|
|
messages.forEach((message, index) => {
|
|
if (message.role === 'tool') {
|
|
const updatedPendingToolParts = applyStoredToolResultToParts(pendingToolParts, message)
|
|
|
|
if (updatedPendingToolParts) {
|
|
pendingToolParts = updatedPendingToolParts
|
|
|
|
return
|
|
}
|
|
|
|
if (applyStoredToolResult(result, message)) {
|
|
return
|
|
}
|
|
|
|
pendingToolParts = [...pendingToolParts, storedToolMessagePart(message, index)]
|
|
pendingToolTimestamp ??= message.timestamp
|
|
|
|
return
|
|
}
|
|
|
|
const content = message.content || message.text || message.context || message.name
|
|
const displayContent = displayContentForMessage(message.role, content)
|
|
const parts: ChatMessagePart[] = []
|
|
|
|
const reasoning =
|
|
message.reasoning ||
|
|
message.reasoning_content ||
|
|
(typeof message.reasoning_details === 'string' ? message.reasoning_details : '')
|
|
|
|
if (reasoning && message.role === 'assistant') {
|
|
parts.push(reasoningPart(reasoning))
|
|
}
|
|
|
|
if (displayContent) {
|
|
parts.push(message.role === 'assistant' ? assistantTextPart(displayContent) : textPart(displayContent))
|
|
}
|
|
|
|
if (message.role === 'assistant' && Array.isArray(message.tool_calls)) {
|
|
parts.push(...message.tool_calls.map((call, callIndex) => toolPartFromStoredCall(call, callIndex)))
|
|
}
|
|
|
|
if (!parts.length) {
|
|
if (message.role !== 'assistant') {
|
|
flushPendingTools(index)
|
|
activeAssistantIndex = null
|
|
}
|
|
|
|
return
|
|
}
|
|
|
|
const isToolOnlyAssistant =
|
|
message.role === 'assistant' && parts.length > 0 && parts.every(part => part.type === 'tool-call')
|
|
|
|
if (isToolOnlyAssistant) {
|
|
pendingToolParts = [...pendingToolParts, ...parts]
|
|
pendingToolTimestamp ??= message.timestamp
|
|
|
|
return
|
|
}
|
|
|
|
if (message.role === 'assistant') {
|
|
if (pendingToolParts.length) {
|
|
if (!appendPartsToActiveAssistant(pendingToolParts, message.timestamp ?? pendingToolTimestamp)) {
|
|
parts.unshift(...pendingToolParts)
|
|
}
|
|
|
|
clearPendingTools()
|
|
}
|
|
|
|
const activeAssistant =
|
|
activeAssistantIndex !== null && result[activeAssistantIndex]?.role === 'assistant'
|
|
? result[activeAssistantIndex]
|
|
: null
|
|
|
|
const currentHasToolCall = parts.some(part => part.type === 'tool-call')
|
|
const activeHasToolCall = Boolean(activeAssistant?.parts.some(part => part.type === 'tool-call'))
|
|
|
|
if (activeAssistant && (currentHasToolCall || activeHasToolCall)) {
|
|
activeAssistant.parts = [...activeAssistant.parts, ...parts]
|
|
activeAssistant.timestamp = message.timestamp ?? activeAssistant.timestamp
|
|
|
|
return
|
|
}
|
|
} else {
|
|
flushPendingTools(index)
|
|
}
|
|
|
|
result.push({
|
|
id: `${message.timestamp || Date.now()}-${index}-${message.role}`,
|
|
role: message.role,
|
|
parts,
|
|
timestamp: message.timestamp
|
|
})
|
|
|
|
activeAssistantIndex = message.role === 'assistant' ? result.length - 1 : null
|
|
})
|
|
flushPendingTools(messages.length)
|
|
|
|
return withUniqueToolCallIds(
|
|
result.filter(m => chatMessageText(m).trim() || m.parts.some(part => part.type !== 'text'))
|
|
)
|
|
}
|
|
|
|
export function preserveLocalAssistantErrors(
|
|
nextMessages: ChatMessage[],
|
|
currentMessages: ChatMessage[]
|
|
): ChatMessage[] {
|
|
const localById = new Map(currentMessages.map(message => [message.id, message]))
|
|
|
|
const mergedNextMessages = nextMessages.map(message => {
|
|
if (message.role !== 'assistant' || message.error || message.hidden) {
|
|
return message
|
|
}
|
|
|
|
const local = localById.get(message.id)
|
|
|
|
if (!local || local.role !== 'assistant' || !local.error || local.hidden) {
|
|
return message
|
|
}
|
|
|
|
return {
|
|
...message,
|
|
error: local.error,
|
|
pending: false
|
|
}
|
|
})
|
|
|
|
const existingIds = new Set(mergedNextMessages.map(message => message.id))
|
|
const preserveIds = new Set<string>()
|
|
const normalize = (value: string) => value.replace(/\s+/g, ' ').trim()
|
|
const tailUserInNext = [...mergedNextMessages].reverse().find(message => message.role === 'user' && !message.hidden)
|
|
const tailUserText = tailUserInNext ? normalize(chatMessageText(tailUserInNext)) : ''
|
|
const tailUserRefs = tailUserInNext ? (tailUserInNext.attachmentRefs ?? []).join('\n') : ''
|
|
|
|
const matchesTailUserInNext = (candidate: ChatMessage) =>
|
|
Boolean(tailUserInNext) &&
|
|
normalize(chatMessageText(candidate)) === tailUserText &&
|
|
(candidate.attachmentRefs ?? []).join('\n') === tailUserRefs
|
|
|
|
for (let index = 0; index < currentMessages.length; index += 1) {
|
|
const message = currentMessages[index]
|
|
|
|
if (message.role !== 'assistant' || !message.error || message.hidden || existingIds.has(message.id)) {
|
|
continue
|
|
}
|
|
|
|
preserveIds.add(message.id)
|
|
|
|
for (let probe = index - 1; probe >= 0; probe -= 1) {
|
|
const candidate = currentMessages[probe]
|
|
|
|
if (candidate.hidden) {
|
|
continue
|
|
}
|
|
|
|
if (candidate.role === 'user' && !existingIds.has(candidate.id) && !matchesTailUserInNext(candidate)) {
|
|
preserveIds.add(candidate.id)
|
|
}
|
|
|
|
break
|
|
}
|
|
}
|
|
|
|
if (preserveIds.size === 0) {
|
|
return mergedNextMessages
|
|
}
|
|
|
|
const preserved = currentMessages
|
|
.filter(message => preserveIds.has(message.id))
|
|
.map(message => ({ ...message, pending: false }))
|
|
|
|
return [...mergedNextMessages, ...preserved]
|
|
}
|
|
|
|
export function branchGroupForUser(userMessage: ChatMessage): string {
|
|
return `branch:${userMessage.id}`
|
|
}
|