bertrand 0.20.0 → 0.21.0

package/README.md

@@ -79,13 +79,14 @@ Shows a picker: start a fresh Claude conversation, or resume one of the prior co
 bertrand list
 ```
 
-Interactive picker showing all sessions with status badges.
+Interactive picker showing all sessions with status badges. Add `--project <slug>` to list sessions from another project without switching the active one.
 
 ### Other commands
 
 | Command | Purpose |
 |---|---|
-| `bertrand log <session>` | Print the timeline event log for a session. |
+| `bertrand log` | List sessions in the active project. Add `--project <slug>` to scope to a different project. |
+| `bertrand log <session>` | Print the timeline event log for a session. Supports `--json` (includes `project: { slug, name }` for agent consumption) and `--project <slug>` for cross-project reads. |
 | `bertrand stats <session>` | Print materialized stats (duration, work/wait split, lines changed). |
 | `bertrand archive <name>` | Archive or unarchive a session. |
 | `bertrand serve` | Start the dashboard HTTP API on `:5200`. |

package/dist/bertrand.js

@@ -15,6 +15,7 @@ var __export = (target, all) => {
     });
 };
 var __esm = (fn, res) => () => (fn && (res = fn(fn = 0)), res);
+var __require = import.meta.require;
 
 // src/lib/paths.ts
 import { homedir } from "os";
@@ -25,6 +26,7 @@ var init_paths = __esm(() => {
     root: join(homedir(), BERTRAND_DIR),
     hooks: join(homedir(), BERTRAND_DIR, "hooks"),
     sessions: join(homedir(), BERTRAND_DIR, "sessions"),
+    runtime: join(homedir(), BERTRAND_DIR, "run"),
     db: join(homedir(), BERTRAND_DIR, "bertrand.db"),
     syncEnv: join(homedir(), BERTRAND_DIR, "sync.env")
   };
@@ -2117,8 +2119,10 @@ async function handleSwitchProject(req) {
     return Response.json({ error: `Unknown project: ${slug}` }, { status: 404 });
   }
   setActiveProjectSlug(slug);
-  queueMicrotask(() => process.exit(0));
-  return Response.json({ ok: true, slug, willRestart: true });
+  process.env.BERTRAND_PROJECT = slug;
+  _resetActiveProjectCache();
+  invalidateDbCache();
+  return Response.json({ ok: true, slug });
 }
 async function handleOpen(req) {
   let body;
@@ -2287,6 +2291,7 @@ var init_server = __esm(() => {
   init_session_archive();
   init_registry();
   init_resolve();
+  init_client();
   PORT = Number(process.env.BERTRAND_PORT ?? 5200);
   routes = [
     [/^\/api\/sessions$/, listSessions],
@@ -3450,10 +3455,8 @@ function installExitHandlers() {
   const onSignal = (signal) => {
     if (isClaudeRunning())
       return;
-    process.exit(signal === "SIGINT" ? 130 : signal === "SIGHUP" ? 129 : 143);
+    process.exit(signal === "SIGHUP" ? 129 : 143);
   };
-  process.on("SIGINT", onSignal);
-  process.on("SIGTERM", onSignal);
   process.on("SIGHUP", onSignal);
 }
 async function launch(opts) {
@@ -3565,6 +3568,7 @@ function finalizeSession(sessionId, conversationId, exitCode) {
   emitSessionEnded({ sessionId });
   computeAndPersist(sessionId);
   stopServerIfIdle();
+  triggerBackgroundPush();
 }
 var liveSession = null, exitHandlersInstalled = false;
 var init_session = __esm(() => {
@@ -3579,39 +3583,68 @@ var init_session = __esm(() => {
   init_spawn_context();
   init_timing();
   init_server_lifecycle();
+  init_trigger();
 });
 
 // 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 join9 } from "path";
 import { randomUUID as randomUUID2 } from "crypto";
 async function runScreen(screen, ...args) {
-  const tmpFile = `/tmp/bertrand-tui-${process.pid}-${Date.now()}.json`;
+  const tmpFile = join9(tmpdir(), `bertrand-tui-${randomUUID2()}.json`);
+  if (process.env.BERTRAND_DEBUG_TUI) {
+    try {
+      const { appendFileSync } = await import("fs");
+      appendFileSync(process.env.BERTRAND_DEBUG_TUI, `--- parent runScreen("${screen}") at ${Date.now()} entry=${SCREEN_ENTRY}
+`);
+    } catch {}
+  }
   const child = spawn4("bun", ["run", SCREEN_ENTRY, screen, tmpFile, ...args], {
-    stdio: "inherit"
-  });
-  const exitCode = await new Promise((resolve) => {
-    child.on("exit", (code) => resolve(code ?? 1));
+    stdio: "inherit",
+    env: process.env
   });
-  if (exitCode !== 0) {
-    throw new Error(`TUI screen "${screen}" exited with code ${exitCode}`);
+  const noopSignal = () => {};
+  process.on("SIGINT", noopSignal);
+  process.on("SIGTERM", noopSignal);
+  let spawnError = null;
+  try {
+    const { code, signal } = await new Promise((resolve) => {
+      child.on("error", (err) => {
+        spawnError = err;
+        resolve({ code: 1, signal: null });
+      });
+      child.on("exit", (c, s) => resolve({ code: c, signal: s }));
+    });
+    if (spawnError) {
+      throw new Error(`Failed to launch TUI screen "${screen}": ${spawnError.message}`);
+    }
+    if (!existsSync8(tmpFile)) {
+      const detail = signal ? `killed by ${signal}` : `exited with code ${code ?? "?"} without writing result`;
+      throw new Error(`TUI screen "${screen}" ${detail}`);
+    }
+    return JSON.parse(readFileSync8(tmpFile, "utf-8"));
+  } finally {
+    process.removeListener("SIGINT", noopSignal);
+    process.removeListener("SIGTERM", noopSignal);
+    try {
+      if (existsSync8(tmpFile))
+        unlinkSync3(tmpFile);
+    } catch {}
   }
-  const result = JSON.parse(readFileSync8(tmpFile, "utf-8"));
-  unlinkSync3(tmpFile);
-  return result;
 }
-async function startStartupTui(skipProjectPicker, initialProjectSlug) {
-  return runScreen("startup", String(skipProjectPicker), initialProjectSlug);
+async function startLaunchTui() {
+  return runScreen("launch");
+}
+async function startProjectPickerTui() {
+  return runScreen("project-picker");
 }
 async function startExitTui(sessionId) {
   return runScreen("exit", sessionId);
 }
 async function startResumeTui(sessionId) {
   const conversations2 = getConversationsBySession(sessionId);
-  if (conversations2.length === 1) {
-    return { type: "conversation", conversationId: conversations2[0].id };
-  }
   if (conversations2.length === 0) {
     return { type: "new" };
   }
@@ -3658,19 +3691,17 @@ function shouldShowProjectPicker() {
   const projects = listProjects();
   return projects.length !== 1;
 }
-async function startTui() {
-  const skipProjectPicker = !shouldShowProjectPicker();
-  const initialProjectSlug = getActiveProjectSlug();
-  const selection = await startStartupTui(skipProjectPicker, initialProjectSlug);
+function activateProject(slug) {
+  setActiveProjectSlug(slug);
   _resetActiveProjectCache();
+}
+async function runLaunchCycle() {
+  const selection = await startLaunchTui();
   switch (selection.type) {
     case "quit":
       return;
     case "create": {
-      const sessionId = await launch({
-        categoryPath: selection.categoryPath,
-        slug: selection.slug
-      });
+      const sessionId = await launch(selection);
       await runSessionLoop(sessionId);
       return;
     }
@@ -3687,6 +3718,28 @@ async function startTui() {
     }
   }
 }
+async function startTui() {
+  if (!shouldShowProjectPicker()) {
+    await runLaunchCycle();
+    return;
+  }
+  const projectSelection = await startProjectPickerTui();
+  switch (projectSelection.type) {
+    case "quit":
+      return;
+    case "select": {
+      activateProject(projectSelection.slug);
+      await runLaunchCycle();
+      return;
+    }
+    case "create": {
+      createProject({ slug: projectSelection.slug });
+      activateProject(projectSelection.slug);
+      await runLaunchCycle();
+      return;
+    }
+  }
+}
 var SCREEN_ENTRY;
 var init_app = __esm(() => {
   init_sessions();
@@ -3694,6 +3747,7 @@ var init_app = __esm(() => {
   init_session_archive();
   init_session();
   init_registry();
+  init_create();
   init_resolve();
   SCREEN_ENTRY = (() => {
     const built = join9(import.meta.dir, "run-screen.js");
@@ -3755,21 +3809,33 @@ var init_recovery = __esm(() => {
 
 // src/cli/commands/launch.ts
 var exports_launch = {};
+function reportFatal(err) {
+  const message = err instanceof Error ? err.message : String(err);
+  console.error(`bertrand: ${message}`);
+  if (process.env.BERTRAND_DEBUG && err instanceof Error && err.stack) {
+    console.error(err.stack);
+  }
+  process.exit(1);
+}
 var init_launch = __esm(() => {
   init_router();
   init_app();
   init_session();
   init_recovery();
   register("launch", async (args) => {
-    recoverStaleSessions();
-    const sessionName = args[0];
-    if (sessionName) {
-      const { categoryPath, slug } = parseSessionName(sessionName);
-      const sessionId = await launch({ categoryPath, slug });
-      await runSessionLoop(sessionId);
-      return;
+    try {
+      recoverStaleSessions();
+      const sessionName = args[0];
+      if (sessionName) {
+        const { categoryPath, slug } = parseSessionName(sessionName);
+        const sessionId = await launch({ categoryPath, slug });
+        await runSessionLoop(sessionId);
+        return;
+      }
+      await startTui();
+    } catch (err) {
+      reportFatal(err);
     }
-    await startTui();
   });
 });
 
@@ -3777,7 +3843,7 @@ var init_launch = __esm(() => {
 function quietHelper(bin) {
   return `bq() { ${bin} "$@" 2>/dev/null || true; }`;
 }
-function waitingScript(bin) {
+function waitingScript(bin, runtimeDir) {
   return `#!/usr/bin/env bash
 # Hook: PreToolUse AskUserQuestion \u2192 enforce multiSelect, mark session as waiting
 ${quietHelper(bin)}
