@threadcrumbs/common 0.1.2 → 0.1.4

package/telemetry/hermes.mjs

@@ -8,20 +8,25 @@ import {
   DETAIL_LIMITS,
   RECENT_MS,
   activityDetail,
+  askOf,
   clip,
   clipBlock,
   emptyActivity,
   endCall,
   keepNewest,
+  keepText,
   number,
+  openTool,
   planItems,
   planSummary,
   settleCalls,
   startCall,
   text,
+  textList,
   titleFromPrompt,
   toolFile,
   toolInput,
+  toolNow,
   toolTarget,
 } from '../lib/telemetry-fields.mjs'
 
@@ -183,8 +188,11 @@ function sessionsFrom(db, profile, lengths, home, at) {
     const open = turnOpen(tip, root)
     if (!open && at - lastAt(tip) > RECENT_MS) continue
     const ids = chain.map((r) => r.id)
-    const errands = rows.filter((r) => isErrand(r) && ids.includes(r.parent_session_id) && turnOpen(r, chainOf(r).at(-1))).length
-    out.push(toSession({ db, profile, tip, root, chain, ids, open, errands, lengths, home, messages, visible, at, lastAt: lastAt(tip) }))
+    const working = rows
+      .filter((r) => isErrand(r) && ids.includes(r.parent_session_id) && turnOpen(r, chainOf(r).at(-1)))
+      .sort((a, b) => seconds(a.started_at) - seconds(b.started_at))
+      .map((r) => ({ id: r.id, name: text(r.title) || 'Subagent' }))
+    out.push(toSession({ db, profile, tip, root, chain, ids, open, errands: working.length, workingSubagents: working, lengths, home, messages, visible, at, lastAt: lastAt(tip) }))
   }
   return out
 }
