bertrand 0.22.1 → 0.23.0

package/dist/migrations/meta/_journal.json

@@ -36,6 +36,27 @@
       "when": 1781546596070,
       "tag": "0004_dapper_apocalypse",
       "breakpoints": true
+    },
+    {
+      "idx": 5,
+      "version": "6",
+      "when": 1781577167000,
+      "tag": "0005_drop_pr_count",
+      "breakpoints": true
+    },
+    {
+      "idx": 6,
+      "version": "6",
+      "when": 1781578831000,
+      "tag": "0006_drop_worktrees_last_question",
+      "breakpoints": true
+    },
+    {
+      "idx": 7,
+      "version": "6",
+      "when": 1782249283327,
+      "tag": "0007_awesome_justin_hammer",
+      "breakpoints": true
     }
   ]
 }

package/dist/run-screen.js

@@ -561,7 +561,7 @@ function StatusDot({ status }) {
   }, undefined, false, undefined, this);
 }
 // src/db/queries/sessions.ts
-import { eq, and, inArray, sql as sql2 } from "drizzle-orm";
+import { eq as eq2, and, inArray, sql as sql2 } from "drizzle-orm";
 
 // src/db/client.ts
 import { Database } from "bun:sqlite";
@@ -719,7 +719,6 @@ function resolveActiveProject() {
 // src/db/schema.ts
 var exports_schema = {};
 __export(exports_schema, {
-  worktreeAssociations: () => worktreeAssociations,
   sessions: () => sessions,
   sessionStats: () => sessionStats,
   sessionLabels: () => sessionLabels,
@@ -764,6 +763,8 @@ var sessions = sqliteTable("sessions", {
   pid: integer("pid"),
   startedAt: text("started_at").notNull().default(sql`(datetime('now'))`),
   endedAt: text("ended_at"),
+  worktreePath: text("worktree_path"),
+  worktreeBranch: text("worktree_branch"),
   createdAt: text("created_at").notNull().default(sql`(datetime('now'))`),
   updatedAt: text("updated_at").notNull().default(sql`(datetime('now'))`)
 }, (t) => [
@@ -784,7 +785,6 @@ var conversations = sqliteTable("conversations", {
   startedAt: text("started_at").notNull().default(sql`(datetime('now'))`),
   endedAt: text("ended_at"),
   discarded: integer("discarded", { mode: "boolean" }).notNull().default(false),
-  lastQuestion: text("last_question"),
   eventCount: integer("event_count").notNull().default(0)
 }, (t) => [index("conv_session").on(t.sessionId)]);
 var events = sqliteTable("events", {
@@ -801,24 +801,11 @@ var events = sqliteTable("events", {
   index("ev_event_created").on(t.event, t.createdAt),
   index("ev_conversation").on(t.conversationId)
 ]);
-var worktreeAssociations = sqliteTable("worktree_associations", {
-  id: text("id").primaryKey(),
-  sessionId: text("session_id").notNull().references(() => sessions.id, { onDelete: "cascade" }),
-  branch: text("branch").notNull(),
-  worktreePath: text("worktree_path"),
-  active: integer("active", { mode: "boolean" }).notNull().default(true),
-  enteredAt: text("entered_at").notNull().default(sql`(datetime('now'))`),
-  exitedAt: text("exited_at")
-}, (t) => [
-  index("wt_session").on(t.sessionId),
-  index("wt_active").on(t.active)
-]);
 var sessionStats = sqliteTable("session_stats", {
   sessionId: text("session_id").primaryKey().references(() => sessions.id, { onDelete: "cascade" }),
   eventCount: integer("event_count").notNull().default(0),
   conversationCount: integer("conversation_count").notNull().default(0),
   interactionCount: integer("interaction_count").notNull().default(0),
-  prCount: integer("pr_count").notNull().default(0),
   claudeWorkS: integer("claude_work_s").notNull().default(0),
   userWaitS: integer("user_wait_s").notNull().default(0),
   activePct: integer("active_pct").notNull().default(0),
@@ -881,13 +868,37 @@ function hasSessionsTable(sqlite) {
 // src/lib/id.ts
 import { nanoid } from "nanoid";
 
+// src/db/queries/categories.ts
+import { eq, like, or, isNull } from "drizzle-orm";
+
+// 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) {
+    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 category: "category/session" (got "${trimmed}")`);
+  }
+  for (const segment of segments) {
+    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 categoryPath = segments[0];
+  const slug = segments.slice(1).join("/");
+  return { categoryPath, slug };
+}
+
 // src/db/queries/sessions.ts
 function getSession(id) {
-  return getDb().select().from(sessions).where(eq(sessions.id, id)).get();
+  return getDb().select().from(sessions).where(eq2(sessions.id, id)).get();
 }
 function getAllSessions(opts) {
   const db = getDb();
-  const query = db.select({ session: sessions, categoryPath: categories.path }).from(sessions).innerJoin(categories, eq(sessions.categoryId, categories.id));
+  const query = db.select({ session: sessions, categoryPath: categories.path }).from(sessions).innerJoin(categories, eq2(sessions.categoryId, categories.id));
   if (opts?.excludeArchived) {
     return query.where(inArray(sessions.status, [
       "active",
@@ -898,10 +909,10 @@ function getAllSessions(opts) {
   return query.all();
 }
 function updateSessionStatus(id, status) {
-  return getDb().update(sessions).set({ status, updatedAt: sql2`(datetime('now'))` }).where(eq(sessions.id, id)).returning().get();
+  return getDb().update(sessions).set({ status, updatedAt: sql2`(datetime('now'))` }).where(eq2(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();
+  return getDb().update(sessions).set({ rating, updatedAt: sql2`(datetime('now'))` }).where(eq2(sessions.id, id)).returning().get();
 }
 
 // src/lib/session-archive.ts
@@ -963,27 +974,6 @@ function formatAgo(isoOrDate) {
   return date.toLocaleDateString("en-US", { month: "short", day: "numeric" });
 }
 
-// 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) {
-    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 category: "category/session" (got "${trimmed}")`);
-  }
-  for (const segment of segments) {
-    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 categoryPath = segments[0];
-  const slug = segments.slice(1).join("/");
-  return { categoryPath, slug };
-}
-
 // src/tui/screens/launch/index.tsx
 import { jsxDEV as jsxDEV6, Fragment } from "react/jsx-dev-runtime";
 var STATUS_COLOR = {
@@ -1308,9 +1298,9 @@ import { useState as useState4 } from "react";
 import { Box as Box6, Text as Text7, useInput as useInput3, 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";
+import { eq as eq3, 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();
+  return getDb().select().from(conversations).where(and2(eq3(conversations.sessionId, sessionId), eq3(conversations.discarded, false))).orderBy(desc(conversations.startedAt)).all();
 }
 
 // src/tui/screens/Exit.tsx

package/package.json

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