bertrand 0.19.0 → 0.20.1

package/dist/bertrand.js

@@ -752,6 +752,7 @@ function openDb(dbPath) {
     return cached;
   mkdirSync4(dirname(dbPath), { recursive: true });
   const sqlite = new Database(dbPath);
+  sqlite.exec("PRAGMA busy_timeout = 5000");
   sqlite.exec("PRAGMA journal_mode = WAL");
   sqlite.exec("PRAGMA foreign_keys = ON");
   sqlite.exec("PRAGMA synchronous = NORMAL");
@@ -761,6 +762,10 @@ function openDb(dbPath) {
   if (!_migrated.has(dbPath)) {
     try {
       migrate(db, { migrationsFolder: MIGRATIONS_FOLDER });
+      if (!hasSessionsTable(sqlite)) {
+        sqlite.exec("DROP TABLE IF EXISTS __drizzle_migrations");
+        migrate(db, { migrationsFolder: MIGRATIONS_FOLDER });
+      }
     } catch (err) {
       sqlite.close();
       throw err;
@@ -770,6 +775,10 @@ function openDb(dbPath) {
   _cache.set(dbPath, db);
   return db;
 }
+function hasSessionsTable(sqlite) {
+  const row = sqlite.query("SELECT name FROM sqlite_master WHERE type='table' AND name='sessions'").get();
+  return row !== null;
+}
 var MIGRATIONS_FOLDER, _cache, _migrated, _testDb = null;
 var init_client = __esm(() => {
   init_resolve();
@@ -833,6 +842,28 @@ var init_sessions = __esm(() => {
   init_id();
 });
 
+// src/db/queries/conversations.ts
+import { eq as eq2, and as and2, desc, sql as sql3 } from "drizzle-orm";
+function createConversation(opts) {
+  return getDb().insert(conversations).values(opts).returning().get();
+}
+function getConversation(id) {
+  return getDb().select().from(conversations).where(eq2(conversations.id, id)).get();
+}
+function getConversationsBySession(sessionId) {
+  return getDb().select().from(conversations).where(and2(eq2(conversations.sessionId, sessionId), eq2(conversations.discarded, false))).orderBy(desc(conversations.startedAt)).all();
+}
+function endConversation(id) {
+  return getDb().update(conversations).set({ endedAt: sql3`(datetime('now'))` }).where(eq2(conversations.id, id)).returning().get();
+}
+function updateLastQuestion(id, question) {
+  return getDb().update(conversations).set({ lastQuestion: question }).where(eq2(conversations.id, id)).returning().get();
+}
+var init_conversations = __esm(() => {
+  init_client();
+  init_schema();
+});
+
 // src/lib/markdown.ts
 function normalizeMarkdown(input) {
   return input.replace(/\r\n?/g, `
@@ -882,7 +913,7 @@ function normalizeAnsweredMeta(meta) {
 }
 
 // src/db/queries/events.ts
-import { eq as eq2, and as and2, desc } from "drizzle-orm";
+import { eq as eq3, and as and3, desc as desc2 } from "drizzle-orm";
 function insertEvent(opts) {
   return getDb().insert(events).values({
     sessionId: opts.sessionId,
@@ -893,17 +924,27 @@ function insertEvent(opts) {
   }).returning().get();
 }
 function getEventsBySession(sessionId) {
-  return getDb().select().from(events).where(eq2(events.sessionId, sessionId)).orderBy(events.createdAt, events.id).all();
+  return getDb().select().from(events).where(eq3(events.sessionId, sessionId)).orderBy(events.createdAt, events.id).all();
 }
 function getEventsByType(sessionId, eventType) {
-  return getDb().select().from(events).where(and2(eq2(events.sessionId, sessionId), eq2(events.event, eventType))).orderBy(events.createdAt).all();
+  return getDb().select().from(events).where(and3(eq3(events.sessionId, sessionId), eq3(events.event, eventType))).orderBy(events.createdAt).all();
+}
+function getLatestEventOfType(sessionId, eventType, conversationId) {
+  const conditions = [
+    eq3(events.sessionId, sessionId),
+    eq3(events.event, eventType)
+  ];
+  if (conversationId) {
+    conditions.push(eq3(events.conversationId, conversationId));
+  }
+  return getDb().select().from(events).where(and3(...conditions)).orderBy(desc2(events.createdAt)).limit(1).get();
 }
 function getLatestRecaps() {
   const rows = getDb().select({
     sessionId: events.sessionId,
     meta: events.meta,
     createdAt: events.createdAt
-  }).from(events).where(eq2(events.event, "session.recap")).orderBy(desc(events.createdAt)).all();
+  }).from(events).where(eq3(events.event, "session.recap")).orderBy(desc2(events.createdAt)).all();
   const result = {};
   for (const row of rows) {
     if (result[row.sessionId])
@@ -921,26 +962,231 @@ var init_events = __esm(() => {
   init_schema();
 });
 
-// src/db/queries/conversations.ts
-import { eq as eq3, and as and3, desc as desc2, sql as sql3 } from "drizzle-orm";
-function createConversation(opts) {
-  return getDb().insert(conversations).values(opts).returning().get();
+// src/db/events/emit.ts
+function emitSessionStarted(args) {
+  return insertEvent({
+    sessionId: args.sessionId,
+    conversationId: args.conversationId,
+    event: "session.started",
+    meta: {
+      category_path: args.categoryPath,
+      session_name: args.sessionName,
+      session_slug: args.sessionSlug,
+      labels: args.labels,
+      summary: args.summary ?? null
+    }
+  });
 }
-function getConversation(id) {
-  return getDb().select().from(conversations).where(eq3(conversations.id, id)).get();
+function emitSessionResumed(args) {
+  return insertEvent({
+    sessionId: args.sessionId,
+    conversationId: args.conversationId,
+    event: "session.resumed",
+    meta: { claude_id: args.conversationId }
+  });
 }
-function getConversationsBySession(sessionId) {
-  return getDb().select().from(conversations).where(and3(eq3(conversations.sessionId, sessionId), eq3(conversations.discarded, false))).orderBy(desc2(conversations.startedAt)).all();
+function emitSessionPaused(args) {
+  return insertEvent({
+    sessionId: args.sessionId,
+    conversationId: args.conversationId,
+    event: "session.paused",
+    meta: { claude_id: args.conversationId }
+  });
 }
-function endConversation(id) {
-  return getDb().update(conversations).set({ endedAt: sql3`(datetime('now'))` }).where(eq3(conversations.id, id)).returning().get();
+function emitSessionPausedByRecovery(args) {
+  return insertEvent({
+    sessionId: args.sessionId,
+    event: "session.paused",
+    summary: "Recovered from stale state (process not found)",
+    meta: { stale_pid: args.stalePid }
+  });
 }
-function updateLastQuestion(id, question) {
-  return getDb().update(conversations).set({ lastQuestion: question }).where(eq3(conversations.id, id)).returning().get();
+function emitSessionEnded(args) {
+  return insertEvent({
+    sessionId: args.sessionId,
+    event: "session.end"
+  });
 }
-var init_conversations = __esm(() => {
-  init_client();
-  init_schema();
+function emitClaudeStarted(args) {
+  return insertEvent({
+    sessionId: args.sessionId,
+    conversationId: args.conversationId,
+    event: "claude.started",
+    meta: {
+      claude_id: args.conversationId,
+      model: args.model,
+      claude_version: args.claudeVersion,
+      git: args.git,
+      cwd: args.cwd
+    }
+  });
+}
+function emitClaudeEnded(args) {
+  return insertEvent({
+    sessionId: args.sessionId,
+    conversationId: args.conversationId,
+    event: "claude.ended",
+    meta: { claude_id: args.conversationId, exit_code: args.exitCode }
+  });
+}
+function emitUserPrompted(args) {
+  return insertEvent({
+    sessionId: args.sessionId,
+    conversationId: args.conversationId,
+    event: "user.prompt",
+    meta: { prompt: args.prompt, claude_id: args.conversationId }
+  });
+}
+function emitSessionWaiting(args) {
+  return insertEvent({
+    sessionId: args.sessionId,
+    conversationId: args.conversationId,
+    event: "session.waiting",
+    summary: args.question,
+    meta: { question: args.question, claude_id: args.conversationId }
+  });
+}
+function emitSessionAnswered(args) {
+  const joinedAnswers = Object.values(args.answers).map((v) => String(v)).join(", ") || undefined;
+  return insertEvent({
+    sessionId: args.sessionId,
+    conversationId: args.conversationId,
+    event: "session.answered",
+    summary: joinedAnswers,
+    meta: {
+      answers: args.answers,
+      annotations: args.annotations ?? {},
+      questions: args.questions ?? [],
+      claude_id: args.conversationId
+    }
+  });
+}
+function emitSessionRecap(args) {
+  return insertEvent({
+    sessionId: args.sessionId,
+    conversationId: args.conversationId,
+    event: "session.recap",
+    summary: args.recap.slice(0, 200),
+    meta: { recap: args.recap, claude_id: args.conversationId }
+  });
+}
+function emitPermissionRequested(args) {
+  return insertEvent({
+    sessionId: args.sessionId,
+    conversationId: args.conversationId,
+    event: "permission.request",
+    meta: {
+      tool: args.tool,
+      detail: args.detail,
+      claude_id: args.conversationId
+    }
+  });
+}
+function emitPermissionResolved(args) {
+  return insertEvent({
+    sessionId: args.sessionId,
+    conversationId: args.conversationId,
+    event: "permission.resolve",
+    meta: {
+      tool: args.tool,
+      detail: args.detail,
+      outcome: args.outcome,
+      claude_id: args.conversationId
+    }
+  });
+}
+function emitToolUsed(args) {
+  const summary = formatToolSummary(args.tool, args.detail);
+  return insertEvent({
+    sessionId: args.sessionId,
+    conversationId: args.conversationId,
+    event: "tool.used",
+    summary,
+    meta: {
+      tool: args.tool,
+      detail: args.detail,
+      outcome: args.outcome,
+      claude_id: args.conversationId
+    }
+  });
+}
+function formatToolSummary(tool, detail) {
+  if (!detail)
+    return tool;
+  switch (tool) {
+    case "Bash":
+      return `ran \`${detail.slice(0, 120)}\``;
+    case "Read":
+      return `read ${detail}`;
+    case "Glob":
+    case "Grep":
+      return `${tool.toLowerCase()} ${detail}`;
+    case "TodoWrite":
+      return "updated todos";
+    case "WebFetch":
+      return `fetched ${detail}`;
+    case "WebSearch":
+      return `searched: ${detail}`;
+    default:
+      return `${tool}: ${detail}`;
+  }
+}
+function emitToolApplied(args) {
+  return insertEvent({
+    sessionId: args.sessionId,
+    conversationId: args.conversationId,
+    event: "tool.applied",
+    summary: args.summary,
+    meta: {
+      permissions: args.permissions,
+      outcome: "applied",
+      claude_id: args.conversationId
+    }
+  });
+}
+function emitAssistantMessage(args) {
+  return insertEvent({
+    sessionId: args.sessionId,
+    conversationId: args.conversationId,
+    event: "assistant.message",
+    summary: args.summary,
+    meta: {
+      model: args.model,
+      text: args.text,
+      thinkingBlocks: args.thinkingBlocks,
+      thinkingBytes: args.thinkingBytes,
+      claude_id: args.conversationId
+    }
+  });
+}
+function emitAssistantRecap(args) {
+  return insertEvent({
+    sessionId: args.sessionId,
+    conversationId: args.conversationId,
+    event: "assistant.recap",
+    summary: args.recap.length > 80 ? `${args.recap.slice(0, 77)}...` : args.recap,
+    meta: { recap: args.recap, claude_id: args.conversationId }
+  });
+}
+function emitContextSnapshot(args) {
+  return insertEvent({
+    sessionId: args.sessionId,
+    conversationId: args.conversationId,
+    event: "context.snapshot",
+    summary: `${args.remainingPct}% remaining`,
+    meta: {
+      model: args.model,
+      input_tokens: String(args.inputTokens),
+      cache_creation_tokens: String(args.cacheCreationTokens),
+      cache_read_tokens: String(args.cacheReadTokens),
+      context_window_tokens: String(args.totalContextTokens),
+      remaining_pct: String(args.remainingPct),
+      claude_id: args.conversationId
+    }
+  });
+}
+var init_emit = __esm(() => {
+  init_events();
 });
 
 // src/cli/commands/update.ts
@@ -955,13 +1201,87 @@ function shouldIgnoreStatusFlip(newStatus, sessionPid) {
     return false;
   return sessionPid === null;
 }
+function dispatchHookEvent(event, ctx) {
+  const { sessionId, conversationId, meta, summary } = ctx;
+  switch (event) {
+    case "user.prompt":
+      emitUserPrompted({
+        sessionId,
+        conversationId,
+        prompt: String(meta.prompt ?? "")
+      });
+      return true;
+    case "session.waiting":
+      emitSessionWaiting({
+        sessionId,
+        conversationId,
+        question: String(meta.question ?? "Waiting for input")
+      });
+      return true;
+    case "session.answered":
+      emitSessionAnswered({
+        sessionId,
+        conversationId,
+        answers: meta.answers ?? {},
+        annotations: meta.annotations ?? {},
+        questions: meta.questions ?? []
+      });
+      return true;
+    case "session.recap":
+      emitSessionRecap({
+        sessionId,
+        conversationId,
+        recap: String(meta.recap ?? "")
+      });
+      return true;
+    case "session.paused":
+      emitSessionPaused({ sessionId, conversationId });
+      return true;
+    case "permission.request":
+      emitPermissionRequested({
+        sessionId,
+        conversationId,
+        tool: String(meta.tool ?? ""),
+        detail: String(meta.detail ?? "")
+      });
+      return true;
+    case "permission.resolve":
+      emitPermissionResolved({
+        sessionId,
+        conversationId,
+        tool: String(meta.tool ?? ""),
+        detail: String(meta.detail ?? ""),
+        outcome: meta.outcome === "denied" ? "denied" : "approved"
+      });
+      return true;
+    case "tool.applied":
+      emitToolApplied({
+        sessionId,
+        conversationId,
+        summary: summary ?? "edited a file",
+        permissions: meta.permissions ?? []
+      });
+      return true;
+    case "tool.used":
+      emitToolUsed({
+        sessionId,
+        conversationId,
+        tool: String(meta.tool ?? "Unknown"),
+        detail: String(meta.detail ?? ""),
+        outcome: meta.outcome === "approved" ? "approved" : "auto"
+      });
+      return true;
+    default:
+      return false;
+  }
+}
 var EVENT_STATUS_MAP;
 var init_update = __esm(() => {
   init_router();
   init_sessions();
-  init_events();
   init_conversations();
   init_trigger();
+  init_emit();
   EVENT_STATUS_MAP = {
     "session.waiting": "waiting",
     "session.answered": "active",
@@ -1006,7 +1326,7 @@ var init_update = __esm(() => {
       return;
     }
     const ignoreStatusFlip = shouldIgnoreStatusFlip(newStatus, session.pid);
-    let meta;
+    let meta = {};
     if (metaJson) {
       try {
         meta = JSON.parse(metaJson);
@@ -1017,15 +1337,15 @@ var init_update = __esm(() => {
     }
     const rawConvoId = meta?.claude_id || process.env.BERTRAND_CLAUDE_ID || undefined;
     const conversationId = rawConvoId && getConversation(rawConvoId) ? rawConvoId : undefined;
-    const answersObj = meta?.answers;
-    const joinedAnswers = answersObj ? Object.values(answersObj).join(", ") || undefined : undefined;
-    insertEvent({
+    const dispatched = dispatchHookEvent(event, {
       sessionId,
       conversationId,
-      event,
-      summary: summaryArg || meta?.question || joinedAnswers || undefined,
-      meta
+      meta,
+      summary: summaryArg
     });
+    if (!dispatched) {
+      return;
+    }
     if (newStatus && !ignoreStatusFlip) {
       updateSessionStatus(sessionId, newStatus);
     }
@@ -1164,7 +1484,7 @@ var init_snapshot = __esm(() => {
   init_router();
   init_sessions();
   init_conversations();
-  init_events();
+  init_emit();
   init_transcript();
   register("snapshot", async (args) => {
     let sessionId = "";
@@ -1197,20 +1517,15 @@ var init_snapshot = __esm(() => {
     if (!snapshot)
       return;
     const convoId = conversationId && getConversation(conversationId) ? conversationId : undefined;
-    insertEvent({
+    emitContextSnapshot({
       sessionId,
       conversationId: convoId,
-      event: "context.snapshot",
-      summary: `${snapshot.remainingPct}% remaining`,
-      meta: {
-        model: snapshot.model,
-        input_tokens: String(snapshot.inputTokens),
-        cache_creation_tokens: String(snapshot.cacheCreationTokens),
-        cache_read_tokens: String(snapshot.cacheReadTokens),
-        context_window_tokens: String(snapshot.totalContextTokens),
-        remaining_pct: String(snapshot.remainingPct),
-        claude_id: convoId
-      }
+      model: snapshot.model,
+      inputTokens: snapshot.inputTokens,
+      cacheCreationTokens: snapshot.cacheCreationTokens,
+      cacheReadTokens: snapshot.cacheReadTokens,
+      totalContextTokens: snapshot.totalContextTokens,
+      remainingPct: snapshot.remainingPct
     });
   });
 });
@@ -1223,14 +1538,16 @@ function summarize(text2) {
   const trimmed = firstLine.trim();
   return trimmed.length > 80 ? `${trimmed.slice(0, 77)}...` : trimmed;
 }
-var RECAP_TAG_RE;
+var RECAP_RE, RECAP_TAG_GLOBAL;
 var init_assistant_message = __esm(() => {
   init_router();
   init_sessions();
   init_conversations();
   init_events();
+  init_emit();
   init_transcript();
-  RECAP_TAG_RE = /<recap>[\s\S]*?<\/recap>/gi;
+  RECAP_RE = /<recap>([\s\S]*?)<\/recap>/i;
+  RECAP_TAG_GLOBAL = /<recap>[\s\S]*?<\/recap>/gi;
   register("assistant-message", async (args) => {
     let sessionId = "";
     let transcriptPath = "";
@@ -1261,34 +1578,50 @@ var init_assistant_message = __esm(() => {
     const turn = getLatestAssistantTurn(transcriptPath);
     if (!turn)
       return;
-    const text2 = turn.text.replace(RECAP_TAG_RE, "").trim();
+    const fullText = turn.text;
+    const textSansRecap = fullText.replace(RECAP_TAG_GLOBAL, "").trim();
     const convoId = conversationId && getConversation(conversationId) ? conversationId : undefined;
-    insertEvent({
-      sessionId,
-      conversationId: convoId,
-      event: "assistant.message",
-      summary: text2 ? summarize(text2) : "thinking only",
-      meta: {
-        model: turn.model,
-        text: text2,
-        thinkingBlocks: turn.thinkingBlocks,
-        thinkingBytes: turn.thinkingBytes,
-        claude_id: convoId
+    if (textSansRecap || turn.thinkingBlocks > 0) {
+      const latestMsg = getLatestEventOfType(sessionId, "assistant.message", convoId);
+      const latestText = latestMsg?.meta?.text;
+      if (latestText !== textSansRecap) {
+        emitAssistantMessage({
+          sessionId,
+          conversationId: convoId,
+          text: textSansRecap,
+          model: turn.model,
+          thinkingBlocks: turn.thinkingBlocks,
+          thinkingBytes: turn.thinkingBytes,
+          summary: textSansRecap ? summarize(textSansRecap) : "thinking only"
+        });
       }
-    });
+    }
+    const recapMatch = fullText.match(RECAP_RE);
+    const recap = recapMatch?.[1]?.trim();
+    if (recap) {
+      const latestRecap = getLatestEventOfType(sessionId, "assistant.recap", convoId);
+      const latestRecapText = latestRecap?.meta?.recap;
+      if (latestRecapText !== recap) {
+        emitAssistantRecap({
+          sessionId,
+          conversationId: convoId,
+          recap
+        });
+      }
+    }
   });
 });
 
 // src/cli/commands/recap-thinking.ts
 var exports_recap_thinking = {};
-var RECAP_RE;
+var RECAP_RE2;
 var init_recap_thinking = __esm(() => {
   init_router();
   init_sessions();
   init_conversations();
-  init_events();
+  init_emit();
   init_transcript();
-  RECAP_RE = /<recap>([\s\S]*?)<\/recap>/i;
+  RECAP_RE2 = /<recap>([\s\S]*?)<\/recap>/i;
   register("recap-thinking", async (args) => {
     let sessionId = "";
     let transcriptPath = "";
@@ -1316,17 +1649,15 @@ var init_recap_thinking = __esm(() => {
     const turn = getLatestAssistantTurn(transcriptPath);
     if (!turn?.text)
       return;
-    const match = turn.text.match(RECAP_RE);
+    const match = turn.text.match(RECAP_RE2);
     const recap = match?.[1]?.trim();
     if (!recap)
       return;
     const convoId = conversationId && getConversation(conversationId) ? conversationId : undefined;
-    insertEvent({
+    emitAssistantRecap({
       sessionId,
       conversationId: convoId,
-      event: "assistant.recap",
-      summary: recap.length > 80 ? `${recap.slice(0, 77)}...` : recap,
-      meta: { recap, claude_id: convoId }
+      recap
     });
   });
 });
@@ -1646,6 +1977,14 @@ function aggregateToolUsage(sessionId) {
       continue;
     counts[tool] = (counts[tool] ?? 0) + 1;
   }
+  const used = getEventsByType(sessionId, "tool.used");
+  for (const ev of used) {
+    const meta = ev.meta;
+    const tool = meta?.tool;
+    if (!tool)
+      continue;
+    counts[tool] = (counts[tool] ?? 0) + 1;
+  }
   return counts;
 }
 function contextTokenStats(sessionId) {
@@ -1778,8 +2117,10 @@ async function handleSwitchProject(req) {
     return Response.json({ error: `Unknown project: ${slug}` }, { status: 404 });
   }
   setActiveProjectSlug(slug);
-  queueMicrotask(() => process.exit(0));
-  return Response.json({ ok: true, slug, willRestart: true });
+  process.env.BERTRAND_PROJECT = slug;
+  _resetActiveProjectCache();
+  invalidateDbCache();
+  return Response.json({ ok: true, slug });
 }
 async function handleOpen(req) {
   let body;
@@ -1948,6 +2289,7 @@ var init_server = __esm(() => {
   init_session_archive();
   init_registry();
   init_resolve();
+  init_client();
   PORT = Number(process.env.BERTRAND_PORT ?? 5200);
   routes = [
     [/^\/api\/sessions$/, listSessions],
@@ -2280,6 +2622,7 @@ function runMigrations(dbPath) {
   const target = dbPath ?? resolveActiveProject().db;
   mkdirSync5(dirname3(target), { recursive: true });
   const sqlite = new Database3(target);
+  sqlite.exec("PRAGMA busy_timeout = 5000");
   sqlite.exec("PRAGMA journal_mode = WAL");
   sqlite.exec("PRAGMA foreign_keys = ON");
   const db = drizzle2(sqlite);
@@ -3145,29 +3488,22 @@ async function launch(opts) {
   await ensureServerStarted();
   const spawnContext = await captureSpawnContext();
   const sessionName = `${opts.categoryPath}/${opts.slug}`;
-  insertEvent({
+  emitSessionStarted({
     sessionId: session.id,
     conversationId: claudeId,
-    event: "session.started",
-    meta: {
-      category_path: opts.categoryPath,
-      session_name: opts.name ?? opts.slug,
-      session_slug: opts.slug,
-      labels: opts.labelNames ?? [],
-      summary: session.summary ?? null
-    }
+    categoryPath: opts.categoryPath,
+    sessionName: opts.name ?? opts.slug,
+    sessionSlug: opts.slug,
+    labels: opts.labelNames ?? [],
+    summary: session.summary ?? null
   });
-  insertEvent({
+  emitClaudeStarted({
     sessionId: session.id,
     conversationId: claudeId,
-    event: "claude.started",
-    meta: {
-      claude_id: claudeId,
-      model: spawnContext.model,
-      claude_version: spawnContext.claudeVersion,
-      git: spawnContext.git,
-      cwd: spawnContext.cwd
-    }
+    model: spawnContext.model,
+    claudeVersion: spawnContext.claudeVersion,
+    git: spawnContext.git,
+    cwd: spawnContext.cwd
   });
   const siblingContext = buildSiblingContext(categoryId, opts.categoryPath, session.id);
   const contract = buildContract(sessionName, siblingContext);
@@ -3191,11 +3527,9 @@ async function resume(opts) {
   liveSession = { sessionId: session.id, claudeId: opts.conversationId };
   installExitHandlers();
   await ensureServerStarted();
-  insertEvent({
+  emitSessionResumed({
     sessionId: session.id,
-    conversationId: opts.conversationId,
-    event: "session.resumed",
-    meta: { claude_id: opts.conversationId }
+    conversationId: opts.conversationId
   });
   const categoryPath = category?.path ?? "";
   const siblingContext = buildSiblingContext(session.categoryId, categoryPath, session.id);
@@ -3219,11 +3553,10 @@ function finalizeSession(sessionId, conversationId, exitCode) {
   if (conversationExists) {
     endConversation(conversationId);
   }
-  insertEvent({
+  emitClaudeEnded({
     sessionId,
     conversationId: safeConversationId,
-    event: "claude.ended",
-    meta: { claude_id: conversationId, exit_code: exitCode }
+    exitCode
   });
   updateSession(sessionId, {
     status: "paused",
@@ -3232,10 +3565,7 @@ function finalizeSession(sessionId, conversationId, exitCode) {
   });
   if (liveSession?.sessionId === sessionId)
     liveSession = null;
-  insertEvent({
-    sessionId,
-    event: "session.end"
-  });
+  emitSessionEnded({ sessionId });
   computeAndPersist(sessionId);
   stopServerIfIdle();
 }
@@ -3243,7 +3573,7 @@ var liveSession = null, exitHandlersInstalled = false;
 var init_session = __esm(() => {
   init_sessions();
   init_conversations();
-  init_events();
+  init_emit();
   init_categories();
   init_labels();
   init_template2();
@@ -3436,11 +3766,9 @@ function recoverStaleSessions() {
         status: "paused",
         pid: null
       });
-      insertEvent({
+      emitSessionPausedByRecovery({
         sessionId: session.id,
-        event: "session.paused",
-        summary: "Recovered from stale state (process not found)",
-        meta: { stale_pid: session.pid }
+        stalePid: session.pid
       });
       recovered++;
     }
@@ -3449,7 +3777,7 @@ function recoverStaleSessions() {
 }
 var init_recovery = __esm(() => {
   init_sessions();
-  init_events();
+  init_emit();
 });
 
 // src/cli/commands/launch.ts
@@ -3473,10 +3801,13 @@ var init_launch = __esm(() => {
 });
 
 // src/hooks/scripts.ts
+function quietHelper(bin) {
+  return `bq() { ${bin} "$@" 2>/dev/null || true; }`;
+}
 function waitingScript(bin) {
-  const BIN = bin;
   return `#!/usr/bin/env bash
 # Hook: PreToolUse AskUserQuestion \u2192 enforce multiSelect, mark session as waiting
+${quietHelper(bin)}
 sid="\${BERTRAND_SESSION:-}"
 [ -z "$sid" ] && exit 0
 
@@ -3500,23 +3831,26 @@ question="$(printf '%s' "$input" | grep -o '"question":"[^"]*"' | head -1 | cut
 # Clear working debounce marker so next resume\u2192working transition fires
 rm -f "/tmp/bertrand-working-$sid"
 
-${BIN} update --session-id "$sid" --event session.waiting --meta "$(jq -n --arg q "$question" --arg cid "$cid" '{question:$q, claude_id:$cid}')"
+bq update --session-id "$sid" --event session.waiting --meta "$(jq -n --arg q "$question" --arg cid "$cid" '{question:$q, claude_id:$cid}')"
 
-# Context snapshot \u2014 extract transcript path and capture token usage
+# Context snapshot \u2014 extract transcript path and capture token usage.
+# assistant-message captures the latest turn's text + recap tag in one pass;
+# replaces the older recap-thinking call which only grabbed the recap. Dedup
+# inside the command makes it idempotent vs the matching Stop-time capture,
+# so the same turn never lands twice.
 tpath="$(printf '%s' "$input" | grep -o '"transcript_path":"[^"]*"' | cut -d'"' -f4)"
 if [ -n "$tpath" ]; then
-  ${BIN} snapshot --session-id "$sid" --transcript-path "$tpath" --conversation-id "$cid" &
-  ${BIN} recap-thinking --session-id "$sid" --transcript-path "$tpath" --conversation-id "$cid" &
+  bq snapshot --session-id "$sid" --transcript-path "$tpath" --conversation-id "$cid" &
+  bq assistant-message --session-id "$sid" --transcript-path "$tpath" --conversation-id "$cid" &
 fi
 
 # Badge + notify in background \u2014 terminal UI doesn't need to block Claude
-${BIN} badge message-question --color '#e0b956' --priority 20 --beep &
-${BIN} notify bertrand "$question" &
+bq badge message-question --color '#e0b956' --priority 20 --beep &
+bq notify bertrand "$question" &
 wait
 `;
 }
 function answeredScript(bin) {
-  const BIN = bin;
   return `#!/usr/bin/env bash
 # Hook: PostToolUse AskUserQuestion \u2192 mark session as active
 #
@@ -3524,6 +3858,7 @@ function answeredScript(bin) {
 # Claude Code so the agent halts immediately instead of taking another turn.
 # This is the mechanical enforcement of the contract's loop-exit rule \u2014 the
 # contract prose is a soft hint, this JSON is the guarantee.
+${quietHelper(bin)}
 sid="\${BERTRAND_SESSION:-}"
 [ -z "$sid" ] && exit 0
 
@@ -3545,9 +3880,9 @@ meta="$(printf '%s' "$input" | jq --arg cid "$cid" '
 # Concatenate all answer values into a single string for the Done-for-now check.
 done_check="$(printf '%s' "$meta" | jq -r '.answers | to_entries | map(.value | tostring) | join(" ")' 2>/dev/null)"
 
-${BIN} update --session-id "$sid" --event session.answered --meta "$meta"
+bq update --session-id "$sid" --event session.answered --meta "$meta"
 
-${BIN} badge --clear &
+bq badge --clear &
 
 # Halt the agent loop if the user signaled Done for now. The Stop hook
 # (on-done.sh) will fire afterwards and mark the session as paused.
@@ -3560,7 +3895,7 @@ if printf '%s' "$done_check" | grep -q "Done for now"; then
     [.questions[]?.options[]? | select(.label == "Done for now") | .description] | first // empty
   ' 2>/dev/null)"
   if [ -n "$recap" ]; then
-    ${BIN} update --session-id "$sid" --event session.recap       --meta "$(jq -n --arg recap "$recap" --arg cid "$cid" '{recap:$recap, claude_id:$cid}')"
+    bq update --session-id "$sid" --event session.recap       --meta "$(jq -n --arg recap "$recap" --arg cid "$cid" '{recap:$recap, claude_id:$cid}')"
   fi
 
   printf '{"continue": false, "stopReason": "User selected Done for now"}\\n'
@@ -3570,9 +3905,9 @@ wait
 `;
 }
 function activeScript(bin) {
-  const BIN = bin;
   return `#!/usr/bin/env bash
 # Hook: PreToolUse (catch-all) \u2192 flip waiting to active
+${quietHelper(bin)}
 sid="\${BERTRAND_SESSION:-}"
 [ -z "$sid" ] && exit 0
 
@@ -3592,13 +3927,13 @@ ${EXTRACT_TOOL}
 
 touch "$marker"
 cid="\${BERTRAND_CLAUDE_ID:-}"
-${BIN} update --session-id "$sid" --event session.active --meta "$(jq -n --arg cid "$cid" '{claude_id:$cid}')"
+bq update --session-id "$sid" --event session.active --meta "$(jq -n --arg cid "$cid" '{claude_id:$cid}')"
 `;
 }
 function permissionWaitScript(bin) {
-  const BIN = bin;
   return `#!/usr/bin/env bash
 # Hook: PermissionRequest \u2192 mark pending, emit permission.request
+${quietHelper(bin)}
 sid="\${BERTRAND_SESSION:-}"
 [ -z "$sid" ] && exit 0
 
@@ -3617,38 +3952,45 @@ case "$tool" in
 esac
 
 cid="\${BERTRAND_CLAUDE_ID:-}"
-${BIN} update --session-id "$sid" --event permission.request --meta "$(jq -n --arg t "$tool" --arg d "$detail" --arg cid "$cid" '{tool:$t, detail:$d, claude_id:$cid}')"
+bq update --session-id "$sid" --event permission.request --meta "$(jq -n --arg t "$tool" --arg d "$detail" --arg cid "$cid" '{tool:$t, detail:$d, claude_id:$cid}')"
 
 # Badge + notify in background
-${BIN} badge bell-exclamation --color '#ff6b35' --priority 25 --beep &
-${BIN} notify bertrand "Needs permission: $tool" &
+bq badge bell-exclamation --color '#ff6b35' --priority 25 --beep &
+bq notify bertrand "Needs permission: $tool" &
 wait
 `;
 }
 function permissionDoneScript(bin) {
-  const BIN = bin;
   return `#!/usr/bin/env bash
 # Hook: PostToolUse (catch-all)
 #
-# Two flows:
-#   1. Edit/Write/MultiEdit: ALWAYS emit tool.applied with diff, regardless of permission
-#      flow. This is the only way to capture diffs for auto-approved edits \u2014 bertrand
-#      must never require disabling auto-approve to gather data.
-#   2. Other tools: emit permission.resolve only if a PermissionRequest preceded this
-#      (marker exists). Rejected tools never reach PostToolUse, so a request without a
-#      resolve = rejected.
+# Captures every tool call Claude makes. Three event flows:
+#   1. Edit/Write/MultiEdit \u2192 tool.applied with diff payload. Keeps the
+#      existing dashboard diff-renderer happy and is the only place we get
+#      old_string/new_string on auto-approved edits.
+#   2. Tools that went through a permission prompt \u2192 permission.resolve.
+#      The PermissionRequest hook set a marker; we clear it and log the
+#      approval. (Denials never reach PostToolUse, so absence-of-resolve
+#      means the user said no.)
+#   3. Everything else (auto-approved Bash/Read/Grep/Glob/etc.) \u2192 tool.used
+#      with outcome:"auto". Previously this case dropped the call entirely;
+#      now Claude's read-only / shell activity shows up in the timeline.
+${quietHelper(bin)}
 sid="\${BERTRAND_SESSION:-}"
 [ -z "$sid" ] && exit 0
 
 input="$(cat)"
 ${EXTRACT_TOOL}
 
+# Don't double-log: AskUserQuestion has its own waiting/answered events
+[ "$tool" = "AskUserQuestion" ] && exit 0
+
 marker="/tmp/bertrand-perm-pending-$sid"
 had_marker=0
 if [ -f "$marker" ]; then
   had_marker=1
   rm -f "$marker"
-  ${BIN} badge --clear &
+  bq badge --clear &
 fi
 
 cid="\${BERTRAND_CLAUDE_ID:-}"
@@ -3660,10 +4002,6 @@ case "$tool" in
       Write) summary="wrote a file" ;;
       *) summary="edited a file" ;;
     esac
-    # Single jq pass: build meta.permissions[] with diff data so the dashboard renders
-    # via the existing WorkContent path (same shape as collapsed permission events).
-    # Emit camelCase keys (oldStr/newStr/edits) directly so WorkContent reads
-    # meta.permissions[] without going through transforms.ts's snake\u2192camel adapter.
     meta="$(printf '%s' "$input" | jq --arg t "$tool" --arg d "$detail" --arg cid "$cid" '
       {
         permissions: [
@@ -3676,28 +4014,40 @@ case "$tool" in
         claude_id: $cid
       }
     ')"
-    ${BIN} update --session-id "$sid" --event tool.applied --summary "$summary" --meta "$meta"
+    bq update --session-id "$sid" --event tool.applied --summary "$summary" --meta "$meta"
     wait
     exit 0
     ;;
 esac
 
-# Other tools: only emit permission.resolve if there was a real prompt
-[ "$had_marker" = "0" ] && exit 0
-
+# Extract a tool-shaped detail for the timeline summary. Bash gets the
+# command, file tools get the path; everything else falls back to a generic
+# label inside the emit helper.
 detail=""
 case "$tool" in
   Bash) detail="$(printf '%s' "$input" | grep -o '"command":"[^"]*"' | head -1 | cut -d'"' -f4 | cut -c1-1000)" ;;
+  Read|NotebookRead) detail="$(printf '%s' "$input" | grep -o '"file_path":"[^"]*"' | head -1 | cut -d'"' -f4 | cut -c1-1000)" ;;
+  Glob) detail="$(printf '%s' "$input" | grep -o '"pattern":"[^"]*"' | head -1 | cut -d'"' -f4 | cut -c1-200)" ;;
+  Grep) detail="$(printf '%s' "$input" | grep -o '"pattern":"[^"]*"' | head -1 | cut -d'"' -f4 | cut -c1-200)" ;;
+  WebFetch) detail="$(printf '%s' "$input" | grep -o '"url":"[^"]*"' | head -1 | cut -d'"' -f4 | cut -c1-300)" ;;
+  WebSearch) detail="$(printf '%s' "$input" | grep -o '"query":"[^"]*"' | head -1 | cut -d'"' -f4 | cut -c1-200)" ;;
 esac
 
-${BIN} update --session-id "$sid" --event permission.resolve --meta "$(jq -n --arg t "$tool" --arg d "$detail" --arg cid "$cid" '{tool:$t, detail:$d, outcome:"approved", claude_id:$cid}')"
+if [ "$had_marker" = "1" ]; then
+  # Prompted-then-approved path. Keep permission.resolve for back-compat
+  # rendering; downstream consumers can migrate to tool.used at their pace.
+  bq update --session-id "$sid" --event permission.resolve --meta "$(jq -n --arg t "$tool" --arg d "$detail" --arg cid "$cid" '{tool:$t, detail:$d, outcome:"approved", claude_id:$cid}')"
+else
+  # Auto-approved path. Without tool.used, these calls were invisible.
+  bq update --session-id "$sid" --event tool.used --meta "$(jq -n --arg t "$tool" --arg d "$detail" --arg cid "$cid" '{tool:$t, detail:$d, outcome:"auto", claude_id:$cid}')"
+fi
 wait
 `;
 }
 function userPromptScript(bin) {
-  const BIN = bin;
   return `#!/usr/bin/env bash
 # Hook: UserPromptSubmit \u2192 record user free-text prompt
+${quietHelper(bin)}
 sid="\${BERTRAND_SESSION:-}"
 [ -z "$sid" ] && exit 0
 
@@ -3707,28 +4057,31 @@ cid="\${BERTRAND_CLAUDE_ID:-}"
 meta="$(printf '%s' "$input" | jq --arg cid "$cid" '{prompt: (.prompt // ""), claude_id: $cid}')"
 [ -z "$meta" ] && exit 0
 
-${BIN} update --session-id "$sid" --event user.prompt --meta "$meta"
+bq update --session-id "$sid" --event user.prompt --meta "$meta"
 `;
 }
 function doneScript(bin) {
-  const BIN = bin;
   return `#!/usr/bin/env bash
 # Hook: Stop \u2192 mark session as paused
+${quietHelper(bin)}
 sid="\${BERTRAND_SESSION:-}"
 [ -z "$sid" ] && exit 0
 
 input="$(cat)"
 cid="\${BERTRAND_CLAUDE_ID:-}"
-${BIN} update --session-id "$sid" --event session.paused --meta "$(jq -n --arg cid "$cid" '{claude_id:$cid}')"
+bq update --session-id "$sid" --event session.paused --meta "$(jq -n --arg cid "$cid" '{claude_id:$cid}')"
 
-# Final context snapshot \u2014 capture token usage at session end
+# Final transcript reads. assistant-message dedups against the most-recent
+# AskUQ-time capture, so a Done-for-now exit (no work between AskUQ and Stop)
+# lands zero new events here; intermediate Stops with fresh assistant output
+# do land new ones.
 tpath="$(printf '%s' "$input" | grep -o '"transcript_path":"[^"]*"' | cut -d'"' -f4)"
 if [ -n "$tpath" ]; then
-  ${BIN} snapshot --session-id "$sid" --transcript-path "$tpath" --conversation-id "$cid" &
-  ${BIN} assistant-message --session-id "$sid" --transcript-path "$tpath" --conversation-id "$cid" &
+  bq snapshot --session-id "$sid" --transcript-path "$tpath" --conversation-id "$cid" &
+  bq assistant-message --session-id "$sid" --transcript-path "$tpath" --conversation-id "$cid" &
 fi
 
-${BIN} badge check --color '#58c142' --priority 10
+bq badge check --color '#58c142' --priority 10
 `;
 }
 var EXTRACT_TOOL = `tool="$(printf '%s' "$input" | grep -o '"tool_name":"[^"]*"' | cut -d'"' -f4)"`, HOOK_SCRIPTS;
@@ -4151,8 +4504,11 @@ var init_catalog = __esm(() => {
     "vercel.deploy": { label: "deployed", category: "integration", color: 245, detailColor: 245, skip: false },
     "user.prompt": { label: "prompt", category: "interaction", color: 36, detailColor: 245, skip: false },
     "context.snapshot": { label: "context", category: "context", color: 245, detailColor: 245, skip: true },
+    "tool.used": { label: "tool", category: "work", color: 214, detailColor: 245, skip: true },
     "tool.work": { label: "tool work", category: "work", color: 214, detailColor: 245, skip: false },
-    "session.recap": { label: "session recap", category: "lifecycle", color: 33, detailColor: 245, skip: false }
+    "session.recap": { label: "session recap", category: "lifecycle", color: 33, detailColor: 245, skip: false },
+    "assistant.message": { label: "claude", category: "interaction", color: 39, detailColor: 245, skip: false },
+    "assistant.recap": { label: "recap", category: "interaction", color: 39, detailColor: 245, skip: false }
   };
   DEFAULT_INFO = {
     label: "unknown",
@@ -4192,7 +4548,7 @@ function collapsePermissions(events2) {
   let i = 0;
   while (i < events2.length) {
     const ev = events2[i];
-    if (ev.event !== "permission.request" && ev.event !== "permission.resolve") {
+    if (!ROLLUP_EVENTS.has(ev.event)) {
       result.push(ev);
       i++;
       continue;
@@ -4200,7 +4556,7 @@ function collapsePermissions(events2) {
     const batch = [];
     while (i < events2.length) {
       const current = events2[i];
-      if (current.event !== "permission.request" && current.event !== "permission.resolve")
+      if (!ROLLUP_EVENTS.has(current.event))
         break;
       batch.push(current);
       i++;
@@ -4209,7 +4565,7 @@ function collapsePermissions(events2) {
       continue;
     const toolCounts = new Map;
     for (const pev of batch) {
-      if (pev.event !== "permission.request")
+      if (pev.event !== "permission.request" && pev.event !== "tool.used")
         continue;
       const meta = pev.meta;
       const tool = meta?.tool ?? "unknown";
@@ -4268,8 +4624,14 @@ function filterSkipped(events2) {
 function compact(events2) {
   return deduplicate(collapsePermissions(repairQAPairs(filterSkipped(events2))));
 }
+var ROLLUP_EVENTS;
 var init_compact = __esm(() => {
   init_catalog();
+  ROLLUP_EVENTS = new Set([
+    "permission.request",
+    "permission.resolve",
+    "tool.used"
+  ]);
 });
 
 // src/cli/commands/log.ts