@staff0rd/assist 0.310.1 → 0.310.3

package/dist/index.js

@@ -6,7 +6,7 @@ import { Command } from "commander";
 // package.json
 var package_default = {
   name: "@staff0rd/assist",
-  version: "0.310.1",
+  version: "0.310.3",
   type: "module",
   main: "dist/index.js",
   bin: {
@@ -1141,8 +1141,8 @@ var options = [
 ];
 
 // src/commands/verify/init/getAvailableOptions/index.ts
-function resolveDescription(desc5, setup2) {
-  return typeof desc5 === "function" ? desc5(setup2) : desc5;
+function resolveDescription(desc6, setup2) {
+  return typeof desc6 === "function" ? desc6(setup2) : desc6;
 }
 function toVerifyOption(def, setup2) {
   return {
@@ -3038,10 +3038,10 @@ function gitPullBacklog(dir) {
 
 // src/shared/db/schema.ts
 import {
-  boolean,
+  boolean as boolean2,
   foreignKey,
   index as index2,
-  integer as integer2,
+  integer as integer3,
   pgTable as pgTable3,
   primaryKey as primaryKey2,
   text as text3
@@ -3065,60 +3065,66 @@ var handovers = pgTable(
 // src/shared/db/usagePeaks.ts
 import {
   bigint,
+  boolean,
   doublePrecision,
+  integer as integer2,
   pgTable as pgTable2,
   primaryKey,
-  text as text2
+  text as text2,
+  timestamp as timestamp2
 } from "drizzle-orm/pg-core";
 var usagePeaks = pgTable2(
   "usage_peaks",
   {
     window: text2().$type().notNull(),
     resetsAt: bigint("resets_at", { mode: "number" }).notNull(),
-    usedPercentage: doublePrecision("used_percentage").notNull()
+    segment: integer2().notNull().default(0),
+    usedPercentage: doublePrecision("used_percentage").notNull(),
+    resetDetected: boolean("reset_detected").notNull().default(false),
+    createdAt: timestamp2("created_at", { withTimezone: true }).notNull().defaultNow()
   },
-  (t) => [primaryKey({ columns: [t.window, t.resetsAt] })]
+  (t) => [primaryKey({ columns: [t.window, t.resetsAt, t.segment] })]
 );
 
 // src/shared/db/schema.ts
 var items = pgTable3(
   "items",
   {
-    id: integer2().generatedByDefaultAsIdentity().primaryKey(),
+    id: integer3().generatedByDefaultAsIdentity().primaryKey(),
     origin: text3().notNull(),
     type: text3().notNull().default("story"),
     name: text3().notNull(),
     description: text3(),
     acceptanceCriteria: text3("acceptance_criteria").notNull().default("[]"),
     status: text3().notNull().default("todo"),
-    currentPhase: integer2("current_phase"),
-    starred: boolean().notNull().default(false)
+    currentPhase: integer3("current_phase"),
+    starred: boolean2().notNull().default(false)
   },
   (t) => [index2("items_origin_idx").on(t.origin)]
 );
 var comments = pgTable3("comments", {
-  id: integer2().generatedByDefaultAsIdentity().primaryKey(),
-  itemId: integer2("item_id").notNull().references(() => items.id, { onDelete: "cascade" }),
-  idx: integer2().notNull(),
+  id: integer3().generatedByDefaultAsIdentity().primaryKey(),
+  itemId: integer3("item_id").notNull().references(() => items.id, { onDelete: "cascade" }),
+  idx: integer3().notNull(),
   text: text3().notNull(),
-  phase: integer2(),
+  phase: integer3(),
   timestamp: text3().notNull(),
   type: text3().notNull().default("comment")
 });
 var links = pgTable3(
   "links",
   {
-    itemId: integer2("item_id").notNull().references(() => items.id, { onDelete: "cascade" }),
+    itemId: integer3("item_id").notNull().references(() => items.id, { onDelete: "cascade" }),
     type: text3().notNull(),
-    targetId: integer2("target_id").notNull()
+    targetId: integer3("target_id").notNull()
   },
   (t) => [primaryKey2({ columns: [t.itemId, t.type, t.targetId] })]
 );
 var planPhases = pgTable3(
   "plan_phases",
   {
-    itemId: integer2("item_id").notNull().references(() => items.id, { onDelete: "cascade" }),
-    idx: integer2().notNull(),
+    itemId: integer3("item_id").notNull().references(() => items.id, { onDelete: "cascade" }),
+    idx: integer3().notNull(),
     name: text3().notNull(),
     manualChecks: text3("manual_checks")
   },
@@ -3127,9 +3133,9 @@ var planPhases = pgTable3(
 var planTasks = pgTable3(
   "plan_tasks",
   {
-    itemId: integer2("item_id").notNull(),
-    phaseIdx: integer2("phase_idx").notNull(),
-    idx: integer2().notNull(),
+    itemId: integer3("item_id").notNull(),
+    phaseIdx: integer3("phase_idx").notNull(),
+    idx: integer3().notNull(),
     task: text3().notNull()
   },
   (t) => [
@@ -3145,7 +3151,7 @@ var metadata = pgTable3("metadata", {
   value: text3().notNull()
 });
 var feeds = pgTable3("feeds", {
-  id: integer2().generatedByDefaultAsIdentity().primaryKey(),
+  id: integer3().generatedByDefaultAsIdentity().primaryKey(),
   url: text3().notNull().unique()
 });
 var schema = {
@@ -3602,9 +3608,34 @@ var SCHEMA = `
 	CREATE TABLE IF NOT EXISTS usage_peaks (
 		"window" TEXT NOT NULL,
 		resets_at BIGINT NOT NULL,
+		segment INTEGER NOT NULL DEFAULT 0,
 		used_percentage DOUBLE PRECISION NOT NULL,
-		PRIMARY KEY ("window", resets_at)
+		reset_detected BOOLEAN NOT NULL DEFAULT false,
+		created_at TIMESTAMPTZ NOT NULL DEFAULT now(),
+		PRIMARY KEY ("window", resets_at, segment)
 	);
+
+	-- Backfill columns on databases created before reset/segment tracking existed.
+	ALTER TABLE usage_peaks ADD COLUMN IF NOT EXISTS reset_detected BOOLEAN NOT NULL DEFAULT false;
+	ALTER TABLE usage_peaks ADD COLUMN IF NOT EXISTS segment INTEGER NOT NULL DEFAULT 0;
+	ALTER TABLE usage_peaks ADD COLUMN IF NOT EXISTS created_at TIMESTAMPTZ NOT NULL DEFAULT now();
+
+	-- Widen the primary key to include segment so a cycle can hold both its
+	-- pre-reset peak and its post-reset continuation. Idempotent: only fires
+	-- while the legacy two-column key is still in place.
+	DO $$
+	BEGIN
+		IF EXISTS (
+			SELECT 1 FROM pg_constraint
+			WHERE conname = 'usage_peaks_pkey'
+			  AND conrelid = 'usage_peaks'::regclass
+			  AND array_length(conkey, 1) = 2
+		) THEN
+			ALTER TABLE usage_peaks DROP CONSTRAINT usage_peaks_pkey;
+			ALTER TABLE usage_peaks ADD CONSTRAINT usage_peaks_pkey
+				PRIMARY KEY ("window", resets_at, segment);
+		END IF;
+	END $$;
 `;
 async function ensureSchema(exec3) {
   await exec3(SCHEMA);
@@ -5490,7 +5521,11 @@ async function listNewsItems(_req, res) {
 // src/shared/db/listUsagePeaks.ts
 import { desc } from "drizzle-orm";
 async function listUsagePeaks(db) {
-  return db.select().from(usagePeaks).orderBy(desc(usagePeaks.resetsAt), usagePeaks.window);
+  return db.select().from(usagePeaks).orderBy(
+    desc(usagePeaks.resetsAt),
+    usagePeaks.window,
+    desc(usagePeaks.segment)
+  );
 }
 
 // src/commands/sessions/web/listUsageHistory.ts
@@ -7382,8 +7417,8 @@ function applyAcMutations(current, options2) {
 // src/commands/backlog/update/buildUpdateValues.ts
 import chalk81 from "chalk";
 function buildUpdateValues(options2) {
-  const { name, desc: desc5, type, ac } = options2;
-  if (!name && !desc5 && !type && !ac) {
+  const { name, desc: desc6, type, ac } = options2;
+  if (!name && !desc6 && !type && !ac) {
     console.log(chalk81.red("Nothing to update. Provide at least one flag."));
     process.exitCode = 1;
     return void 0;
@@ -7399,8 +7434,8 @@ function buildUpdateValues(options2) {
     set.name = name;
     fieldNames.push("name");
   }
-  if (desc5) {
-    set.description = desc5;
+  if (desc6) {
+    set.description = desc6;
     fieldNames.push("description");
   }
   if (type) {
@@ -19148,8 +19183,8 @@ function buildOutputPath(outputDir, processName) {
   if (!existsSync49(outputDir)) {
     mkdirSync21(outputDir, { recursive: true });
   }
-  const timestamp2 = (/* @__PURE__ */ new Date()).toISOString().replace(/[:.]/g, "-");
-  return resolve14(outputDir, `${processName}-${timestamp2}.png`);
+  const timestamp3 = (/* @__PURE__ */ new Date()).toISOString().replace(/[:.]/g, "-");
+  return resolve14(outputDir, `${processName}-${timestamp3}.png`);
 }
 function runPowerShellScript(processName, outputPath) {
   const scriptPath = join59(tmpdir7(), `assist-screenshot-${Date.now()}.ps1`);
@@ -19451,26 +19486,46 @@ function broadcastSessions(sessions, clients, windowsSessions = [], active) {
   });
 }
 
+// src/shared/db/recordWindowPeak.ts
+import { and as and13, desc as desc5, eq as eq31, sql as sql5 } from "drizzle-orm";
+var RESET_DROP_THRESHOLD = 1;
+async function recordWindowPeak(db, window, resetsAt, usedPercentage) {
+  const [active] = await db.select().from(usagePeaks).where(
+    and13(eq31(usagePeaks.window, window), eq31(usagePeaks.resetsAt, resetsAt))
+  ).orderBy(desc5(usagePeaks.segment)).limit(1);
+  if (!active) {
+    await db.insert(usagePeaks).values({ window, resetsAt, segment: 0, usedPercentage });
+    return;
+  }
+  const matchActive = and13(
+    eq31(usagePeaks.window, window),
+    eq31(usagePeaks.resetsAt, resetsAt),
+    eq31(usagePeaks.segment, active.segment)
+  );
+  if (usedPercentage < active.usedPercentage - RESET_DROP_THRESHOLD) {
+    await db.update(usagePeaks).set({ resetDetected: true }).where(matchActive);
+    await db.insert(usagePeaks).values({
+      window,
+      resetsAt,
+      segment: active.segment + 1,
+      usedPercentage
+    });
+    return;
+  }
+  await db.update(usagePeaks).set({
+    usedPercentage: sql5`GREATEST(${usagePeaks.usedPercentage}, ${usedPercentage})`
+  }).where(matchActive);
+}
+
 // src/shared/db/recordUsagePeak.ts
-import { sql as sql5 } from "drizzle-orm";
 var WINDOWS = ["five_hour", "seven_day"];
 async function recordUsagePeak(db, rateLimits) {
-  const rows = WINDOWS.flatMap((window) => {
+  for (const window of WINDOWS) {
     const w = rateLimits[window];
-    if (!w) return [];
-    if (typeof w.resets_at !== "number" || typeof w.used_percentage !== "number")
-      return [];
-    return [
-      { window, resetsAt: w.resets_at, usedPercentage: w.used_percentage }
-    ];
-  });
-  if (rows.length === 0) return;
-  await db.insert(usagePeaks).values(rows).onConflictDoUpdate({
-    target: [usagePeaks.window, usagePeaks.resetsAt],
-    set: {
-      usedPercentage: sql5`GREATEST(${usagePeaks.usedPercentage}, excluded.used_percentage)`
-    }
-  });
+    if (!w || typeof w.resets_at !== "number" || typeof w.used_percentage !== "number")
+      continue;
+    await recordWindowPeak(db, window, w.resets_at, w.used_percentage);
+  }
 }
 
 // src/commands/sessions/daemon/persistUsagePeak.ts
@@ -20723,7 +20778,7 @@ function backlogRunMarkers(text5) {
 function extractSessionMeta(lines) {
   let sessionId = "";
   let cwd = "";
-  let timestamp2 = "";
+  let timestamp3 = "";
   let name = "";
   let commandName = "";
   let commandArgs = "";
@@ -20731,14 +20786,14 @@ function extractSessionMeta(lines) {
     const entry = safeParse(line);
     if (!entry) continue;
     sessionId ||= strField(entry, "sessionId");
-    timestamp2 ||= strField(entry, "timestamp");
+    timestamp3 ||= strField(entry, "timestamp");
     cwd ||= strField(entry, "cwd");
     if (entry.type === "user" && !entry.isMeta) {
       ({ name, commandName, commandArgs } = parseFirstUserEntry(entry));
       break;
     }
   }
-  return { sessionId, cwd, timestamp: timestamp2, name, commandName, commandArgs };
+  return { sessionId, cwd, timestamp: timestamp3, name, commandName, commandArgs };
 }
 function parseFirstUserEntry(entry) {
   const raw = messageText(entry);
@@ -20779,13 +20834,13 @@ async function parseSessionFile(filePath, origin = "wsl") {
     handle = await fs29.promises.open(filePath, "r");
     const meta = extractSessionMeta(await readHeadLines(handle));
     if (!meta.sessionId) return null;
-    const timestamp2 = meta.timestamp || (await fs29.promises.stat(filePath)).mtime.toISOString();
+    const timestamp3 = meta.timestamp || (await fs29.promises.stat(filePath)).mtime.toISOString();
     return {
       sessionId: meta.sessionId,
       name: meta.name || `Session ${meta.sessionId.slice(0, 8)}`,
       project: deriveProject(meta.cwd, filePath, origin),
       cwd: meta.cwd,
-      timestamp: timestamp2,
+      timestamp: timestamp3,
       origin,
       ...deriveHistoryFields(meta.commandName, meta.commandArgs, meta.name)
     };

package/package.json

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