@staff0rd/assist 0.409.0 → 0.410.0

package/dist/index.js

@@ -6,7 +6,7 @@ import { Command } from "commander";
 // package.json
 var package_default = {
   name: "@staff0rd/assist",
-  version: "0.409.0",
+  version: "0.410.0",
   type: "module",
   main: "dist/index.js",
   bin: {
@@ -1221,8 +1221,8 @@ async function assertMigrationsInSync(exec3) {
 // src/shared/db/migrations/MigrationExecutor.ts
 function pgExecutor(queryable) {
   return {
-    exec: (sql24) => queryable.query(sql24),
-    query: async (sql24, params) => (await queryable.query(sql24, params)).rows
+    exec: (sql25) => queryable.query(sql25),
+    query: async (sql25, params) => (await queryable.query(sql25, params)).rows
   };
 }
 
@@ -4754,8 +4754,8 @@ async function buildDump(tables, copyOut) {
 // src/commands/backlog/dump/copyTableOut.ts
 import { to as copyTo } from "pg-copy-streams";
 async function copyTableOut(client, table) {
-  const sql24 = `COPY ${table.name} (${table.columns.join(", ")}) TO STDOUT`;
-  const stream = client.query(copyTo(sql24));
+  const sql25 = `COPY ${table.name} (${table.columns.join(", ")}) TO STDOUT`;
+  const stream = client.query(copyTo(sql25));
   const chunks = [];
   for await (const chunk of stream) {
     chunks.push(Buffer.isBuffer(chunk) ? chunk : Buffer.from(chunk));
@@ -7888,21 +7888,30 @@ function incompleteSubtaskCounts(orm) {
   }).from(itemSubtasks).where(ne(itemSubtasks.status, "done")).groupBy(itemSubtasks.itemId).as("incomplete_counts");
 }
 
-// src/commands/backlog/phaseUsageTotals.ts
+// src/commands/backlog/planPhaseCounts.ts
 import { sql as sql14 } from "drizzle-orm";
+function planPhaseCounts(orm) {
+  return orm.select({
+    itemId: planPhases.itemId,
+    count: sql14`count(*)::int`.as("plan_phase_count")
+  }).from(planPhases).groupBy(planPhases.itemId).as("plan_phase_counts");
+}
+
+// src/commands/backlog/phaseUsageTotals.ts
+import { sql as sql15 } from "drizzle-orm";
 function phaseUsageTotals(orm) {
   return orm.select({
     itemId: phaseUsage.itemId,
-    tokensUp: sql14`sum(${phaseUsage.tokensUp})::bigint`.as(
+    tokensUp: sql15`sum(${phaseUsage.tokensUp})::bigint`.as(
       "total_tokens_up"
     ),
-    tokensDown: sql14`sum(${phaseUsage.tokensDown})::bigint`.as(
+    tokensDown: sql15`sum(${phaseUsage.tokensDown})::bigint`.as(
       "total_tokens_down"
     ),
-    activeMs: sql14`sum(${phaseUsage.activeMs})::bigint`.as(
+    activeMs: sql15`sum(${phaseUsage.activeMs})::bigint`.as(
       "total_active_ms"
     ),
-    peakContextPct: sql14`max(${phaseUsage.peakContextPct})`.as(
+    peakContextPct: sql15`max(${phaseUsage.peakContextPct})`.as(
       "max_peak_context_pct"
     )
   }).from(phaseUsage).groupBy(phaseUsage.itemId).as("usage_totals");
@@ -7919,6 +7928,8 @@ function rowToItemSummary(row) {
     starred: row.starred,
     jiraKey: row.jiraKey ?? void 0,
     githubIssue: row.githubIssue ?? void 0,
+    currentPhase: row.currentPhase ?? void 0,
+    totalPhases: (row.planPhaseCount || 1) + 1,
     incompleteSubtasks: row.incompleteSubtasks ?? 0,
     usageTotal: row.tokensUp == null ? void 0 : {
       tokensUp: Number(row.tokensUp),
@@ -7933,6 +7944,7 @@ function rowToItemSummary(row) {
 async function loadItemSummaries(orm, origin) {
   const incompleteCounts = incompleteSubtaskCounts(orm);
   const usageTotals = phaseUsageTotals(orm);
+  const phaseCounts = planPhaseCounts(orm);
   const rows = await orm.select({
     id: items.id,
     origin: items.origin,
@@ -7942,12 +7954,14 @@ async function loadItemSummaries(orm, origin) {
     starred: items.starred,
     jiraKey: items.jiraKey,
     githubIssue: items.githubIssue,
+    currentPhase: items.currentPhase,
+    planPhaseCount: phaseCounts.count,
     incompleteSubtasks: incompleteCounts.count,
     tokensUp: usageTotals.tokensUp,
     tokensDown: usageTotals.tokensDown,
     activeMs: usageTotals.activeMs,
     peakContextPct: usageTotals.peakContextPct
-  }).from(items).leftJoin(incompleteCounts, eq12(incompleteCounts.itemId, items.id)).leftJoin(usageTotals, eq12(usageTotals.itemId, items.id)).where(origin === void 0 ? void 0 : eq12(items.origin, origin)).orderBy(asc5(items.id));
+  }).from(items).leftJoin(incompleteCounts, eq12(incompleteCounts.itemId, items.id)).leftJoin(usageTotals, eq12(usageTotals.itemId, items.id)).leftJoin(phaseCounts, eq12(phaseCounts.itemId, items.id)).where(origin === void 0 ? void 0 : eq12(items.origin, origin)).orderBy(asc5(items.id));
   return rows.map(rowToItemSummary);
 }
 
@@ -8745,12 +8759,12 @@ async function listNewsItems(_req, res) {
 }
 
 // src/shared/db/listUsagePeaks.ts
-import { and as and7, count, desc as desc2, eq as eq16, getTableColumns, sql as sql15 } from "drizzle-orm";
+import { and as and7, count, desc as desc2, eq as eq16, getTableColumns, sql as sql16 } from "drizzle-orm";
 async function listUsagePeaks(db, paging) {
   const avgContext = db.select({
     window: phaseCycleContext.window,
     resetsAt: phaseCycleContext.resetsAt,
-    avgContextPct: sql15`cast(avg(${phaseCycleContext.peakContextPct}) as double precision)`.as(
+    avgContextPct: sql16`cast(avg(${phaseCycleContext.peakContextPct}) as double precision)`.as(
       "avg_context_pct"
     ),
     phaseCount: count().as("phase_count")
@@ -9961,8 +9975,8 @@ async function readStdinBuffer() {
 import { finished } from "stream/promises";
 import { from as copyFrom } from "pg-copy-streams";
 async function copyTableIn(client, table, data) {
-  const sql24 = `COPY ${table.name} (${table.columns.join(", ")}) FROM STDIN`;
-  const stream = client.query(copyFrom(sql24));
+  const sql25 = `COPY ${table.name} (${table.columns.join(", ")}) FROM STDIN`;
+  const stream = client.query(copyFrom(sql25));
   stream.end(data);
   await finished(stream);
 }
@@ -10086,11 +10100,11 @@ async function insertPhaseAt(orm, itemId2, phaseIdx, name, tasks, manualChecks,
 }
 
 // src/commands/backlog/insertSubtask.ts
-import { sql as sql16 } from "drizzle-orm";
+import { sql as sql17 } from "drizzle-orm";
 async function insertSubtask(orm, itemId2, title, description) {
   await orm.insert(itemSubtasks).values({
     itemId: itemId2,
-    idx: sql16`(SELECT COALESCE(MAX(${itemSubtasks.idx}) + 1, 0) FROM ${itemSubtasks} WHERE ${itemSubtasks.itemId} = ${itemId2})`,
+    idx: sql17`(SELECT COALESCE(MAX(${itemSubtasks.idx}) + 1, 0) FROM ${itemSubtasks} WHERE ${itemSubtasks.itemId} = ${itemId2})`,
     title,
     description: description ?? null,
     status: "todo"
@@ -15721,9 +15735,9 @@ function registerGithub(program2) {
 }
 
 // src/commands/handover/countPendingHandovers.ts
-import { and as and18, eq as eq37, isNull, sql as sql17 } from "drizzle-orm";
+import { and as and18, eq as eq37, isNull, sql as sql18 } from "drizzle-orm";
 async function countPendingHandovers(orm, origin) {
-  const [row] = await orm.select({ count: sql17`count(*)::int` }).from(handovers).where(and18(eq37(handovers.origin, origin), isNull(handovers.recalledAt)));
+  const [row] = await orm.select({ count: sql18`count(*)::int` }).from(handovers).where(and18(eq37(handovers.origin, origin), isNull(handovers.recalledAt)));
   return row?.count ?? 0;
 }
 
@@ -22126,8 +22140,8 @@ function filterToSql(filter) {
 // src/commands/seq/fetchSeqData.ts
 function buildDataParams(filter, count7, from, to) {
   const sqlFilter = filterToSql(filter);
-  const sql24 = `select @Timestamp, @Level, @Exception, @Message from stream where ${sqlFilter} order by @Timestamp desc limit ${count7}`;
-  const params = new URLSearchParams({ q: sql24 });
+  const sql25 = `select @Timestamp, @Level, @Exception, @Message from stream where ${sqlFilter} order by @Timestamp desc limit ${count7}`;
+  const params = new URLSearchParams({ q: sql25 });
   if (from) params.set("rangeStartUtc", from);
   if (to) params.set("rangeEndUtc", to);
   return params;
@@ -22388,26 +22402,26 @@ import chalk194 from "chalk";
 // src/commands/sql/loadConnections.ts
 function loadConnections3() {
   const raw = loadGlobalConfigRaw();
-  const sql24 = raw.sql;
-  return sql24?.connections ?? [];
+  const sql25 = raw.sql;
+  return sql25?.connections ?? [];
 }
 function saveConnections3(connections) {
   const raw = loadGlobalConfigRaw();
-  const sql24 = raw.sql ?? {};
-  sql24.connections = connections;
-  raw.sql = sql24;
+  const sql25 = raw.sql ?? {};
+  sql25.connections = connections;
+  raw.sql = sql25;
   saveGlobalConfig(raw);
 }
 function getDefaultConnection2() {
   const raw = loadGlobalConfigRaw();
-  const sql24 = raw.sql;
-  return sql24?.defaultConnection;
+  const sql25 = raw.sql;
+  return sql25?.defaultConnection;
 }
 function setDefaultConnection2(name) {
   const raw = loadGlobalConfigRaw();
-  const sql24 = raw.sql ?? {};
-  sql24.defaultConnection = name;
-  raw.sql = sql24;
+  const sql25 = raw.sql ?? {};
+  sql25.defaultConnection = name;
+  raw.sql = sql25;
   saveGlobalConfig(raw);
 }
 
@@ -22478,9 +22492,9 @@ function resolveConnection3(name) {
 }
 
 // src/commands/sql/sqlConnect.ts
-import sql18 from "mssql";
+import sql19 from "mssql";
 async function sqlConnect(conn) {
-  return await sql18.connect({
+  return await sql19.connect({
     server: conn.server,
     port: conn.port,
     user: conn.user,
@@ -22557,11 +22571,11 @@ var MUTATION_PATTERN = new RegExp(
   `\\b(${MUTATION_KEYWORDS.join("|")})\\b`,
   "i"
 );
-function stripComments(sql24) {
-  return sql24.replace(/\/\*[\s\S]*?\*\//g, " ").replace(/--[^\n]*/g, " ");
+function stripComments(sql25) {
+  return sql25.replace(/\/\*[\s\S]*?\*\//g, " ").replace(/--[^\n]*/g, " ");
 }
-function isMutation(sql24) {
-  const stripped = stripComments(sql24);
+function isMutation(sql25) {
+  const stripped = stripComments(sql25);
   if (MUTATION_PATTERN.test(stripped)) return true;
   return /\bSELECT\b[\s\S]+\bINTO\s+\w/i.test(stripped);
 }
@@ -24914,13 +24928,13 @@ function drainSessions(sessions, onDrained) {
 }
 
 // src/shared/db/recordPhaseActiveMs.ts
-import { sql as sql19 } from "drizzle-orm";
+import { sql as sql20 } from "drizzle-orm";
 async function recordPhaseActiveMs(db, itemId2, phaseIdx, activeMs) {
   if (activeMs <= 0) return;
   await db.insert(phaseUsage).values({ itemId: itemId2, phaseIdx, activeMs }).onConflictDoUpdate({
     target: [phaseUsage.itemId, phaseUsage.phaseIdx],
     set: {
-      activeMs: sql19`${phaseUsage.activeMs} + excluded.active_ms`
+      activeMs: sql20`${phaseUsage.activeMs} + excluded.active_ms`
     }
   });
 }
@@ -25112,7 +25126,7 @@ function makeStatusChangeHandler(dismiss, notify2, reuseForRun) {
 }
 
 // src/shared/db/recordPhaseCycleContext.ts
-import { sql as sql20 } from "drizzle-orm";
+import { sql as sql21 } from "drizzle-orm";
 async function recordPhaseCycleContext(db, itemId2, phaseIdx, window, resetsAt, pct) {
   if (pct <= 0) return;
   await db.insert(phaseCycleContext).values({ itemId: itemId2, phaseIdx, window, resetsAt, peakContextPct: pct }).onConflictDoUpdate({
@@ -25123,24 +25137,24 @@ async function recordPhaseCycleContext(db, itemId2, phaseIdx, window, resetsAt,
       phaseCycleContext.resetsAt
     ],
     set: {
-      peakContextPct: sql20`GREATEST(${phaseCycleContext.peakContextPct}, ${pct})`
+      peakContextPct: sql21`GREATEST(${phaseCycleContext.peakContextPct}, ${pct})`
     }
   });
 }
 
 // src/shared/db/recordPhasePeakContext.ts
-import { sql as sql21 } from "drizzle-orm";
+import { sql as sql22 } from "drizzle-orm";
 async function recordPhasePeakContext(db, itemId2, phaseIdx, pct) {
   await db.insert(phaseUsage).values({ itemId: itemId2, phaseIdx, peakContextPct: pct }).onConflictDoUpdate({
     target: [phaseUsage.itemId, phaseUsage.phaseIdx],
     set: {
-      peakContextPct: sql21`GREATEST(${phaseUsage.peakContextPct}, ${pct})`
+      peakContextPct: sql22`GREATEST(${phaseUsage.peakContextPct}, ${pct})`
     }
   });
 }
 
 // src/shared/db/recordPhaseTranscriptUsage.ts
-import { sql as sql22 } from "drizzle-orm";
+import { sql as sql23 } from "drizzle-orm";
 async function recordPhaseTranscriptUsage(db, itemId2, phaseIdx, responses) {
   const byId = /* @__PURE__ */ new Map();
   for (const r of responses) byId.set(r.messageId, r);
@@ -25160,8 +25174,8 @@ async function recordPhaseTranscriptUsage(db, itemId2, phaseIdx, responses) {
     await tx.insert(phaseUsage).values({ itemId: itemId2, phaseIdx, tokensUp, tokensDown }).onConflictDoUpdate({
       target: [phaseUsage.itemId, phaseUsage.phaseIdx],
       set: {
-        tokensUp: sql22`${phaseUsage.tokensUp} + ${tokensUp}`,
-        tokensDown: sql22`${phaseUsage.tokensDown} + ${tokensDown}`
+        tokensUp: sql23`${phaseUsage.tokensUp} + ${tokensUp}`,
+        tokensDown: sql23`${phaseUsage.tokensDown} + ${tokensDown}`
       }
     });
     return { tokensUp, tokensDown };
@@ -25169,12 +25183,12 @@ async function recordPhaseTranscriptUsage(db, itemId2, phaseIdx, responses) {
 }
 
 // src/shared/db/recordWindowTokens.ts
-import { and as and21, eq as eq40, sql as sql23 } from "drizzle-orm";
+import { and as and21, eq as eq40, sql as sql24 } from "drizzle-orm";
 async function recordWindowTokens(db, window, resetsAt, tokensUp, tokensDown) {
   if (tokensUp <= 0 && tokensDown <= 0) return;
   await db.update(usagePeaks).set({
-    tokensUp: sql23`${usagePeaks.tokensUp} + ${tokensUp}`,
-    tokensDown: sql23`${usagePeaks.tokensDown} + ${tokensDown}`
+    tokensUp: sql24`${usagePeaks.tokensUp} + ${tokensUp}`,
+    tokensDown: sql24`${usagePeaks.tokensDown} + ${tokensDown}`
   }).where(
     and21(
       eq40(usagePeaks.window, window),

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@staff0rd/assist",
-	"version": "0.409.0",
+	"version": "0.410.0",
 	"type": "module",
 	"main": "dist/index.js",
 	"bin": {