@@ -213,11 +221,15 @@ function detailFrom(db, rootId, at) {
 
   const activity = emptyActivity()
   const prompts = []
+  const thoughts = []
+  const replies = []
   const pick = (column, fallback = 'NULL') => (messages.has(column) ? column : `${fallback} AS ${column}`)
+  const said = (column) => (messages.has(column) ? `CASE WHEN role = 'assistant' THEN ${column} END AS ${column}` : `NULL AS ${column}`)
+  const reasons = messages.has('reasoning') || messages.has('reasoning_content')
   const order = messages.has('timestamp') ? 'timestamp, id' : 'id'
   const records = db
     .prepare(
-      `SELECT id, role, CASE WHEN role = 'user' THEN content END AS content, ${pick('tool_calls')}, ${pick('tool_call_id')}, ${pick('timestamp', '0')}
+      `SELECT id, role, CASE WHEN role IN ('user', 'assistant') THEN content END AS content, ${said('reasoning')}, ${said('reasoning_content')}, ${pick('tool_calls')}, ${pick('tool_call_id')}, ${pick('timestamp', '0')}
        FROM messages WHERE session_id IN (${placeholders}) ${visible} ORDER BY ${order}`,
     )
     .all(...ids)
@@ -227,10 +239,12 @@ function detailFrom(db, rootId, at) {
       settleCalls(activity)
       const prompt = text(record.content).trim()
       if (prompt) keepNewest(prompts, { at: time, text: clipBlock(prompt, DETAIL_LIMITS.promptText) }, DETAIL_LIMITS.prompts)
-    } else if (record.role === 'assistant' && record.tool_calls) {
-      for (const call of parseJson(record.tool_calls, [])) {
+    } else if (record.role === 'assistant') {
+      keepText(thoughts, 'thoughts', { at: time, text: text(record.reasoning) || text(record.reasoning_content) })
+      keepText(replies, 'replies', { at: time, text: text(record.content) })
+      for (const call of (record.tool_calls && parseJson(record.tool_calls, [])) || []) {
         if (!call?.id) continue
-        const args = typeof call.function?.arguments === 'string' ? parseJson(call.function.arguments, null) : call.function?.arguments
+        const args = callArgs(call)
         startCall(activity, { id: text(call.id), name: text(call.function?.name), target: toolTarget(args, cwd), input: toolInput(args), ...toolFile(args, cwd), startedAt: time })
       }
     } else if (record.role === 'tool' && record.tool_call_id) {
@@ -252,7 +266,7 @@ function detailFrom(db, rootId, at) {
         status: working ? 'working' : FAILED_END.test(text(r.end_reason)) ? 'error' : r.ended_at != null ? 'done' : 'idle',
         model: text(r.model),
         tokens: tokens.some((t) => t != null) ? { input: tokens[0] || 0, output: tokens[1] || 0, cacheRead: tokens[2] || 0, cacheWrite: tokens[3] || 0 } : null,
-        tool: working && label ? { name: label[1].trim(), startedAt: seconds(r.last_activity_at) } : null,
+        tool: working && label ? toolNow({ name: label[1].trim(), startedAt: seconds(r.last_activity_at) }) : null,
         startedAt: seconds(r.started_at),
         lastActivityAt: lastAt(r),
       }
@@ -289,11 +303,14 @@ function detailFrom(db, rootId, at) {
     subagents,
     files: null,
     prompts,
+    thoughts: reasons ? textList(thoughts) : null,
+    replies: textList(replies),
+    contextBreakdown: null,
     errors,
   }
 }
 
-function openCalls(db, sessionId, messages, visible) {
+function openCalls(db, sessionId, messages, visible, cwd) {
   if (!['tool_calls', 'tool_call_id', 'timestamp'].every((c) => messages.has(c))) return []
   const last = db
     .prepare(`SELECT id, tool_calls, timestamp FROM messages WHERE session_id = ? AND role = 'assistant' ${visible} ORDER BY id DESC LIMIT 1`)
@@ -310,7 +327,17 @@ function openCalls(db, sessionId, messages, visible) {
   )
   return (Array.isArray(calls) ? calls : [])
     .filter((c) => c?.id && !answered.has(c.id))
-    .map((c) => ({ name: text(c.function?.name), startedAt: seconds(last.timestamp) }))
+    .map((c) => openTool(text(c.function?.name), seconds(last.timestamp), callArgs(c), cwd))
+}
+
+const callArgs = (call) => (typeof call.function?.arguments === 'string' ? parseJson(call.function.arguments, null) : call.function?.arguments)
+
+function turnStart(db, ids, messages, visible) {
+  if (!messages.has('timestamp')) return null
+  const row = db
+    .prepare(`SELECT MAX(timestamp) AS at FROM messages WHERE session_id IN (${ids.map(() => '?').join(', ')}) AND role = 'user' ${visible}`)
+    .get(...ids)
+  return row?.at == null ? null : seconds(row.at)
 }
 
 function latestPlan(db, ids, messages) {
@@ -339,25 +366,28 @@ function sum(chain, column) {
   return known ? total : null
 }
 
-function toSession({ db, profile, tip, root, chain, ids, open, errands, lengths, home, messages, visible, at, lastAt }) {
+function toSession({ db, profile, tip, root, chain, ids, open, errands, workingSubagents, lengths, home, messages, visible, at, lastAt }) {
   const description = text(tip.last_activity_description)
   const placeholders = ids.map(() => '?').join(', ')
-  const calls = open ? openCalls(db, tip.id, messages, visible) : []
+  const calls = open ? openCalls(db, tip.id, messages, visible, text(tip.cwd)) : []
   const working = calls.filter((c) => !DELEGATE_TOOLS.has(c.name))
+  const asking = ASKING.exec(description)
   let status
+  let statusReason
   if (open) {
-    if (ASKING.test(description)) status = 'asking'
-    else status = !working.length && (calls.length || errands) ? 'delegating' : 'working'
-  } else if (errands) status = 'delegating'
-  else if (tip.last_read_at != null) status = seconds(tip.last_activity_at || tip.started_at) > seconds(tip.last_read_at) ? 'done' : 'idle'
-  else status = tip.ended_at == null && at - lastAt < ACTIVE_WINDOW_MS ? 'done' : 'idle'
+    if (asking) [status, statusReason] = ['asking', /approval/i.test(asking[1]) ? 'approval' : 'question']
+    else if (!working.length && (calls.length || errands)) [status, statusReason] = ['delegating', 'subagents']
+    else [status, statusReason] = ['working', 'turn-open']
+  } else if (errands) [status, statusReason] = ['delegating', 'subagents']
+  else if (tip.last_read_at != null) [status, statusReason] = seconds(tip.last_activity_at || tip.started_at) > seconds(tip.last_read_at) ? ['done', 'unread'] : ['idle', 'read']
+  else [status, statusReason] = tip.ended_at == null && at - lastAt < ACTIVE_WINDOW_MS ? ['done', 'recent'] : ['idle', 'quiet']
 
   let tool = null
   if (status === 'working' || status === 'delegating') {
     const latest = (working.length ? working : calls).at(-1)
     const label = TOOL_LABEL.exec(description)
-    if (latest) tool = latest
-    else if (label) tool = { name: label[1].trim(), startedAt: seconds(tip.last_activity_at) }
+    if (latest) tool = toolNow(latest)
+    else if (label) tool = toolNow({ name: label[1].trim(), startedAt: seconds(tip.last_activity_at) })
   }
 
   const where = text(tip.git_repo_root) || text(tip.cwd)
@@ -393,11 +423,17 @@ function toSession({ db, profile, tip, root, chain, ids, open, errands, lengths,
       ? { input: tokens[0] || 0, output: tokens[1] || 0, cacheRead: tokens[2] || 0, cacheWrite: tokens[3] || 0 }
       : null,
     context: used ? { used, limit: contextLimit(lengths, text(tip.model), tip.billing_base_url) } : null,
+    contextHistory: null,
     costUsd: costs.some((c) => c != null) ? costs.reduce((total, c) => total + number(c), 0) : null,
     lines: null,
     plan: planSummary(latestPlan(db, ids, messages)),
     subagents: errands,
+    workingSubagents,
     prompts: number(prompts?.n),
+    turnStartedAt: open ? turnStart(db, ids, messages, visible) : null,
+    statusReason,
+    ask: askOf(status),
+    usageLimits: null,
   }
 }