@smithers-orchestrator/usage 0.24.2 → 0.25.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@smithers-orchestrator/usage",
-  "version": "0.24.2",
+  "version": "0.25.1",
   "description": "Report how much rate limit or subscription quota each registered Smithers account has consumed, across Claude, Codex, OpenAI, Anthropic, and Google providers.",
   "type": "module",
   "sideEffects": false,
@@ -20,8 +20,7 @@
     "src/"
   ],
   "dependencies": {
-    "@smithers-orchestrator/errors": "0.24.2",
-    "@smithers-orchestrator/accounts": "0.24.2"
+    "@smithers-orchestrator/accounts": "0.25.1"
   },
   "devDependencies": {
     "@types/bun": "latest",

package/src/claudeOauthUsage.js

@@ -25,6 +25,9 @@ export async function claudeOauthUsage(account) {
     if (!creds) {
         return { source: "none", error: "No Claude OAuth credentials in configDir or Keychain" };
     }
+    if (typeof creds.expiresAt === "number" && creds.expiresAt <= Date.now()) {
+        return { source: "none", error: "Claude OAuth token expired; run `claude` to refresh" };
+    }
     try {
         const res = await fetch(USAGE_URL, {
             headers: {

package/src/getAccountUsage.js

@@ -38,7 +38,6 @@ async function probeFor(account) {
             return anthropicHeaderUsage(account);
         case "openai-api":
             return openaiHeaderUsage(account);
-        case "gemini":
         case "antigravity":
         case "gemini-api":
             return googleUsage(account);

package/src/parseAnthropicRateLimitHeaders.js

@@ -22,7 +22,7 @@ function countWindow(get, prefix, id, label) {
     const remaining = int(get(`${prefix}-remaining`));
     if (limit === undefined && remaining === undefined) return undefined;
     const reset = get(`${prefix}-reset`);
-    const used = limit !== undefined && remaining !== undefined ? limit - remaining : undefined;
+    const used = limit !== undefined && remaining !== undefined ? Math.max(0, limit - remaining) : undefined;
     return {
         id,
         label,

package/src/parseDurationSeconds.js

@@ -20,8 +20,11 @@ export function parseDurationSeconds(value) {
     const re = /(\d+(?:\.\d+)?)(ms|us|µs|ns|s|m|h)/g;
     let total = 0;
     let matched = false;
+    let position = 0;
     let match;
     while ((match = re.exec(trimmed)) !== null) {
+        if (match.index !== position) return undefined;
+        position = re.lastIndex;
         matched = true;
         const amount = Number(match[1]);
         switch (match[2]) {
@@ -34,5 +37,5 @@ export function parseDurationSeconds(value) {
             case "ns": total += amount / 1_000_000_000; break;
         }
     }
-    return matched ? total : undefined;
+    return matched && position === trimmed.length ? total : undefined;
 }

package/src/parseOpenAiRateLimitHeaders.js

@@ -25,7 +25,7 @@ function countWindow(get, suffix, id, label, nowMs) {
     const remaining = int(get(`x-ratelimit-remaining-${suffix}`));
     if (limit === undefined && remaining === undefined) return undefined;
     const resetSeconds = parseDurationSeconds(get(`x-ratelimit-reset-${suffix}`));
-    const used = limit !== undefined && remaining !== undefined ? limit - remaining : undefined;
+    const used = limit !== undefined && remaining !== undefined ? Math.max(0, limit - remaining) : undefined;
     return {
         id,
         label,

package/src/usageCache.js

@@ -28,7 +28,8 @@ export function readUsageCache(env = process.env) {
     if (!existsSync(path)) return { version: 1, entries: {} };
     try {
         const parsed = JSON.parse(readFileSync(path, "utf8"));
-        if (parsed && typeof parsed === "object" && parsed.entries && typeof parsed.entries === "object") {
+        if (parsed && typeof parsed === "object" && parsed.version === 1
+            && parsed.entries && typeof parsed.entries === "object" && !Array.isArray(parsed.entries)) {
             return { version: 1, entries: parsed.entries };
         }
     } catch {