@@ -3802,7 +3868,7 @@ 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 "/tmp/bertrand-working-$sid"
+rm -f "${runtimeDir}/working-$sid"
 
 bq update --session-id "$sid" --event session.waiting --meta "$(jq -n --arg q "$question" --arg cid "$cid" '{question:$q, claude_id:$cid}')"
 
@@ -3823,7 +3889,7 @@ bq notify bertrand "$question" &
 wait
 `;
 }
-function answeredScript(bin) {
+function answeredScript(bin, _runtimeDir) {
   return `#!/usr/bin/env bash
 # Hook: PostToolUse AskUserQuestion \u2192 mark session as active
 #
@@ -3877,7 +3943,7 @@ fi
 wait
 `;
 }
-function activeScript(bin) {
+function activeScript(bin, runtimeDir) {
   return `#!/usr/bin/env bash
 # Hook: PreToolUse (catch-all) \u2192 flip waiting to active
 ${quietHelper(bin)}
@@ -3886,7 +3952,7 @@ sid="\${BERTRAND_SESSION:-}"
 
 # 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="/tmp/bertrand-working-$sid"
+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
@@ -3903,7 +3969,7 @@ cid="\${BERTRAND_CLAUDE_ID:-}"
 bq update --session-id "$sid" --event session.active --meta "$(jq -n --arg cid "$cid" '{claude_id:$cid}')"
 `;
 }
-function permissionWaitScript(bin) {
+function permissionWaitScript(bin, runtimeDir) {
   return `#!/usr/bin/env bash
 # Hook: PermissionRequest \u2192 mark pending, emit permission.request
 ${quietHelper(bin)}
