bertrand 0.25.1 → 0.27.0

package/dist/bertrand.js

@@ -681,7 +681,7 @@ var init_schema = __esm(() => {
     slug: text("slug").notNull(),
     name: text("name").notNull(),
     status: text("status", {
-      enum: ["active", "waiting", "paused", "archived"]
+      enum: ["active", "waiting", "blocked", "paused", "archived"]
     }).notNull().default("paused"),
     summary: text("summary"),
     rating: integer("rating"),
@@ -890,7 +890,7 @@ var init_parse_session_name = __esm(() => {
 });
 
 // src/db/queries/sessions.ts
-import { eq as eq2, and, inArray, sql as sql2 } from "drizzle-orm";
+import { eq as eq2, and, inArray, sql as sql2, desc } from "drizzle-orm";
 function resolveSessionByName(name) {
   const flat = parseSessionName(name);
   const flatCategory = getCategoryByPath(flat.categoryPath);
@@ -942,9 +942,9 @@ function selectSessions(db, opts) {
       "active",
       "waiting",
       "paused"
-    ])).all();
+    ])).orderBy(desc(sessions.updatedAt)).all();
   }
-  return query.all();
+  return query.orderBy(desc(sessions.updatedAt)).all();
 }
 function getAllSessions(opts) {
   return selectSessions(getDb(), opts);
@@ -973,7 +973,7 @@ var init_sessions = __esm(() => {
 });
 
 // src/db/queries/conversations.ts
-import { eq as eq3, and as and2, desc, sql as sql3 } from "drizzle-orm";
+import { eq as eq3, and as and2, desc as desc2, sql as sql3 } from "drizzle-orm";
 function createConversation(opts) {
   return getDb().insert(conversations).values(opts).returning().get();
 }
@@ -981,7 +981,7 @@ function getConversation(id) {
   return getDb().select().from(conversations).where(eq3(conversations.id, id)).get();
 }
 function getConversationsBySession(sessionId) {
-  return getDb().select().from(conversations).where(and2(eq3(conversations.sessionId, sessionId), eq3(conversations.discarded, false))).orderBy(desc(conversations.startedAt)).all();
+  return getDb().select().from(conversations).where(and2(eq3(conversations.sessionId, sessionId), eq3(conversations.discarded, false))).orderBy(desc2(conversations.startedAt)).all();
 }
 function endConversation(id) {
   return getDb().update(conversations).set({ endedAt: sql3`(datetime('now'))` }).where(eq3(conversations.id, id)).returning().get();
@@ -1038,7 +1038,7 @@ function normalizeAnsweredMeta(meta) {
 }
 
 // src/db/queries/events.ts
-import { eq as eq4, and as and3, desc as desc2 } from "drizzle-orm";
+import { eq as eq4, and as and3, desc as desc3 } from "drizzle-orm";
 function insertEvent(opts) {
   return getDb().insert(events).values({
     sessionId: opts.sessionId,
@@ -1062,7 +1062,7 @@ function getLatestEventOfType(sessionId, eventType, conversationId) {
   if (conversationId) {
     conditions.push(eq4(events.conversationId, conversationId));
   }
-  return getDb().select().from(events).where(and3(...conditions)).orderBy(desc2(events.createdAt)).limit(1).get();
+  return getDb().select().from(events).where(and3(...conditions)).orderBy(desc3(events.createdAt)).limit(1).get();
 }
 var init_events = __esm(() => {
   init_client();
@@ -1216,7 +1216,7 @@ __export(exports_update, {
 function shouldIgnoreStatusFlip(newStatus, sessionPid) {
   if (!newStatus)
     return false;
-  if (newStatus !== "active" && newStatus !== "waiting")
+  if (newStatus !== "active" && newStatus !== "waiting" && newStatus !== "blocked")
     return false;
   return sessionPid === null;
 }
@@ -1291,7 +1291,9 @@ var init_update = __esm(() => {
   init_emit();
   EVENT_STATUS_MAP = {
     "session.waiting": "waiting",
+    "session.blocked": "blocked",
     "session.answered": "active",
+    "session.active": "active",
     "session.paused": "paused"
   };
   register("update", async (args) => {
@@ -2015,7 +2017,7 @@ function archiveAllPaused() {
 var ACTIVE_STATUSES;
 var init_session_archive = __esm(() => {
   init_sessions();
-  ACTIVE_STATUSES = ["active", "waiting"];
+  ACTIVE_STATUSES = ["active", "waiting", "blocked"];
 });
 
 // src/server/index.ts
@@ -2199,7 +2201,7 @@ var PORT, listSessions = (_params, url) => {
   for (const project of resolveProjectScope(url)) {
     const db = getDbForProject(project.slug);
     for (const { session } of getAllSessionsForProject(project)) {
-      const isLive = session.status === "active" || session.status === "waiting";
+      const isLive = session.status === "active" || session.status === "waiting" || session.status === "blocked";
       if (isLive) {
         result[session.id] = liveStats(session.id, db);
         continue;
@@ -2213,7 +2215,7 @@ var PORT, listSessions = (_params, url) => {
   const session = getSession(sessionId, db);
   if (!session)
     return null;
-  const isLive = session.status === "active" || session.status === "waiting";
+  const isLive = session.status === "active" || session.status === "waiting" || session.status === "blocked";
   if (isLive)
     return liveStats(sessionId, db);
   return getSessionStats(sessionId, db) ?? liveStats(sessionId, db);
@@ -3702,6 +3704,12 @@ ${EXTRACT_TOOL}
 # would look identical to an auto-approved one.
 touch "${runtimeDir2}/perm-pending-$sid"
 
+# Flip the session to \`blocked\` so the sidebar shows the distinct
+# permission-request state (orange) instead of looking like Claude is still
+# working. on-permission-done.sh flips it back to active once the approved
+# tool runs.
+bq update --session-id "$sid" --event session.blocked
+
 # Badge + notify in background
 bq badge bell-exclamation --color '#ff6b35' --priority 25 --beep &
 bq notify bertrand "Needs permission: $tool" &
@@ -3738,6 +3746,9 @@ if [ -f "$marker" ]; then
   had_marker=1
   rm -f "$marker"
   bq badge --clear &
+  # Approved tool is now running \u2192 clear the blocked state back to active.
+  # No-op if the session already moved on (update dedupes same-status flips).
+  bq update --session-id "$sid" --event session.active &
 fi
 
 cid="\${BERTRAND_CLAUDE_ID:-}"
@@ -4796,7 +4807,7 @@ var init_stats2 = __esm(() => {
   init_events();
   init_timing();
   init_format();
-  ACTIVE_STATUSES2 = ["active", "waiting"];
+  ACTIVE_STATUSES2 = ["active", "waiting", "blocked"];
   register("stats", async (args) => {
     const isJson = args.includes("--json");
     const filteredArgs = args.filter((a) => !a.startsWith("--"));
@@ -4941,7 +4952,7 @@ function countSessions(slug) {
     const all = db.select({ status: sessions.status }).from(sessions).all();
     return {
       total: all.length,
-      active: all.filter((s) => s.status === "active" || s.status === "waiting").length
+      active: all.filter((s) => s.status === "active" || s.status === "waiting" || s.status === "blocked").length
     };
   } catch {
     return UNREADABLE_COUNTS;