@staff0rd/assist 0.290.0 → 0.291.1

package/dist/index.js

@@ -6,7 +6,7 @@ import { Command } from "commander";
 // package.json
 var package_default = {
   name: "@staff0rd/assist",
-  version: "0.290.0",
+  version: "0.291.1",
   type: "module",
   main: "dist/index.js",
   bin: {
@@ -15855,12 +15855,16 @@ function filterToSql(filter) {
 }
 
 // src/commands/seq/fetchSeqData.ts
-async function fetchSeqData(conn, filter, count6, from, to) {
+function buildDataParams(filter, count6, from, to) {
   const sqlFilter = filterToSql(filter);
   const sql4 = `select @Timestamp, @Level, @Exception, @Message from stream where ${sqlFilter} order by @Timestamp desc limit ${count6}`;
   const params = new URLSearchParams({ q: sql4 });
-  if (from) params.set("fromDateUtc", from);
-  if (to) params.set("toDateUtc", to);
+  if (from) params.set("rangeStartUtc", from);
+  if (to) params.set("rangeEndUtc", to);
+  return params;
+}
+async function fetchSeqData(conn, filter, count6, from, to) {
+  const params = buildDataParams(filter, count6, from, to);
   const response = await fetchSeq(conn, "/api/data", params);
   const data = await response.json();
   return mapDataToEvents(data);
@@ -18300,6 +18304,20 @@ function broadcastSessions(sessions, clients, windowsSessions = []) {
   });
 }
 
+// src/commands/sessions/daemon/ClientHub.ts
+var ClientHub = class extends Set {
+  latestLimits;
+  updateLimits(rateLimits) {
+    this.latestLimits = rateLimits;
+    broadcast(this, { type: "limits", rateLimits });
+  }
+  greet(client) {
+    if (this.latestLimits) {
+      sendTo(client, { type: "limits", rateLimits: this.latestLimits });
+    }
+  }
+};
+
 // src/commands/sessions/daemon/spawnPty.ts
 import * as pty from "node-pty";
 
@@ -19397,7 +19415,7 @@ var SessionManager = class {
     this.onIdleChange = onIdleChange;
   }
   sessions = /* @__PURE__ */ new Map();
-  clients = /* @__PURE__ */ new Set();
+  clients = new ClientHub();
   nextId = 1;
   shuttingDown = false;
   // why: dispatch calls windowsProxy.route() to forward windows-origin sessions
@@ -19641,6 +19659,7 @@ var handlers = {
   history: handleHistory,
   "fetch-transcript": handleFetchTranscript,
   shutdown: handleShutdown,
+  limits: (_client, m, d) => m.clients.updateLimits(d.rateLimits),
   input: routed(
     (_client, m, d) => m.writeToSession(d.sessionId, d.data)
   ),
@@ -19669,6 +19688,7 @@ function handleConnection(socket, manager) {
     }
   };
   manager.addClient(client);
+  manager.clients.greet(client);
   const lines = createInterface7({ input: socket });
   lines.on("error", () => {
   });
@@ -20014,10 +20034,12 @@ import chalk165 from "chalk";
 
 // src/commands/buildLimitsSegment.ts
 import chalk164 from "chalk";
+
+// src/shared/rateLimitLevel.ts
 var FIVE_HOUR_SECONDS = 5 * 3600;
 var SEVEN_DAY_SECONDS = 7 * 86400;
-function formatTimeLeft(resetsAt) {
-  const seconds = Math.max(0, resetsAt - Math.floor(Date.now() / 1e3));
+function formatRateLimitTimeLeft(resetsAt, now) {
+  const seconds = Math.max(0, resetsAt - now);
   const days = Math.floor(seconds / 86400);
   const hours = Math.floor(seconds % 86400 / 3600);
   const minutes = Math.floor(seconds % 3600 / 60);
@@ -20025,45 +20047,72 @@ function formatTimeLeft(resetsAt) {
   if (hours > 0) return `${hours}h ${minutes}m`;
   return `${minutes}m`;
 }
-function projectUsage(pct, resetsAt, windowSeconds) {
+function projectUsage(pct, resetsAt, windowSeconds, now) {
   if (resetsAt == null) return void 0;
-  const now = Math.floor(Date.now() / 1e3);
   const timeRemaining = Math.max(0, resetsAt - now);
   const elapsed = Math.max(0, windowSeconds - timeRemaining) / windowSeconds;
   if (elapsed < 0.05) return void 0;
   return pct / elapsed;
 }
-function colorizeRateLimit(pct, resetsAt, windowSeconds) {
-  const label2 = `${Math.round(pct)}%`;
-  const projected = projectUsage(pct, resetsAt, windowSeconds);
-  if (projected == null) return chalk164.green(label2);
-  if (projected > 100) return chalk164.red(label2);
-  if (projected > 75) return chalk164.yellow(label2);
-  return chalk164.green(label2);
+function rateLimitLevel(pct, resetsAt, windowSeconds, now) {
+  const projected = projectUsage(pct, resetsAt, windowSeconds, now);
+  if (projected == null) return "ok";
+  if (projected > 100) return "over";
+  if (projected > 75) return "warn";
+  return "ok";
 }
-function formatLimit(pct, resetsAt, windowSeconds, fallbackLabel) {
-  const timeLabel = resetsAt ? formatTimeLeft(resetsAt) : fallbackLabel;
-  return `${colorizeRateLimit(pct, resetsAt, windowSeconds)} (${timeLabel})`;
+
+// src/commands/buildLimitsSegment.ts
+var LEVEL_COLOR = {
+  ok: chalk164.green,
+  warn: chalk164.yellow,
+  over: chalk164.red
+};
+function formatLimit(pct, resetsAt, windowSeconds, fallbackLabel, now) {
+  const level = rateLimitLevel(pct, resetsAt, windowSeconds, now);
+  const label2 = LEVEL_COLOR[level](`${Math.round(pct)}%`);
+  const timeLabel = resetsAt ? formatRateLimitTimeLeft(resetsAt, now) : fallbackLabel;
+  return `${label2} (${timeLabel})`;
 }
 function buildLimitsSegment(rateLimits) {
   const fiveHrPct = rateLimits?.five_hour?.used_percentage;
   const sevenDayPct = rateLimits?.seven_day?.used_percentage;
   if (fiveHrPct == null || sevenDayPct == null) return "";
+  const now = Math.floor(Date.now() / 1e3);
   const fiveHr = formatLimit(
     fiveHrPct,
     rateLimits?.five_hour?.resets_at,
     FIVE_HOUR_SECONDS,
-    "5h"
+    "5h",
+    now
   );
   const sevenDay = formatLimit(
     sevenDayPct,
     rateLimits?.seven_day?.resets_at,
     SEVEN_DAY_SECONDS,
-    "7d"
+    "7d",
+    now
   );
   return ` | Limits - ${fiveHr}, ${sevenDay}`;
 }
 
+// src/commands/relayRateLimits.ts
+async function relayRateLimits(rateLimits) {
+  if (!rateLimits) return;
+  try {
+    const socket = await connectToDaemon();
+    const timer = setTimeout(() => socket.destroy(), 500);
+    socket.on("error", () => {
+    });
+    socket.write(`${JSON.stringify({ type: "limits", rateLimits })}
+`, () => {
+      clearTimeout(timer);
+      socket.end();
+    });
+  } catch {
+  }
+}
+
 // src/commands/statusLine.ts
 chalk165.level = 3;
 function formatNumber(num) {
@@ -20084,6 +20133,7 @@ async function statusLine() {
   console.log(
     `${model} | Tokens - ${formatNumber(totalOut)} \u2191 : ${formatNumber(totalIn)} \u2193 | Context - ${colorizePercent(usedPct)}${buildLimitsSegment(data.rate_limits)}`
   );
+  await relayRateLimits(data.rate_limits);
 }
 
 // src/commands/sync.ts

package/package.json

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