bertrand 0.22.1 → 0.22.2

package/dist/bertrand.js

@@ -599,8 +599,6 @@ var init_router = __esm(() => {
   aliases = new Map;
   HOOK_COMMANDS = new Set([
     "update",
-    "snapshot",
-    "recap-thinking",
     "assistant-message",
     "notify",
     "badge"
@@ -610,7 +608,6 @@ var init_router = __esm(() => {
 // src/db/schema.ts
 var exports_schema = {};
 __export(exports_schema, {
-  worktreeAssociations: () => worktreeAssociations,
   sessions: () => sessions,
   sessionStats: () => sessionStats,
   sessionLabels: () => sessionLabels,
@@ -621,7 +618,7 @@ __export(exports_schema, {
 });
 import { sqliteTable, text, integer, index, uniqueIndex } from "drizzle-orm/sqlite-core";
 import { sql } from "drizzle-orm";
-var categories, labels, sessions, sessionLabels, conversations, events, worktreeAssociations, sessionStats;
+var categories, labels, sessions, sessionLabels, conversations, events, sessionStats;
 var init_schema = __esm(() => {
   categories = sqliteTable("categories", {
     id: text("id").primaryKey(),
@@ -677,7 +674,6 @@ var init_schema = __esm(() => {
     startedAt: text("started_at").notNull().default(sql`(datetime('now'))`),
     endedAt: text("ended_at"),
     discarded: integer("discarded", { mode: "boolean" }).notNull().default(false),
-    lastQuestion: text("last_question"),
     eventCount: integer("event_count").notNull().default(0)
   }, (t) => [index("conv_session").on(t.sessionId)]);
   events = sqliteTable("events", {
@@ -694,24 +690,11 @@ var init_schema = __esm(() => {
     index("ev_event_created").on(t.event, t.createdAt),
     index("ev_conversation").on(t.conversationId)
   ]);
-  worktreeAssociations = sqliteTable("worktree_associations", {
-    id: text("id").primaryKey(),
-    sessionId: text("session_id").notNull().references(() => sessions.id, { onDelete: "cascade" }),
-    branch: text("branch").notNull(),
-    worktreePath: text("worktree_path"),
-    active: integer("active", { mode: "boolean" }).notNull().default(true),
-    enteredAt: text("entered_at").notNull().default(sql`(datetime('now'))`),
-    exitedAt: text("exited_at")
-  }, (t) => [
-    index("wt_session").on(t.sessionId),
-    index("wt_active").on(t.active)
-  ]);
   sessionStats = sqliteTable("session_stats", {
     sessionId: text("session_id").primaryKey().references(() => sessions.id, { onDelete: "cascade" }),
     eventCount: integer("event_count").notNull().default(0),
     conversationCount: integer("conversation_count").notNull().default(0),
     interactionCount: integer("interaction_count").notNull().default(0),
-    prCount: integer("pr_count").notNull().default(0),
     claudeWorkS: integer("claude_work_s").notNull().default(0),
     userWaitS: integer("user_wait_s").notNull().default(0),
     activePct: integer("active_pct").notNull().default(0),
@@ -859,9 +842,6 @@ function getConversationsBySession(sessionId) {
 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();
@@ -966,50 +946,6 @@ var init_events = __esm(() => {
 });
 
 // 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 emitSessionResumed(args) {
-  return insertEvent({
-    sessionId: args.sessionId,
-    conversationId: args.conversationId,
-    event: "session.resumed",
-    meta: { claude_id: args.conversationId }
-  });
-}
-function emitSessionPaused(args) {
-  return insertEvent({
-    sessionId: args.sessionId,
-    conversationId: args.conversationId,
-    event: "session.paused",
-    meta: { claude_id: args.conversationId }
-  });
-}
-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 emitSessionEnded(args) {
-  return insertEvent({
-    sessionId: args.sessionId,
-    event: "session.end"
-  });
-}
 function emitClaudeStarted(args) {
   return insertEvent({
     sessionId: args.sessionId,
@@ -1017,9 +953,6 @@ function emitClaudeStarted(args) {
     event: "claude.started",
     meta: {
       claude_id: args.conversationId,
-      model: args.model,
-      claude_version: args.claudeVersion,
-      git: args.git,
       cwd: args.cwd
     }
   });
@@ -1073,31 +1006,6 @@ function emitSessionRecap(args) {
     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({
@@ -1171,23 +1079,6 @@ function emitAssistantRecap(args) {
     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();
 });
@@ -1237,26 +1128,6 @@ function dispatchHookEvent(event, ctx) {
         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,
@@ -1283,15 +1154,11 @@ var init_update = __esm(() => {
   init_router();
   init_sessions();
   init_conversations();
-  init_trigger();
   init_emit();
   EVENT_STATUS_MAP = {
     "session.waiting": "waiting",
     "session.answered": "active",
-    "session.active": "active",
-    "session.paused": "paused",
-    "session.started": "active",
-    "session.end": "paused"
+    "session.paused": "paused"
   };
   register("update", async (args) => {
     let sessionId = "";
@@ -1340,24 +1207,15 @@ var init_update = __esm(() => {
     }
     const rawConvoId = meta?.claude_id || process.env.BERTRAND_CLAUDE_ID || undefined;
     const conversationId = rawConvoId && getConversation(rawConvoId) ? rawConvoId : undefined;
-    const dispatched = dispatchHookEvent(event, {
+    dispatchHookEvent(event, {
       sessionId,
       conversationId,
       meta,
       summary: summaryArg
     });
-    if (!dispatched) {
-      return;
-    }
     if (newStatus && !ignoreStatusFlip) {
       updateSessionStatus(sessionId, newStatus);
     }
-    if (event === "session.waiting" && conversationId && meta?.question) {
-      updateLastQuestion(conversationId, meta.question);
-    }
-    if (event === "session.end") {
-      triggerBackgroundPush();
-    }
   });
 });
 
@@ -1365,13 +1223,6 @@ var init_update = __esm(() => {
 import { existsSync as existsSync5, readFileSync as readFileSync4 } from "fs";
 import { homedir as homedir2 } from "os";
 import { join as join6 } from "path";
-function getContextWindowSize(model) {
-  for (const [prefix, size] of Object.entries(CONTEXT_WINDOW_SIZES)) {
-    if (model.startsWith(prefix))
-      return size;
-  }
-  return 200000;
-}
 function claudeTranscriptPath(sessionId, cwd) {
   const dir = (cwd ?? process.cwd()).replace(/\//g, "-");
   return join6(homedir2(), ".claude", "projects", dir, `${sessionId}.jsonl`);
@@ -1439,108 +1290,7 @@ function getLatestAssistantTurn(filePath) {
     thinkingBytes
   };
 }
-function getContextSnapshot(filePath) {
-  if (!existsSync5(filePath))
-    return null;
-  const text2 = readFileSync4(filePath, "utf-8");
-  const lines = text2.split(`
-`);
-  for (let i = lines.length - 1;i >= 0; i--) {
-    const line = lines[i];
-    if (!line)
-      continue;
-    let entry;
-    try {
-      entry = JSON.parse(line);
-    } catch {
-      continue;
-    }
-    if (entry.type !== "assistant")
-      continue;
-    const message = entry.message;
-    const usage = message?.usage;
-    if (!usage)
-      continue;
-    const model = message?.model ?? "";
-    const inputTokens = usage.input_tokens ?? 0;
-    const outputTokens = usage.output_tokens ?? 0;
-    const cacheCreationTokens = usage.cache_creation_input_tokens ?? 0;
-    const cacheReadTokens = usage.cache_read_input_tokens ?? 0;
-    const totalContextTokens = inputTokens + cacheCreationTokens + cacheReadTokens;
-    const windowSize = getContextWindowSize(model);
-    const remainingPct = Math.max(0, Math.min(100, Math.round(100 - totalContextTokens * 100 / windowSize)));
-    return {
-      model,
-      inputTokens,
-      outputTokens,
-      cacheCreationTokens,
-      cacheReadTokens,
-      totalContextTokens,
-      remainingPct
-    };
-  }
-  return null;
-}
-var CONTEXT_WINDOW_SIZES;
-var init_transcript = __esm(() => {
-  CONTEXT_WINDOW_SIZES = {
-    "claude-opus-4": 1e6,
-    "claude-sonnet-4": 200000,
-    "claude-haiku-4": 200000
-  };
-});
-
-// src/cli/commands/snapshot.ts
-var exports_snapshot = {};
-var init_snapshot = __esm(() => {
-  init_router();
-  init_sessions();
-  init_conversations();
-  init_emit();
-  init_transcript();
-  register("snapshot", async (args) => {
-    let sessionId = "";
-    let transcriptPath = "";
-    let conversationId = "";
-    for (let i = 0;i < args.length; i++) {
-      const arg = args[i];
-      const next = args[i + 1];
-      if (arg === "--session-id" && next) {
-        sessionId = next;
-        i++;
-      } else if (arg === "--transcript-path" && next) {
-        transcriptPath = next;
-        i++;
-      } else if (arg === "--conversation-id" && next) {
-        conversationId = next;
-        i++;
-      }
-    }
-    if (!sessionId || !transcriptPath) {
-      console.error("Usage: bertrand snapshot --session-id <id> --transcript-path <path> [--conversation-id <id>]");
-      process.exit(1);
-    }
-    const session = getSession(sessionId);
-    if (!session) {
-      console.error(`Session not found: ${sessionId}`);
-      process.exit(1);
-    }
-    const snapshot = getContextSnapshot(transcriptPath);
-    if (!snapshot)
-      return;
-    const convoId = conversationId && getConversation(conversationId) ? conversationId : undefined;
-    emitContextSnapshot({
-      sessionId,
-      conversationId: convoId,
-      model: snapshot.model,
-      inputTokens: snapshot.inputTokens,
-      cacheCreationTokens: snapshot.cacheCreationTokens,
-      cacheReadTokens: snapshot.cacheReadTokens,
-      totalContextTokens: snapshot.totalContextTokens,
-      remainingPct: snapshot.remainingPct
-    });
-  });
-});
+var init_transcript = () => {};
 
 // src/cli/commands/assistant-message.ts
 var exports_assistant_message = {};
@@ -1624,56 +1374,6 @@ var init_assistant_message = __esm(() => {
   });
 });
 
-// src/cli/commands/recap-thinking.ts
-var exports_recap_thinking = {};
-var RECAP_RE2;
-var init_recap_thinking = __esm(() => {
-  init_router();
-  init_sessions();
-  init_conversations();
-  init_emit();
-  init_transcript();
-  RECAP_RE2 = /<recap>([\s\S]*?)<\/recap>/i;
-  register("recap-thinking", async (args) => {
-    let sessionId = "";
-    let transcriptPath = "";
-    let conversationId = "";
-    for (let i = 0;i < args.length; i++) {
-      const arg = args[i];
-      const next = args[i + 1];
-      if (arg === "--session-id" && next) {
-        sessionId = next;
-        i++;
-      } else if (arg === "--transcript-path" && next) {
-        transcriptPath = next;
-        i++;
-      } else if (arg === "--conversation-id" && next) {
-        conversationId = next;
-        i++;
-      }
-    }
-    if (!sessionId || !transcriptPath) {
-      console.error("Usage: bertrand recap-thinking --session-id <id> --transcript-path <path> [--conversation-id <id>]");
-      process.exit(1);
-    }
-    if (!getSession(sessionId))
-      return;
-    const turn = getLatestAssistantTurn(transcriptPath);
-    if (!turn?.text)
-      return;
-    const match = turn.text.match(RECAP_RE2);
-    const recap = match?.[1]?.trim();
-    if (!recap)
-      return;
-    const convoId = conversationId && getConversation(conversationId) ? conversationId : undefined;
-    emitAssistantRecap({
-      sessionId,
-      conversationId: convoId,
-      recap
-    });
-  });
-});
-
 // src/terminal/wave.ts
 import { execSync } from "child_process";
 
@@ -1935,7 +1635,6 @@ function computeTimings(events2) {
 function computeSessionStats(sessionId) {
   const events2 = getEventsBySession(sessionId);
   const summary = computeTimings(events2);
-  const prEvents = getEventsByType(sessionId, "gh.pr.created");
   const conversationIds = new Set(events2.filter((e) => e.conversationId).map((e) => e.conversationId));
   const interactionCount = events2.filter((e) => e.event === "session.waiting" || e.event === "session.answered").length;
   const diff = computeDiffStats(sessionId);
@@ -1943,7 +1642,6 @@ function computeSessionStats(sessionId) {
     eventCount: events2.length,
     conversationCount: conversationIds.size,
     interactionCount,
-    prCount: prEvents.length,
     claudeWorkS: Math.round(summary.totalClaudeWorkMs / 1000),
     userWaitS: Math.round(summary.totalUserWaitMs / 1000),
     activePct: summary.activePct,
@@ -1981,14 +1679,6 @@ function aggregateToolUsage(sessionId) {
       counts[p.tool] = (counts[p.tool] ?? 0) + (p.count ?? 1);
     }
   }
-  const resolves = getEventsByType(sessionId, "permission.resolve");
-  for (const ev of resolves) {
-    const meta = ev.meta;
-    const tool = meta?.tool;
-    if (!tool)
-      continue;
-    counts[tool] = (counts[tool] ?? 0) + 1;
-  }
   const used = getEventsByType(sessionId, "tool.used");
   for (const ev of used) {
     const meta = ev.meta;
@@ -1999,40 +1689,6 @@ function aggregateToolUsage(sessionId) {
   }
   return counts;
 }
-function contextTokenStats(sessionId) {
-  const snapshots = getEventsByType(sessionId, "context.snapshot");
-  const samples = [];
-  for (const ev of snapshots) {
-    const meta = ev.meta;
-    const total = parseInt(meta?.context_window_tokens ?? "0", 10);
-    if (Number.isFinite(total) && total > 0)
-      samples.push(total);
-  }
-  if (samples.length === 0)
-    return { avg: 0, max: 0, latest: 0 };
-  let sum = 0;
-  let max = 0;
-  for (const n of samples) {
-    sum += n;
-    if (n > max)
-      max = n;
-  }
-  const avg = Math.round(sum / samples.length);
-  const latest = samples[samples.length - 1] ?? 0;
-  return { avg, max, latest };
-}
-function permissionDenialCount(sessionId) {
-  const all = getEventsBySession(sessionId);
-  let requests = 0;
-  let resolves = 0;
-  for (const ev of all) {
-    if (ev.event === "permission.request")
-      requests++;
-    else if (ev.event === "permission.resolve")
-      resolves++;
-  }
-  return Math.max(0, requests - resolves);
-}
 function discardRate(sessionId) {
   const row = getDb().select({
     total: sql5`count(*)`,
@@ -2046,8 +1702,6 @@ function discardRate(sessionId) {
 function computeEngagementStats(sessionId) {
   return {
     toolUsage: aggregateToolUsage(sessionId),
-    contextTokens: contextTokenStats(sessionId),
-    permissionDenials: permissionDenialCount(sessionId),
     discardRate: discardRate(sessionId)
   };
 }
@@ -2364,7 +2018,7 @@ function cleanupSnapshot() {
   }
 }
 var SIDECAR_SUFFIXES;
-var init_snapshot2 = __esm(() => {
+var init_snapshot = __esm(() => {
   init_resolve();
   SIDECAR_SUFFIXES = ["", "-wal", "-shm"];
 });
@@ -2563,7 +2217,7 @@ var init_engine = __esm(() => {
   init_resolve();
   init_lsof();
   init_config();
-  init_snapshot2();
+  init_snapshot();
   init_crypto();
 });
 
@@ -3281,73 +2935,6 @@ var init_process = __esm(() => {
   init_resolve();
 });
 
-// src/engine/spawn-context.ts
-import { execFile as execFile2 } from "child_process";
-import { promisify } from "util";
-function captureModel() {
-  return process.env.BERTRAND_MODEL || process.env.CLAUDE_MODEL || undefined;
-}
-async function captureClaudeVersion() {
-  if (cachedClaudeVersion !== null)
-    return cachedClaudeVersion;
-  try {
-    const { stdout } = await execFileAsync("claude", ["--version"], {
-      timeout: 5000
-    });
-    const match2 = stdout.trim().match(/(\d+\.\d+\.\d+(?:\.\d+)?)/);
-    cachedClaudeVersion = match2 ? match2[1] : stdout.trim() || undefined;
-    return cachedClaudeVersion;
-  } catch {
-    cachedClaudeVersion = undefined;
-    return;
-  }
-}
-async function captureGit() {
-  try {
-    const [statusRes, shaRes] = await Promise.all([
-      execFileAsync("git", ["status", "--porcelain=v2", "--branch"], {
-        timeout: 5000
-      }),
-      execFileAsync("git", ["rev-parse", "HEAD"], { timeout: 5000 })
-    ]);
-    let branch;
-    let dirty = false;
-    for (const line of statusRes.stdout.split(`
-`)) {
-      if (line.startsWith("# branch.head ")) {
-        branch = line.slice("# branch.head ".length).trim();
-      } else if (line && !line.startsWith("#")) {
-        dirty = true;
-      }
-    }
-    if (!branch)
-      return;
-    return {
-      branch,
-      sha: shaRes.stdout.trim(),
-      dirty
-    };
-  } catch {
-    return;
-  }
-}
-async function captureSpawnContext() {
-  const [claudeVersion, git] = await Promise.all([
-    captureClaudeVersion(),
-    captureGit()
-  ]);
-  return {
-    model: captureModel(),
-    claudeVersion,
-    git,
-    cwd: process.cwd()
-  };
-}
-var execFileAsync, cachedClaudeVersion = null;
-var init_spawn_context = __esm(() => {
-  execFileAsync = promisify(execFile2);
-});
-
 // src/lib/server-lifecycle.ts
 import { spawn as spawn3 } from "child_process";
 import { readFileSync as readFileSync7, writeFileSync as writeFileSync4, unlinkSync as unlinkSync2 } from "fs";
@@ -3496,24 +3083,11 @@ async function launch(opts) {
   liveSession = { sessionId: session.id, claudeId };
   installExitHandlers();
   await ensureServerStarted();
-  const spawnContext = await captureSpawnContext();
   const sessionName = `${opts.categoryPath}/${opts.slug}`;
-  emitSessionStarted({
-    sessionId: session.id,
-    conversationId: claudeId,
-    categoryPath: opts.categoryPath,
-    sessionName: opts.name ?? opts.slug,
-    sessionSlug: opts.slug,
-    labels: opts.labelNames ?? [],
-    summary: session.summary ?? null
-  });
   emitClaudeStarted({
     sessionId: session.id,
     conversationId: claudeId,
-    model: spawnContext.model,
-    claudeVersion: spawnContext.claudeVersion,
-    git: spawnContext.git,
-    cwd: spawnContext.cwd
+    cwd: process.cwd()
   });
   const siblingContext = buildSiblingContext(categoryId, opts.categoryPath, session.id);
   const contract = buildContract(sessionName, siblingContext);
@@ -3538,19 +3112,11 @@ async function resume(opts) {
   liveSession = { sessionId: session.id, claudeId: opts.conversationId };
   installExitHandlers();
   await ensureServerStarted();
-  emitSessionResumed({
-    sessionId: session.id,
-    conversationId: opts.conversationId
-  });
   if (isFreshClaudeSession) {
-    const spawnContext = await captureSpawnContext();
     emitClaudeStarted({
       sessionId: session.id,
       conversationId: opts.conversationId,
-      model: spawnContext.model,
-      claudeVersion: spawnContext.claudeVersion,
-      git: spawnContext.git,
-      cwd: spawnContext.cwd
+      cwd: process.cwd()
     });
   }
   const categoryPath = category?.path ?? "";
@@ -3587,7 +3153,6 @@ function finalizeSession(sessionId, conversationId, exitCode) {
   });
   if (liveSession?.sessionId === sessionId)
     liveSession = null;
-  emitSessionEnded({ sessionId });
   computeAndPersist(sessionId);
   stopServerIfIdle();
   triggerBackgroundPush();
@@ -3602,7 +3167,6 @@ var init_session = __esm(() => {
   init_template2();
   init_context();
   init_process();
-  init_spawn_context();
   init_timing();
   init_server_lifecycle();
   init_trigger();
@@ -3820,10 +3384,6 @@ function recoverStaleSessions() {
         status: "paused",
         pid: null
       });
-      emitSessionPausedByRecovery({
-        sessionId: session.id,
-        stalePid: session.pid
-      });
       recovered++;
     }
   }
@@ -3831,7 +3391,6 @@ function recoverStaleSessions() {
 }
 var init_recovery = __esm(() => {
   init_sessions();
-  init_emit();
 });
 
 // src/cli/commands/launch.ts
@@ -3900,14 +3459,11 @@ rm -f "${runtimeDir}/working-$sid"
 
 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.
-# 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.
+# Capture the latest assistant turn's text + recap tag. 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
-  bq snapshot --session-id "$sid" --transcript-path "$tpath" --conversation-id "$cid" &
   bq assistant-message --session-id "$sid" --transcript-path "$tpath" --conversation-id "$cid" &
 fi
 
@@ -3971,35 +3527,9 @@ fi
 wait
 `;
 }
-function activeScript(bin, runtimeDir) {
-  return `#!/usr/bin/env bash
-# Hook: PreToolUse (catch-all) \u2192 flip waiting to active
-${quietHelper(bin)}
-sid="\${BERTRAND_SESSION:-}"
-[ -z "$sid" ] && exit 0
-
-# Debounce: skip if we already sent session.active within the last 5 seconds.
-# This avoids spawning bertrand (~31ms) on every tool call during rapid sequences.
-marker="${runtimeDir}/working-$sid"
-if [ -f "$marker" ]; then
-  age=$(( $(date +%s) - $(stat -f%m "$marker" 2>/dev/null || echo 0) ))
-  [ "$age" -lt 5 ] && exit 0
-fi
-
-input="$(cat)"
-${EXTRACT_TOOL}
-
-# AskUserQuestion has its own PreToolUse hook
-[ "$tool" = "AskUserQuestion" ] && exit 0
-
-touch "$marker"
-cid="\${BERTRAND_CLAUDE_ID:-}"
-bq update --session-id "$sid" --event session.active --meta "$(jq -n --arg cid "$cid" '{claude_id:$cid}')"
-`;
-}
 function permissionWaitScript(bin, runtimeDir) {
   return `#!/usr/bin/env bash
-# Hook: PermissionRequest \u2192 mark pending, emit permission.request
+# Hook: PermissionRequest \u2192 mark pending, badge + notify
 ${quietHelper(bin)}
 sid="\${BERTRAND_SESSION:-}"
 [ -z "$sid" ] && exit 0
@@ -4008,19 +3538,11 @@ input="$(cat)"
 ${EXTRACT_TOOL}
 [ "$tool" = "AskUserQuestion" ] && exit 0
 
-# Write marker so PostToolUse knows this was a real permission prompt (not auto-approved)
+# Marker tells the PostToolUse hook to emit tool.used with outcome:approved
+# instead of outcome:auto. Without it, every prompted-then-approved tool call
+# would look identical to an auto-approved one.
 touch "${runtimeDir}/perm-pending-$sid"
 
-# Extract detail from tool_input via grep (avoid jq for simple fields)
-detail=""
-case "$tool" in
-  Bash) detail="$(printf '%s' "$input" | grep -o '"command":"[^"]*"' | head -1 | cut -d'"' -f4 | cut -c1-1000)" ;;
-  Edit|Write|Read) detail="$(printf '%s' "$input" | grep -o '"file_path":"[^"]*"' | head -1 | cut -d'"' -f4 | cut -c1-1000)" ;;
-esac
-
-cid="\${BERTRAND_CLAUDE_ID:-}"
-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
 bq badge bell-exclamation --color '#ff6b35' --priority 25 --beep &
 bq notify bertrand "Needs permission: $tool" &
@@ -4031,17 +3553,15 @@ function permissionDoneScript(bin, runtimeDir) {
   return `#!/usr/bin/env bash
 # Hook: PostToolUse (catch-all)
 #
-# Captures every tool call Claude makes. Three event flows:
+# Captures every tool call Claude makes. Two 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.
+#   2. Everything else \u2192 tool.used. The PermissionRequest hook may have set
+#      a marker; if so the call was prompted-then-approved (outcome:approved),
+#      otherwise it was auto-approved (outcome:auto). Denials never reach
+#      PostToolUse, so absence of a tool.used after a permission.request means
+#      the user said no.
 ${quietHelper(bin)}
 sid="\${BERTRAND_SESSION:-}"
 [ -z "$sid" ] && exit 0
@@ -4100,14 +3620,9 @@ case "$tool" in
   WebSearch) detail="$(printf '%s' "$input" | grep -o '"query":"[^"]*"' | head -1 | cut -d'"' -f4 | cut -c1-200)" ;;
 esac
 
-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
+outcome="auto"
+[ "$had_marker" = "1" ] && outcome="approved"
+bq update --session-id "$sid" --event tool.used --meta "$(jq -n --arg t "$tool" --arg d "$detail" --arg o "$outcome" --arg cid "$cid" '{tool:$t, detail:$d, outcome:$o, claude_id:$cid}')"
 wait
 `;
 }
@@ -4129,22 +3644,22 @@ bq update --session-id "$sid" --event user.prompt --meta "$meta"
 }
 function doneScript(bin, _runtimeDir) {
   return `#!/usr/bin/env bash
-# Hook: Stop \u2192 mark session as paused
+# Hook: Stop \u2192 flip session status to paused; no event row written.
+# The status flip is driven by EVENT_STATUS_MAP[session.paused]; dispatchHookEvent
+# no longer has a session.paused case, so update.ts flips status without inserting.
 ${quietHelper(bin)}
 sid="\${BERTRAND_SESSION:-}"
 [ -z "$sid" ] && exit 0
 
 input="$(cat)"
 cid="\${BERTRAND_CLAUDE_ID:-}"
-bq update --session-id "$sid" --event session.paused --meta "$(jq -n --arg cid "$cid" '{claude_id:$cid}')"
+bq update --session-id "$sid" --event session.paused
 
-# 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.
+# Final assistant-message read. 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.
 tpath="$(printf '%s' "$input" | grep -o '"transcript_path":"[^"]*"' | cut -d'"' -f4)"
 if [ -n "$tpath" ]; then
-  bq snapshot --session-id "$sid" --transcript-path "$tpath" --conversation-id "$cid" &
   bq assistant-message --session-id "$sid" --transcript-path "$tpath" --conversation-id "$cid" &
 fi
 
@@ -4156,7 +3671,6 @@ var init_scripts = __esm(() => {
   HOOK_SCRIPTS = {
     "on-waiting.sh": waitingScript,
     "on-answered.sh": answeredScript,
-    "on-active.sh": activeScript,
     "on-permission-wait.sh": permissionWaitScript,
     "on-permission-done.sh": permissionDoneScript,
     "on-user-prompt.sh": userPromptScript,
@@ -4215,10 +3729,6 @@ var init_settings = __esm(() => {
       {
         matcher: "AskUserQuestion",
         hooks: [{ type: "command", command: `${paths.hooks}/on-waiting.sh` }]
-      },
-      {
-        matcher: "",
-        hooks: [{ type: "command", command: `${paths.hooks}/on-active.sh` }]
       }
     ],
     PostToolUse: [
@@ -4542,31 +4052,8 @@ function extractSummary(row) {
       const answers = meta.answers;
       return answers ? Object.values(answers).join(", ") : "";
     }
-    case "permission.request":
-    case "permission.resolve": {
-      const tool = meta.tool ?? "";
-      const detail = meta.detail ?? "";
-      return detail ? `${tool}: ${detail}` : tool;
-    }
-    case "gh.pr.created": {
-      const title = meta.pr_title ?? "";
-      const url = meta.pr_url ?? "";
-      return title || url;
-    }
-    case "gh.pr.merged":
-      return meta.branch ?? "";
-    case "worktree.entered":
-      return meta.branch ?? "";
-    case "linear.issue.read":
-      return meta.issue_title ?? "";
-    case "notion.page.read":
-      return meta.page_title ?? "";
-    case "vercel.deploy":
-      return meta.project_name ?? "";
     case "user.prompt":
       return meta.prompt ?? "";
-    case "context.snapshot":
-      return meta.remaining_pct ? `${meta.remaining_pct}% remaining` : "";
     case "session.recap":
       return meta.recap ?? "";
     default:
@@ -4596,26 +4083,13 @@ function enrichAll(rows) {
 var catalog, DEFAULT_INFO;
 var init_catalog = __esm(() => {
   catalog = {
-    "session.started": { label: "started", category: "lifecycle", color: 34, detailColor: 245, skip: false },
-    "session.resumed": { label: "resumed", category: "lifecycle", color: 34, detailColor: 245, skip: false },
-    "session.end": { label: "ended", category: "lifecycle", color: 245, detailColor: 245, skip: false },
     "claude.started": { label: "claude started", category: "lifecycle", color: 35, detailColor: 245, skip: false },
     "claude.ended": { label: "claude ended", category: "lifecycle", color: 35, detailColor: 245, skip: false },
     "claude.discarded": { label: "discarded", category: "lifecycle", color: 245, detailColor: 245, skip: false },
     "session.waiting": { label: "waiting", category: "interaction", color: 33, detailColor: 245, skip: false },
     "session.answered": { label: "answered", category: "interaction", color: 36, detailColor: 245, skip: false },
-    "permission.request": { label: "permission", category: "work", color: 214, detailColor: 245, skip: false },
-    "permission.resolve": { label: "allowed", category: "work", color: 214, detailColor: 245, skip: false },
-    "worktree.entered": { label: "worktree", category: "lifecycle", color: 35, detailColor: 245, skip: false },
-    "worktree.exited": { label: "worktree exited", category: "lifecycle", color: 35, detailColor: 245, skip: false },
-    "gh.pr.created": { label: "PR created", category: "integration", color: 32, detailColor: 32, skip: false },
-    "gh.pr.merged": { label: "PR merged", category: "integration", color: 35, detailColor: 35, skip: false },
-    "linear.issue.read": { label: "Linear issue", category: "integration", color: 33, detailColor: 33, skip: false },
-    "notion.page.read": { label: "Notion page", category: "integration", color: 245, detailColor: 245, skip: false },
-    "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.used": { label: "tool", category: "work", color: 214, detailColor: 245, skip: false },
     "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 },
     "assistant.message": { label: "claude", category: "interaction", color: 39, detailColor: 245, skip: false },
@@ -4676,8 +4150,6 @@ function collapsePermissions(events2) {
       continue;
     const toolCounts = new Map;
     for (const pev of batch) {
-      if (pev.event !== "permission.request" && pev.event !== "tool.used")
-        continue;
       const meta = pev.meta;
       const tool = meta?.tool ?? "unknown";
       toolCounts.set(tool, (toolCounts.get(tool) ?? 0) + 1);
@@ -4739,8 +4211,6 @@ var ROLLUP_EVENTS;
 var init_compact = __esm(() => {
   init_catalog();
   ROLLUP_EVENTS = new Set([
-    "permission.request",
-    "permission.resolve",
     "tool.used"
   ]);
 });
@@ -4982,14 +4452,11 @@ function getMetrics(sessionId, name, status2) {
   const allEvents = getEventsBySession(sessionId);
   const conversations2 = new Set;
   let interactionCount = 0;
-  let prCount = 0;
   for (const ev of allEvents) {
     if (ev.conversationId)
       conversations2.add(ev.conversationId);
     if (ev.event === "session.waiting" || ev.event === "session.answered")
       interactionCount++;
-    if (ev.event === "gh.pr.created")
-      prCount++;
   }
   return {
     name,
@@ -4997,7 +4464,6 @@ function getMetrics(sessionId, name, status2) {
     eventCount: allEvents.length,
     conversationCount: conversations2.size,
     interactionCount,
-    prCount,
     claudeWorkS: Math.round(timing.totalClaudeWorkMs / 1000),
     userWaitS: Math.round(timing.totalUserWaitMs / 1000),
     activePct: timing.activePct,
@@ -5018,9 +4484,8 @@ function renderGlobal(metrics, isJson) {
     claudeWorkS: acc.claudeWorkS + m.claudeWorkS,
     userWaitS: acc.userWaitS + m.userWaitS,
     conversations: acc.conversations + m.conversationCount,
-    prs: acc.prs + m.prCount,
     interactions: acc.interactions + m.interactionCount
-  }), { sessions: 0, active: 0, durationS: 0, claudeWorkS: 0, userWaitS: 0, conversations: 0, prs: 0, interactions: 0 });
+  }), { sessions: 0, active: 0, durationS: 0, claudeWorkS: 0, userWaitS: 0, conversations: 0, interactions: 0 });
   const totalTracked = totals.claudeWorkS + totals.userWaitS;
   const globalActivePct = totalTracked > 0 ? Math.round(totals.claudeWorkS / totalTracked * 100) : 0;
   if (isJson) {
@@ -5037,7 +4502,6 @@ function renderGlobal(metrics, isJson) {
   console.log(`  Claude work:   ${dur(totals.claudeWorkS)} ${dim}(${pct(globalActivePct)})${reset}`);
   console.log(`  User wait:     ${dur(totals.userWaitS)} ${dim}(${pct(100 - globalActivePct)})${reset}`);
   console.log(`  Conversations: ${totals.conversations}`);
-  console.log(`  PRs:           ${totals.prs}`);
   console.log(`  Interactions:  ${totals.interactions}`);
 }
 function renderCategory(metrics, categoryPath, isJson) {
@@ -5052,21 +4516,20 @@ function renderCategory(metrics, categoryPath, isJson) {
   const maxName = Math.max(...sorted.map((m) => m.name.length), 4);
   console.log(`${bold}${categoryPath}${reset}
 `);
-  console.log(`${dim}${"NAME".padEnd(maxName)}  ${"DURATION".padEnd(8)}  ${"CLAUDE".padEnd(8)}  ${"WAIT".padEnd(8)}  ${"ACT%".padEnd(5)}  ${"CONVOS".padEnd(6)}  PRS${reset}`);
+  console.log(`${dim}${"NAME".padEnd(maxName)}  ${"DURATION".padEnd(8)}  ${"CLAUDE".padEnd(8)}  ${"WAIT".padEnd(8)}  ${"ACT%".padEnd(5)}  CONVOS${reset}`);
   for (const m of sorted) {
-    console.log(`${m.name.padEnd(maxName)}  ${dur(m.durationS).padEnd(8)}  ${dur(m.claudeWorkS).padEnd(8)}  ${dur(m.userWaitS).padEnd(8)}  ${pct(m.activePct).padEnd(5)}  ${String(m.conversationCount).padEnd(6)}  ${m.prCount}`);
+    console.log(`${m.name.padEnd(maxName)}  ${dur(m.durationS).padEnd(8)}  ${dur(m.claudeWorkS).padEnd(8)}  ${dur(m.userWaitS).padEnd(8)}  ${pct(m.activePct).padEnd(5)}  ${m.conversationCount}`);
   }
   const totals = sorted.reduce((acc, m) => ({
     durationS: acc.durationS + m.durationS,
     claudeWorkS: acc.claudeWorkS + m.claudeWorkS,
     userWaitS: acc.userWaitS + m.userWaitS,
-    conversations: acc.conversations + m.conversationCount,
-    prs: acc.prs + m.prCount
-  }), { durationS: 0, claudeWorkS: 0, userWaitS: 0, conversations: 0, prs: 0 });
+    conversations: acc.conversations + m.conversationCount
+  }), { durationS: 0, claudeWorkS: 0, userWaitS: 0, conversations: 0 });
   const totalTracked = totals.claudeWorkS + totals.userWaitS;
   const totalPct = totalTracked > 0 ? Math.round(totals.claudeWorkS / totalTracked * 100) : 0;
   console.log(`${dim}${"\u2500".repeat(maxName + 50)}${reset}`);
-  console.log(`${"TOTAL".padEnd(maxName)}  ${dur(totals.durationS).padEnd(8)}  ${dur(totals.claudeWorkS).padEnd(8)}  ${dur(totals.userWaitS).padEnd(8)}  ${pct(totalPct).padEnd(5)}  ${String(totals.conversations).padEnd(6)}  ${totals.prs}`);
+  console.log(`${"TOTAL".padEnd(maxName)}  ${dur(totals.durationS).padEnd(8)}  ${dur(totals.claudeWorkS).padEnd(8)}  ${dur(totals.userWaitS).padEnd(8)}  ${pct(totalPct).padEnd(5)}  ${totals.conversations}`);
 }
 function renderSession(m, isJson) {
   if (isJson) {
@@ -5084,7 +4547,6 @@ function renderSession(m, isJson) {
   console.log(`  Events:        ${m.eventCount}`);
   console.log(`  Conversations: ${m.conversationCount}`);
   console.log(`  Interactions:  ${m.interactionCount}`);
-  console.log(`  PRs:           ${m.prCount}`);
 }
 var ACTIVE_STATUSES2;
 var init_stats2 = __esm(() => {
@@ -5534,9 +4996,7 @@ init_router();
 var command = process.argv[2];
 var hotPath = {
   update: () => Promise.resolve().then(() => (init_update(), exports_update)),
-  snapshot: () => Promise.resolve().then(() => (init_snapshot(), exports_snapshot)),
   "assistant-message": () => Promise.resolve().then(() => (init_assistant_message(), exports_assistant_message)),
-  "recap-thinking": () => Promise.resolve().then(() => (init_recap_thinking(), exports_recap_thinking)),
   badge: () => Promise.resolve().then(() => (init_badge(), exports_badge)),
   notify: () => Promise.resolve().then(() => (init_notify(), exports_notify)),
   serve: () => Promise.resolve().then(() => (init_serve(), exports_serve)),
@@ -5554,9 +5014,7 @@ if (command && command in hotPath) {
     Promise.resolve().then(() => (init_backfill_stats(), exports_backfill_stats)),
     Promise.resolve().then(() => (init_archive(), exports_archive)),
     Promise.resolve().then(() => (init_update(), exports_update)),
-    Promise.resolve().then(() => (init_snapshot(), exports_snapshot)),
     Promise.resolve().then(() => (init_assistant_message(), exports_assistant_message)),
-    Promise.resolve().then(() => (init_recap_thinking(), exports_recap_thinking)),
     Promise.resolve().then(() => (init_serve(), exports_serve)),
     Promise.resolve().then(() => (init_badge(), exports_badge)),
     Promise.resolve().then(() => (init_notify(), exports_notify)),