bertrand 0.20.1 → 0.22.0

package/dist/migrations/meta/_journal.json

@@ -29,6 +29,13 @@
       "when": 1781474706585,
       "tag": "0003_categories_rename",
       "breakpoints": true
+    },
+    {
+      "idx": 4,
+      "version": "6",
+      "when": 1781546596070,
+      "tag": "0004_dapper_apocalypse",
+      "breakpoints": true
     }
   ]
 }

package/dist/run-screen.js

@@ -15,7 +15,7 @@ var __export = (target, all) => {
 };
 
 // src/tui/run-screen.tsx
-import { writeFileSync as writeFileSync2 } from "fs";
+import { writeFileSync as writeFileSync2, appendFileSync } from "fs";
 import { render } from "@orchetron/storm";
 
 // src/tui/screens/launch/index.tsx
@@ -590,6 +590,7 @@ var paths = {
   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")
 };
@@ -759,6 +760,7 @@ var sessions = sqliteTable("sessions", {
     enum: ["active", "waiting", "paused", "archived"]
   }).notNull().default("paused"),
   summary: text("summary"),
+  rating: integer("rating"),
   pid: integer("pid"),
   startedAt: text("started_at").notNull().default(sql`(datetime('now'))`),
   endedAt: text("ended_at"),
@@ -898,6 +900,9 @@ function getAllSessions(opts) {
 function updateSessionStatus(id, status) {
   return getDb().update(sessions).set({ status, updatedAt: sql2`(datetime('now'))` }).where(eq(sessions.id, id)).returning().get();
 }
+function setSessionRating(id, rating) {
+  return getDb().update(sessions).set({ rating, updatedAt: sql2`(datetime('now'))` }).where(eq(sessions.id, id)).returning().get();
+}
 
 // src/lib/session-archive.ts
 var ACTIVE_STATUSES = ["active", "waiting"];
@@ -959,6 +964,7 @@ function formatAgo(isoOrDate) {
 }
 
 // src/lib/parse-session-name.ts
+var SEGMENT_PATTERN = /^[a-z0-9][a-z0-9._-]*$/i;
 function parseSessionName(input) {
   const trimmed = input.trim().replace(/^\/+|\/+$/g, "");
   if (!trimmed) {
@@ -969,12 +975,12 @@ function parseSessionName(input) {
     throw new Error(`Session name must include at least one category: "category/session" (got "${trimmed}")`);
   }
   for (const segment of segments) {
-    if (!/^[a-z0-9][a-z0-9._-]*$/i.test(segment)) {
+    if (!SEGMENT_PATTERN.test(segment)) {
       throw new Error(`Invalid segment "${segment}": must start with alphanumeric and contain only letters, digits, dots, underscores, or dashes`);
     }
   }
-  const slug = segments[segments.length - 1];
-  const categoryPath = segments.slice(0, -1).join("/");
+  const categoryPath = segments[0];
+  const slug = segments.slice(1).join("/");
   return { categoryPath, slug };
 }
 
@@ -1324,7 +1330,7 @@ var OPTIONS = [
   {
     action: "resume",
     label: "Resume",
-    hint: "Start a new conversation in this session"
+    hint: "Continue a conversation or start a new one"
   }
 ];
 function Exit({ sessionId, onAction }) {
@@ -1332,10 +1338,19 @@ function Exit({ sessionId, onAction }) {
   const [cursor, setCursor] = useState4(0);
   const session = getSession(sessionId);
   const conversations2 = session ? getConversationsBySession(session.id) : [];
+  const [rating, setRating] = useState4(session?.rating ?? null);
+  const persistRating = (next) => {
+    setRating(next);
+    setSessionRating(sessionId, next);
+  };
   useInput3((e) => {
     if (e.key === "c" && e.ctrl)
       exit();
-    if (e.key === "up" || e.key === "k") {
+    if (e.key >= "1" && e.key <= "5") {
+      persistRating(Number(e.key));
+    } else if (e.key === "0" || e.key === "backspace") {
+      persistRating(null);
+    } else if (e.key === "up" || e.key === "k") {
       setCursor((c) => Math.max(0, c - 1));
     } else if (e.key === "down" || e.key === "j") {
       setCursor((c) => Math.min(OPTIONS.length - 1, c + 1));
@@ -1399,6 +1414,29 @@ function Exit({ sessionId, onAction }) {
           }, undefined, true, undefined, this)
         ]
       }, undefined, true, undefined, this),
+      /* @__PURE__ */ jsxDEV7(Box6, {
+        flexDirection: "column",
+        children: [
+          /* @__PURE__ */ jsxDEV7(Text7, {
+            dim: true,
+            children: "How effective was this session?"
+          }, undefined, false, undefined, this),
+          /* @__PURE__ */ jsxDEV7(Box6, {
+            flexDirection: "row",
+            gap: 1,
+            children: [
+              /* @__PURE__ */ jsxDEV7(Text7, {
+                color: "#FFD580",
+                children: [1, 2, 3, 4, 5].map((n) => rating !== null && n <= rating ? "\u2605" : "\u2606").join(" ")
+              }, undefined, false, undefined, this),
+              /* @__PURE__ */ jsxDEV7(Text7, {
+                dim: true,
+                children: rating !== null ? `${rating} star${rating === 1 ? "" : "s"}` : "unrated"
+              }, undefined, false, undefined, this)
+            ]
+          }, undefined, true, undefined, this)
+        ]
+      }, undefined, true, undefined, this),
       /* @__PURE__ */ jsxDEV7(Box6, {
         flexDirection: "column",
         children: OPTIONS.map((opt, i) => /* @__PURE__ */ jsxDEV7(Box6, {
@@ -1422,7 +1460,7 @@ function Exit({ sessionId, onAction }) {
       /* @__PURE__ */ jsxDEV7(Box6, {
         children: /* @__PURE__ */ jsxDEV7(Text7, {
           dim: true,
-          children: "\u2191\u2193 navigate \xB7 enter select \xB7 q save & quit"
+          children: "1-5 rate \xB7 0/backspace clear \xB7 \u2191\u2193 navigate \xB7 enter select \xB7 q save & quit"
         }, undefined, false, undefined, this)
       }, undefined, false, undefined, this)
     ]
@@ -1730,71 +1768,146 @@ if (!screen || !outputPath) {
   console.error("Usage: run-screen <screen> <outputPath> [args...]");
   process.exit(1);
 }
+var RESULT_PATH = outputPath;
+var DEBUG_PATH = process.env.BERTRAND_DEBUG_TUI || null;
+var START_HR = process.hrtime.bigint();
+function phase(name, detail) {
+  if (!DEBUG_PATH)
+    return;
+  const elapsedMs = Number(process.hrtime.bigint() - START_HR) / 1e6;
+  const line = `${elapsedMs.toFixed(2).padStart(8)}ms  ${name}${detail ? "  " + detail : ""}
+`;
+  try {
+    appendFileSync(DEBUG_PATH, line);
+  } catch {}
+}
+phase("spawn", `screen=${screen} pid=${process.pid} isTTY=${process.stdout.isTTY ?? "?"} term=${process.env.TERM_PROGRAM || process.env.TERM || "?"}`);
 var result;
-switch (screen) {
-  case "launch": {
-    let selection = { type: "quit" };
-    const app = render(/* @__PURE__ */ jsxDEV10(Launch, {
-      onSelect: (s) => {
-        selection = s;
-      }
-    }, undefined, false, undefined, this), { alternateScreen: true, patchConsole: true });
-    await app.waitUntilExit();
-    app.unmount();
-    result = selection;
-    break;
-  }
-  case "project-picker": {
-    let selection = { type: "quit" };
-    const app = render(/* @__PURE__ */ jsxDEV10(ProjectPicker, {
-      onSelect: (s) => {
-        selection = s;
-      }
-    }, undefined, false, undefined, this), { alternateScreen: true, patchConsole: true });
-    await app.waitUntilExit();
-    app.unmount();
-    result = selection;
-    break;
-  }
-  case "exit": {
-    const sessionId = args[0];
-    if (!sessionId) {
-      console.error("exit requires sessionId");
-      process.exit(1);
+var resultWritten = false;
+function writeResult() {
+  if (resultWritten)
+    return;
+  resultWritten = true;
+  try {
+    writeFileSync2(RESULT_PATH, JSON.stringify(result));
+  } catch {}
+}
+process.on("SIGINT", writeResult);
+process.on("SIGTERM", writeResult);
+process.on("SIGHUP", writeResult);
+process.on("uncaughtException", writeResult);
+process.on("unhandledRejection", writeResult);
+var renderCount = 0;
+var onRender = (m) => {
+  renderCount++;
+  phase(`paint #${renderCount}`, `cells=${m.cellsChanged} took=${m.renderTime.toFixed(2)}ms`);
+};
+try {
+  switch (screen) {
+    case "launch": {
+      let selection = { type: "quit" };
+      result = selection;
+      phase("render() pre");
+      const app = render(/* @__PURE__ */ jsxDEV10(Launch, {
+        onSelect: (s) => {
+          selection = s;
+          result = selection;
+        }
+      }, undefined, false, undefined, this), { alternateScreen: true, patchConsole: true, onRender });
+      phase("render() post");
+      app.screen.invalidate();
+      app.requestRepaint();
+      phase("post-mount invalidate+requestRepaint");
+      await app.waitUntilExit();
+      phase("waitUntilExit returned");
+      app.unmount();
+      phase("unmount done");
+      result = selection;
+      break;
     }
-    let action = "save";
-    const app = render(/* @__PURE__ */ jsxDEV10(Exit, {
-      sessionId,
-      onAction: (a) => {
-        action = a;
+    case "project-picker": {
+      let selection = { type: "quit" };
+      result = selection;
+      phase("render() pre");
+      const app = render(/* @__PURE__ */ jsxDEV10(ProjectPicker, {
+        onSelect: (s) => {
+          selection = s;
+          result = selection;
+        }
+      }, undefined, false, undefined, this), { alternateScreen: true, patchConsole: true, onRender });
+      phase("render() post");
+      app.screen.invalidate();
+      app.requestRepaint();
+      phase("post-mount invalidate+requestRepaint");
+      await app.waitUntilExit();
+      phase("waitUntilExit returned");
+      app.unmount();
+      phase("unmount done");
+      result = selection;
+      break;
+    }
+    case "exit": {
+      const sessionId = args[0];
+      if (!sessionId) {
+        console.error("exit requires sessionId");
+        process.exit(1);
       }
-    }, undefined, false, undefined, this), { alternateScreen: true, patchConsole: true });
-    await app.waitUntilExit();
-    app.unmount();
-    result = action;
-    break;
-  }
-  case "resume": {
-    const sessionId = args[0];
-    if (!sessionId) {
-      console.error("resume requires sessionId");
-      process.exit(1);
+      let action = "save";
+      result = action;
+      phase("render() pre");
+      const app = render(/* @__PURE__ */ jsxDEV10(Exit, {
+        sessionId,
+        onAction: (a) => {
+          action = a;
+          result = action;
+        }
+      }, undefined, false, undefined, this), { alternateScreen: true, patchConsole: true, onRender });
+      phase("render() post");
+      app.screen.invalidate();
+      app.requestRepaint();
+      phase("post-mount invalidate+requestRepaint");
+      await app.waitUntilExit();
+      phase("waitUntilExit returned");
+      app.unmount();
+      phase("unmount done");
+      result = action;
+      break;
     }
-    let selection = { type: "back" };
-    const app = render(/* @__PURE__ */ jsxDEV10(Resume, {
-      sessionId,
-      onSelect: (s) => {
-        selection = s;
+    case "resume": {
+      const sessionId = args[0];
+      if (!sessionId) {
+        console.error("resume requires sessionId");
+        process.exit(1);
       }
-    }, undefined, false, undefined, this), { alternateScreen: true, patchConsole: true });
-    await app.waitUntilExit();
-    app.unmount();
-    result = selection;
-    break;
+      let selection = { type: "back" };
+      result = selection;
+      phase("render() pre");
+      const app = render(/* @__PURE__ */ jsxDEV10(Resume, {
+        sessionId,
+        onSelect: (s) => {
+          selection = s;
+          result = selection;
+        }
+      }, undefined, false, undefined, this), { alternateScreen: true, patchConsole: true, onRender });
+      phase("render() post");
+      app.screen.invalidate();
+      app.requestRepaint();
+      phase("post-mount invalidate+requestRepaint");
+      await app.waitUntilExit();
+      phase("waitUntilExit returned");
+      app.unmount();
+      phase("unmount done");
+      result = selection;
+      break;
+    }
+    default:
+      console.error(`Unknown screen: ${screen}`);
+      process.exit(1);
   }
-  default:
-    console.error(`Unknown screen: ${screen}`);
-    process.exit(1);
+  writeResult();
+  phase("result written");
+} finally {
+  writeResult();
+  phase("finally complete");
 }
-writeFileSync2(outputPath, JSON.stringify(result));
 process.exit(0);

package/package.json

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