bertrand 0.14.1 → 0.16.0

package/dist/bertrand.js

@@ -1151,8 +1151,63 @@ var init_engagement_stats = __esm(() => {
   init_events();
 });
 
+// src/lib/session-archive.ts
+function archiveSession(id) {
+  const session = getSession(id);
+  if (!session)
+    return { ok: false, reason: "not-found" };
+  if (ACTIVE_STATUSES.includes(session.status)) {
+    return { ok: false, reason: "active" };
+  }
+  if (session.status === "archived") {
+    return { ok: false, reason: "already-archived" };
+  }
+  const updated = updateSessionStatus(id, "archived");
+  return { ok: true, session: updated };
+}
+function unarchiveSession(id) {
+  const session = getSession(id);
+  if (!session)
+    return { ok: false, reason: "not-found" };
+  if (session.status !== "archived") {
+    return { ok: false, reason: "not-archived" };
+  }
+  const updated = updateSessionStatus(id, "paused");
+  return { ok: true, session: updated };
+}
+function archiveAllPaused() {
+  const rows = getAllSessions({ excludeArchived: true });
+  const paused = rows.filter((r) => r.session.status === "paused");
+  const archived = [];
+  for (const row of paused) {
+    const updated = updateSessionStatus(row.session.id, "archived");
+    archived.push({ session: updated, groupPath: row.groupPath });
+  }
+  return { archived };
+}
+var ACTIVE_STATUSES;
+var init_session_archive = __esm(() => {
+  init_sessions();
+  ACTIVE_STATUSES = ["active", "waiting"];
+});
+
 // src/server/index.ts
 import { execFile } from "child_process";
