bertrand 0.24.0 → 0.25.1

package/dist/bertrand.js

@@ -919,8 +919,8 @@ function createSession(opts) {
   const id = createId();
   return db.insert(sessions).values({ id, ...opts }).returning().get();
 }
-function getSession(id) {
-  return getDb().select().from(sessions).where(eq2(sessions.id, id)).get();
+function getSession(id, db = getDb()) {
+  return db.select().from(sessions).where(eq2(sessions.id, id)).get();
 }
 function getSessionByCategorySlug(categoryId, slug) {
   return getDb().select().from(sessions).where(and(eq2(sessions.categoryId, categoryId), eq2(sessions.slug, slug))).get();
@@ -931,8 +931,11 @@ function getSessionsByCategory(categoryId) {
 function getActiveSessions() {
   return getDb().select({ session: sessions, categoryPath: categories.path }).from(sessions).innerJoin(categories, eq2(sessions.categoryId, categories.id)).where(inArray(sessions.status, ["active", "waiting"])).all();
 }
-function getAllSessions(opts) {
-  const db = getDb();
+function countLiveSessions(db = getDb()) {
+  const row = db.select({ n: sql2`count(*)` }).from(sessions).where(inArray(sessions.status, ["active", "waiting"])).get();
+  return row?.n ?? 0;
+}
+function selectSessions(db, opts) {
   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, [
@@ -943,6 +946,15 @@ function getAllSessions(opts) {
   }
   return query.all();
 }
+function getAllSessions(opts) {
+  return selectSessions(getDb(), opts);
+}
+function getAllSessionsForProject(project, opts) {
+  return selectSessions(getDbForProject(project.slug), opts).map((s) => ({
+    ...s,
+    project
+  }));
+}
 function updateSessionStatus(id, status) {
   return getDb().update(sessions).set({ status, updatedAt: sql2`(datetime('now'))` }).where(eq2(sessions.id, id)).returning().get();
 }
@@ -1036,11 +1048,11 @@ function insertEvent(opts) {
     meta: normalizeEventMeta(opts.event, opts.meta)
   }).returning().get();
 }
-function getEventsBySession(sessionId) {
-  return getDb().select().from(events).where(eq4(events.sessionId, sessionId)).orderBy(events.createdAt, events.id).all();
+function getEventsBySession(sessionId, db = getDb()) {
+  return db.select().from(events).where(eq4(events.sessionId, sessionId)).orderBy(events.createdAt, events.id).all();
 }
-function getEventsByType(sessionId, eventType) {
-  return getDb().select().from(events).where(and3(eq4(events.sessionId, sessionId), eq4(events.event, eventType))).orderBy(events.createdAt).all();
+function getEventsByType(sessionId, eventType, db = getDb()) {
+  return db.select().from(events).where(and3(eq4(events.sessionId, sessionId), eq4(events.event, eventType))).orderBy(events.createdAt).all();
 }
 function getLatestEventOfType(sessionId, eventType, conversationId) {
   const conditions = [
@@ -1745,8 +1757,8 @@ var init_notify = __esm(() => {
 
 // src/db/queries/stats.ts
 import { eq as eq5, sql as sql4 } from "drizzle-orm";
-function getSessionStats(sessionId) {
-  return getDb().select().from(sessionStats).where(eq5(sessionStats.sessionId, sessionId)).get();
+function getSessionStats(sessionId, db = getDb()) {
+  return db.select().from(sessionStats).where(eq5(sessionStats.sessionId, sessionId)).get();
 }
 function upsertSessionStats(sessionId, data) {
   return getDb().insert(sessionStats).values({
@@ -1770,8 +1782,8 @@ function lineCount(s) {
   return s.split(`
 `).length;
 }
-function computeDiffStats(sessionId) {
-  const applied = getEventsByType(sessionId, "tool.applied");
+function computeDiffStats(sessionId, db = getDb()) {
+  const applied = getEventsByType(sessionId, "tool.applied", db);
   const files = new Set;
   let linesAdded = 0;
   let linesRemoved = 0;
@@ -1796,6 +1808,7 @@ function computeDiffStats(sessionId) {
 }
 var init_diff_stats = __esm(() => {
   init_events();
+  init_client();
 });
 
 // src/lib/timing.ts
@@ -1885,12 +1898,12 @@ function computeTimings(events2) {
   }
   return { totalClaudeWorkMs, totalUserWaitMs, activePct, durationS, segments };
 }
-function computeSessionStats(sessionId) {
-  const events2 = getEventsBySession(sessionId);
+function computeSessionStats(sessionId, db = getDb()) {
+  const events2 = getEventsBySession(sessionId, db);
   const summary = computeTimings(events2);
   const conversationIds = new Set(events2.filter((e) => e.conversationId).map((e) => e.conversationId));
   const interactionCount = events2.filter((e) => e.event === "session.waiting" || e.event === "session.answered").length;
-  const diff = computeDiffStats(sessionId);
+  const diff = computeDiffStats(sessionId, db);
   return {
     eventCount: events2.length,
     conversationCount: conversationIds.size,
@@ -1916,13 +1929,14 @@ var init_timing = __esm(() => {
   init_events();
   init_stats();
   init_diff_stats();
+  init_client();
 });
 
 // src/lib/engagement_stats.ts
 import { eq as eq6, sql as sql5 } from "drizzle-orm";
-function aggregateToolUsage(sessionId) {
+function aggregateToolUsage(sessionId, db) {
   const counts = {};
-  const applied = getEventsByType(sessionId, "tool.applied");
+  const applied = getEventsByType(sessionId, "tool.applied", db);
   for (const ev of applied) {
     const meta = ev.meta;
     const permissions = meta?.permissions ?? [];
@@ -1932,7 +1946,7 @@ function aggregateToolUsage(sessionId) {
       counts[p.tool] = (counts[p.tool] ?? 0) + (p.count ?? 1);
     }
   }
-  const used = getEventsByType(sessionId, "tool.used");
+  const used = getEventsByType(sessionId, "tool.used", db);
   for (const ev of used) {
     const meta = ev.meta;
     const tool = meta?.tool;
@@ -1942,8 +1956,8 @@ function aggregateToolUsage(sessionId) {
   }
   return counts;
 }
-function discardRate(sessionId) {
-  const row = getDb().select({
+function discardRate(sessionId, db) {
+  const row = db.select({
     total: sql5`count(*)`,
     discarded: sql5`sum(case when ${conversations.discarded} then 1 else 0 end)`
   }).from(conversations).where(eq6(conversations.sessionId, sessionId)).get();
@@ -1952,10 +1966,10 @@ function discardRate(sessionId) {
     discarded: row?.discarded ?? 0
   };
 }
-function computeEngagementStats(sessionId) {
+function computeEngagementStats(sessionId, db = getDb()) {
   return {
-    toolUsage: aggregateToolUsage(sessionId),
-    discardRate: discardRate(sessionId)
+    toolUsage: aggregateToolUsage(sessionId, db),
+    discardRate: discardRate(sessionId, db)
   };
 }
 var init_engagement_stats = __esm(() => {
@@ -2008,13 +2022,28 @@ var init_session_archive = __esm(() => {
 import { execFile } from "child_process";
 import { existsSync as existsSync6 } from "fs";
 import { join as join8 } from "path";
-function liveStats(sessionId) {
+function liveStats(sessionId, db) {
   return {
     sessionId,
-    ...computeSessionStats(sessionId),
+    ...computeSessionStats(sessionId, db),
     updatedAt: new Date().toISOString()
   };
 }
+function resolveProjectScope(url) {
+  const nameBySlug = new Map(listProjects().map((p) => [p.slug, p.name]));
+  const param = url.searchParams.get("projects");
+  if (param === null) {
+    const active = resolveActiveProject();
+    return [{ slug: active.slug, name: active.name }];
+  }
+  return param.split(",").map((s) => s.trim()).filter((slug) => nameBySlug.has(slug)).map((slug) => ({ slug, name: nameBySlug.get(slug) }));
+}
+function resolveDb(url) {
+  const slug = url.searchParams.get("project");
+  if (slug && projectExists(slug))
+    return getDbForProject(slug);
+  return;
+}
 function archiveResponse(result) {
   if (result.ok)
     return Response.json(result.session);
@@ -2158,42 +2187,44 @@ function startServer(port = PORT) {
 }
 var PORT, listSessions = (_params, url) => {
   const excludeArchived = url.searchParams.get("excludeArchived") !== "false";
-  return getAllSessions({ excludeArchived });
+  return resolveProjectScope(url).flatMap((project) => getAllSessionsForProject(project, { excludeArchived }));
 }, getSessionById = ({ id }) => getSession(id), listEvents = ({ sessionId }, url) => {
+  const db = resolveDb(url);
   const eventType = url.searchParams.get("type");
   if (eventType)
-    return getEventsByType(sessionId, eventType);
-  return getEventsBySession(sessionId);
-}, listAllStats = () => {
+    return getEventsByType(sessionId, eventType, db);
+  return getEventsBySession(sessionId, db);
+}, listAllStats = (_params, url) => {
   const result = {};
-  for (const { session } of getAllSessions()) {
-    const isLive = session.status === "active" || session.status === "waiting";
-    if (isLive) {
-      result[session.id] = liveStats(session.id);
-      continue;
+  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";
+      if (isLive) {
+        result[session.id] = liveStats(session.id, db);
+        continue;
+      }
+      result[session.id] = getSessionStats(session.id, db) ?? liveStats(session.id, db);
     }
-    result[session.id] = getSessionStats(session.id) ?? liveStats(session.id);
   }
   return result;
-}, getStatsBySession = ({
-  sessionId
-}) => {
-  const session = getSession(sessionId);
+}, getStatsBySession = ({ sessionId }, url) => {
+  const db = resolveDb(url);
+  const session = getSession(sessionId, db);
   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), listAllProjects = () => {
+    return liveStats(sessionId, db);
+  return getSessionStats(sessionId, db) ?? liveStats(sessionId, db);
+}, getEngagement = ({ sessionId }, url) => computeEngagementStats(sessionId, resolveDb(url)), listAllProjects = () => {
   const active = resolveActiveProject();
   return listProjects().map((p) => ({
     slug: p.slug,
     name: p.name,
     active: p.slug === active.slug,
-    lastUsedAt: p.lastUsedAt
+    lastUsedAt: p.lastUsedAt,
+    liveCount: countLiveSessions(getDbForProject(p.slug))
   }));
 }, getActiveProjectMeta = () => {
   const active = resolveActiveProject();