@usagefleet/cli 1.2.184 → 1.2.186

package/README.md

@@ -118,6 +118,8 @@ WinRT toast via `powershell.exe`.
 `usagefleet notify-test` confirms it works and prints the thresholds in effect.
 For a list of your own use `USAGEFLEET_NOTIFY_THRESHOLDS="50,80,99.5"` (it
 replaces the mode's list), disable everything with `USAGEFLEET_NOTIFY=0`.
+To also hear when a window that crossed a threshold resets, set
+`USAGEFLEET_NOTIFY_RESET=1` or `"notifyReset": true`.
 
 ## Blocking prompts over the limit
 
@@ -180,6 +182,7 @@ it (`usagefleet config` prints this same table):
 | `limitsInterval` | `USAGEFLEET_LIMITS_INTERVAL` | seconds between limit reports (default 60; 300 on API keys, where each report costs a 1-token ping) |
 | `notifications` | `USAGEFLEET_NOTIFY` | desktop notifications, on by default (`false`/`0` disables) |
 | `notifyMode` | `USAGEFLEET_NOTIFY_MODE` | alert preset: `off`, `quiet`, `standard`, `steady`, `critical` (default: the Devices page value, else `standard`) |
+| `notifyReset` | `USAGEFLEET_NOTIFY_RESET` | also notify when a window that crossed a threshold resets, off by default (`true`/`1` enables) |
 | `notifyThresholds` | `USAGEFLEET_NOTIFY_THRESHOLDS` | utilization % that trigger an alert, replacing the mode's list — array in the file, comma list in env, one decimal kept |
 | `batch` | `USAGEFLEET_BATCH` | records per upload (default 100, server caps at 1000) |
 | `update` | `USAGEFLEET_UPDATE` | `false`/`0` turns the self-update check off |

package/dist/index.js

@@ -175,7 +175,7 @@ function cmdNotifyTest() {
     sendNotification('usagefleet', 'Test notification — desktop alerts are working.', {
         urgency: 'normal',
     });
-    console.log(step('notified', `${detectOs()} · thresholds ${cfg.thresholds.join(', ')}%`));
+    console.log(step('notified', `${detectOs()} · thresholds ${cfg.thresholds.join(', ')}%${cfg.notifyReset ? ' · on reset' : ''}`));
 }
 async function cmdStatus() {
     const cfg = loadConfig();
@@ -298,6 +298,7 @@ function cmdConfig() {
         ['batch', 'USAGEFLEET_BATCH', 'records per upload (default 100, max 1000)'],
         ['notifications', 'USAGEFLEET_NOTIFY', 'desktop notifications (false/0 disables)'],
         ['notifyMode', 'USAGEFLEET_NOTIFY_MODE', 'alert preset: off | quiet | standard | steady | critical'],
+        ['notifyReset', 'USAGEFLEET_NOTIFY_RESET', 'also alert when a window that crossed a threshold resets'],
         ['notifyThresholds', 'USAGEFLEET_NOTIFY_THRESHOLDS', '% alerts · array; env comma list (replaces the preset)'],
         ['update', 'USAGEFLEET_UPDATE', 'self-update while watching (false/0 disables)'],
         ['updateInterval', 'USAGEFLEET_UPDATE_INTERVAL', 'seconds between update checks (default 21600)'],

package/dist/notifier.js

@@ -36,7 +36,9 @@ export function loadNotifyConfig(env = process.env, file = readStore(), serverMo
     // One decimal, like the readings themselves: 99.1 must stay 99.1.
     const parsed = candidates.map(n => Math.round(n * 10) / 10).filter(n => Number.isFinite(n) && n > 0 && n <= 100);
     const thresholds = parsed.length > 0 ? [...new Set(parsed)].toSorted((a, b) => a - b) : NOTIFY_MODES[mode];
-    return { enabled, thresholds };
+    const rawReset = env.USAGEFLEET_NOTIFY_RESET;
+    const notifyReset = rawReset?.trim() ? !flagOff(rawReset) : file.notifyReset === true;
+    return { enabled, notifyReset, thresholds };
 }
 /**
  * Decide whether a window crosses a not-yet-notified threshold. Pure — no IO.
@@ -48,15 +50,21 @@ export function loadNotifyConfig(env = process.env, file = readStore(), serverMo
  * is lowered so a subsequent re-cross notifies again. A small dip does not move
  * it: a group's slice is derived and wobbles between readings, and a mark that
  * followed every wobble would re-alert each time pct straddled a threshold.
+ *
+ * `reset` is true once, on the first reading after a window that crossed a
+ * threshold has passed its reset time.
  */
-export function evaluateWindow(prev, pct, resetsAt, thresholds) {
+export function evaluateWindow(prev, pct, resetsAt, thresholds, now = Date.now()) {
     const rolledOver = !prev || !sameWindow(prev.resetsAt, resetsAt);
     const lastBucket = rolledOver ? 0 : prev.lastBucket;
     // Within a window the first resetsAt stays, so the jitter alone never rewrites the store.
     const windowResetsAt = rolledOver ? resetsAt : prev.resetsAt;
+    // The time check matters: an idle account reads resets_at null, and the next window
+    // starting from null is a rollover too, but not a reset.
+    const reset = rolledOver && !!prev && prev.lastBucket > 0 && prev.resetsAt !== null && Date.parse(prev.resetsAt) <= now;
     if (pct == null) {
         // No reading this cycle — keep the mark, just track the (possibly new) window.
-        return { fire: null, urgent: false, next: { lastBucket, resetsAt: windowResetsAt } };
+        return { fire: null, urgent: false, reset, next: { lastBucket, resetsAt: windowResetsAt } };
     }
     // Highest threshold the current pct has reached (thresholds are ascending).
     let top = 0;
@@ -69,12 +77,12 @@ export function evaluateWindow(prev, pct, resetsAt, thresholds) {
         // `critical` is sticky on most Linux daemons, so only entering the danger zone and
         // the wall get it; a dense tail (99.1, 99.2, ...) must not pile up.
         const urgent = (lastBucket < DANGER_ZONE && top >= DANGER_ZONE) || top >= 100;
-        return { fire: top, urgent, next: { lastBucket: top, resetsAt: windowResetsAt } };
+        return { fire: top, urgent, reset, next: { lastBucket: top, resetsAt: windowResetsAt } };
     }
     // top <= lastBucket: nothing fires. The mark holds through a wobble and follows
     // pct down only on a real drop.
     const mark = pct < lastBucket - REARM_MARGIN ? top : lastBucket;
-    return { fire: null, urgent: false, next: { lastBucket: mark, resetsAt: windowResetsAt } };
+    return { fire: null, urgent: false, reset, next: { lastBucket: mark, resetsAt: windowResetsAt } };
 }
 // oauth/usage jitters resets_at by milliseconds per request; a real rollover moves it by hours.
 function sameWindow(a, b) {
@@ -123,6 +131,14 @@ export function maybeNotify(report, cfg = loadNotifyConfig(), log = () => {
         };
         const fivePct = fmt(report.fiveHourPct ?? 0);
         const sevenPct = fmt(report.sevenDayPct ?? 0);
+        if (cfg.notifyReset && five.reset) {
+            sendNotification('Claude usage · 5-hour limit', 'Your 5-hour limit has reset.');
+            log('ok', 'notified · 5h window reset');
+        }
+        if (cfg.notifyReset && seven.reset) {
+            sendNotification('Claude usage · weekly limit', 'Your weekly limit has reset.');
+            log('ok', 'notified · weekly window reset');
+        }
         if (five.fire != null) {
             sendNotification('Claude usage · 5-hour limit', `${fivePct}% of your 5-hour limit used${resetSuffix(report.fiveHourResetsAt)}.`, { urgency: five.urgent ? 'critical' : 'normal' });
             log('ok', `notified · 5h at ${fivePct}% · crossed ${five.fire}%`);

package/dist/release.js

@@ -1,2 +1,2 @@
 // Generated by .github/workflows/release.yml.
-export const RELEASE_VERSION = "1.2.184";
+export const RELEASE_VERSION = "1.2.186";

package/dist/store.js

@@ -61,6 +61,7 @@ function normalize(raw) {
             sevenDay: { ...freshWindow(), ...raw.notify?.sevenDay },
         },
         notifyMode: raw.notifyMode,
+        notifyReset: raw.notifyReset,
         notifyThresholds: raw.notifyThresholds,
         piDir: raw.piDir,
         pjDir: raw.pjDir,

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@usagefleet/cli",
-	"version": "1.2.184",
+	"version": "1.2.186",
 	"description": "Tails Claude Code, Claude Desktop, and pi agent JSONL logs and reports token usage to a UsageFleet server.",
 	"keywords": [
 		"claude",