+import { existsSync as existsSync3 } from "fs";
+import { join as join3 } from "path";
+function liveStats(sessionId) {
+  return {
+    sessionId,
+    ...computeSessionStats(sessionId),
+    updatedAt: new Date().toISOString()
+  };
+}
+function archiveResponse(result) {
+  if (result.ok)
+    return Response.json(result.session);
+  const meta = ARCHIVE_ERROR[result.reason] ?? { status: 400, message: "Operation failed" };
+  return Response.json({ error: meta.message, reason: result.reason }, { status: meta.status });
+}
 async function handleOpen(req) {
   let body;
   try {
@@ -1190,10 +1245,33 @@ function match(pathname, url) {
   }
   return Response.json({ error: "Not found" }, { status: 404 });
 }
+function findDashboardDir() {
+  const candidates = [
+    join3(import.meta.dir, "dashboard"),
+    join3(import.meta.dir, "..", "dashboard")
+  ];
+  for (const dir of candidates) {
+    if (existsSync3(join3(dir, "index.html")))
+      return dir;
+  }
+  return null;
+}
+async function serveDashboard(pathname) {
+  if (!DASHBOARD_DIR)
+    return null;
+  const requested = pathname === "/" ? "/index.html" : pathname;
+  const filePath = join3(DASHBOARD_DIR, requested);
+  if (!filePath.startsWith(DASHBOARD_DIR))
+    return null;
+  const file = Bun.file(filePath);
+  if (await file.exists())
+    return new Response(file);
+  return new Response(Bun.file(join3(DASHBOARD_DIR, "index.html")));
+}
 function startServer(port = PORT) {
   const server = Bun.serve({
     port,
-    fetch(req) {
+    async fetch(req) {
       const url = new URL(req.url);
       if (req.method === "OPTIONS") {
         return new Response(null, {
@@ -1205,76 +1283,97 @@ function startServer(port = PORT) {
         });
       }
       if (req.method === "POST" && url.pathname === "/api/open") {
-        return handleOpen(req).then((r) => {
-          r.headers.set("Access-Control-Allow-Origin", "*");
-          return r;
-        });
+        const r = await handleOpen(req);
+        r.headers.set("Access-Control-Allow-Origin", "*");
+        return r;
+      }
+      if (req.method === "POST") {
+        const archiveMatch = /^\/api\/sessions\/([^/]+)\/archive$/.exec(url.pathname);
+        if (archiveMatch) {
+          const response2 = archiveResponse(archiveSession(archiveMatch[1]));
+          response2.headers.set("Access-Control-Allow-Origin", "*");
+          return response2;
+        }
+        const unarchiveMatch = /^\/api\/sessions\/([^/]+)\/unarchive$/.exec(url.pathname);
+        if (unarchiveMatch) {
+          const response2 = archiveResponse(unarchiveSession(unarchiveMatch[1]));
+          response2.headers.set("Access-Control-Allow-Origin", "*");
+          return response2;
+        }
+      }
+      if (url.pathname.startsWith("/api/")) {
+        const response2 = match(url.pathname, url);
+        response2.headers.set("Access-Control-Allow-Origin", "*");
+        return response2;
       }
+      const dashboardResponse = await serveDashboard(url.pathname);
+      if (dashboardResponse)
+        return dashboardResponse;
       const response = match(url.pathname, url);
       response.headers.set("Access-Control-Allow-Origin", "*");
       return response;
     }
   });
-  console.log(`bertrand API server listening on http://localhost:${server.port}`);
+  const dashboardNote = DASHBOARD_DIR ? " (with bundled dashboard)" : "";
+  console.log(`bertrand API server listening on http://localhost:${server.port}${dashboardNote}`);
   return server;
 }
-var PORT, routes;
+var PORT, listSessions = (_params, url) => {
+  const excludeArchived = url.searchParams.get("excludeArchived") !== "false";
+  return getAllSessions({ excludeArchived });
+}, getSessionById = ({ id }) => getSession(id), listEvents = ({ sessionId }, url) => {
+  const eventType = url.searchParams.get("type");
+  if (eventType)
+    return getEventsByType(sessionId, eventType);
+  return getEventsBySession(sessionId);
+}, listAllStats = () => {
+  const result = {};
+  for (const { session } of getAllSessions()) {
+    const isLive = session.status === "active" || session.status === "waiting";
+    if (isLive) {
+      result[session.id] = liveStats(session.id);
+      continue;
+    }
+    result[session.id] = getSessionStats(session.id) ?? liveStats(session.id);
+  }
+  return result;
+}, getStatsBySession = ({
+  sessionId
+}) => {
+  const session = getSession(sessionId);
+  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(), routes, ARCHIVE_ERROR, DASHBOARD_DIR;
 var init_server = __esm(() => {
   init_sessions();
   init_events();
   init_stats();
   init_timing();
   init_engagement_stats();
+  init_session_archive();
   PORT = Number(process.env.BERTRAND_PORT ?? 5200);
   routes = [
-    [/^\/api\/sessions$/, (_params, url) => {
-      const excludeArchived = url.searchParams.get("excludeArchived") !== "false";
-      return getAllSessions({ excludeArchived });
-    }],
-    [/^\/api\/sessions\/(?<id>[^/]+)$/, ({ id }) => {
-      return getSession(id);
-    }],
-    [/^\/api\/events\/(?<sessionId>[^/]+)$/, ({ sessionId }, url) => {
-      const eventType = url.searchParams.get("type");
-      if (eventType)
-        return getEventsByType(sessionId, eventType);
-      return getEventsBySession(sessionId);
-    }],
-    [/^\/api\/stats$/, () => {
-      const all = getAllSessions();
-      const now = new Date().toISOString();
-      const result = {};
-      for (const { session } of all) {
-        const isLive = session.status === "active" || session.status === "waiting";
-        if (isLive) {
-          result[session.id] = { sessionId: session.id, ...computeSessionStats(session.id), updatedAt: now };
-          continue;
-        }
-        const stored = getSessionStats(session.id);
-        result[session.id] = stored ?? { sessionId: session.id, ...computeSessionStats(session.id), updatedAt: now };
-      }
-      return result;
-    }],
-    [/^\/api\/stats\/(?<sessionId>[^/]+)$/, ({ sessionId }) => {
-      const session = getSession(sessionId);
-      if (!session)
-        return null;
-      const isLive = session.status === "active" || session.status === "waiting";
-      if (isLive) {
-        return { sessionId, ...computeSessionStats(sessionId), updatedAt: new Date().toISOString() };
-      }
-      const stored = getSessionStats(sessionId);
-      if (stored)
-        return stored;
-      return { sessionId, ...computeSessionStats(sessionId), updatedAt: new Date().toISOString() };
-    }],
-    [/^\/api\/engagement\/(?<sessionId>[^/]+)$/, ({ sessionId }) => {
-      return computeEngagementStats(sessionId);
-    }],
-    [/^\/api\/recaps$/, () => {
-      return getLatestRecaps();
-    }]
+    [/^\/api\/sessions$/, listSessions],
+    [/^\/api\/sessions\/(?<id>[^/]+)$/, getSessionById],
+    [/^\/api\/events\/(?<sessionId>[^/]+)$/, listEvents],
+    [/^\/api\/stats$/, listAllStats],
+    [/^\/api\/stats\/(?<sessionId>[^/]+)$/, getStatsBySession],
+    [/^\/api\/engagement\/(?<sessionId>[^/]+)$/, getEngagement],
+    [/^\/api\/recaps$/, listRecaps]
   ];
+  ARCHIVE_ERROR = {
+    "not-found": { status: 404, message: "Session not found" },
+    active: { status: 409, message: "Cannot archive an active session" },
+    "already-archived": { status: 409, message: "Session is already archived" },
+    "not-archived": { status: 409, message: "Session is not archived" }
+  };
+  DASHBOARD_DIR = findDashboardDir();
 });
 
 // src/cli/commands/serve.ts
@@ -1361,16 +1460,10 @@ var init_labels = __esm(() => {
 // src/contract/template.md
 var template_default = `You are running inside bertrand, session: {sessionName}. Follow these rules strictly:
 
-At session start, run: ToolSearch with query "select:AskUserQuestion" to load the tool.
-
-After every response, you MUST call AskUserQuestion. This is a continuous loop \u2014 every turn ends with AskUserQuestion. Always include a "Done for now" option so the user can exit the loop when ready. 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). 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.
 
-Each question must encapsulate the moment \u2014 name the specific decision, tradeoff, or next step being asked about. Avoid generic phrasing like "What next?", "How should we proceed?", or "What would you like to do?". A reader who sees only the question (no recap, no preceding text) should understand what is being decided. Prefer "Which gap should we tackle first \u2014 bundle analysis, end-to-end dry-run, or registry?" over "What's next?"
-
-Every option must be a concrete, actionable next step. No filler like "Have questions?" or "Want to learn more?" \u2014 if clarification is needed, phrase it as a specific action: "Discuss tradeoffs of X vs Y".
-
 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 = () => {};
@@ -1379,25 +1472,14 @@ var init_template = () => {};
 function buildContract(sessionName, ...contextLayers) {
   const base = template_default.replace("{sessionName}", sessionName);
   const layers = contextLayers.map((c) => c.trim()).filter((c) => c.length > 0);
-  const middle = layers.length === 0 ? "" : `
+  if (layers.length === 0)
+    return base;
+  return base + `
 
 ` + layers.join(`
 
 `);
-  return base + middle + `
-
-` + TRAILING_CRITICAL_RULES;
 }
-var TRAILING_CRITICAL_RULES = `## CRITICAL RULE \u2014 applies to every AskUserQuestion call
-
-Every AskUserQuestion call MUST set \`multiSelect: true\` on every question. No exceptions.
-
-The AskUserQuestion tool schema describes multiSelect as "allow multiple answers to be selected instead of just one." **Ignore that framing.** In bertrand, multiSelect is a UX-safety mechanism, not a cardinality signal \u2014 single-select submits on Enter the moment a question block gains focus, causing accidental selections. multiSelect requires explicit confirmation before submitting.
-
-Apply this rule even when options are mutually exclusive (e.g., "Which library: A, B, C, or D?"). The mechanic is about preventing accidental submissions, not about how many answers the user picks.
-
-WRONG: \`{ "multiSelect": false, "options": [...] }\`
-RIGHT: \`{ "multiSelect": true,  "options": [...] }\``;
 var init_template2 = __esm(() => {
   init_template();
 });
@@ -1600,6 +1682,92 @@ var init_spawn_context = __esm(() => {
   execFileAsync = promisify(execFile2);
 });
 
+// src/lib/server-lifecycle.ts
+import { spawn as spawn2 } from "child_process";
+import { readFileSync as readFileSync3, writeFileSync, unlinkSync } from "fs";
+import { join as join4 } from "path";
+function readPidFile() {
+  try {
+    const pid = Number(readFileSync3(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)
+    writeFileSync(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: join4(paths.root, "server.pid"),
+    port: Number(process.env.BERTRAND_PORT ?? 5200),
+    resolveBin() {
+      try {
+        const config = JSON.parse(readFileSync3(join4(paths.root, "config.json"), "utf-8"));
+        return typeof config?.bin === "string" ? config.bin : null;
+      } catch {
+        return null;
+      }
+    },
+    getActiveCount: () => getActiveSessions().length
+  };
+  deps = defaultDeps;
+});
+
 // src/engine/session.ts
 import { randomUUID } from "crypto";
 async function launch(opts) {
@@ -1626,6 +1794,7 @@ async function launch(opts) {
     sessionId: session.id
   });
   updateSession(session.id, { status: "active", pid: process.pid });
+  await ensureServerStarted();
   const spawnContext = await captureSpawnContext();
   const sessionName = `${opts.groupPath}/${opts.slug}`;
   insertEvent({
@@ -1671,6 +1840,7 @@ async function resume(opts) {
   const group = getGroup(session.groupId);
   const sessionName = group ? `${group.path}/${session.slug}` : session.name;
   updateSession(session.id, { status: "active", pid: process.pid });
+  await ensureServerStarted();
   insertEvent({
     sessionId: session.id,
     conversationId: opts.conversationId,
@@ -1715,6 +1885,7 @@ function finalizeSession(sessionId, conversationId, exitCode) {
     event: "session.end"
   });
   computeAndPersist(sessionId);
+  stopServerIfIdle();
 }
 var init_session = __esm(() => {
   init_sessions();
@@ -1727,16 +1898,17 @@ var init_session = __esm(() => {
   init_process();
   init_spawn_context();
   init_timing();
+  init_server_lifecycle();
 });
 
 // src/tui/app.tsx
-import { spawn as spawn2 } from "child_process";
-import { existsSync as existsSync3, readFileSync as readFileSync3, unlinkSync } from "fs";
-import { join as join3 } from "path";
+import { spawn as spawn3 } from "child_process";
+import { existsSync as existsSync4, readFileSync as readFileSync4, unlinkSync as unlinkSync2 } from "fs";
+import { join as join5 } from "path";
 import { randomUUID as randomUUID2 } from "crypto";
 async function runScreen(screen, ...args) {
   const tmpFile = `/tmp/bertrand-tui-${process.pid}-${Date.now()}.json`;
-  const child = spawn2("bun", ["run", SCREEN_ENTRY, screen, tmpFile, ...args], {
+  const child = spawn3("bun", ["run", SCREEN_ENTRY, screen, tmpFile, ...args], {
     stdio: "inherit"
   });
   const exitCode = await new Promise((resolve) => {
@@ -1745,8 +1917,8 @@ async function runScreen(screen, ...args) {
   if (exitCode !== 0) {
     throw new Error(`TUI screen "${screen}" exited with code ${exitCode}`);
   }
-  const result = JSON.parse(readFileSync3(tmpFile, "utf-8"));
-  unlinkSync(tmpFile);
+  const result = JSON.parse(readFileSync4(tmpFile, "utf-8"));
+  unlinkSync2(tmpFile);
   return result;
 }
 async function startLaunchTui() {
@@ -1785,7 +1957,7 @@ async function runSessionLoop(sessionId) {
     case "save":
       break;
     case "archive":
-      updateSessionStatus(sessionId, "archived");
+      archiveSession(sessionId);
       break;
     case "discard":
       deleteSession(sessionId);
@@ -1810,11 +1982,6 @@ async function startTui() {
       await runSessionLoop(sessionId);
       break;
     }
-    case "resume": {
-      const sessionId = await resume(selection);
-      await runSessionLoop(sessionId);
-      break;
-    }
     case "pick": {
       const conversationId = await resolveConversationForResume(selection.sessionId);
       if (!conversationId)
@@ -1832,10 +1999,11 @@ var SCREEN_ENTRY;
 var init_app = __esm(() => {
   init_sessions();
   init_conversations();
+  init_session_archive();
   init_session();
   SCREEN_ENTRY = (() => {
-    const built = join3(import.meta.dir, "run-screen.js");
-    return existsSync3(built) ? built : join3(import.meta.dir, "run-screen.tsx");
+    const built = join5(import.meta.dir, "run-screen.js");
+    return existsSync4(built) ? built : join5(import.meta.dir, "run-screen.tsx");
   })();
 });
 
@@ -1860,7 +2028,7 @@ function parseSessionName(input) {
 }
 
 // src/engine/recovery.ts
-function isProcessAlive(pid) {
+function isProcessAlive2(pid) {
   try {
     process.kill(pid, 0);
     return true;
@@ -1872,7 +2040,7 @@ function recoverStaleSessions() {
   const active = getActiveSessions();
   let recovered = 0;
   for (const { session } of active) {
-    if (session.pid && !isProcessAlive(session.pid)) {
+    if (session.pid && !isProcessAlive2(session.pid)) {
       updateSession(session.id, {
         status: "paused",
         pid: null
@@ -1939,11 +2107,21 @@ var init_migrate = __esm(() => {
 function waitingScript(bin) {
   const BIN = bin;
   return `#!/usr/bin/env bash
-# Hook: PreToolUse AskUserQuestion \u2192 mark session as waiting
+# Hook: PreToolUse AskUserQuestion \u2192 enforce multiSelect, mark session as waiting
 sid="\${BERTRAND_SESSION:-}"
 [ -z "$sid" ] && exit 0
 
 input="$(cat)"
+
+# Block AUQ calls that omit multiSelect:true on any question. multiSelect is a
+# UX-safety mechanism in bertrand (prevents submit-on-focus), not a cardinality
+# signal. Enforce mechanically so the rule sticks in subagent / job contexts
+# where the system-prompt contract never reaches the agent.
+if printf '%s' "$input" | jq -e '.tool_input.questions[]? | select(.multiSelect != true)' > /dev/null 2>&1; then
+  printf 'All AskUserQuestion questions must set multiSelect:true. This is a UX-safety mechanism in bertrand (prevents submit-on-focus when the question block gains focus), not a cardinality signal. Retry with multiSelect:true on every question.\\n' >&2
+  exit 2
+fi
+
 cid="\${BERTRAND_CLAUDE_ID:-}"
 
 # Extract question \u2014 grep for simple field extraction (~1ms vs jq ~15ms)
@@ -2198,13 +2376,13 @@ var init_scripts = __esm(() => {
 });
 
 // src/hooks/install.ts
-import { mkdirSync as mkdirSync3, writeFileSync, chmodSync } from "fs";
-import { join as join4 } from "path";
+import { mkdirSync as mkdirSync3, writeFileSync as writeFileSync2, chmodSync } from "fs";
+import { join as join6 } from "path";
 function installHookScripts(bin) {
   mkdirSync3(paths.hooks, { recursive: true });
   for (const [filename, scriptFn] of Object.entries(HOOK_SCRIPTS)) {
-    const filePath = join4(paths.hooks, filename);
-    writeFileSync(filePath, scriptFn(bin));
+    const filePath = join6(paths.hooks, filename);
+    writeFileSync2(filePath, scriptFn(bin));
     chmodSync(filePath, 493);
   }
   console.log(`Installed ${Object.keys(HOOK_SCRIPTS).length} hook scripts to ${paths.hooks}`);
@@ -2215,8 +2393,8 @@ var init_install = __esm(() => {
 });
 
 // src/hooks/settings.ts
-import { readFileSync as readFileSync4, writeFileSync as writeFileSync2, mkdirSync as mkdirSync4 } from "fs";
-import { join as join5, dirname as dirname3 } from "path";
+import { readFileSync as readFileSync5, writeFileSync as writeFileSync3, mkdirSync as mkdirSync4 } from "fs";
+import { join as join7, dirname as dirname3 } from "path";
 import { homedir as homedir2 } from "os";
 function isBertrandGroup(group) {
   return group.hooks?.some((h) => h.command?.includes(".bertrand/hooks/")) ?? false;
@@ -2224,7 +2402,7 @@ function isBertrandGroup(group) {
 function installHookSettings() {
   let settings = {};
   try {
-    settings = JSON.parse(readFileSync4(SETTINGS_PATH, "utf-8"));
+    settings = JSON.parse(readFileSync5(SETTINGS_PATH, "utf-8"));
   } catch {}
   const existingHooks = settings.hooks && typeof settings.hooks === "object" && !Array.isArray(settings.hooks) ? settings.hooks : {};
   const merged = { ...existingHooks };
@@ -2234,14 +2412,14 @@ function installHookSettings() {
   }
   settings.hooks = merged;
   mkdirSync4(dirname3(SETTINGS_PATH), { recursive: true });
-  writeFileSync2(SETTINGS_PATH, JSON.stringify(settings, null, 2) + `
+  writeFileSync3(SETTINGS_PATH, JSON.stringify(settings, null, 2) + `
 `);
   console.log(`Updated ${SETTINGS_PATH} with bertrand hooks`);
 }
 var SETTINGS_PATH, BERTRAND_HOOKS;
 var init_settings = __esm(() => {
   init_paths();
-  SETTINGS_PATH = join5(homedir2(), ".claude", "settings.json");
+  SETTINGS_PATH = join7(homedir2(), ".claude", "settings.json");
   BERTRAND_HOOKS = {
     PreToolUse: [
       {
@@ -2285,8 +2463,8 @@ var init_settings = __esm(() => {
 });
 
 // src/lib/completions.ts
-import { writeFileSync as writeFileSync3, mkdirSync as mkdirSync5 } from "fs";
-import { join as join6 } from "path";
+import { writeFileSync as writeFileSync4, mkdirSync as mkdirSync5 } from "fs";
+import { join as join8 } from "path";
 function bashCompletion() {
   return `# bertrand bash completion
 _bertrand() {
@@ -2316,11 +2494,11 @@ function fishCompletion() {
 `;
 }
 function generateCompletions() {
-  const dir = join6(paths.root, "completions");
+  const dir = join8(paths.root, "completions");
   mkdirSync5(dir, { recursive: true });
-  writeFileSync3(join6(dir, "bertrand.bash"), bashCompletion());
-  writeFileSync3(join6(dir, "_bertrand"), zshCompletion());
-  writeFileSync3(join6(dir, "bertrand.fish"), fishCompletion());
+  writeFileSync4(join8(dir, "bertrand.bash"), bashCompletion());
+  writeFileSync4(join8(dir, "_bertrand"), zshCompletion());
+  writeFileSync4(join8(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`);
@@ -2347,9 +2525,9 @@ var init_completions = __esm(() => {
 
 // src/cli/commands/init.ts
 var exports_init = {};
-import { mkdirSync as mkdirSync6, readFileSync as readFileSync5, writeFileSync as writeFileSync4, chmodSync as chmodSync2 } from "fs";
+import { mkdirSync as mkdirSync6, readFileSync as readFileSync6, writeFileSync as writeFileSync5, chmodSync as chmodSync2 } from "fs";
 import { execSync as execSync2 } from "child_process";
-import { join as join7 } from "path";
+import { join as join9 } from "path";
 function detectTerminal() {
   try {
     execSync2("which wsh", { stdio: "ignore" });
@@ -2359,12 +2537,12 @@ function detectTerminal() {
   }
 }
 function writeConfig(config) {
-  writeFileSync4(CONFIG_PATH, JSON.stringify(config, null, 2) + `
+  writeFileSync5(CONFIG_PATH, JSON.stringify(config, null, 2) + `
 `);
 }
 function readConfig() {
   try {
-    return JSON.parse(readFileSync5(CONFIG_PATH, "utf-8"));
+    return JSON.parse(readFileSync6(CONFIG_PATH, "utf-8"));
   } catch {
     return null;
   }
@@ -2375,10 +2553,10 @@ function resolveBin() {
     return onPath;
   const entry = process.argv[1];
   if (entry && SOURCE_ENTRY.test(entry)) {
-    const launcherDir = join7(paths.root, "bin");
-    const launcher = join7(launcherDir, "bertrand-dev");
+    const launcherDir = join9(paths.root, "bin");
+    const launcher = join9(launcherDir, "bertrand-dev");
     mkdirSync6(launcherDir, { recursive: true });
-    writeFileSync4(launcher, `#!/usr/bin/env bash
+    writeFileSync5(launcher, `#!/usr/bin/env bash
 exec ${process.execPath} ${JSON.stringify(entry)} "$@"
 `);
     chmodSync2(launcher, 493);
@@ -2394,7 +2572,7 @@ var init_init = __esm(() => {
   init_settings();
   init_paths();
   init_completions();
-  CONFIG_PATH = join7(paths.root, "config.json");
+  CONFIG_PATH = join9(paths.root, "config.json");
   SOURCE_ENTRY = /\/src\/index\.tsx?$/;
   register("init", async () => {
     console.log(`bertrand init
@@ -2984,7 +3162,7 @@ function dur(seconds) {
 function renderGlobal(metrics, isJson) {
   const totals = metrics.reduce((acc, m) => ({
     sessions: acc.sessions + 1,
-    active: acc.active + (ACTIVE_STATUSES.includes(m.status) ? 1 : 0),
+    active: acc.active + (ACTIVE_STATUSES2.includes(m.status) ? 1 : 0),
     durationS: acc.durationS + m.durationS,
     claudeWorkS: acc.claudeWorkS + m.claudeWorkS,
     userWaitS: acc.userWaitS + m.userWaitS,
@@ -3057,7 +3235,7 @@ function renderSession(m, isJson) {
   console.log(`  Interactions:  ${m.interactionCount}`);
   console.log(`  PRs:           ${m.prCount}`);
 }
-var ACTIVE_STATUSES;
+var ACTIVE_STATUSES2;
 var init_stats2 = __esm(() => {
   init_router();
   init_sessions();
@@ -3066,7 +3244,7 @@ var init_stats2 = __esm(() => {
   init_events();
   init_timing();
   init_format();
-  ACTIVE_STATUSES = ["active", "waiting"];
+  ACTIVE_STATUSES2 = ["active", "waiting"];
   register("stats", async (args) => {
     const isJson = args.includes("--json");
     const filteredArgs = args.filter((a) => !a.startsWith("--"));
@@ -3139,32 +3317,27 @@ function resolveSession(name) {
   }
   return { session, groupPath };
 }
-var ACTIVE_STATUSES2;
 var init_archive = __esm(() => {
   init_router();
   init_sessions();
   init_groups();
-  ACTIVE_STATUSES2 = ["active", "waiting"];
+  init_session_archive();
   register("archive", async (args) => {
     const isUndo = args.includes("--undo");
     const isAllPaused = args.includes("--all-paused");
     const filteredArgs = args.filter((a) => !a.startsWith("--"));
     const sessionName = filteredArgs[0];
     if (isAllPaused) {
-      const rows = getAllSessions({ excludeArchived: true });
-      const paused = rows.filter((r) => r.session.status === "paused");
-      if (paused.length === 0) {
+      const { archived } = archiveAllPaused();
+      if (archived.length === 0) {
         console.log("No paused sessions to archive.");
         return;
       }
-      let archived = 0;
-      for (const row of paused) {
-        updateSessionStatus(row.session.id, "archived");
-        console.log(`  archived ${row.groupPath}/${row.session.slug}`);
-        archived++;
+      for (const { session: session2, groupPath: groupPath2 } of archived) {
+        console.log(`  archived ${groupPath2}/${session2.slug}`);
       }
       console.log(`
-Archived ${archived} session${archived === 1 ? "" : "s"}.`);
+Archived ${archived.length} session${archived.length === 1 ? "" : "s"}.`);
       return;
     }
     if (!sessionName) {
@@ -3176,23 +3349,33 @@ Archived ${archived} session${archived === 1 ? "" : "s"}.`);
     const { session, groupPath } = resolveSession(sessionName);
     const fullName = `${groupPath}/${session.slug}`;
     if (isUndo) {
-      if (session.status !== "archived") {
-        console.error(`${fullName} is not archived (status: ${session.status})`);
+      const result2 = unarchiveSession(session.id);
+      if (!result2.ok) {
+        if (result2.reason === "not-archived") {
+          console.error(`${fullName} is not archived (status: ${session.status})`);
+        } else {
+          console.error(`Session not found: ${fullName}`);
+        }
         process.exit(1);
       }
-      updateSessionStatus(session.id, "paused");
       console.log(`Unarchived ${fullName}`);
       return;
     }
-    if (ACTIVE_STATUSES2.includes(session.status)) {
-      console.error(`Cannot archive active session ${fullName} (status: ${session.status})`);
-      process.exit(1);
-    }
-    if (session.status === "archived") {
-      console.error(`${fullName} is already archived`);
+    const result = archiveSession(session.id);
+    if (!result.ok) {
+      switch (result.reason) {
+        case "active":
+          console.error(`Cannot archive active session ${fullName} (status: ${session.status})`);
+          break;
+        case "already-archived":
+          console.error(`${fullName} is already archived`);
+          break;
+        case "not-found":
+          console.error(`Session not found: ${fullName}`);
+          break;
+      }
       process.exit(1);
     }
-    updateSessionStatus(session.id, "archived");
     console.log(`Archived ${fullName}`);
   });
 });