bertrand 0.14.0 → 0.15.0

package/dist/bertrand.js

@@ -1151,8 +1151,54 @@ 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";
+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 {
@@ -1210,6 +1256,20 @@ function startServer(port = PORT) {
           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;
+        }
+      }
       const response = match(url.pathname, url);
       response.headers.set("Access-Control-Allow-Origin", "*");
       return response;
@@ -1218,13 +1278,14 @@ function startServer(port = PORT) {
   console.log(`bertrand API server listening on http://localhost:${server.port}`);
   return server;
 }
-var PORT, routes;
+var PORT, routes, ARCHIVE_ERROR;
 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) => {
@@ -1275,6 +1336,12 @@ var init_server = __esm(() => {
       return getLatestRecaps();
     }]
   ];
+  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" }
+  };
 });
 
 // src/cli/commands/serve.ts
@@ -1361,16 +1428,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.
 
-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".
-
-Every AskUserQuestion call MUST use multiSelect: true. No exceptions. Single-select fires on Enter with no confirmation, which causes accidental selections when a block gains focus. multiSelect requires explicit confirmation before submitting.
-
 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 = () => {};
@@ -1774,7 +1835,7 @@ async function runSessionLoop(sessionId) {
     case "save":
       break;
     case "archive":
-      updateSessionStatus(sessionId, "archived");
+      archiveSession(sessionId);
       break;
     case "discard":
       deleteSession(sessionId);
@@ -1799,11 +1860,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)
@@ -1821,6 +1877,7 @@ 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");
@@ -1928,11 +1985,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)
@@ -2973,7 +3040,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,
@@ -3046,7 +3113,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();
@@ -3055,7 +3122,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("--"));
@@ -3128,32 +3195,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) {
@@ -3165,23 +3227,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}`);
   });
 });

package/dist/run-screen.js

@@ -19,8 +19,8 @@ import { writeFileSync } from "fs";
 import { render } from "@orchetron/storm";
 
 // src/tui/screens/launch/index.tsx
-import { useCallback as useCallback2 } from "react";
-import { Box as Box5, useTui as useTui2 } from "@orchetron/storm";
+import { useMemo as useMemo2, useState as useState2 } from "react";
+import { Box as Box4, Text as Text5, useTui } from "@orchetron/storm";
 
 // src/tui/components/app-details.tsx
 import { Box, Text } from "@orchetron/storm";
@@ -74,6 +74,24 @@ import { useMemo, useState } from "react";
 import { Box as Box3, Text as Text3, TextInput, useInput } from "@orchetron/storm";
 import { jsxDEV as jsxDEV3 } from "react/jsx-dev-runtime";
 var NEW_KEY = "__new__";
+function isSelectable(row) {
+  if (row.value === NEW_KEY)
+    return true;
+  const item = row;
+  return item.kind !== "header" && !item.disabled;
+}
+function findNextSelectable(rows, from, direction) {
+  let i = from;
+  while (i >= 0 && i < rows.length) {
+    if (isSelectable(rows[i]))
+      return i;
+    i += direction;
+  }
+  return -1;
+}
+function findFirstSelectable(rows) {
+  return findNextSelectable(rows, 0, 1);
+}
 function Picker(props) {
   const {
     items,
@@ -81,7 +99,7 @@ function Picker(props) {
     placeholder,
     allowCreate = true,
     emptyHint,
-    maxVisible = 8
+    maxVisible = 12
   } = props;
   const [filter, setFilter] = useState("");
   const [cursor, setCursor] = useState(0);
@@ -89,13 +107,19 @@ function Picker(props) {
     const q = filter.trim().toLowerCase();
     if (!q)
       return items;
-    return items.filter((it) => it.label.toLowerCase().includes(q));
+    return items.filter((it) => it.kind !== "header" && it.label.toLowerCase().includes(q));
   }, [filter, items]);
-  const exactMatch = useMemo(() => filtered.some((it) => it.label.toLowerCase() === filter.trim().toLowerCase()), [filter, filtered]);
+  const exactMatch = useMemo(() => filtered.some((it) => it.kind !== "header" && it.label.toLowerCase() === filter.trim().toLowerCase()), [filter, filtered]);
   const showCreate = allowCreate && filter.trim().length > 0 && !exactMatch;
   const visibleRows = useMemo(() => showCreate ? [...filtered, { value: NEW_KEY }] : filtered, [filtered, showCreate]);
-  if (cursor >= visibleRows.length) {
-    setTimeout(() => setCursor(Math.max(0, visibleRows.length - 1)), 0);
+  if (visibleRows.length === 0) {
+    if (cursor !== 0)
+      setTimeout(() => setCursor(0), 0);
+  } else if (cursor >= visibleRows.length || !isSelectable(visibleRows[cursor])) {
+    const next = findFirstSelectable(visibleRows);
+    if (next !== -1 && next !== cursor) {
+      setTimeout(() => setCursor(next), 0);
+    }
   }
   useInput((e) => {
     if (!isFocused)
@@ -108,16 +132,24 @@ function Picker(props) {
     if (visibleRows.length === 0)
       return;
     if (e.key === "up") {
-      setCursor((c) => Math.max(0, c - 1));
+      setCursor((c) => {
+        const next = findNextSelectable(visibleRows, c - 1, -1);
+        return next === -1 ? c : next;
+      });
     } else if (e.key === "down") {
-      setCursor((c) => Math.min(visibleRows.length - 1, c + 1));
+      setCursor((c) => {
+        const next = findNextSelectable(visibleRows, c + 1, 1);
+        return next === -1 ? c : next;
+      });
     } else if (e.key === "tab" && props.mode === "multi") {
       props.onDone();
     }
   }, { isActive: isFocused });
   const submitCursor = () => {
     const row = visibleRows[cursor];
-    const value = row && row.value === NEW_KEY ? filter.trim() : row?.value ?? "";
+    if (!row || !isSelectable(row))
+      return;
+    const value = row.value === NEW_KEY ? filter.trim() : row.value;
     if (!value)
       return;
     if (props.mode === "single") {
@@ -230,28 +262,46 @@ function Picker(props) {
               }, "__new__", true, undefined, this);
             }
             const item = row;
+            if (item.kind === "header") {
+              return /* @__PURE__ */ jsxDEV3(Box3, {
+                flexDirection: "row",
+                children: /* @__PURE__ */ jsxDEV3(Text3, {
+                  dim: true,
+                  bold: true,
+                  color: item.color ?? undefined,
+                  children: item.label
+                }, undefined, false, undefined, this)
+              }, `h:${item.value}`, false, undefined, this);
+            }
             const isSelected = selectedSet.has(item.value);
             const marker = props.mode === "multi" ? isSelected ? "\u2713 " : "  " : "";
+            const dim = item.dim || item.disabled;
             return /* @__PURE__ */ jsxDEV3(Box3, {
               flexDirection: "row",
               justifyContent: "space-between",
               gap: 1,
               backgroundColor: isCursor ? "green" : undefined,
               children: [
-                /* @__PURE__ */ jsxDEV3(Text3, {
-                  color: isCursor ? "black" : item.color ?? undefined,
-                  bold: isCursor,
-                  children: [
-                    marker,
-                    item.label
-                  ]
-                }, undefined, true, undefined, this),
+                /* @__PURE__ */ jsxDEV3(Box3, {
+                  flexDirection: "row",
+                  gap: 0,
+                  children: item.display ? item.display : /* @__PURE__ */ jsxDEV3(Text3, {
+                    color: isCursor ? "black" : item.color ?? undefined,
+                    bold: isCursor,
+                    dim: !isCursor && dim,
+                    children: [
+                      marker,
+                      item.label
+                    ]
+                  }, undefined, true, undefined, this)
+                }, undefined, false, undefined, this),
                 item.meta && /* @__PURE__ */ jsxDEV3(Box3, {
                   paddingX: 1,
                   backgroundColor: isCursor ? "black" : "#3a3a3a",
                   children: /* @__PURE__ */ jsxDEV3(Text3, {
                     color: isCursor ? "green" : "white",
                     bold: true,
+                    dim: !isCursor && dim,
                     children: item.meta
                   }, undefined, false, undefined, this)
                 }, undefined, false, undefined, this)
@@ -287,12 +337,8 @@ function StatusDot({ status }) {
     children: "\u25CF"
   }, undefined, false, undefined, this);
 }
-// src/tui/screens/launch/create-screen.tsx
-import { useState as useState2, useMemo as useMemo2, useCallback, useEffect, useRef } from "react";
-import { Box as Box4, Text as Text5, TextInput as TextInput2, useInput as useInput2, useTui } from "@orchetron/storm";
-
-// src/db/queries/groups.ts
-import { eq, like, or, isNull } from "drizzle-orm";
+// src/db/queries/sessions.ts
+import { eq, and, inArray, sql as sql2 } from "drizzle-orm";
 
 // src/db/client.ts
 import { Database } from "bun:sqlite";
@@ -442,19 +488,13 @@ function getDb() {
 // src/lib/id.ts
 import { nanoid } from "nanoid";
 
-// src/db/queries/groups.ts
-function getAllGroups() {
-  return getDb().select().from(groups).all();
-}
-
 // src/db/queries/sessions.ts
-import { eq as eq2, and, inArray, sql as sql2 } from "drizzle-orm";
 function getSession(id) {
-  return getDb().select().from(sessions).where(eq2(sessions.id, id)).get();
+  return getDb().select().from(sessions).where(eq(sessions.id, id)).get();
 }
 function getAllSessions(opts) {
   const db = getDb();
-  const query = db.select({ session: sessions, groupPath: groups.path }).from(sessions).innerJoin(groups, eq2(sessions.groupId, groups.id));
+  const query = db.select({ session: sessions, groupPath: groups.path }).from(sessions).innerJoin(groups, eq(sessions.groupId, groups.id));
   if (opts?.excludeArchived) {
     return query.where(inArray(sessions.status, [
       "active",
@@ -465,214 +505,6 @@ function getAllSessions(opts) {
   return query.all();
 }
 
-// src/tui/screens/launch/create-screen.tsx
-import { jsxDEV as jsxDEV5 } from "react/jsx-dev-runtime";
-function CreateScreen({
-  isFocused,
-  onSubmit,
-  onQuit
-}) {
-  const { clear } = useTui();
-  const [step, setStep] = useState2("group");
-  const [groupPath, setGroupPath] = useState2(null);
-  const [slug, setSlug] = useState2("");
-  const [error, setError] = useState2(null);
-  const stepRef = useRef(step);
-  stepRef.current = step;
-  useEffect(() => {
-    clear();
-  }, [step, clear]);
-  const groupItems = useMemo2(() => {
-    const activeSessions = getAllSessions({ excludeArchived: true });
-    const counts = new Map;
-    for (const s of activeSessions) {
-      counts.set(s.groupPath, (counts.get(s.groupPath) ?? 0) + 1);
-    }
-    return getAllGroups().filter((g) => counts.has(g.path)).sort((a, b) => a.path.localeCompare(b.path)).map((g) => ({
-      value: g.path,
-      label: g.path,
-      color: g.color,
-      meta: `${counts.get(g.path)}`
-    }));
-  }, []);
-  const handleGroupPicked = useCallback((value) => {
-    setGroupPath(value);
-    setError(null);
-    setStep("slug");
-  }, []);
-  const handleSlugSubmit = useCallback((value) => {
-    if (stepRef.current !== "slug")
-      return;
-    const trimmed = value.trim();
-    if (!trimmed) {
-      setError("Name cannot be empty.");
-      return;
-    }
-    if (!/^[a-z0-9][a-z0-9._-]*$/i.test(trimmed)) {
-      setError("Name must start alphanumeric; letters, digits, dots, underscores, dashes only.");
-      return;
-    }
-    if (!groupPath)
-      return;
-    onSubmit({ groupPath, slug: trimmed });
-  }, [groupPath, onSubmit]);
-  useInput2((e) => {
-    if (!isFocused)
-      return;
-    if (e.key === "c" && e.ctrl) {
-      onQuit();
-      return;
-    }
-    if (e.key === "escape" && step === "slug") {
-      setStep("group");
-      setSlug("");
-      setError(null);
-    }
-  }, { isActive: isFocused });
-  return /* @__PURE__ */ jsxDEV5(Box4, {
-    flexDirection: "column",
-    gap: 1,
-    children: [
-      /* @__PURE__ */ jsxDEV5(Box4, {
-        flexDirection: "row",
-        gap: 1,
-        children: [
-          /* @__PURE__ */ jsxDEV5(Text5, {
-            bold: true,
-            children: "New session"
-          }, undefined, false, undefined, this),
-          /* @__PURE__ */ jsxDEV5(Text5, {
-            dim: true,
-            children: "\xB7"
-          }, undefined, false, undefined, this),
-          /* @__PURE__ */ jsxDEV5(Text5, {
-            dim: true,
-            children: stepLabel(step)
-          }, undefined, false, undefined, this)
-        ]
-      }, undefined, true, undefined, this),
-      groupPath && step === "slug" && /* @__PURE__ */ jsxDEV5(Box4, {
-        flexDirection: "row",
-        gap: 1,
-        children: [
-          /* @__PURE__ */ jsxDEV5(Text5, {
-            dim: true,
-            children: "Group:"
-          }, undefined, false, undefined, this),
-          /* @__PURE__ */ jsxDEV5(Text5, {
-            color: "green",
-            children: groupPath
-          }, undefined, false, undefined, this)
-        ]
-      }, undefined, true, undefined, this),
-      /* @__PURE__ */ jsxDEV5(Box4, {
-        flexDirection: "column",
-        height: step === "group" ? undefined : 0,
-        overflow: "hidden",
-        children: /* @__PURE__ */ jsxDEV5(Picker, {
-          mode: "single",
-          items: groupItems,
-          isFocused: isFocused && step === "group",
-          placeholder: "Pick or type a new group path\u2026",
-          onSubmit: handleGroupPicked,
-          emptyHint: "No active groups. Type a name to create one."
-        }, undefined, false, undefined, this)
-      }, undefined, false, undefined, this),
-      /* @__PURE__ */ jsxDEV5(Box4, {
-        flexDirection: "column",
-        gap: 0,
-        height: step === "slug" ? undefined : 0,
-        overflow: "hidden",
-        children: [
-          /* @__PURE__ */ jsxDEV5(Text5, {
-            dim: true,
-            children: "Name"
-          }, undefined, false, undefined, this),
-          /* @__PURE__ */ jsxDEV5(Box4, {
-            borderStyle: "round",
-            borderColor: isFocused ? "green" : undefined,
-            borderDimColor: !isFocused,
-            paddingX: 1,
-            children: /* @__PURE__ */ jsxDEV5(TextInput2, {
-              value: slug,
-              onChange: (v) => {
-                setSlug(v);
-                setError(null);
-              },
-              onSubmit: handleSlugSubmit,
-              placeholder: "fix-auth-bug",
-              color: "green",
-              placeholderColor: "gray",
-              isFocused: isFocused && step === "slug"
-            }, undefined, false, undefined, this)
-          }, undefined, false, undefined, this)
-        ]
-      }, undefined, true, undefined, this),
-      error && /* @__PURE__ */ jsxDEV5(Text5, {
-        color: "red",
-        children: error
-      }, undefined, false, undefined, this),
-      /* @__PURE__ */ jsxDEV5(Text5, {
-        dim: true,
-        children: footer(step)
-      }, undefined, false, undefined, this)
-    ]
-  }, undefined, true, undefined, this);
-}
-function stepLabel(step) {
-  return step === "group" ? "1/2 Group" : "2/2 Name";
-}
-function footer(step) {
-  if (step === "group") {
-    return "\u2191\u2193 navigate \xB7 enter pick \xB7 ctrl+c quit";
-  }
-  return "enter create \xB7 esc back \xB7 ctrl+c quit";
-}
-
-// src/tui/screens/launch/index.tsx
-import { jsxDEV as jsxDEV6 } from "react/jsx-dev-runtime";
-function Launch({ onSelect }) {
-  const { exit } = useTui2();
-  const select = useCallback2((selection) => {
-    onSelect(selection);
-    exit();
-  }, [onSelect, exit]);
-  return /* @__PURE__ */ jsxDEV6(Box5, {
-    flexDirection: "column",
-    paddingY: 1,
-    gap: 1,
-    children: [
-      /* @__PURE__ */ jsxDEV6(Box5, {
-        marginX: 1,
-        children: /* @__PURE__ */ jsxDEV6(Logo, {}, undefined, false, undefined, this)
-      }, undefined, false, undefined, this),
-      /* @__PURE__ */ jsxDEV6(Box5, {
-        flexDirection: "column",
-        marginX: 2,
-        gap: 1,
-        children: [
-          /* @__PURE__ */ jsxDEV6(AppDetails, {}, undefined, false, undefined, this),
-          /* @__PURE__ */ jsxDEV6(CreateScreen, {
-            isFocused: true,
-            onSubmit: (payload) => select({ type: "create", ...payload }),
-            onQuit: () => select({ type: "quit" })
-          }, undefined, false, undefined, this)
-        ]
-      }, undefined, true, undefined, this)
-    ]
-  }, undefined, true, undefined, this);
-}
-
-// src/tui/screens/Exit.tsx
-import { useState as useState3 } from "react";
-import { Box as Box6, Text as Text6, useInput as useInput3, useTui as useTui3 } from "@orchetron/storm";
-
-// src/db/queries/conversations.ts
-import { eq as eq3, and as and2, desc, sql as sql3 } from "drizzle-orm";
-function getConversationsBySession(sessionId) {
-  return getDb().select().from(conversations).where(and2(eq3(conversations.sessionId, sessionId), eq3(conversations.discarded, false))).orderBy(desc(conversations.startedAt)).all();
-}
-
 // src/lib/format.ts
 var SECOND = 1000;
 var MINUTE = 60 * SECOND;
@@ -706,8 +538,248 @@ function formatAgo(isoOrDate) {
   return date.toLocaleDateString("en-US", { month: "short", day: "numeric" });
 }
 
+// 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 group: "group/session" (got "${trimmed}")`);
+  }
+  for (const segment of segments) {
+    if (!/^[a-z0-9][a-z0-9._-]*$/i.test(segment)) {
+      throw new Error(`Invalid segment "${segment}": must start with alphanumeric and contain only letters, digits, dots, underscores, or dashes`);
+    }
+  }
+  const slug = segments[segments.length - 1];
+  const groupPath = segments.slice(0, -1).join("/");
+  return { groupPath, slug };
+}
+
+// src/tui/screens/launch/index.tsx
+import { jsxDEV as jsxDEV5, Fragment } from "react/jsx-dev-runtime";
+var STATUS_COLOR = {
+  paused: "gold",
+  waiting: "red"
+};
+var STATUS_RANK = {
+  paused: 0,
+  waiting: 1
+};
+function statusRank(status) {
+  return STATUS_RANK[status] ?? 99;
+}
+function recencyKey(s) {
+  return s.session.endedAt ?? s.session.startedAt;
+}
+function sessionRow(s) {
+  const status = s.session.status;
+  const color = STATUS_COLOR[status] ?? "gray";
+  const disabled = status === "waiting";
+  return {
+    value: `${s.groupPath}/${s.session.slug}`,
+    label: `${s.groupPath}/${s.session.slug} ${status}`,
+    meta: formatAgo(recencyKey(s)),
+    disabled,
+    display: /* @__PURE__ */ jsxDEV5(Fragment, {
+      children: [
+        /* @__PURE__ */ jsxDEV5(Text5, {
+          children: "  "
+        }, undefined, false, undefined, this),
+        /* @__PURE__ */ jsxDEV5(Text5, {
+          color,
+          children: "\u25CF "
+        }, undefined, false, undefined, this),
+        /* @__PURE__ */ jsxDEV5(Text5, {
+          color,
+          dim: disabled,
+          children: status.padEnd(8)
+        }, undefined, false, undefined, this),
+        /* @__PURE__ */ jsxDEV5(Text5, {
+          children: " "
+        }, undefined, false, undefined, this),
+        /* @__PURE__ */ jsxDEV5(Text5, {
+          dim: disabled,
+          children: s.session.slug
+        }, undefined, false, undefined, this)
+      ]
+    }, undefined, true, undefined, this)
+  };
+}
+function groupHeader(groupPath) {
+  return {
+    value: `__group:${groupPath}`,
+    label: groupPath,
+    kind: "header"
+  };
+}
+function Launch({ onSelect }) {
+  const { exit } = useTui();
+  const [error, setError] = useState2(null);
+  const allSessions = useMemo2(() => getAllSessions({ excludeArchived: true }), []);
+  const visibleSessions = useMemo2(() => {
+    return allSessions.filter((s) => s.session.status === "paused" || s.session.status === "waiting").sort((a, b) => {
+      const g = a.groupPath.localeCompare(b.groupPath);
+      if (g !== 0)
+        return g;
+      const r = statusRank(a.session.status) - statusRank(b.session.status);
+      if (r !== 0)
+        return r;
+      return recencyKey(b).localeCompare(recencyKey(a));
+    });
+  }, [allSessions]);
+  const items = useMemo2(() => {
+    const rows = [];
+    let lastGroup = null;
+    for (const s of visibleSessions) {
+      if (s.groupPath !== lastGroup) {
+        rows.push(groupHeader(s.groupPath));
+        lastGroup = s.groupPath;
+      }
+      rows.push(sessionRow(s));
+    }
+    return rows;
+  }, [visibleSessions]);
+  const sessionByValue = useMemo2(() => {
+    const map = new Map;
+    for (const s of allSessions) {
+      map.set(`${s.groupPath}/${s.session.slug}`, s);
+    }
+    return map;
+  }, [allSessions]);
+  const select = (selection) => {
+    onSelect(selection);
+    exit();
+  };
+  const handleSubmit = (value) => {
+    const existing = sessionByValue.get(value);
+    if (existing) {
+      if (existing.session.status === "paused") {
+        select({ type: "pick", sessionId: existing.session.id });
+        return;
+      }
+      setError(`${value} is ${existing.session.status} \u2014 can't resume from here.`);
+      return;
+    }
+    try {
+      const { groupPath, slug } = parseSessionName(value);
+      select({ type: "create", groupPath, slug });
+    } catch (e) {
+      setError(e instanceof Error ? e.message : "Invalid name");
+    }
+  };
+  const counts = useMemo2(() => {
+    let paused = 0;
+    let waiting = 0;
+    for (const s of visibleSessions) {
+      if (s.session.status === "paused")
+        paused++;
+      else if (s.session.status === "waiting")
+        waiting++;
+    }
+    return { paused, waiting };
+  }, [visibleSessions]);
+  return /* @__PURE__ */ jsxDEV5(Box4, {
+    flexDirection: "column",
+    paddingY: 1,
+    gap: 1,
+    children: [
+      /* @__PURE__ */ jsxDEV5(Box4, {
+        marginX: 1,
+        children: /* @__PURE__ */ jsxDEV5(Logo, {}, undefined, false, undefined, this)
+      }, undefined, false, undefined, this),
+      /* @__PURE__ */ jsxDEV5(Box4, {
+        flexDirection: "column",
+        marginX: 2,
+        gap: 1,
+        children: [
+          /* @__PURE__ */ jsxDEV5(AppDetails, {}, undefined, false, undefined, this),
+          /* @__PURE__ */ jsxDEV5(Box4, {
+            flexDirection: "column",
+            gap: 1,
+            children: [
+              /* @__PURE__ */ jsxDEV5(Box4, {
+                flexDirection: "row",
+                gap: 1,
+                children: [
+                  /* @__PURE__ */ jsxDEV5(Text5, {
+                    bold: true,
+                    children: "Sessions"
+                  }, undefined, false, undefined, this),
+                  visibleSessions.length === 0 ? /* @__PURE__ */ jsxDEV5(Text5, {
+                    dim: true,
+                    children: "\xB7 none \u2014 type group/slug to create"
+                  }, undefined, false, undefined, this) : /* @__PURE__ */ jsxDEV5(Fragment, {
+                    children: [
+                      /* @__PURE__ */ jsxDEV5(Text5, {
+                        dim: true,
+                        children: "\xB7"
+                      }, undefined, false, undefined, this),
+                      /* @__PURE__ */ jsxDEV5(Text5, {
+                        color: "gold",
+                        children: [
+                          counts.paused,
+                          " paused"
+                        ]
+                      }, undefined, true, undefined, this),
+                      counts.waiting > 0 && /* @__PURE__ */ jsxDEV5(Fragment, {
+                        children: [
+                          /* @__PURE__ */ jsxDEV5(Text5, {
+                            dim: true,
+                            children: "\xB7"
+                          }, undefined, false, undefined, this),
+                          /* @__PURE__ */ jsxDEV5(Text5, {
+                            color: "red",
+                            dim: true,
+                            children: [
+                              counts.waiting,
+                              " waiting"
+                            ]
+                          }, undefined, true, undefined, this)
+                        ]
+                      }, undefined, true, undefined, this)
+                    ]
+                  }, undefined, true, undefined, this)
+                ]
+              }, undefined, true, undefined, this),
+              /* @__PURE__ */ jsxDEV5(Picker, {
+                mode: "single",
+                items,
+                isFocused: true,
+                placeholder: "Filter or type group/slug to create\u2026",
+                emptyHint: "No paused sessions. Type group/slug to create one.",
+                onSubmit: handleSubmit
+              }, undefined, false, undefined, this),
+              error && /* @__PURE__ */ jsxDEV5(Text5, {
+                color: "red",
+                children: error
+              }, undefined, false, undefined, this),
+              /* @__PURE__ */ jsxDEV5(Text5, {
+                dim: true,
+                children: "\u2191\u2193 navigate \xB7 enter continue/create \xB7 esc clear \xB7 ctrl+c quit"
+              }, undefined, false, undefined, this)
+            ]
+          }, undefined, true, undefined, this)
+        ]
+      }, undefined, true, undefined, this)
+    ]
+  }, undefined, true, undefined, this);
+}
+
 // src/tui/screens/Exit.tsx