@@ -3915,7 +3981,7 @@ ${EXTRACT_TOOL}
 [ "$tool" = "AskUserQuestion" ] && exit 0
 
 # Write marker so PostToolUse knows this was a real permission prompt (not auto-approved)
-touch "/tmp/bertrand-perm-pending-$sid"
+touch "${runtimeDir}/perm-pending-$sid"
 
 # Extract detail from tool_input via grep (avoid jq for simple fields)
 detail=""
@@ -3933,7 +3999,7 @@ bq notify bertrand "Needs permission: $tool" &
 wait
 `;
 }
-function permissionDoneScript(bin) {
+function permissionDoneScript(bin, runtimeDir) {
   return `#!/usr/bin/env bash
 # Hook: PostToolUse (catch-all)
 #
@@ -3958,7 +4024,7 @@ ${EXTRACT_TOOL}
 # Don't double-log: AskUserQuestion has its own waiting/answered events
 [ "$tool" = "AskUserQuestion" ] && exit 0
 
-marker="/tmp/bertrand-perm-pending-$sid"
+marker="${runtimeDir}/perm-pending-$sid"
 had_marker=0
 if [ -f "$marker" ]; then
   had_marker=1
@@ -4017,7 +4083,7 @@ fi
 wait
 `;
 }
-function userPromptScript(bin) {
+function userPromptScript(bin, _runtimeDir) {
   return `#!/usr/bin/env bash
 # Hook: UserPromptSubmit \u2192 record user free-text prompt
 ${quietHelper(bin)}
