bertrand 0.22.1 → 0.23.0

package/dist/bertrand.js

@@ -599,9 +599,8 @@ var init_router = __esm(() => {
   aliases = new Map;
   HOOK_COMMANDS = new Set([
     "update",
-    "snapshot",
-    "recap-thinking",
     "assistant-message",
+    "contract",
     "notify",
     "badge"
   ]);
@@ -610,7 +609,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 +619,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(),
@@ -657,6 +655,8 @@ var init_schema = __esm(() => {
     pid: integer("pid"),
     startedAt: text("started_at").notNull().default(sql`(datetime('now'))`),
     endedAt: text("ended_at"),
+    worktreePath: text("worktree_path"),
+    worktreeBranch: text("worktree_branch"),
     createdAt: text("created_at").notNull().default(sql`(datetime('now'))`),
     updatedAt: text("updated_at").notNull().default(sql`(datetime('now'))`)
   }, (t) => [
@@ -677,7 +677,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 +693,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),
@@ -799,28 +785,122 @@ function createId(size = 12) {
 }
 var init_id = () => {};
 
+// src/db/queries/categories.ts
+import { eq, like, or, isNull } from "drizzle-orm";
+function createCategory(opts) {
+  const db = getDb();
+  const id = createId();
+  let path = opts.slug;
+  let depth = 0;
+  if (opts.parentId) {
+    const parent = db.select().from(categories).where(eq(categories.id, opts.parentId)).get();
+    if (!parent)
+      throw new Error(`Parent category ${opts.parentId} not found`);
+    path = `${parent.path}/${opts.slug}`;
+    depth = parent.depth + 1;
+  }
+  return db.insert(categories).values({ id, slug: opts.slug, name: opts.name, parentId: opts.parentId, path, depth }).returning().get();
+}
+function getCategory(id) {
+  return getDb().select().from(categories).where(eq(categories.id, id)).get();
+}
+function getCategoryByPath(path) {
+  return getDb().select().from(categories).where(eq(categories.path, path)).get();
+}
+function getOrCreateCategoryPath(path) {
+  const existing = getCategoryByPath(path);
+  if (existing)
+    return existing.id;
+  const segments = path.split("/");
+  let parentId;
+  for (let i = 0;i < segments.length; i++) {
+    const partialPath = segments.slice(0, i + 1).join("/");
+    const category = getCategoryByPath(partialPath);
+    if (category) {
+      parentId = category.id;
+    } else {
+      const slug = segments[i];
+      const created = createCategory({ slug, name: slug, parentId });
+      parentId = created.id;
+    }
+  }
+  return parentId;
+}
+var init_categories = __esm(() => {
+  init_client();
+  init_schema();
+  init_id();
+});
+
+// src/lib/parse-session-name.ts
+function parseSessionName(input) {
+  const trimmed = input.trim().replace(/^\/+|\/+$/g, "");
+  if (!trimmed) {
+    throw new Error("Session name cannot be empty");
+  }
+  const segments = trimmed.split("/").filter(Boolean);
+  if (segments.length < 2) {
+    throw new Error(`Session name must include at least one category: "category/session" (got "${trimmed}")`);
+  }
+  for (const segment of segments) {
+    if (!SEGMENT_PATTERN.test(segment)) {
+      throw new Error(`Invalid segment "${segment}": must start with alphanumeric and contain only letters, digits, dots, underscores, or dashes`);
+    }
+  }
+  const categoryPath = segments[0];
+  const slug = segments.slice(1).join("/");
+  return { categoryPath, slug };
+}
+var SEGMENT_PATTERN;
+var init_parse_session_name = __esm(() => {
+  SEGMENT_PATTERN = /^[a-z0-9][a-z0-9._-]*$/i;
+});
+
 // src/db/queries/sessions.ts
-import { eq, and, inArray, sql as sql2 } from "drizzle-orm";
+import { eq as eq2, and, inArray, sql as sql2 } from "drizzle-orm";
+function resolveSessionByName(name) {
+  const flat = parseSessionName(name);
+  const flatCategory = getCategoryByPath(flat.categoryPath);
+  if (flatCategory) {
+    const session = getSessionByCategorySlug(flatCategory.id, flat.slug);
+    if (session) {
+      return { session, categoryPath: flat.categoryPath, slug: flat.slug };
+    }
+  }
+  const segments = name.trim().replace(/^\/+|\/+$/g, "").split("/").filter(Boolean);
+  if (segments.length >= 3) {
+    const legacyCategoryPath = segments.slice(0, -1).join("/");
+    const legacySlug = segments[segments.length - 1];
+    const legacyCategory = getCategoryByPath(legacyCategoryPath);
+    if (legacyCategory) {
+      const session = getSessionByCategorySlug(legacyCategory.id, legacySlug);
+      if (session) {
+        return { session, categoryPath: legacyCategoryPath, slug: legacySlug };
+      }
+    }
+  }
+  return;
+}
 function createSession(opts) {
   const db = getDb();
   const id = createId();
   return db.insert(sessions).values({ id, ...opts }).returning().get();
 }
 function getSession(id) {
-  return getDb().select().from(sessions).where(eq(sessions.id, id)).get();
+  return getDb().select().from(sessions).where(eq2(sessions.id, id)).get();
 }
 function getSessionByCategorySlug(categoryId, slug) {
-  return getDb().select().from(sessions).where(and(eq(sessions.categoryId, categoryId), eq(sessions.slug, slug))).get();
+  return getDb().select().from(sessions).where(and(eq2(sessions.categoryId, categoryId), eq2(sessions.slug, slug))).get();
 }
 function getSessionsByCategory(categoryId) {
-  return getDb().select().from(sessions).where(eq(sessions.categoryId, categoryId)).all();
+  return getDb().select().from(sessions).where(eq2(sessions.categoryId, categoryId)).all();
 }
 function getActiveSessions() {
-  return getDb().select({ session: sessions, categoryPath: categories.path }).from(sessions).innerJoin(categories, eq(sessions.categoryId, categories.id)).where(inArray(sessions.status, ["active", "waiting"])).all();
+  return getDb().select({ session: sessions, categoryPath: categories.path }).from(sessions).innerJoin(categories, eq2(sessions.categoryId, categories.id)).where(inArray(sessions.status, ["active", "waiting"])).all();
 }
 function getAllSessions(opts) {
   const db = getDb();
-  const query = db.select({ session: sessions, categoryPath: categories.path }).from(sessions).innerJoin(categories, eq(sessions.categoryId, categories.id));
+  const query = db.select({ session: sessions, categoryPath: categories.path }).from(sessions).innerJoin(categories, eq2(sessions.categoryId, categories.id));
   if (opts?.excludeArchived) {
     return query.where(inArray(sessions.status, [
       "active",
@@ -831,36 +911,35 @@ function getAllSessions(opts) {
   return query.all();
 }
 function updateSessionStatus(id, status) {
-  return getDb().update(sessions).set({ status, updatedAt: sql2`(datetime('now'))` }).where(eq(sessions.id, id)).returning().get();
+  return getDb().update(sessions).set({ status, updatedAt: sql2`(datetime('now'))` }).where(eq2(sessions.id, id)).returning().get();
 }
 function updateSession(id, data) {
-  return getDb().update(sessions).set({ ...data, updatedAt: sql2`(datetime('now'))` }).where(eq(sessions.id, id)).returning().get();
+  return getDb().update(sessions).set({ ...data, updatedAt: sql2`(datetime('now'))` }).where(eq2(sessions.id, id)).returning().get();
 }
 function deleteSession(id) {
-  return getDb().delete(sessions).where(eq(sessions.id, id)).run();
+  return getDb().delete(sessions).where(eq2(sessions.id, id)).run();
 }
 var init_sessions = __esm(() => {
   init_client();
   init_schema();
   init_id();
+  init_categories();
+  init_parse_session_name();
 });
 
 // src/db/queries/conversations.ts
-import { eq as eq2, and as and2, desc, sql as sql3 } from "drizzle-orm";
+import { eq as eq3, 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();
+  return getDb().select().from(conversations).where(eq3(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();
+  return getDb().select().from(conversations).where(and2(eq3(conversations.sessionId, sessionId), eq3(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();
+  return getDb().update(conversations).set({ endedAt: sql3`(datetime('now'))` }).where(eq3(conversations.id, id)).returning().get();
 }
 var init_conversations = __esm(() => {
   init_client();
@@ -916,7 +995,7 @@ function normalizeAnsweredMeta(meta) {
 }
 
 // src/db/queries/events.ts
-import { eq as eq3, and as and3, desc as desc2 } from "drizzle-orm";
+import { eq as eq4, and as and3, desc as desc2 } from "drizzle-orm";
 function insertEvent(opts) {
   return getDb().insert(events).values({
     sessionId: opts.sessionId,
@@ -927,18 +1006,18 @@ function insertEvent(opts) {
   }).returning().get();
 }
 function getEventsBySession(sessionId) {
-  return getDb().select().from(events).where(eq3(events.sessionId, sessionId)).orderBy(events.createdAt, events.id).all();
+  return getDb().select().from(events).where(eq4(events.sessionId, sessionId)).orderBy(events.createdAt, events.id).all();
 }
 function getEventsByType(sessionId, eventType) {
-  return getDb().select().from(events).where(and3(eq3(events.sessionId, sessionId), eq3(events.event, eventType))).orderBy(events.createdAt).all();
+  return getDb().select().from(events).where(and3(eq4(events.sessionId, sessionId), eq4(events.event, eventType))).orderBy(events.createdAt).all();
 }
 function getLatestEventOfType(sessionId, eventType, conversationId) {
   const conditions = [
-    eq3(events.sessionId, sessionId),
-    eq3(events.event, eventType)
+    eq4(events.sessionId, sessionId),
+    eq4(events.event, eventType)
   ];
   if (conversationId) {
-    conditions.push(eq3(events.conversationId, conversationId));
+    conditions.push(eq4(events.conversationId, conversationId));
   }
   return getDb().select().from(events).where(and3(...conditions)).orderBy(desc2(events.createdAt)).limit(1).get();
 }
@@ -947,7 +1026,7 @@ function getLatestRecaps() {
     sessionId: events.sessionId,
     meta: events.meta,
     createdAt: events.createdAt
-  }).from(events).where(eq3(events.event, "session.recap")).orderBy(desc2(events.createdAt)).all();
+  }).from(events).where(eq4(events.event, "session.recap")).orderBy(desc2(events.createdAt)).all();
   const result = {};
   for (const row of rows) {
     if (result[row.sessionId])
@@ -966,50 +1045,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 +1052,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 +1105,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,21 +1178,22 @@ function emitAssistantRecap(args) {
     meta: { recap: args.recap, claude_id: args.conversationId }
   });
 }
-function emitContextSnapshot(args) {
+function emitWorktreeEntered(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
-    }
+    event: "worktree.entered",
+    summary: args.branch ? `entered worktree ${args.branch}` : "entered worktree",
+    meta: { path: args.path, branch: args.branch, claude_id: args.conversationId }
+  });
+}
+function emitWorktreeExited(args) {
+  return insertEvent({
+    sessionId: args.sessionId,
+    conversationId: args.conversationId,
+    event: "worktree.exited",
+    summary: args.branch ? `exited worktree ${args.branch}` : "exited worktree",
+    meta: { path: args.path, branch: args.branch, claude_id: args.conversationId }
   });
 }
 var init_emit = __esm(() => {
@@ -1195,7 +1203,8 @@ var init_emit = __esm(() => {
 // src/cli/commands/update.ts
 var exports_update = {};
 __export(exports_update, {
-  shouldIgnoreStatusFlip: () => shouldIgnoreStatusFlip
+  shouldIgnoreStatusFlip: () => shouldIgnoreStatusFlip,
+  dispatchHookEvent: () => dispatchHookEvent
 });
 function shouldIgnoreStatusFlip(newStatus, sessionPid) {
   if (!newStatus)
@@ -1237,26 +1246,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,
@@ -1274,6 +1263,22 @@ function dispatchHookEvent(event, ctx) {
         outcome: meta.outcome === "approved" ? "approved" : "auto"
       });
       return true;
+    case "worktree.entered": {
+      const path = String(meta.path ?? "");
+      const branch = meta.branch ? String(meta.branch) : undefined;
+      emitWorktreeEntered({ sessionId, conversationId, path, branch });
+      updateSession(sessionId, {
+        worktreePath: path || null,
+        worktreeBranch: branch ?? null
+      });
+      return true;
+    }
+    case "worktree.exited": {
+      const path = meta.path ? String(meta.path) : undefined;
+      emitWorktreeExited({ sessionId, conversationId, path });
+      updateSession(sessionId, { worktreePath: null, worktreeBranch: null });
+      return true;
+    }
     default:
       return false;
   }
@@ -1283,15 +1288,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 +1341,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 +1357,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 +1424,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,53 +1508,153 @@ var init_assistant_message = __esm(() => {
   });
 });
 
-// src/cli/commands/recap-thinking.ts
-var exports_recap_thinking = {};
-var RECAP_RE2;
-var init_recap_thinking = __esm(() => {
+// src/contract/template.md
+var template_default = `You are running inside bertrand, session: {sessionName}. Follow these rules strictly:
+
+After every response, you MUST call AskUserQuestion. This is a continuous loop \u2014 every turn ends with AskUserQuestion. Always include an option labeled exactly \`Done for now\` (this exact wording is required \u2014 the session-exit hook greps for it). The description for "Done for now" must be a 1-2 sentence summary of what was accomplished so far. Describe outcomes (what was built, fixed, decided), not process.
+
+If the user's most recent answer to AskUserQuestion was "Done for now" (or contains it), this turn is the FINAL turn. Respond briefly to acknowledge and do NOT call AskUserQuestion again \u2014 the loop is over.
+
+Before each AskUserQuestion call, emit a \`<recap>...</recap>\` block in your text output. Use markdown \u2014 a short bullet list is usually the most scannable shape; a single short paragraph is fine when the turn was one cohesive thing. Keep it concise. The recap covers what happened since the previous AskUserQuestion (or session start) \u2014 what you found, decided, or did. Write the gist for someone reading the session timeline, not a process log. The dashboard renders these between AskUserQuestion events; do not use this tag for any other purpose.
+`;
+var init_template = () => {};
+
+// src/contract/template.ts
+function buildContract(sessionName, ...contextLayers) {
+  const base = template_default.replace("{sessionName}", sessionName);
+  const layers = contextLayers.map((c) => c.trim()).filter((c) => c.length > 0);
+  if (layers.length === 0)
+    return base;
+  return base + `
+
+` + layers.join(`
+
+`);
+}
+var init_template2 = __esm(() => {
+  init_template();
+});
+
+// src/lib/format.ts
+function formatDuration(ms) {
+  if (ms < MINUTE)
+    return `${Math.round(ms / SECOND)}s`;
+  const days = Math.floor(ms / DAY);
+  const hours = Math.floor(ms % DAY / HOUR);
+  const minutes = Math.floor(ms % HOUR / MINUTE);
+  if (days > 0)
+    return hours > 0 ? `${days}d ${hours}h` : `${days}d`;
+  if (hours > 0)
+    return minutes > 0 ? `${hours}h ${minutes}m` : `${hours}h`;
+  return `${minutes}m`;
+}
+function formatAgo(isoOrDate) {
+  const date = typeof isoOrDate === "string" ? new Date(isoOrDate) : isoOrDate;
+  const ms = Date.now() - date.getTime();
+  if (ms < MINUTE)
+    return "just now";
+  if (ms < HOUR)
+    return `${Math.floor(ms / MINUTE)}m ago`;
+  if (ms < DAY)
+    return `${Math.floor(ms / HOUR)}h ago`;
+  if (ms < 2 * DAY)
+    return "yesterday";
+  if (ms < 7 * DAY)
+    return `${Math.floor(ms / DAY)}d ago`;
+  return date.toLocaleDateString("en-US", { month: "short", day: "numeric" });
+}
+function truncate(text2, maxLen) {
+  if (text2.length <= maxLen)
+    return text2;
+  return text2.slice(0, maxLen - 1) + "\u2026";
+}
+function formatTime(iso, includeDate = false) {
+  const date = new Date(iso);
+  const time = date.toLocaleTimeString("en-US", {
+    hour: "numeric",
+    minute: "2-digit"
+  });
+  if (!includeDate)
+    return time;
+  const day = date.toLocaleDateString("en-US", {
+    month: "short",
+    day: "numeric"
+  });
+  return `${day} ${time}`;
+}
+var SECOND = 1000, MINUTE, HOUR, DAY;
+var init_format = __esm(() => {
+  MINUTE = 60 * SECOND;
+  HOUR = 60 * MINUTE;
+  DAY = 24 * HOUR;
+});
+
+// src/contract/context.ts
+function buildSiblingContext(categoryId, categoryPath, currentSessionId) {
+  const siblings = getSessionsByCategory(categoryId).filter((s) => s.id !== currentSessionId);
+  if (siblings.length === 0)
+    return "";
+  const lines = siblings.map((s) => {
+    const ago = s.updatedAt ? formatAgo(s.updatedAt) : "unknown";
+    const summary = s.summary ? ` \u2014 "${s.summary}"` : "";
+    const worktree = s.worktreeBranch ? ` [worktree: ${s.worktreeBranch}]` : "";
+    return `- ${categoryPath}/${s.slug}: ${s.status}${worktree}${summary} (${ago})`;
+  });
+  const guidance = [
+    "",
+    "To inspect any sibling session's full record, run:",
+    "  bertrand log <category>/<slug> --json",
+    "Returns session metadata, stats, conversations, and the full event timeline.",
+    "Reach for this when the user references work done in another session, or you need to verify what was decided or tried elsewhere."
+  ].join(`
+`);
+  return `## Sibling Sessions
+${lines.join(`
+`)}
+${guidance}`;
+}
+var init_context = __esm(() => {
+  init_sessions();
+  init_format();
+});
+
+// src/cli/commands/contract.ts
+var exports_contract = {};
+var init_contract = __esm(() => {
   init_router();
   init_sessions();
-  init_conversations();
-  init_emit();
-  init_transcript();
-  RECAP_RE2 = /<recap>([\s\S]*?)<\/recap>/i;
-  register("recap-thinking", async (args) => {
+  init_categories();
+  init_template2();
+  init_context();
+  register("contract", async (args) => {
     let sessionId = "";
-    let transcriptPath = "";
-    let conversationId = "";
+    let short = false;
     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++;
+      } else if (arg === "--short") {
+        short = true;
       }
     }
-    if (!sessionId || !transcriptPath) {
-      console.error("Usage: bertrand recap-thinking --session-id <id> --transcript-path <path> [--conversation-id <id>]");
+    if (!sessionId) {
+      console.error("Usage: bertrand contract --session-id <id> [--short]");
       process.exit(1);
     }
-    if (!getSession(sessionId))
-      return;
-    const turn = getLatestAssistantTurn(transcriptPath);
-    if (!turn?.text)
+    const session = getSession(sessionId);
+    if (!session)
       return;
-    const match = turn.text.match(RECAP_RE2);
-    const recap = match?.[1]?.trim();
-    if (!recap)
+    const category = getCategory(session.categoryId);
+    const categoryPath = category?.path ?? "";
+    const sessionName = categoryPath ? `${categoryPath}/${session.slug}` : session.slug;
+    if (short) {
+      process.stdout.write(`Reminder \u2014 you are in bertrand session ${sessionName}: end this turn with an AskUserQuestion call (multiSelect:true on every question, plus a "Done for now" option) preceded by a <recap> block.`);
       return;
-    const convoId = conversationId && getConversation(conversationId) ? conversationId : undefined;
-    emitAssistantRecap({
-      sessionId,
-      conversationId: convoId,
-      recap
-    });
+    }
+    const siblingContext = buildSiblingContext(session.categoryId, categoryPath, session.id);
+    process.stdout.write(buildContract(sessionName, siblingContext));
   });
 });
 
@@ -1791,9 +1775,9 @@ var init_notify = __esm(() => {
 });
 
 // src/db/queries/stats.ts
-import { eq as eq4, sql as sql4 } from "drizzle-orm";
+import { eq as eq5, sql as sql4 } from "drizzle-orm";
 function getSessionStats(sessionId) {
-  return getDb().select().from(sessionStats).where(eq4(sessionStats.sessionId, sessionId)).get();
+  return getDb().select().from(sessionStats).where(eq5(sessionStats.sessionId, sessionId)).get();
 }
 function upsertSessionStats(sessionId, data) {
   return getDb().insert(sessionStats).values({
@@ -1935,7 +1919,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 +1926,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,
@@ -1968,7 +1950,7 @@ var init_timing = __esm(() => {
 });
 
 // src/lib/engagement_stats.ts
-import { eq as eq5, sql as sql5 } from "drizzle-orm";
+import { eq as eq6, sql as sql5 } from "drizzle-orm";
 function aggregateToolUsage(sessionId) {
   const counts = {};
   const applied = getEventsByType(sessionId, "tool.applied");
@@ -1981,14 +1963,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,45 +1973,11 @@ 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(*)`,
     discarded: sql5`sum(case when ${conversations.discarded} then 1 else 0 end)`
-  }).from(conversations).where(eq5(conversations.sessionId, sessionId)).get();
+  }).from(conversations).where(eq6(conversations.sessionId, sessionId)).get();
   return {
     total: row?.total ?? 0,
     discarded: row?.discarded ?? 0
@@ -2046,8 +1986,6 @@ function discardRate(sessionId) {
 function computeEngagementStats(sessionId) {
   return {
     toolUsage: aggregateToolUsage(sessionId),
-    contextTokens: contextTokenStats(sessionId),
-    permissionDenials: permissionDenialCount(sessionId),
     discardRate: discardRate(sessionId)
   };
 }
@@ -2291,7 +2229,7 @@ var PORT, listSessions = (_params, url) => {
 }, getActiveProjectMeta = () => {
   const active = resolveActiveProject();
   return { slug: active.slug, name: active.name };
-}, routes, ARCHIVE_ERROR, DASHBOARD_DIR;
+}, listWorktreeSessions = () => getAllSessions({ excludeArchived: true }).filter(({ session }) => session.worktreePath != null), routes, ARCHIVE_ERROR, DASHBOARD_DIR;
 var init_server = __esm(() => {
   init_sessions();
   init_events();
@@ -2306,6 +2244,7 @@ var init_server = __esm(() => {
   routes = [
     [/^\/api\/sessions$/, listSessions],
     [/^\/api\/sessions\/(?<id>[^/]+)$/, getSessionById],
+    [/^\/api\/worktrees$/, listWorktreeSessions],
     [/^\/api\/events\/(?<sessionId>[^/]+)$/, listEvents],
     [/^\/api\/stats$/, listAllStats],
     [/^\/api\/stats\/(?<sessionId>[^/]+)$/, getStatsBySession],
@@ -2364,7 +2303,7 @@ function cleanupSnapshot() {
   }
 }
 var SIDECAR_SUFFIXES;
-var init_snapshot2 = __esm(() => {
+var init_snapshot = __esm(() => {
   init_resolve();
   SIDECAR_SUFFIXES = ["", "-wal", "-shm"];
 });
@@ -2563,7 +2502,7 @@ var init_engine = __esm(() => {
   init_resolve();
   init_lsof();
   init_config();
-  init_snapshot2();
+  init_snapshot();
   init_crypto();
 });
 
@@ -2721,60 +2660,6 @@ var init_bootstrap = __esm(() => {
   init_config2();
 });
 
-// src/lib/format.ts
-function formatDuration(ms) {
-  if (ms < MINUTE)
-    return `${Math.round(ms / SECOND)}s`;
-  const days = Math.floor(ms / DAY);
-  const hours = Math.floor(ms % DAY / HOUR);
-  const minutes = Math.floor(ms % HOUR / MINUTE);
-  if (days > 0)
-    return hours > 0 ? `${days}d ${hours}h` : `${days}d`;
-  if (hours > 0)
-    return minutes > 0 ? `${hours}h ${minutes}m` : `${hours}h`;
-  return `${minutes}m`;
-}
-function formatAgo(isoOrDate) {
-  const date = typeof isoOrDate === "string" ? new Date(isoOrDate) : isoOrDate;
-  const ms = Date.now() - date.getTime();
-  if (ms < MINUTE)
-    return "just now";
-  if (ms < HOUR)
-    return `${Math.floor(ms / MINUTE)}m ago`;
-  if (ms < DAY)
-    return `${Math.floor(ms / HOUR)}h ago`;
-  if (ms < 2 * DAY)
-    return "yesterday";
-  if (ms < 7 * DAY)
-    return `${Math.floor(ms / DAY)}d ago`;
-  return date.toLocaleDateString("en-US", { month: "short", day: "numeric" });
-}
-function truncate(text2, maxLen) {
-  if (text2.length <= maxLen)
-    return text2;
-  return text2.slice(0, maxLen - 1) + "\u2026";
-}
-function formatTime(iso, includeDate = false) {
-  const date = new Date(iso);
-  const time = date.toLocaleTimeString("en-US", {
-    hour: "numeric",
-    minute: "2-digit"
-  });
-  if (!includeDate)
-    return time;
-  const day = date.toLocaleDateString("en-US", {
-    month: "short",
-    day: "numeric"
-  });
-  return `${day} ${time}`;
-}
-var SECOND = 1000, MINUTE, HOUR, DAY;
-var init_format = __esm(() => {
-  MINUTE = 60 * SECOND;
-  HOUR = 60 * MINUTE;
-  DAY = 24 * HOUR;
-});
-
 // src/cli/commands/sync.ts
 var exports_sync = {};
 import { hostname as hostname2 } from "os";
@@ -3070,80 +2955,33 @@ var init_sync = __esm(() => {
         return;
       case "pull":
         await runPull(rest);
-        return;
-      case "status":
-        await runStatus();
-        return;
-      case "onboard":
-        await runOnboard();
-        return;
-      case "invite":
-        runInvite();
-        return;
-      case "enable":
-        runEnable();
-        return;
-      case "disable":
-        runDisable();
-        return;
-      case undefined:
-      case "--help":
-      case "-h":
-        printUsage2();
-        return;
-      default:
-        console.error(`Unknown subcommand: ${sub}`);
-        printUsage2();
-        process.exit(1);
-    }
-  });
-});
-
-// src/db/queries/categories.ts
-import { eq as eq6, like, or, isNull } from "drizzle-orm";
-function createCategory(opts) {
-  const db = getDb();
-  const id = createId();
-  let path = opts.slug;
-  let depth = 0;
-  if (opts.parentId) {
-    const parent = db.select().from(categories).where(eq6(categories.id, opts.parentId)).get();
-    if (!parent)
-      throw new Error(`Parent category ${opts.parentId} not found`);
-    path = `${parent.path}/${opts.slug}`;
-    depth = parent.depth + 1;
-  }
-  return db.insert(categories).values({ id, slug: opts.slug, name: opts.name, parentId: opts.parentId, path, depth }).returning().get();
-}
-function getCategory(id) {
-  return getDb().select().from(categories).where(eq6(categories.id, id)).get();
-}
-function getCategoryByPath(path) {
-  return getDb().select().from(categories).where(eq6(categories.path, path)).get();
-}
-function getOrCreateCategoryPath(path) {
-  const existing = getCategoryByPath(path);
-  if (existing)
-    return existing.id;
-  const segments = path.split("/");
-  let parentId;
-  for (let i = 0;i < segments.length; i++) {
-    const partialPath = segments.slice(0, i + 1).join("/");
-    const category = getCategoryByPath(partialPath);
-    if (category) {
-      parentId = category.id;
-    } else {
-      const slug = segments[i];
-      const created = createCategory({ slug, name: slug, parentId });
-      parentId = created.id;
+        return;
+      case "status":
+        await runStatus();
+        return;
+      case "onboard":
+        await runOnboard();
+        return;
+      case "invite":
+        runInvite();
+        return;
+      case "enable":
+        runEnable();
+        return;
+      case "disable":
+        runDisable();
+        return;
+      case undefined:
+      case "--help":
+      case "-h":
+        printUsage2();
+        return;
+      default:
+        console.error(`Unknown subcommand: ${sub}`);
+        printUsage2();
+        process.exit(1);
     }
-  }
-  return parentId;
-}
-var init_categories = __esm(() => {
-  init_client();
-  init_schema();
-  init_id();
+  });
 });
 
 // src/db/queries/labels.ts
@@ -3169,61 +3007,6 @@ var init_labels = __esm(() => {
   init_id();
 });
 
-// src/contract/template.md
-var template_default = `You are running inside bertrand, session: {sessionName}. Follow these rules strictly:
-
-After every response, you MUST call AskUserQuestion. This is a continuous loop \u2014 every turn ends with AskUserQuestion. Always include an option labeled exactly \`Done for now\` (this exact wording is required \u2014 the session-exit hook greps for it). The description for "Done for now" must be a 1-2 sentence summary of what was accomplished so far. Describe outcomes (what was built, fixed, decided), not process.
-
-If the user's most recent answer to AskUserQuestion was "Done for now" (or contains it), this turn is the FINAL turn. Respond briefly to acknowledge and do NOT call AskUserQuestion again \u2014 the loop is over.
-
-Before each AskUserQuestion call, emit a \`<recap>...</recap>\` block in your text output. Use markdown \u2014 a short bullet list is usually the most scannable shape; a single short paragraph is fine when the turn was one cohesive thing. Keep it concise. The recap covers what happened since the previous AskUserQuestion (or session start) \u2014 what you found, decided, or did. Write the gist for someone reading the session timeline, not a process log. The dashboard renders these between AskUserQuestion events; do not use this tag for any other purpose.
-`;
-var init_template = () => {};
-
-// src/contract/template.ts
-function buildContract(sessionName, ...contextLayers) {
-  const base = template_default.replace("{sessionName}", sessionName);
-  const layers = contextLayers.map((c) => c.trim()).filter((c) => c.length > 0);
-  if (layers.length === 0)
-    return base;
-  return base + `
-
-` + layers.join(`
-
-`);
-}
-var init_template2 = __esm(() => {
-  init_template();
-});
-
-// src/contract/context.ts
-function buildSiblingContext(categoryId, categoryPath, currentSessionId) {
-  const siblings = getSessionsByCategory(categoryId).filter((s) => s.id !== currentSessionId);
-  if (siblings.length === 0)
-    return "";
-  const lines = siblings.map((s) => {
-    const ago = s.updatedAt ? formatAgo(s.updatedAt) : "unknown";
-    const summary = s.summary ? ` \u2014 "${s.summary}"` : "";
-    return `- ${categoryPath}/${s.slug}: ${s.status}${summary} (${ago})`;
-  });
-  const guidance = [
-    "",
-    "To inspect any sibling session's full record, run:",
-    "  bertrand log <category>/<slug> --json",
-    "Returns session metadata, stats, conversations, and the full event timeline.",
-    "Reach for this when the user references work done in another session, or you need to verify what was decided or tried elsewhere."
-  ].join(`
-`);
-  return `## Sibling Sessions
-${lines.join(`
-`)}
-${guidance}`;
-}
-var init_context = __esm(() => {
-  init_sessions();
-  init_format();
-});
-
 // src/engine/process.ts
 import { spawn as spawn2 } from "child_process";
 function launchClaude(opts) {
@@ -3281,73 +3064,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";
@@ -3434,6 +3150,44 @@ var init_server_lifecycle = __esm(() => {
   deps = defaultDeps;
 });
 
+// src/hooks/runtime.ts
+import { readdirSync as readdirSync2, rmSync, statSync as statSync4 } from "fs";
+import { join as join10 } from "path";
+function rmMarker(name) {
+  rmSync(join10(runtimeDir, name), { force: true });
+}
+function pruneSessionMarkers(sessionId, conversationId) {
+  rmMarker(`done-${sessionId}`);
+  rmMarker(`auq-nudge-${sessionId}`);
+  rmMarker(`working-${sessionId}`);
+  rmMarker(`worktree-${sessionId}`);
+  if (conversationId)
+    rmMarker(`${CONTRACT_MARKER_PREFIX}${conversationId}`);
+}
+function pruneStaleContractMarkers(maxAgeMs = STALE_MS) {
+  let entries;
+  try {
+    entries = readdirSync2(runtimeDir);
+  } catch {
+    return;
+  }
+  const cutoff = Date.now() - maxAgeMs;
+  for (const name of entries) {
+    if (!name.startsWith(CONTRACT_MARKER_PREFIX))
+      continue;
+    try {
+      if (statSync4(join10(runtimeDir, name)).mtimeMs < cutoff)
+        rmMarker(name);
+    } catch {}
+  }
+}
+var CONTRACT_MARKER_PREFIX = "contract-sent-", STALE_MS, runtimeDir;
+var init_runtime = __esm(() => {
+  init_paths();
+  STALE_MS = 24 * 60 * 60 * 1000;
+  runtimeDir = paths.runtime;
+});
+
 // src/engine/session.ts
 import { randomUUID } from "crypto";
 function forceFinalizeLive() {
@@ -3470,6 +3224,7 @@ function installExitHandlers() {
   process.on("SIGHUP", onSignal);
 }
 async function launch(opts) {
+  pruneStaleContractMarkers();
   const existingCategory = getCategoryByPath(opts.categoryPath);
   if (existingCategory) {
     const existing = getSessionByCategorySlug(existingCategory.id, opts.slug);
@@ -3496,24 +3251,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);
@@ -3528,6 +3270,7 @@ async function launch(opts) {
   return session.id;
 }
 async function resume(opts) {
+  pruneStaleContractMarkers();
   const session = getSession(opts.sessionId);
   if (!session)
     throw new Error(`Session not found: ${opts.sessionId}`);
@@ -3538,19 +3281,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 +3322,7 @@ function finalizeSession(sessionId, conversationId, exitCode) {
   });
   if (liveSession?.sessionId === sessionId)
     liveSession = null;
-  emitSessionEnded({ sessionId });
+  pruneSessionMarkers(sessionId, safeConversationId);
   computeAndPersist(sessionId);
   stopServerIfIdle();
   triggerBackgroundPush();
@@ -3602,21 +3337,21 @@ var init_session = __esm(() => {
   init_template2();
   init_context();
   init_process();
-  init_spawn_context();
   init_timing();
   init_server_lifecycle();
   init_trigger();
   init_transcript();
+  init_runtime();
 });
 
 // src/tui/app.tsx
 import { spawn as spawn4 } from "child_process";
 import { existsSync as existsSync8, readFileSync as readFileSync8, unlinkSync as unlinkSync3 } from "fs";
 import { tmpdir } from "os";
-import { join as join10 } from "path";
+import { join as join11 } from "path";
 import { randomUUID as randomUUID2 } from "crypto";
 async function runScreen(screen, ...args) {
-  const tmpFile = join10(tmpdir(), `bertrand-tui-${randomUUID2()}.json`);
+  const tmpFile = join11(tmpdir(), `bertrand-tui-${randomUUID2()}.json`);
   if (process.env.BERTRAND_DEBUG_TUI) {
     try {
       const { appendFileSync } = await import("fs");
@@ -3626,7 +3361,7 @@ async function runScreen(screen, ...args) {
   }
   const child = spawn4("bun", ["run", SCREEN_ENTRY, screen, tmpFile, ...args], {
     stdio: "inherit",
-    env: process.env
+    env: { ...process.env, BERTRAND_PROJECT: resolveActiveProject().slug }
   });
   const noopSignal = () => {};
   process.on("SIGINT", noopSignal);
@@ -3773,35 +3508,11 @@ var init_app = __esm(() => {
   init_create();
   init_resolve();
   SCREEN_ENTRY = (() => {
-    const built = join10(import.meta.dir, "run-screen.js");
-    return existsSync8(built) ? built : join10(import.meta.dir, "run-screen.tsx");
+    const built = join11(import.meta.dir, "run-screen.js");
+    return existsSync8(built) ? built : join11(import.meta.dir, "run-screen.tsx");
   })();
 });
 
-// src/lib/parse-session-name.ts
-function parseSessionName(input) {
-  const trimmed = input.trim().replace(/^\/+|\/+$/g, "");
-  if (!trimmed) {
-    throw new Error("Session name cannot be empty");
-  }
-  const segments = trimmed.split("/").filter(Boolean);
-  if (segments.length < 2) {
-    throw new Error(`Session name must include at least one category: "category/session" (got "${trimmed}")`);
-  }
-  for (const segment of segments) {
-    if (!SEGMENT_PATTERN.test(segment)) {
-      throw new Error(`Invalid segment "${segment}": must start with alphanumeric and contain only letters, digits, dots, underscores, or dashes`);
-    }
-  }
-  const categoryPath = segments[0];
-  const slug = segments.slice(1).join("/");
-  return { categoryPath, slug };
-}
-var SEGMENT_PATTERN;
-var init_parse_session_name = __esm(() => {
-  SEGMENT_PATTERN = /^[a-z0-9][a-z0-9._-]*$/i;
-});
-
 // src/engine/recovery.ts
 function isProcessAlive2(pid) {
   try {
@@ -3820,10 +3531,6 @@ function recoverStaleSessions() {
         status: "paused",
         pid: null
       });
-      emitSessionPausedByRecovery({
-        sessionId: session.id,
-        stalePid: session.pid
-      });
       recovered++;
     }
   }
@@ -3831,7 +3538,6 @@ function recoverStaleSessions() {
 }
 var init_recovery = __esm(() => {
   init_sessions();
-  init_emit();
 });
 
 // src/cli/commands/launch.ts
@@ -3871,7 +3577,7 @@ var init_launch = __esm(() => {
 function quietHelper(bin) {
   return `bq() { ${bin} "$@" 2>/dev/null || true; }`;
 }
-function waitingScript(bin, runtimeDir) {
+function waitingScript(bin, runtimeDir2) {
   return `#!/usr/bin/env bash
 # Hook: PreToolUse AskUserQuestion \u2192 enforce multiSelect, mark session as waiting
 ${quietHelper(bin)}
@@ -3896,18 +3602,15 @@ question="$(printf '%s' "$input" | grep -o '"question":"[^"]*"' | head -1 | cut
 [ -z "$question" ] && question="Waiting for input"
 
 # Clear working debounce marker so next resume\u2192working transition fires
-rm -f "${runtimeDir}/working-$sid"
+rm -f "${runtimeDir2}/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
 
@@ -3917,7 +3620,7 @@ bq notify bertrand "$question" &
 wait
 `;
 }
-function answeredScript(bin, _runtimeDir) {
+function answeredScript(bin, runtimeDir2) {
   return `#!/usr/bin/env bash
 # Hook: PostToolUse AskUserQuestion \u2192 mark session as active
 #
@@ -3951,9 +3654,18 @@ bq update --session-id "$sid" --event session.answered --meta "$meta"
 
 bq badge --clear &
 
+# The loop is healthy \u2014 the agent ended its turn on AskUserQuestion and the
+# user answered. Reset the Stop-hook nudge counter so its cap applies per
+# run of consecutive contract violations, not cumulatively across the session.
+rm -f "${runtimeDir2}/auq-nudge-$sid"
+
 # 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.
 if printf '%s' "$done_check" | grep -q "Done for now"; then
+  # Tell on-done.sh this Stop is a legitimate exit, not a dropped AUQ call \u2014
+  # so it pauses normally instead of forcing the loop to continue.
+  touch "${runtimeDir2}/done-$sid"
+
   # Promote the picked Done-for-now option's description into a session.recap
   # event so the timeline has a dedicated end-of-session summary row. Bertrand
   # forces session exit before Claude can write a closing message, so this
@@ -3971,35 +3683,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) {
+function permissionWaitScript(bin, runtimeDir2) {
   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,18 +3694,10 @@ input="$(cat)"
 ${EXTRACT_TOOL}
 [ "$tool" = "AskUserQuestion" ] && exit 0
 
-# Write marker so PostToolUse knows this was a real permission prompt (not auto-approved)
-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}')"
+# 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 "${runtimeDir2}/perm-pending-$sid"
 
 # Badge + notify in background
 bq badge bell-exclamation --color '#ff6b35' --priority 25 --beep &
@@ -4027,21 +3705,19 @@ bq notify bertrand "Needs permission: $tool" &
 wait
 `;
 }
-function permissionDoneScript(bin, runtimeDir) {
+function permissionDoneScript(bin, runtimeDir2) {
   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
@@ -4049,10 +3725,11 @@ sid="\${BERTRAND_SESSION:-}"
 input="$(cat)"
 ${EXTRACT_TOOL}
 
-# Don't double-log: AskUserQuestion has its own waiting/answered events
-[ "$tool" = "AskUserQuestion" ] && exit 0
+# Don't double-log: AskUserQuestion has its own waiting/answered events, and
+# EnterWorktree/ExitWorktree have their own worktree.entered/exited hooks.
+case "$tool" in AskUserQuestion|EnterWorktree|ExitWorktree) exit 0 ;; esac
 
-marker="${runtimeDir}/perm-pending-$sid"
+marker="${runtimeDir2}/perm-pending-$sid"
 had_marker=0
 if [ -f "$marker" ]; then
   had_marker=1
@@ -4100,20 +3777,23 @@ 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
 `;
 }
-function userPromptScript(bin, _runtimeDir) {
+function userPromptScript(bin, runtimeDir2) {
   return `#!/usr/bin/env bash
-# Hook: UserPromptSubmit \u2192 record user free-text prompt
+# Hook: UserPromptSubmit \u2192 record user prompt + re-inject the session contract.
+#
+# The contract normally arrives via --append-system-prompt on bertrand's own
+# claude spawn, which reaches only that one process. Sessions that inherit the
+# BERTRAND_* env vars without going through launchClaude (background jobs,
+# nested \`claude\`, the Warp plugin's own launcher) never receive it. Re-
+# injecting here \u2014 through the durable env/hook channel \u2014 closes that gap.
+# Full contract on the first prompt of each conversation, a one-line reminder
+# thereafter, to keep the per-turn token cost low.
 ${quietHelper(bin)}
 sid="\${BERTRAND_SESSION:-}"
 [ -z "$sid" ] && exit 0
@@ -4121,34 +3801,102 @@ sid="\${BERTRAND_SESSION:-}"
 input="$(cat)"
 cid="\${BERTRAND_CLAUDE_ID:-}"
 
+# Record the prompt event. Stdout muted so only the context JSON below reaches
+# the hook's stdout (UserPromptSubmit parses stdout as a hook decision).
 meta="$(printf '%s' "$input" | jq --arg cid "$cid" '{prompt: (.prompt // ""), claude_id: $cid}')"
-[ -z "$meta" ] && exit 0
+[ -n "$meta" ] && bq update --session-id "$sid" --event user.prompt --meta "$meta" >/dev/null
+
+# Re-deliver the contract as additional context.
+marker="${runtimeDir2}/contract-sent-\${cid:-$sid}"
+if [ -f "$marker" ]; then
+  contract="$(bq contract --session-id "$sid" --short)"
+else
+  contract="$(bq contract --session-id "$sid")"
+  : > "$marker"
+fi
 
-bq update --session-id "$sid" --event user.prompt --meta "$meta"
+[ -n "$contract" ] && jq -n --arg c "$contract"   '{hookSpecificOutput: {hookEventName: "UserPromptSubmit", additionalContext: $c}}'
 `;
 }
-function doneScript(bin, _runtimeDir) {
+function doneScript(bin, runtimeDir2) {
   return `#!/usr/bin/env bash
-# Hook: Stop \u2192 mark session as paused
+# Hook: Stop \u2192 enforce AUQ loop, else flip session status to paused.
 ${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}')"
 
-# 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.
+done_marker="${runtimeDir2}/done-$sid"
+nudge_marker="${runtimeDir2}/auq-nudge-$sid"
+
+# Capture the assistant turn either way. Stdout is muted so it can never corrupt
+# a decision-JSON payload. Dedups against the most-recent AskUQ-time capture, so
+# a Done-for-now exit lands zero new events; a dropped-AUQ Stop records the
+# stray turn; intermediate Stops with fresh output land normally.
 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" &
+  bq assistant-message --session-id "$sid" --transcript-path "$tpath" --conversation-id "$cid" >/dev/null &
+fi
+
+if [ ! -f "$done_marker" ]; then
+  # Not a Done-for-now exit \u2192 the turn ended without AskUserQuestion. Force the
+  # loop to continue, up to a small cap so a context where AUQ is genuinely
+  # unavailable can't wedge the session in an endless block/stop cycle. The
+  # counter is reset on every answered AUQ (on-answered.sh), so the cap bounds
+  # consecutive violations, not the whole session.
+  count="$(cat "$nudge_marker" 2>/dev/null)"
+  case "$count" in ''|*[!0-9]*) count=0 ;; esac
+  if [ "$count" -lt 3 ]; then
+    printf '%s' "$((count + 1))" > "$nudge_marker"
+    reason='This is a bertrand session: every turn must end with an AskUserQuestion call (multiSelect:true on every question) that includes a "Done for now" option, preceded by a <recap> block. You ended a turn without calling AskUserQuestion. Call it now to continue the loop, or \u2014 if the work is finished \u2014 present it so the user can pick "Done for now" to end the session.'
+    wait
+    jq -n --arg r "$reason" '{decision:"block", reason:$r}'
+    exit 0
+  fi
+  # Cap reached \u2014 stop nudging and let the session pause normally.
 fi
 
+# Terminal path: legitimate Done-for-now exit, or nudge cap exhausted.
+rm -f "$done_marker" "$nudge_marker"
+bq update --session-id "$sid" --event session.paused
 bq badge check --color '#58c142' --priority 10
+wait
+`;
+}
+function enterWorktreeScript(bin, runtimeDir2) {
+  return `#!/usr/bin/env bash
+# Hook: PostToolUse EnterWorktree \u2192 record worktree path + branch on the session.
+${quietHelper(bin)}
+sid="\${BERTRAND_SESSION:-}"
+[ -z "$sid" ] && exit 0
+
+input="$(cat)"
+cid="\${BERTRAND_CLAUDE_ID:-}"
+
+path="$(printf '%s' "$input" | jq -r '.cwd // empty' 2>/dev/null)"
+[ -z "$path" ] && exit 0
+branch="$(git -C "$path" rev-parse --abbrev-ref HEAD 2>/dev/null)"
+
+printf '%s' "$path" > "${runtimeDir2}/worktree-$sid"
+
+bq update --session-id "$sid" --event worktree.entered --meta "$(jq -n --arg p "$path" --arg b "$branch" --arg cid "$cid" '{path:$p, branch:$b, claude_id:$cid}')"
+`;
+}
+function exitWorktreeScript(bin, runtimeDir2) {
+  return `#!/usr/bin/env bash
+# Hook: PostToolUse ExitWorktree \u2192 clear the session's worktree state.
+${quietHelper(bin)}
+sid="\${BERTRAND_SESSION:-}"
+[ -z "$sid" ] && exit 0
+
+cid="\${BERTRAND_CLAUDE_ID:-}"
+marker="${runtimeDir2}/worktree-$sid"
+path="$(cat "$marker" 2>/dev/null)"
+rm -f "$marker"
+
+bq update --session-id "$sid" --event worktree.exited --meta "$(jq -n --arg p "$path" --arg cid "$cid" '{path:$p, claude_id:$cid}')"
 `;
 }
 var EXTRACT_TOOL = `tool="$(printf '%s' "$input" | grep -o '"tool_name":"[^"]*"' | cut -d'"' -f4)"`, HOOK_SCRIPTS;
@@ -4156,22 +3904,23 @@ 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,
-    "on-done.sh": doneScript
+    "on-done.sh": doneScript,
+    "on-enter-worktree.sh": enterWorktreeScript,
+    "on-exit-worktree.sh": exitWorktreeScript
   };
 });
 
 // src/hooks/install.ts
 import { mkdirSync as mkdirSync7, writeFileSync as writeFileSync5, chmodSync as chmodSync2 } from "fs";
-import { join as join11 } from "path";
+import { join as join12 } from "path";
 function installHookScripts(bin) {
   mkdirSync7(paths.hooks, { recursive: true });
   mkdirSync7(paths.runtime, { recursive: true });
   for (const [filename, scriptFn] of Object.entries(HOOK_SCRIPTS)) {
-    const filePath = join11(paths.hooks, filename);
+    const filePath = join12(paths.hooks, filename);
     writeFileSync5(filePath, scriptFn(bin, paths.runtime));
     chmodSync2(filePath, 493);
   }
@@ -4184,7 +3933,7 @@ var init_install = __esm(() => {
 
 // src/hooks/settings.ts
 import { readFileSync as readFileSync9, writeFileSync as writeFileSync6, mkdirSync as mkdirSync8 } from "fs";
-import { join as join12, dirname as dirname4 } from "path";
+import { join as join13, dirname as dirname4 } from "path";
 import { homedir as homedir3 } from "os";
 function isBertrandGroup(group) {
   return group.hooks?.some((h) => h.command?.includes(".bertrand/hooks/")) ?? false;
@@ -4209,16 +3958,12 @@ function installHookSettings() {
 var SETTINGS_PATH, BERTRAND_HOOKS;
 var init_settings = __esm(() => {
   init_paths();
-  SETTINGS_PATH = join12(homedir3(), ".claude", "settings.json");
+  SETTINGS_PATH = join13(homedir3(), ".claude", "settings.json");
   BERTRAND_HOOKS = {
     PreToolUse: [
       {
         matcher: "AskUserQuestion",
         hooks: [{ type: "command", command: `${paths.hooks}/on-waiting.sh` }]
-      },
-      {
-        matcher: "",
-        hooks: [{ type: "command", command: `${paths.hooks}/on-active.sh` }]
       }
     ],
     PostToolUse: [
@@ -4226,6 +3971,14 @@ var init_settings = __esm(() => {
         matcher: "AskUserQuestion",
         hooks: [{ type: "command", command: `${paths.hooks}/on-answered.sh` }]
       },
+      {
+        matcher: "EnterWorktree",
+        hooks: [{ type: "command", command: `${paths.hooks}/on-enter-worktree.sh` }]
+      },
+      {
+        matcher: "ExitWorktree",
+        hooks: [{ type: "command", command: `${paths.hooks}/on-exit-worktree.sh` }]
+      },
       {
         matcher: "",
         hooks: [{ type: "command", command: `${paths.hooks}/on-permission-done.sh` }]
@@ -4254,7 +4007,7 @@ var init_settings = __esm(() => {
 
 // src/lib/completions.ts
 import { writeFileSync as writeFileSync7, mkdirSync as mkdirSync9 } from "fs";
-import { join as join13 } from "path";
+import { join as join14 } from "path";
 function bashCompletion() {
   return `# bertrand bash completion
 _bertrand() {
@@ -4284,11 +4037,11 @@ function fishCompletion() {
 `;
 }
 function generateCompletions() {
-  const dir = join13(paths.root, "completions");
+  const dir = join14(paths.root, "completions");
   mkdirSync9(dir, { recursive: true });
-  writeFileSync7(join13(dir, "bertrand.bash"), bashCompletion());
-  writeFileSync7(join13(dir, "_bertrand"), zshCompletion());
-  writeFileSync7(join13(dir, "bertrand.fish"), fishCompletion());
+  writeFileSync7(join14(dir, "bertrand.bash"), bashCompletion());
+  writeFileSync7(join14(dir, "_bertrand"), zshCompletion());
+  writeFileSync7(join14(dir, "bertrand.fish"), fishCompletion());
   console.log(`Shell completions written to ${dir}`);
   console.log("  Add to your shell config:");
   console.log(`    bash: source ${dir}/bertrand.bash`);
@@ -4319,7 +4072,7 @@ var init_completions = __esm(() => {
 var exports_init = {};
 import { mkdirSync as mkdirSync10, writeFileSync as writeFileSync8, chmodSync as chmodSync3 } from "fs";
 import { execSync as execSync2 } from "child_process";
-import { join as join14 } from "path";
+import { join as join15 } from "path";
 function detectTerminal() {
   try {
     execSync2("which wsh", { stdio: "ignore" });
@@ -4334,8 +4087,8 @@ function resolveBin() {
     return onPath;
   const entry = process.argv[1];
   if (entry && SOURCE_ENTRY.test(entry)) {
-    const launcherDir = join14(paths.root, "bin");
-    const launcher = join14(launcherDir, "bertrand-dev");
+    const launcherDir = join15(paths.root, "bin");
+    const launcher = join15(launcherDir, "bertrand-dev");
     mkdirSync10(launcherDir, { recursive: true });
     writeFileSync8(launcher, `#!/usr/bin/env bash
 exec ${process.execPath} ${JSON.stringify(entry)} "$@"
@@ -4542,33 +4295,13 @@ 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 ?? "";
+    case "worktree.entered":
+    case "worktree.exited":
+      return meta.branch ?? meta.path ?? "";
     default:
       return "";
   }
@@ -4596,30 +4329,19 @@ 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 },
-    "assistant.recap": { label: "recap", category: "interaction", color: 39, detailColor: 245, skip: false }
+    "assistant.recap": { label: "recap", category: "interaction", color: 39, detailColor: 245, skip: false },
+    "worktree.entered": { label: "worktree entered", category: "lifecycle", color: 78, detailColor: 245, skip: false },
+    "worktree.exited": { label: "worktree exited", category: "lifecycle", color: 245, detailColor: 245, skip: false }
   };
   DEFAULT_INFO = {
     label: "unknown",
@@ -4676,8 +4398,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 +4459,6 @@ var ROLLUP_EVENTS;
 var init_compact = __esm(() => {
   init_catalog();
   ROLLUP_EVENTS = new Set([
-    "permission.request",
-    "permission.resolve",
     "tool.used"
   ]);
 });
@@ -4930,13 +4648,11 @@ var init_log = __esm(() => {
   init_router();
   init_sessions();
   init_events();
-  init_categories();
   init_stats();
   init_conversations();
   init_catalog();
   init_compact();
   init_timing();
-  init_parse_session_name();
   init_format();
   init_resolve();
   init_cli_flag();
@@ -4956,18 +4672,12 @@ var init_log = __esm(() => {
       showAllSessions();
       return;
     }
-    const { categoryPath, slug } = parseSessionName(target);
-    const category = getCategoryByPath(categoryPath);
-    if (!category) {
-      console.error(`Category not found: ${categoryPath}`);
-      process.exit(1);
-    }
-    const session = getSessionByCategorySlug(category.id, slug);
-    if (!session) {
+    const resolved = resolveSessionByName(target);
+    if (!resolved) {
       console.error(`Session not found: ${target}`);
       process.exit(1);
     }
-    showSessionLog(session, `${categoryPath}/${slug}`, isJson);
+    showSessionLog(resolved.session, `${resolved.categoryPath}/${resolved.slug}`, isJson);
   });
 });
 
@@ -4982,14 +4692,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 +4704,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 +4724,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 +4742,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 +4756,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 +4787,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(() => {
@@ -5095,7 +4797,6 @@ var init_stats2 = __esm(() => {
   init_events();
   init_timing();
   init_format();
-  init_parse_session_name();
   ACTIVE_STATUSES2 = ["active", "waiting"];
   register("stats", async (args) => {
     const isJson = args.includes("--json");
@@ -5108,29 +4809,23 @@ var init_stats2 = __esm(() => {
       return;
     }
     if (target.endsWith("/")) {
-      const categoryPath2 = target.replace(/\/+$/, "");
-      const category2 = getCategoryByPath(categoryPath2);
-      if (!category2) {
-        console.error(`Category not found: ${categoryPath2}`);
+      const categoryPath = target.replace(/\/+$/, "");
+      const category = getCategoryByPath(categoryPath);
+      if (!category) {
+        console.error(`Category not found: ${categoryPath}`);
         process.exit(1);
       }
-      const categorySessions = getSessionsByCategory(category2.id);
+      const categorySessions = getSessionsByCategory(category.id);
       const metrics = categorySessions.map((s) => getMetrics(s.id, s.slug, s.status));
-      renderCategory(metrics, categoryPath2, isJson);
+      renderCategory(metrics, categoryPath, isJson);
       return;
     }
-    const { categoryPath, slug } = parseSessionName(target);
-    const category = getCategoryByPath(categoryPath);
-    if (!category) {
-      console.error(`Category not found: ${categoryPath}`);
-      process.exit(1);
-    }
-    const session = getSessionByCategorySlug(category.id, slug);
-    if (!session) {
+    const resolved = resolveSessionByName(target);
+    if (!resolved) {
       console.error(`Session not found: ${target}`);
       process.exit(1);
     }
-    const m = getMetrics(session.id, `${categoryPath}/${slug}`, session.status);
+    const m = getMetrics(resolved.session.id, `${resolved.categoryPath}/${resolved.slug}`, resolved.session.status);
     renderSession(m, isJson);
   });
 });
@@ -5156,24 +4851,16 @@ var init_backfill_stats = __esm(() => {
 // src/cli/commands/archive.ts
 var exports_archive = {};
 function resolveSession(name) {
-  const { categoryPath, slug } = parseSessionName(name);
-  const category = getCategoryByPath(categoryPath);
-  if (!category) {
-    console.error(`Category not found: ${categoryPath}`);
-    process.exit(1);
-  }
-  const session = getSessionByCategorySlug(category.id, slug);
-  if (!session) {
+  const resolved = resolveSessionByName(name);
+  if (!resolved) {
     console.error(`Session not found: ${name}`);
     process.exit(1);
   }
-  return { session, categoryPath };
+  return { session: resolved.session, categoryPath: resolved.categoryPath };
 }
 var init_archive = __esm(() => {
   init_router();
   init_sessions();
-  init_categories();
-  init_parse_session_name();
   init_session_archive();
   register("archive", async (args) => {
     const isUndo = args.includes("--undo");
@@ -5245,7 +4932,7 @@ __export(exports_project, {
   createSubcommand: () => createSubcommand,
   _UsageError: () => _UsageError
 });
-import { existsSync as existsSync9, rmSync } from "fs";
+import { existsSync as existsSync9, rmSync as rmSync2 } from "fs";
 function countSessions(slug) {
   const dbFile = projectPaths(slug).db;
   if (!existsSync9(dbFile))
@@ -5425,7 +5112,7 @@ function removeSubcommand(args) {
   removeProject(slug);
   invalidateDbCache(slug);
   if (purge) {
-    rmSync(projectPaths(slug).root, { recursive: true, force: true });
+    rmSync2(projectPaths(slug).root, { recursive: true, force: true });
   }
   console.log(`Removed project "${slug}"${purge ? " (directory purged)" : " (directory left on disk; pass --purge to delete)"}.`);
 }
@@ -5534,9 +5221,8 @@ 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)),
+  contract: () => Promise.resolve().then(() => (init_contract(), exports_contract)),
   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 +5240,8 @@ 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_contract(), exports_contract)),
     Promise.resolve().then(() => (init_serve(), exports_serve)),
     Promise.resolve().then(() => (init_badge(), exports_badge)),
     Promise.resolve().then(() => (init_notify(), exports_notify)),