-import { jsxDEV as jsxDEV7 } from "react/jsx-dev-runtime";
+import { useState as useState3 } from "react";
+import { Box as Box5, Text as Text6, useInput as useInput2, useTui as useTui2 } from "@orchetron/storm";
+
+// src/db/queries/conversations.ts
+import { eq as eq2, and as and2, desc, sql as sql3 } from "drizzle-orm";
+function getConversationsBySession(sessionId) {
+  return getDb().select().from(conversations).where(and2(eq2(conversations.sessionId, sessionId), eq2(conversations.discarded, false))).orderBy(desc(conversations.startedAt)).all();
+}
+
+// src/tui/screens/Exit.tsx
+import { jsxDEV as jsxDEV6 } from "react/jsx-dev-runtime";
 var OPTIONS = [
   { action: "save", label: "Save", hint: "Keep session paused for later" },
   {
@@ -727,11 +799,11 @@ var OPTIONS = [
   }
 ];
 function Exit({ sessionId, onAction }) {
-  const { exit } = useTui3();
+  const { exit } = useTui2();
   const [cursor, setCursor] = useState3(0);
   const session = getSession(sessionId);
   const conversations2 = session ? getConversationsBySession(session.id) : [];
-  useInput3((e) => {
+  useInput2((e) => {
     if (e.key === "c" && e.ctrl)
       exit();
     if (e.key === "up" || e.key === "k") {
@@ -748,37 +820,37 @@ function Exit({ sessionId, onAction }) {
     }
   });
   if (!session) {
-    return /* @__PURE__ */ jsxDEV7(Text6, {
+    return /* @__PURE__ */ jsxDEV6(Text6, {
       color: "red",
       children: "Session not found"
     }, undefined, false, undefined, this);
   }
   const duration = session.endedAt && session.startedAt ? formatDuration(new Date(session.endedAt).getTime() - new Date(session.startedAt).getTime()) : null;
-  return /* @__PURE__ */ jsxDEV7(Box6, {
+  return /* @__PURE__ */ jsxDEV6(Box5, {
     flexDirection: "column",
     padding: 1,
     gap: 1,
     children: [
-      /* @__PURE__ */ jsxDEV7(Text6, {
+      /* @__PURE__ */ jsxDEV6(Text6, {
         bold: true,
         color: "#82AAFF",
         children: "Session ended"
       }, undefined, false, undefined, this),
-      /* @__PURE__ */ jsxDEV7(Box6, {
+      /* @__PURE__ */ jsxDEV6(Box5, {
         flexDirection: "column",
         children: [
-          /* @__PURE__ */ jsxDEV7(Box6, {
+          /* @__PURE__ */ jsxDEV6(Box5, {
             flexDirection: "row",
             gap: 1,
             children: [
-              /* @__PURE__ */ jsxDEV7(StatusDot, {
+              /* @__PURE__ */ jsxDEV6(StatusDot, {
                 status: session.status
               }, undefined, false, undefined, this),
-              /* @__PURE__ */ jsxDEV7(Text6, {
+              /* @__PURE__ */ jsxDEV6(Text6, {
                 bold: true,
                 children: session.name
               }, undefined, false, undefined, this),
-              duration && /* @__PURE__ */ jsxDEV7(Text6, {
+              duration && /* @__PURE__ */ jsxDEV6(Text6, {
                 dim: true,
                 children: [
                   "(",
@@ -788,7 +860,7 @@ function Exit({ sessionId, onAction }) {
               }, undefined, true, undefined, this)
             ]
           }, undefined, true, undefined, this),
-          /* @__PURE__ */ jsxDEV7(Text6, {
+          /* @__PURE__ */ jsxDEV6(Text6, {
             dim: true,
             children: [
               conversations2.length,
@@ -798,28 +870,28 @@ function Exit({ sessionId, onAction }) {
           }, undefined, true, undefined, this)
         ]
       }, undefined, true, undefined, this),
-      /* @__PURE__ */ jsxDEV7(Box6, {
+      /* @__PURE__ */ jsxDEV6(Box5, {
         flexDirection: "column",
-        children: OPTIONS.map((opt, i) => /* @__PURE__ */ jsxDEV7(Box6, {
+        children: OPTIONS.map((opt, i) => /* @__PURE__ */ jsxDEV6(Box5, {
           flexDirection: "row",
           gap: 1,
           children: [
-            /* @__PURE__ */ jsxDEV7(Text6, {
+            /* @__PURE__ */ jsxDEV6(Text6, {
               children: i === cursor ? "\u276F" : " "
             }, undefined, false, undefined, this),
-            /* @__PURE__ */ jsxDEV7(Text6, {
+            /* @__PURE__ */ jsxDEV6(Text6, {
               bold: i === cursor,
               children: opt.label
             }, undefined, false, undefined, this),
-            /* @__PURE__ */ jsxDEV7(Text6, {
+            /* @__PURE__ */ jsxDEV6(Text6, {
               dim: true,
               children: opt.hint
             }, undefined, false, undefined, this)
           ]
         }, opt.action, true, undefined, this))
       }, undefined, false, undefined, this),
-      /* @__PURE__ */ jsxDEV7(Box6, {
-        children: /* @__PURE__ */ jsxDEV7(Text6, {
+      /* @__PURE__ */ jsxDEV6(Box5, {
+        children: /* @__PURE__ */ jsxDEV6(Text6, {
           dim: true,
           children: "\u2191\u2193 navigate \xB7 enter select \xB7 q save & quit"
         }, undefined, false, undefined, this)
@@ -830,10 +902,10 @@ function Exit({ sessionId, onAction }) {
 
 // src/tui/screens/Resume.tsx
 import { useState as useState4 } from "react";
-import { Box as Box7, Text as Text7, useInput as useInput4, useTui as useTui4 } from "@orchetron/storm";
-import { jsxDEV as jsxDEV8 } from "react/jsx-dev-runtime";
+import { Box as Box6, Text as Text7, useInput as useInput3, useTui as useTui3 } from "@orchetron/storm";
+import { jsxDEV as jsxDEV7 } from "react/jsx-dev-runtime";
 function Resume({ sessionId, onSelect }) {
-  const { exit } = useTui4();
+  const { exit } = useTui3();
   const [cursor, setCursor] = useState4(0);
   const session = getSession(sessionId);
   const conversations2 = getConversationsBySession(sessionId);
@@ -842,7 +914,7 @@ function Resume({ sessionId, onSelect }) {
     onSelect(selection);
     exit();
   };
-  useInput4((e) => {
+  useInput3((e) => {
     if (e.key === "c" && e.ctrl)
       select({ type: "back" });
     if (e.key === "up" || e.key === "k") {
@@ -861,17 +933,17 @@ function Resume({ sessionId, onSelect }) {
     }
   });
   if (!session) {
-    return /* @__PURE__ */ jsxDEV8(Text7, {
+    return /* @__PURE__ */ jsxDEV7(Text7, {
       color: "red",
       children: "Session not found"
     }, undefined, false, undefined, this);
   }
-  return /* @__PURE__ */ jsxDEV8(Box7, {
+  return /* @__PURE__ */ jsxDEV7(Box6, {
     flexDirection: "column",
     padding: 1,
     gap: 1,
     children: [
-      /* @__PURE__ */ jsxDEV8(Text7, {
+      /* @__PURE__ */ jsxDEV7(Text7, {
         bold: true,
         color: "#82AAFF",
         children: [
@@ -879,17 +951,17 @@ function Resume({ sessionId, onSelect }) {
           session.name
         ]
       }, undefined, true, undefined, this),
-      /* @__PURE__ */ jsxDEV8(Box7, {
+      /* @__PURE__ */ jsxDEV7(Box6, {
         flexDirection: "column",
         children: [
-          /* @__PURE__ */ jsxDEV8(Box7, {
+          /* @__PURE__ */ jsxDEV7(Box6, {
             flexDirection: "row",
             gap: 1,
             children: [
-              /* @__PURE__ */ jsxDEV8(Text7, {
+              /* @__PURE__ */ jsxDEV7(Text7, {
                 children: cursor === 0 ? "\u276F" : " "
               }, undefined, false, undefined, this),
-              /* @__PURE__ */ jsxDEV8(Text7, {
+              /* @__PURE__ */ jsxDEV7(Text7, {
                 bold: cursor === 0,
                 color: "#34D399",
                 children: "+ New conversation"
@@ -901,42 +973,42 @@ function Resume({ sessionId, onSelect }) {
             const isSelected = cursor === idx;
             const duration = conv.endedAt ? formatDuration(new Date(conv.endedAt).getTime() - new Date(conv.startedAt).getTime()) : "active";
             const ago = formatAgo(conv.startedAt);
-            return /* @__PURE__ */ jsxDEV8(Box7, {
+            return /* @__PURE__ */ jsxDEV7(Box6, {
               flexDirection: "row",
               gap: 1,
               children: [
-                /* @__PURE__ */ jsxDEV8(Text7, {
+                /* @__PURE__ */ jsxDEV7(Text7, {
                   children: isSelected ? "\u276F" : " "
                 }, undefined, false, undefined, this),
-                /* @__PURE__ */ jsxDEV8(Text7, {
+                /* @__PURE__ */ jsxDEV7(Text7, {
                   bold: isSelected,
                   dim: conv.discarded,
                   children: conv.id.slice(0, 8)
                 }, undefined, false, undefined, this),
-                /* @__PURE__ */ jsxDEV8(Text7, {
+                /* @__PURE__ */ jsxDEV7(Text7, {
                   dim: true,
                   children: ago
                 }, undefined, false, undefined, this),
-                /* @__PURE__ */ jsxDEV8(Text7, {
+                /* @__PURE__ */ jsxDEV7(Text7, {
                   dim: true,
                   children: "\xB7"
                 }, undefined, false, undefined, this),
-                /* @__PURE__ */ jsxDEV8(Text7, {
+                /* @__PURE__ */ jsxDEV7(Text7, {
                   dim: true,
                   children: [
                     conv.eventCount,
                     " events"
                   ]
                 }, undefined, true, undefined, this),
-                /* @__PURE__ */ jsxDEV8(Text7, {
+                /* @__PURE__ */ jsxDEV7(Text7, {
                   dim: true,
                   children: "\xB7"
                 }, undefined, false, undefined, this),
-                /* @__PURE__ */ jsxDEV8(Text7, {
+                /* @__PURE__ */ jsxDEV7(Text7, {
                   dim: true,
                   children: duration
                 }, undefined, false, undefined, this),
-                conv.discarded && /* @__PURE__ */ jsxDEV8(Text7, {
+                conv.discarded && /* @__PURE__ */ jsxDEV7(Text7, {
                   color: "red",
                   dim: true,
                   children: "(discarded)"
@@ -946,8 +1018,8 @@ function Resume({ sessionId, onSelect }) {
           })
         ]
       }, undefined, true, undefined, this),
-      /* @__PURE__ */ jsxDEV8(Box7, {
-        children: /* @__PURE__ */ jsxDEV8(Text7, {
+      /* @__PURE__ */ jsxDEV7(Box6, {
+        children: /* @__PURE__ */ jsxDEV7(Text7, {
           dim: true,
           children: "\u2191\u2193 navigate \xB7 enter select \xB7 q back"
         }, undefined, false, undefined, this)
@@ -957,7 +1029,7 @@ function Resume({ sessionId, onSelect }) {
 }
 
 // src/tui/run-screen.tsx
-import { jsxDEV as jsxDEV9 } from "react/jsx-dev-runtime";
+import { jsxDEV as jsxDEV8 } from "react/jsx-dev-runtime";
 var [, , screen, outputPath, ...args] = process.argv;
 if (!screen || !outputPath) {
   console.error("Usage: run-screen <screen> <outputPath> [args...]");
@@ -967,7 +1039,7 @@ var result;
 switch (screen) {
   case "launch": {
     let selection = { type: "quit" };
-    const app = render(/* @__PURE__ */ jsxDEV9(Launch, {
+    const app = render(/* @__PURE__ */ jsxDEV8(Launch, {
       onSelect: (s) => {
         selection = s;
       }
@@ -984,7 +1056,7 @@ switch (screen) {
       process.exit(1);
     }
     let action = "save";
-    const app = render(/* @__PURE__ */ jsxDEV9(Exit, {
+    const app = render(/* @__PURE__ */ jsxDEV8(Exit, {
       sessionId,
       onAction: (a) => {
         action = a;
@@ -1002,7 +1074,7 @@ switch (screen) {
       process.exit(1);
     }
     let selection = { type: "back" };
-    const app = render(/* @__PURE__ */ jsxDEV9(Resume, {
+    const app = render(/* @__PURE__ */ jsxDEV8(Resume, {
       sessionId,
       onSelect: (s) => {
         selection = s;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bertrand",
-  "version": "0.14.0",
+  "version": "0.15.0",
   "publishConfig": {
     "access": "public"
   },