@@ -4033,7 +4099,7 @@ meta="$(printf '%s' "$input" | jq --arg cid "$cid" '{prompt: (.prompt // ""), cl
 bq update --session-id "$sid" --event user.prompt --meta "$meta"
 `;
 }
-function doneScript(bin) {
+function doneScript(bin, _runtimeDir) {
   return `#!/usr/bin/env bash
 # Hook: Stop \u2192 mark session as paused
 ${quietHelper(bin)}
@@ -4075,9 +4141,10 @@ import { mkdirSync as mkdirSync7, writeFileSync as writeFileSync5, chmodSync as
 import { join as join10 } 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 = join10(paths.hooks, filename);
-    writeFileSync5(filePath, scriptFn(bin));
+    writeFileSync5(filePath, scriptFn(bin, paths.runtime));
     chmodSync2(filePath, 493);
   }
   console.log(`Installed ${Object.keys(HOOK_SCRIPTS).length} hook scripts to ${paths.hooks}`);
@@ -4266,6 +4333,7 @@ var init_init = __esm(() => {
 `);
     mkdirSync10(paths.root, { recursive: true });
     mkdirSync10(paths.hooks, { recursive: true });
+    mkdirSync10(paths.runtime, { recursive: true });
     const active = resolveActiveProject();
     runMigrations(active.db);
     console.log(`  Database: ${active.db}`);
@@ -4296,6 +4364,40 @@ Error: couldn't locate the bertrand binary on PATH.
   });
 });
 
+// src/lib/projects/cli-flag.ts
+function extractProjectFlag2(args) {
+  const rest = [];
+  let project;
+  for (let i = 0;i < args.length; i++) {
+    const a = args[i];
+    if (a === "--project") {
+      project = args[i + 1];
+      i++;
+      continue;
+    }
+    if (a.startsWith("--project=")) {
+      project = a.slice("--project=".length);
+      continue;
+    }
+    rest.push(a);
+  }
+  return { project, rest };
+}
+function applyProjectFlag(slug) {
+  if (!slug)
+    return;
+  if (!projectExists(slug)) {
+    console.error(`Unknown project: ${slug}. Run \`bertrand project list\` to see registered projects.`);
+    process.exit(1);
+  }
+  process.env.BERTRAND_PROJECT = slug;
+  _resetActiveProjectCache();
+}
+var init_cli_flag = __esm(() => {
+  init_resolve();
+  init_registry();
+});
+
 // src/cli/commands/list.ts
 var exports_list = {};
 function buildRows(sessions2) {
@@ -4311,13 +4413,15 @@ function buildRows(sessions2) {
   });
 }
 function renderTable(rows) {
+  const dim = "\x1B[2m";
+  const reset = "\x1B[0m";
+  const project = resolveActiveProject();
+  console.log(`${dim}Project: ${project.slug} (${project.name})${reset}`);
   if (rows.length === 0) {
     console.log("No sessions found.");
     return;
   }
   const maxName = Math.max(...rows.map((r) => r.name.length), 4);
-  const dim = "\x1B[2m";
-  const reset = "\x1B[0m";
   console.log(`${dim}${"  "} ${"NAME".padEnd(maxName)}  ${"STATUS".padEnd(10)}  ${"DURATION".padEnd(8)}  ${"CONVOS".padEnd(6)}  LAST ACTIVE${reset}`);
   for (const row of rows) {
     const dot = STATUS_DOTS[row.status] ?? "?";
@@ -4329,12 +4433,14 @@ function renderTable(rows) {
   }
 }
 function renderJson(rows) {
+  const project = resolveActiveProject();
   const data = rows.map((r) => ({
     name: r.name,
     status: r.status,
     duration: r.duration,
     conversations: r.conversations,
-    updatedAt: r.updatedAt
+    updatedAt: r.updatedAt,
+    project: { slug: project.slug, name: project.name }
   }));
   console.log(JSON.stringify(data, null, 2));
 }
@@ -4345,6 +4451,8 @@ var init_list = __esm(() => {
   init_categories();
   init_stats();
   init_format();
+  init_resolve();
+  init_cli_flag();
   STATUS_DOTS = {
     active: "\x1B[32m\u25CF\x1B[0m",
     waiting: "\x1B[33m\u25CF\x1B[0m",
@@ -4353,10 +4461,12 @@ var init_list = __esm(() => {
   };
   alias("ls", "list");
   register("list", async (args) => {
-    const isJson = args.includes("--json");
-    const showAll = args.includes("--all") || args.includes("-a");
-    const categoryFlag = args.indexOf("--category");
-    const categoryPath = categoryFlag !== -1 ? args[categoryFlag + 1] : undefined;
+    const { project: projectSlug, rest: argsWithoutProject } = extractProjectFlag2(args);
+    applyProjectFlag(projectSlug);
+    const isJson = argsWithoutProject.includes("--json");
+    const showAll = argsWithoutProject.includes("--all") || argsWithoutProject.includes("-a");
+    const categoryFlag = argsWithoutProject.indexOf("--category");
+    const categoryPath = categoryFlag !== -1 ? argsWithoutProject[categoryFlag + 1] : undefined;
     let sessionRows;
     if (categoryPath) {
       const category = getCategoryByPath(categoryPath);
@@ -4616,7 +4726,9 @@ function ansi256(code, text2) {
   return `\x1B[38;5;${code}m${text2}${RESET}`;
 }
 function showAllSessions() {
+  const project = resolveActiveProject();
   const rows = getAllSessions().sort((a, b) => new Date(b.session.updatedAt).getTime() - new Date(a.session.updatedAt).getTime());
+  console.log(`${DIM}Project: ${project.slug} (${project.name})${RESET}`);
   if (rows.length === 0) {
     console.log("No sessions.");
     return;
@@ -4741,15 +4853,22 @@ function renderTimingFooter(sessionId) {
   lines.push(`${DIM}Duration: ${formatDuration(durationS * 1000)} \xB7 Claude: ${formatDuration(claudeWorkS * 1000)} (${activePctVal}%) \xB7 Wait: ${formatDuration(userWaitS * 1000)} (${100 - activePctVal}%)${RESET}`);
   return lines;
 }
+function renderBreadcrumb(projectSlug, projectName, sessionName) {
+  const segments = sessionName.split("/").filter(Boolean);
+  const trail = segments.join(` ${DIM}\u203A${RESET} `);
+  return `${DIM}${projectSlug} (${projectName})${RESET} ${DIM}\xB7${RESET} ${BOLD}${trail}${RESET}`;
+}
 function showSessionLog(session, sessionName, isJson) {
   const sessionId = session.id;
   const rawEvents = getEventsBySession(sessionId);
   const enriched = enrichAll(rawEvents);
   const compacted = compact(enriched);
+  const project = resolveActiveProject();
   if (isJson) {
     const stats = getSessionStats(sessionId);
     const conversations2 = getConversationsBySession(sessionId);
     console.log(JSON.stringify({
+      project: { slug: project.slug, name: project.name },
       session: { ...session, name: sessionName },
       stats,
       conversations: conversations2,
@@ -4767,6 +4886,8 @@ function showSessionLog(session, sessionName, isJson) {
   }
   const segments = segmentByConversation(compacted);
   const allLines = [];
+  allLines.push(renderBreadcrumb(project.slug, project.name, sessionName));
+  allLines.push("");
   for (let i = 0;i < segments.length; i++) {
     const segLines = renderSegment(segments[i], i, segments.length);
     allLines.push(...segLines);
@@ -4788,6 +4909,8 @@ var init_log = __esm(() => {
   init_compact();
   init_timing();
   init_format();
+  init_resolve();
+  init_cli_flag();
   STATUS_DOTS2 = {
     active: ansi(32, "\u25CF"),
     waiting: ansi(33, "\u25CF"),
@@ -4795,8 +4918,10 @@ var init_log = __esm(() => {
     archived: `${DIM}\u25CB${RESET}`
   };
   register("log", async (args) => {
-    const isJson = args.includes("--json");
-    const filteredArgs = args.filter((a) => !a.startsWith("--"));
+    const { project: projectSlug, rest: argsWithoutProject } = extractProjectFlag2(args);
+    applyProjectFlag(projectSlug);
+    const isJson = argsWithoutProject.includes("--json");
+    const filteredArgs = argsWithoutProject.filter((a) => !a.startsWith("--"));
     const target = filteredArgs[0];
     if (!target) {
       showAllSessions();