bertrand 0.23.0 → 0.25.0

package/dist/bertrand.js

@@ -504,6 +504,48 @@ var init_trigger = __esm(() => {
   init_config2();
 });
 
+// src/cli/help.ts
+function helpText(opts = {}) {
+  const header = opts.agent ? AGENT_HEADER : HUMAN_HEADER;
+  return `${header}
+
+${COMMAND_REFERENCE}`;
+}
+var COMMAND_REFERENCE = `Usage:
+  bertrand                     Launch the interactive TUI; start or resume a session.
+  bertrand init                First-time setup: install hooks, settings, completions.
+
+Inspect sessions (read-only):
+  bertrand list [--json]       List sessions in the active project with status + activity.
+  bertrand log <session> [--json]
+                               Full record for one session: metadata, stats,
+                               conversations, and the complete event timeline.
+                               <session> is "<category>/<slug>" (see \`list\`). Use this
+                               to see what was decided or tried in another session.
+  bertrand stats <session> [--json]
+                               Aggregate statistics (durations, interactions, diff metrics).
+
+Manage sessions & projects:
+  bertrand archive <session>   Archive or unarchive a session.
+  bertrand project <op>        list | create | switch | current | rename | remove | import
+                               (bertrand project --help)
+  bertrand sync <op>           onboard | push | pull | status | invite | enable | disable
+                               (bertrand sync --help)
+  bertrand serve               Start the local dashboard HTTP server.
+
+Add --json to list/log/stats for machine-readable output. Most commands accept
+--project <slug> to target a project other than the active one.`, HUMAN_HEADER = `bertrand \u2014 multi-session workflow manager for Claude Code
+
+bertrand wraps each Claude Code conversation in a tracked "session": it records the
+full event timeline (prompts, answers, tool use, PRs, deploys), groups sessions by
+project, and can replicate that history across machines.`, AGENT_HEADER = `## bertrand CLI
+
+You are running inside a bertrand session. bertrand wraps each Claude Code
+conversation in a tracked "session" and records the full event timeline (prompts,
+answers, tool use, PRs, deploys), grouped by project and replicable across machines.
+The subcommands below inspect and manage that data \u2014 reach for them (e.g.
+\`bertrand log <session>\`) instead of assuming sessions are isolated.`;
+
 // src/cli/router.ts
 import { existsSync as existsSync4 } from "fs";
 function register(name, handler) {
@@ -544,6 +586,10 @@ async function autoInitIfFirstRun() {
 async function route(argv) {
   const args = argv.slice(2);
   const command = args[0];
+  if (command === "--help" || command === "-h" || command === "help") {
+    console.log(helpText({ agent: args.includes("--agent") }));
+    return;
+  }
   if (!command || !HOOK_COMMANDS.has(command)) {
     migrateOrAbort();
   }
@@ -573,21 +619,7 @@ function resolveCommand(name) {
   return;
 }
 function printUsage() {
-  console.log(`
-bertrand \u2014 multi-session workflow manager for Claude Code
-
-Usage:
-  bertrand                  Launch TUI (or resume named session)
-  bertrand init             Setup wizard
-  bertrand list             Session picker
-  bertrand log <session>    View session log
-  bertrand stats <session>  Session statistics
-  bertrand archive <name>   Archive/unarchive a session
-  bertrand project <op>     list|create|switch|current|rename|remove (see: bertrand project --help)
-  bertrand update           Hook-facing state writer (internal)
-  bertrand serve            Start dashboard HTTP server
-  bertrand sync <op>        push|pull|status|onboard (see: bertrand sync --help)
-`.trim());
+  console.log(helpText());
 }
 var commands, aliases, HOOK_COMMANDS;
 var init_router = __esm(() => {
@@ -602,7 +634,8 @@ var init_router = __esm(() => {
     "assistant-message",
     "contract",
     "notify",
-    "badge"
+    "badge",
+    "ensure-server"
   ]);
 });
 
@@ -886,8 +919,8 @@ function createSession(opts) {
   const id = createId();
   return db.insert(sessions).values({ id, ...opts }).returning().get();
 }
-function getSession(id) {
-  return getDb().select().from(sessions).where(eq2(sessions.id, id)).get();
+function getSession(id, db = getDb()) {
+  return db.select().from(sessions).where(eq2(sessions.id, id)).get();
 }
 function getSessionByCategorySlug(categoryId, slug) {
   return getDb().select().from(sessions).where(and(eq2(sessions.categoryId, categoryId), eq2(sessions.slug, slug))).get();
@@ -898,8 +931,11 @@ function getSessionsByCategory(categoryId) {
 function getActiveSessions() {
   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();
+function countLiveSessions(db = getDb()) {
+  const row = db.select({ n: sql2`count(*)` }).from(sessions).where(inArray(sessions.status, ["active", "waiting"])).get();
+  return row?.n ?? 0;
+}
+function selectSessions(db, opts) {
   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, [
@@ -910,6 +946,15 @@ function getAllSessions(opts) {
   }
   return query.all();
 }
+function getAllSessions(opts) {
+  return selectSessions(getDb(), opts);
+}
+function getAllSessionsForProject(project, opts) {
+  return selectSessions(getDbForProject(project.slug), opts).map((s) => ({
+    ...s,
+    project
+  }));
+}
 function updateSessionStatus(id, status) {
   return getDb().update(sessions).set({ status, updatedAt: sql2`(datetime('now'))` }).where(eq2(sessions.id, id)).returning().get();
 }
@@ -955,8 +1000,6 @@ function normalizeEventMeta(eventName, meta) {
   if (!meta)
     return meta;
   switch (eventName) {
-    case "session.recap":
-      return mapStringField(meta, "recap", normalizeMarkdown);
     case "assistant.message":
       return mapStringField(meta, "text", normalizeMarkdown);
     case "session.answered":
@@ -1005,11 +1048,11 @@ function insertEvent(opts) {
     meta: normalizeEventMeta(opts.event, opts.meta)
   }).returning().get();
 }
-function getEventsBySession(sessionId) {
-  return getDb().select().from(events).where(eq4(events.sessionId, sessionId)).orderBy(events.createdAt, events.id).all();
+function getEventsBySession(sessionId, db = getDb()) {
+  return db.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(eq4(events.sessionId, sessionId), eq4(events.event, eventType))).orderBy(events.createdAt).all();
+function getEventsByType(sessionId, eventType, db = getDb()) {
+  return db.select().from(events).where(and3(eq4(events.sessionId, sessionId), eq4(events.event, eventType))).orderBy(events.createdAt).all();
 }
 function getLatestEventOfType(sessionId, eventType, conversationId) {
   const conditions = [
@@ -1021,24 +1064,6 @@ function getLatestEventOfType(sessionId, eventType, conversationId) {
   }
   return getDb().select().from(events).where(and3(...conditions)).orderBy(desc2(events.createdAt)).limit(1).get();
 }
-function getLatestRecaps() {
-  const rows = getDb().select({
-    sessionId: events.sessionId,
-    meta: events.meta,
-    createdAt: events.createdAt
-  }).from(events).where(eq4(events.event, "session.recap")).orderBy(desc2(events.createdAt)).all();
-  const result = {};
-  for (const row of rows) {
-    if (result[row.sessionId])
-      continue;
-    const meta = row.meta;
-    const recap = typeof meta?.recap === "string" ? meta.recap : null;
-    if (!recap)
-      continue;
-    result[row.sessionId] = { recap, createdAt: row.createdAt };
-  }
-  return result;
-}
 var init_events = __esm(() => {
   init_client();
   init_schema();
@@ -1096,15 +1121,6 @@ function emitSessionAnswered(args) {
     }
   });
 }
-function emitSessionRecap(args) {
-  return insertEvent({
-    sessionId: args.sessionId,
-    conversationId: args.conversationId,
-    event: "session.recap",
-    summary: args.recap.slice(0, 200),
-    meta: { recap: args.recap, claude_id: args.conversationId }
-  });
-}
 function emitToolUsed(args) {
   const summary = formatToolSummary(args.tool, args.detail);
   return insertEvent({
@@ -1169,15 +1185,6 @@ function emitAssistantMessage(args) {
     }
   });
 }
-function emitAssistantRecap(args) {
-  return insertEvent({
-    sessionId: args.sessionId,
-    conversationId: args.conversationId,
-    event: "assistant.recap",
-    summary: args.recap.length > 80 ? `${args.recap.slice(0, 77)}...` : args.recap,
-    meta: { recap: args.recap, claude_id: args.conversationId }
-  });
-}
 function emitWorktreeEntered(args) {
   return insertEvent({
     sessionId: args.sessionId,
@@ -1239,13 +1246,6 @@ function dispatchHookEvent(event, ctx) {
         questions: meta.questions ?? []
       });
       return true;
-    case "session.recap":
-      emitSessionRecap({
-        sessionId,
-        conversationId,
-        recap: String(meta.recap ?? "")
-      });
-      return true;
     case "tool.applied":
       emitToolApplied({
         sessionId,
@@ -1434,7 +1434,6 @@ function summarize(text2) {
   const trimmed = firstLine.trim();
   return trimmed.length > 80 ? `${trimmed.slice(0, 77)}...` : trimmed;
 }
-var RECAP_RE, RECAP_TAG_GLOBAL;
 var init_assistant_message = __esm(() => {
   init_router();
   init_sessions();
@@ -1442,8 +1441,6 @@ var init_assistant_message = __esm(() => {
   init_events();
   init_emit();
   init_transcript();
-  RECAP_RE = /<recap>([\s\S]*?)<\/recap>/i;
-  RECAP_TAG_GLOBAL = /<recap>[\s\S]*?<\/recap>/gi;
   register("assistant-message", async (args) => {
     let sessionId = "";
     let transcriptPath = "";
@@ -1474,34 +1471,20 @@ var init_assistant_message = __esm(() => {
     const turn = getLatestAssistantTurn(transcriptPath);
     if (!turn)
       return;
-    const fullText = turn.text;
-    const textSansRecap = fullText.replace(RECAP_TAG_GLOBAL, "").trim();
+    const text2 = turn.text.trim();
     const convoId = conversationId && getConversation(conversationId) ? conversationId : undefined;
-    if (textSansRecap || turn.thinkingBlocks > 0) {
+    if (text2 || turn.thinkingBlocks > 0) {
       const latestMsg = getLatestEventOfType(sessionId, "assistant.message", convoId);
       const latestText = latestMsg?.meta?.text;
-      if (latestText !== textSansRecap) {
+      if (latestText !== text2) {
         emitAssistantMessage({
           sessionId,
           conversationId: convoId,
-          text: textSansRecap,
+          text: text2,
           model: turn.model,
           thinkingBlocks: turn.thinkingBlocks,
           thinkingBytes: turn.thinkingBytes,
-          summary: textSansRecap ? summarize(textSansRecap) : "thinking only"
-        });
-      }
-    }
-    const recapMatch = fullText.match(RECAP_RE);
-    const recap = recapMatch?.[1]?.trim();
-    if (recap) {
-      const latestRecap = getLatestEventOfType(sessionId, "assistant.recap", convoId);
-      const latestRecapText = latestRecap?.meta?.recap;
-      if (latestRecapText !== recap) {
-        emitAssistantRecap({
-          sessionId,
-          conversationId: convoId,
-          recap
+          summary: text2 ? summarize(text2) : "thinking only"
         });
       }
     }
@@ -1511,11 +1494,9 @@ var init_assistant_message = __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.
+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).
 
 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 = () => {};
 
@@ -1650,11 +1631,11 @@ var init_contract = __esm(() => {
     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.`);
+      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).`);
       return;
     }
     const siblingContext = buildSiblingContext(session.categoryId, categoryPath, session.id);
-    process.stdout.write(buildContract(sessionName, siblingContext));
+    process.stdout.write(buildContract(sessionName, helpText({ agent: true }), siblingContext));
   });
 });
 
@@ -1776,8 +1757,8 @@ var init_notify = __esm(() => {
 
 // src/db/queries/stats.ts
 import { eq as eq5, sql as sql4 } from "drizzle-orm";
-function getSessionStats(sessionId) {
-  return getDb().select().from(sessionStats).where(eq5(sessionStats.sessionId, sessionId)).get();
+function getSessionStats(sessionId, db = getDb()) {
+  return db.select().from(sessionStats).where(eq5(sessionStats.sessionId, sessionId)).get();
 }
 function upsertSessionStats(sessionId, data) {
   return getDb().insert(sessionStats).values({
@@ -1801,8 +1782,8 @@ function lineCount(s) {
   return s.split(`
 `).length;
 }
-function computeDiffStats(sessionId) {
-  const applied = getEventsByType(sessionId, "tool.applied");
+function computeDiffStats(sessionId, db = getDb()) {
+  const applied = getEventsByType(sessionId, "tool.applied", db);
   const files = new Set;
   let linesAdded = 0;
   let linesRemoved = 0;
@@ -1827,6 +1808,7 @@ function computeDiffStats(sessionId) {
 }
 var init_diff_stats = __esm(() => {
   init_events();
+  init_client();
 });
 
 // src/lib/timing.ts
@@ -1916,12 +1898,12 @@ function computeTimings(events2) {
   }
   return { totalClaudeWorkMs, totalUserWaitMs, activePct, durationS, segments };
 }
-function computeSessionStats(sessionId) {
-  const events2 = getEventsBySession(sessionId);
+function computeSessionStats(sessionId, db = getDb()) {
+  const events2 = getEventsBySession(sessionId, db);
   const summary = computeTimings(events2);
   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);
+  const diff = computeDiffStats(sessionId, db);
   return {
     eventCount: events2.length,
     conversationCount: conversationIds.size,
@@ -1947,13 +1929,14 @@ var init_timing = __esm(() => {
   init_events();
   init_stats();
   init_diff_stats();
+  init_client();
 });
 
 // src/lib/engagement_stats.ts
 import { eq as eq6, sql as sql5 } from "drizzle-orm";
-function aggregateToolUsage(sessionId) {
+function aggregateToolUsage(sessionId, db) {
   const counts = {};
-  const applied = getEventsByType(sessionId, "tool.applied");
+  const applied = getEventsByType(sessionId, "tool.applied", db);
   for (const ev of applied) {
     const meta = ev.meta;
     const permissions = meta?.permissions ?? [];
@@ -1963,7 +1946,7 @@ function aggregateToolUsage(sessionId) {
       counts[p.tool] = (counts[p.tool] ?? 0) + (p.count ?? 1);
     }
   }
-  const used = getEventsByType(sessionId, "tool.used");
+  const used = getEventsByType(sessionId, "tool.used", db);
   for (const ev of used) {
     const meta = ev.meta;
     const tool = meta?.tool;
@@ -1973,8 +1956,8 @@ function aggregateToolUsage(sessionId) {
   }
   return counts;
 }
-function discardRate(sessionId) {
-  const row = getDb().select({
+function discardRate(sessionId, db) {
+  const row = db.select({
     total: sql5`count(*)`,
     discarded: sql5`sum(case when ${conversations.discarded} then 1 else 0 end)`
   }).from(conversations).where(eq6(conversations.sessionId, sessionId)).get();
@@ -1983,10 +1966,10 @@ function discardRate(sessionId) {
     discarded: row?.discarded ?? 0
   };
 }
-function computeEngagementStats(sessionId) {
+function computeEngagementStats(sessionId, db = getDb()) {
   return {
-    toolUsage: aggregateToolUsage(sessionId),
-    discardRate: discardRate(sessionId)
+    toolUsage: aggregateToolUsage(sessionId, db),
+    discardRate: discardRate(sessionId, db)
   };
 }
 var init_engagement_stats = __esm(() => {
@@ -2039,13 +2022,28 @@ var init_session_archive = __esm(() => {
 import { execFile } from "child_process";
 import { existsSync as existsSync6 } from "fs";
 import { join as join8 } from "path";
-function liveStats(sessionId) {
+function liveStats(sessionId, db) {
   return {
     sessionId,
-    ...computeSessionStats(sessionId),
+    ...computeSessionStats(sessionId, db),
     updatedAt: new Date().toISOString()
   };
 }
+function resolveProjectScope(url) {
+  const nameBySlug = new Map(listProjects().map((p) => [p.slug, p.name]));
+  const param = url.searchParams.get("projects");
+  if (param === null) {
+    const active = resolveActiveProject();
+    return [{ slug: active.slug, name: active.name }];
+  }
+  return param.split(",").map((s) => s.trim()).filter((slug) => nameBySlug.has(slug)).map((slug) => ({ slug, name: nameBySlug.get(slug) }));
+}
+function resolveDb(url) {
+  const slug = url.searchParams.get("project");
+  if (slug && projectExists(slug))
+    return getDbForProject(slug);
+  return;
+}
 function archiveResponse(result) {
   if (result.ok)
     return Response.json(result.session);
@@ -2189,42 +2187,44 @@ function startServer(port = PORT) {
 }
 var PORT, listSessions = (_params, url) => {
   const excludeArchived = url.searchParams.get("excludeArchived") !== "false";
-  return getAllSessions({ excludeArchived });
+  return resolveProjectScope(url).flatMap((project) => getAllSessionsForProject(project, { excludeArchived }));
 }, getSessionById = ({ id }) => getSession(id), listEvents = ({ sessionId }, url) => {
+  const db = resolveDb(url);
   const eventType = url.searchParams.get("type");
   if (eventType)
-    return getEventsByType(sessionId, eventType);
-  return getEventsBySession(sessionId);
-}, listAllStats = () => {
+    return getEventsByType(sessionId, eventType, db);
+  return getEventsBySession(sessionId, db);
+}, listAllStats = (_params, url) => {
   const result = {};
-  for (const { session } of getAllSessions()) {
-    const isLive = session.status === "active" || session.status === "waiting";
-    if (isLive) {
-      result[session.id] = liveStats(session.id);
-      continue;
+  for (const project of resolveProjectScope(url)) {
+    const db = getDbForProject(project.slug);
+    for (const { session } of getAllSessionsForProject(project)) {
+      const isLive = session.status === "active" || session.status === "waiting";
+      if (isLive) {
+        result[session.id] = liveStats(session.id, db);
+        continue;
+      }
+      result[session.id] = getSessionStats(session.id, db) ?? liveStats(session.id, db);
     }
-    result[session.id] = getSessionStats(session.id) ?? liveStats(session.id);
   }
   return result;
-}, getStatsBySession = ({
-  sessionId
-}) => {
-  const session = getSession(sessionId);
+}, getStatsBySession = ({ sessionId }, url) => {
+  const db = resolveDb(url);
+  const session = getSession(sessionId, db);
   if (!session)
     return null;
   const isLive = session.status === "active" || session.status === "waiting";
   if (isLive)
-    return liveStats(sessionId);
-  return getSessionStats(sessionId) ?? liveStats(sessionId);
-}, getEngagement = ({
-  sessionId
-}) => computeEngagementStats(sessionId), listRecaps = () => getLatestRecaps(), listAllProjects = () => {
+    return liveStats(sessionId, db);
+  return getSessionStats(sessionId, db) ?? liveStats(sessionId, db);
+}, getEngagement = ({ sessionId }, url) => computeEngagementStats(sessionId, resolveDb(url)), listAllProjects = () => {
   const active = resolveActiveProject();
   return listProjects().map((p) => ({
     slug: p.slug,
     name: p.name,
     active: p.slug === active.slug,
-    lastUsedAt: p.lastUsedAt
+    lastUsedAt: p.lastUsedAt,
+    liveCount: countLiveSessions(getDbForProject(p.slug))
   }));
 }, getActiveProjectMeta = () => {
   const active = resolveActiveProject();
@@ -2249,7 +2249,6 @@ var init_server = __esm(() => {
     [/^\/api\/stats$/, listAllStats],
     [/^\/api\/stats\/(?<sessionId>[^/]+)$/, getStatsBySession],
     [/^\/api\/engagement\/(?<sessionId>[^/]+)$/, getEngagement],
-    [/^\/api\/recaps$/, listRecaps],
     [/^\/api\/projects$/, listAllProjects],
     [/^\/api\/active-project$/, getActiveProjectMeta]
   ];
@@ -2273,9 +2272,110 @@ var init_serve = __esm(() => {
   });
 });
 
+// src/lib/server-lifecycle.ts
+import { spawn as spawn2 } from "child_process";
+import { readFileSync as readFileSync6, writeFileSync as writeFileSync4, unlinkSync } from "fs";
+import { join as join9 } from "path";
+function readPidFile() {
+  try {
+    const pid = Number(readFileSync6(deps.pidFile, "utf-8").trim());
+    return Number.isFinite(pid) && pid > 0 ? pid : null;
+  } catch {
+    return null;
+  }
+}
+function isProcessAlive(pid) {
+  try {
+    process.kill(pid, 0);
+    return true;
+  } catch {
+    return false;
+  }
+}
+async function isPortListening(port) {
+  try {
+    await fetch(`http://localhost:${port}/api/sessions`, {
+      signal: AbortSignal.timeout(500)
+    });
+    return true;
+  } catch {
+    return false;
+  }
+}
+function removePidFile() {
+  try {
+    unlinkSync(deps.pidFile);
+  } catch {}
+}
+async function ensureServerStarted() {
+  const existingPid = readPidFile();
+  if (existingPid && isProcessAlive(existingPid))
+    return;
+  if (existingPid)
+    removePidFile();
+  if (await isPortListening(deps.port))
+    return;
+  const bin = deps.resolveBin();
+  if (!bin)
+    return;
+  const child = spawn2(bin, ["serve"], {
+    detached: true,
+    stdio: "ignore",
+    env: { ...process.env, BERTRAND_PORT: String(deps.port) }
+  });
+  child.unref();
+  if (child.pid)
+    writeFileSync4(deps.pidFile, String(child.pid));
+}
+async function ensureServerForActiveSessions() {
+  if (deps.getActiveCount() === 0)
+    return;
+  await ensureServerStarted();
+}
+function stopServerIfIdle() {
+  if (deps.getActiveCount() > 0)
+    return;
+  const pid = readPidFile();
+  if (!pid)
+    return;
+  try {
+    process.kill(pid, "SIGTERM");
+  } catch {}
+  removePidFile();
+}
+var defaultDeps, deps;
+var init_server_lifecycle = __esm(() => {
+  init_paths();
+  init_sessions();
+  defaultDeps = {
+    pidFile: join9(paths.root, "server.pid"),
+    port: Number(process.env.BERTRAND_PORT ?? 5200),
+    resolveBin() {
+      try {
+        const config = JSON.parse(readFileSync6(join9(paths.root, "config.json"), "utf-8"));
+        return typeof config?.bin === "string" ? config.bin : null;
+      } catch {
+        return null;
+      }
+    },
+    getActiveCount: () => getActiveSessions().length
+  };
+  deps = defaultDeps;
+});
+
+// src/cli/commands/ensure-server.ts
+var exports_ensure_server = {};
+var init_ensure_server = __esm(() => {
+  init_router();
+  init_server_lifecycle();
+  register("ensure-server", async () => {
+    await ensureServerForActiveSessions();
+  });
+});
+
 // src/sync/snapshot.ts
 import { Database as Database2 } from "bun:sqlite";
-import { existsSync as existsSync7, unlinkSync } from "fs";
+import { existsSync as existsSync7, unlinkSync as unlinkSync2 } from "fs";
 function snapshotPathFor(dbPath) {
   return `${dbPath}.sync-snapshot`;
 }
@@ -2297,7 +2397,7 @@ function cleanupSnapshot() {
     const p = base + suffix;
     if (existsSync7(p)) {
       try {
-        unlinkSync(p);
+        unlinkSync2(p);
       } catch {}
     }
   }
@@ -2350,7 +2450,7 @@ var init_crypto = __esm(() => {
 
 // src/sync/engine.ts
 import { createClient } from "@supabase/supabase-js";
-import { readFileSync as readFileSync6, renameSync as renameSync3, statSync as statSync3, openSync, writeSync, fsyncSync, closeSync } from "fs";
+import { readFileSync as readFileSync7, renameSync as renameSync3, statSync as statSync3, openSync, writeSync, fsyncSync, closeSync } from "fs";
 import { dirname as dirname2 } from "path";
 function client(cfg) {
   if (!cfg)
@@ -2380,7 +2480,7 @@ async function push() {
         error: `snapshot failed: ${e instanceof Error ? e.message : String(e)}`
       };
     }
-    const plaintext = readFileSync6(snapshotPath);
+    const plaintext = readFileSync7(snapshotPath);
     const ciphertext = encrypt(plaintext, cfg.encryptionKey);
     const { error } = await supabase.storage.from(cfg.bucket).upload(cfg.objectKey, ciphertext, {
       contentType: "application/octet-stream",
@@ -3008,7 +3108,7 @@ var init_labels = __esm(() => {
 });
 
 // src/engine/process.ts
-import { spawn as spawn2 } from "child_process";
+import { spawn as spawn3 } from "child_process";
 function launchClaude(opts) {
   const args = [];
   if (opts.resume) {
@@ -3029,7 +3129,7 @@ function launchClaude(opts) {
     BERTRAND_PROJECT_DB: active.db
   };
   return new Promise((resolve, reject) => {
-    const child = spawn2("claude", args, {
+    const child = spawn3("claude", args, {
       env,
       stdio: "inherit",
       shell: false
@@ -3064,92 +3164,6 @@ var init_process = __esm(() => {
   init_resolve();
 });
 
-// src/lib/server-lifecycle.ts
-import { spawn as spawn3 } from "child_process";
-import { readFileSync as readFileSync7, writeFileSync as writeFileSync4, unlinkSync as unlinkSync2 } from "fs";
-import { join as join9 } from "path";
-function readPidFile() {
-  try {
-    const pid = Number(readFileSync7(deps.pidFile, "utf-8").trim());
-    return Number.isFinite(pid) && pid > 0 ? pid : null;
-  } catch {
-    return null;
-  }
-}
-function isProcessAlive(pid) {
-  try {
-    process.kill(pid, 0);
-    return true;
-  } catch {
-    return false;
-  }
-}
-async function isPortListening(port) {
-  try {
-    await fetch(`http://localhost:${port}/api/sessions`, {
-      signal: AbortSignal.timeout(500)
-    });
-    return true;
-  } catch {
-    return false;
-  }
-}
-function removePidFile() {
-  try {
-    unlinkSync2(deps.pidFile);
-  } catch {}
-}
-async function ensureServerStarted() {
-  const existingPid = readPidFile();
-  if (existingPid && isProcessAlive(existingPid))
-    return;
-  if (existingPid)
-    removePidFile();
-  if (await isPortListening(deps.port))
-    return;
-  const bin = deps.resolveBin();
-  if (!bin)
-    return;
-  const child = spawn3(bin, ["serve"], {
-    detached: true,
-    stdio: "ignore",
-    env: { ...process.env, BERTRAND_PORT: String(deps.port) }
-  });
-  child.unref();
-  if (child.pid)
-    writeFileSync4(deps.pidFile, String(child.pid));
-}
-function stopServerIfIdle() {
-  if (deps.getActiveCount() > 0)
-    return;
-  const pid = readPidFile();
-  if (!pid)
-    return;
-  try {
-    process.kill(pid, "SIGTERM");
-  } catch {}
-  removePidFile();
-}
-var defaultDeps, deps;
-var init_server_lifecycle = __esm(() => {
-  init_paths();
-  init_sessions();
-  defaultDeps = {
-    pidFile: join9(paths.root, "server.pid"),
-    port: Number(process.env.BERTRAND_PORT ?? 5200),
-    resolveBin() {
-      try {
-        const config = JSON.parse(readFileSync7(join9(paths.root, "config.json"), "utf-8"));
-        return typeof config?.bin === "string" ? config.bin : null;
-      } catch {
-        return null;
-      }
-    },
-    getActiveCount: () => getActiveSessions().length
-  };
-  deps = defaultDeps;
-});
-
 // src/hooks/runtime.ts
 import { readdirSync as readdirSync2, rmSync, statSync as statSync4 } from "fs";
 import { join as join10 } from "path";
@@ -3258,7 +3272,7 @@ async function launch(opts) {
     cwd: process.cwd()
   });
   const siblingContext = buildSiblingContext(categoryId, opts.categoryPath, session.id);
-  const contract = buildContract(sessionName, siblingContext);
+  const contract = buildContract(sessionName, helpText({ agent: true }), siblingContext);
   const exitCode = await launchClaude({
     sessionId: session.id,
     claudeId,
@@ -3290,7 +3304,7 @@ async function resume(opts) {
   }
   const categoryPath = category?.path ?? "";
   const siblingContext = buildSiblingContext(session.categoryId, categoryPath, session.id);
-  const contract = buildContract(sessionName, siblingContext);
+  const contract = buildContract(sessionName, helpText({ agent: true }), siblingContext);
   const exitCode = await launchClaude({
     sessionId: session.id,
     claudeId: opts.conversationId,
@@ -3606,7 +3620,7 @@ 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}')"
 
-# Capture the latest assistant turn's text + recap tag. Dedup inside the
+# Capture the latest assistant turn's text. 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)"
@@ -3666,17 +3680,6 @@ if printf '%s' "$done_check" | grep -q "Done for now"; then
   # 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
-  # reuses the agent-authored recap that already lives on the option.
-  recap="$(printf '%s' "$meta" | jq -r '
-    [.questions[]?.options[]? | select(.label == "Done for now") | .description] | first // empty
-  ' 2>/dev/null)"
-  if [ -n "$recap" ]; then
-    bq update --session-id "$sid" --event session.recap       --meta "$(jq -n --arg recap "$recap" --arg cid "$cid" '{recap:$recap, claude_id:$cid}')"
-  fi
-
   printf '{"continue": false, "stopReason": "User selected Done for now"}\\n'
 fi
 
@@ -3850,7 +3853,7 @@ if [ ! -f "$done_marker" ]; then
   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.'
+    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. 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
@@ -4297,8 +4300,6 @@ function extractSummary(row) {
     }
     case "user.prompt":
       return meta.prompt ?? "";
-    case "session.recap":
-      return meta.recap ?? "";
     case "worktree.entered":
     case "worktree.exited":
       return meta.branch ?? meta.path ?? "";
@@ -4337,9 +4338,7 @@ var init_catalog = __esm(() => {
     "user.prompt": { label: "prompt", category: "interaction", color: 36, detailColor: 245, skip: false },
     "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 },
     "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 }
   };
@@ -5226,6 +5225,7 @@ var hotPath = {
   badge: () => Promise.resolve().then(() => (init_badge(), exports_badge)),
   notify: () => Promise.resolve().then(() => (init_notify(), exports_notify)),
   serve: () => Promise.resolve().then(() => (init_serve(), exports_serve)),
+  "ensure-server": () => Promise.resolve().then(() => (init_ensure_server(), exports_ensure_server)),
   sync: () => Promise.resolve().then(() => (init_sync(), exports_sync))
 };
 if (command && command in hotPath) {