agent-tank 0.9.9 → 0.9.10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agent-tank",
-  "version": "0.9.9",
+  "version": "0.9.10",
   "description": "Monitor and query usage limits for LLM CLI tools (Claude, Antigravity, Codex) via HTTP API",
   "main": "src/index.js",
   "bin": {

package/src/agents/base.js

@@ -134,14 +134,6 @@ class BaseAgent {
         return;
       }
 
-      if (/rate.?limited|rate_limit_error/i.test(cleanOutput)) {
-        logger.agent(this.name, 'Rate limited, preserving last known usage data');
-        this.error = 'Rate limited — using cached data';
-        this.lastUpdated = new Date().toISOString();
-        // Don't overwrite this.usage — keep the last known good data
-        return;
-      }
-
       // Check for session/auth errors — preserve cached data if available
       const sessionErrorMatch = cleanOutput.match(/session.?expired|session.?error|invalid.?session|authentication.?error|auth.?failed|Unable to (?:load|fetch)|Error loading|could not (?:load|fetch)|Failed to load usage|not authenticated|login required|sign.?in required/i);
       if (sessionErrorMatch) {
@@ -152,12 +144,7 @@ class BaseAgent {
         return;
       }
 
-      const parsed = this.parseOutput(output);
-
-      // Only update usage if we got meaningful data (not all-null)
-      const hasData = parsed && Object.values(parsed).some(v => v !== null && v !== undefined && (typeof v !== 'object' || (Array.isArray(v) ? v.length > 0 : Object.keys(v).length > 0)));
-      if (hasData) { this.usage = parsed; this.lastUpdated = new Date().toISOString(); } else if (this.usage) { logger.agent(this.name, 'Parse returned no data, preserving last known usage'); this.error = 'Failed to parse — using cached data'; } else { this.usage = parsed; this.lastUpdated = new Date().toISOString(); }
-      logger.agent(this.name, 'Parsed usage:', logger.json(this.usage));
+      this._applyParsedUsage(this.parseOutput(output), cleanOutput);
     } catch (err) {
       if (this.isStopping() && err.message === 'Agent stopping') {
         logger.agent(this.name, 'Refresh cancelled during shutdown');
@@ -171,6 +158,34 @@ class BaseAgent {
     }
   }
 
+  // Decide what to do with freshly parsed usage, given the raw (cleaned) output.
+  // Prefers fresh data; treats rate-limit notices as an error only when no
+  // usable data came back (a partial rate limit — e.g. Claude's per-model /
+  // Sonnet breakdown — still yields session/weekly data, and the rate-limited
+  // section simply parses to null and is omitted by the formatter).
+  _applyParsedUsage(parsed, cleanOutput) {
+    const hasData = parsed && Object.values(parsed).some(v =>
+      v !== null && v !== undefined &&
+      (typeof v !== 'object' || (Array.isArray(v) ? v.length > 0 : Object.keys(v).length > 0)));
+
+    if (hasData) {
+      this.usage = parsed;
+      this.lastUpdated = new Date().toISOString();
+    } else if (/rate.?limited|rate_limit_error/i.test(cleanOutput)) {
+      logger.agent(this.name, 'Rate limited with no usable data, preserving last known usage');
+      this.error = this.usage ? 'Rate limited — using cached data' : 'Rate limited';
+      this.lastUpdated = new Date().toISOString();
+      return;
+    } else if (this.usage) {
+      logger.agent(this.name, 'Parse returned no data, preserving last known usage');
+      this.error = 'Failed to parse — using cached data';
+    } else {
+      this.usage = parsed;
+      this.lastUpdated = new Date().toISOString();
+    }
+    logger.agent(this.name, 'Parsed usage:', logger.json(this.usage));
+  }
+
   async runCommand() {
     if (this.isStopping()) {
       throw this._createStopError();

package/src/agents/pty-output-parser.js

@@ -250,8 +250,20 @@ function addPaceData(sectionData, cycleType) {
 function parsePtyOutput(clean) {
   const usage = { session: null, weeklyAll: null, weeklySonnet: null };
 
-  // Parse session
-  const sessionData = parseUsageSection(extractSection(clean, 'Current\\s*session', 'Current\\s*week'));
+  // Parse session. The "Current session" label is frequently corrupted while
+  // Claude's /usage dialog is still rendering (e.g. "Curretsession"), even
+  // though the bar, "N% used", and reset time are intact. When the labeled
+  // extraction fails, fall back to the region before the weekly section — the
+  // session block is the only "N% used" that appears there.
+  let sessionData = parseUsageSection(extractSection(clean, 'Current\\s*session', 'Current\\s*week'));
+  if (!sessionData) {
+    const beforeWeekly = clean.split(/Current\s*week/i);
+    // length > 1 confirms the weekly section exists, i.e. this is real /usage
+    // output and beforeWeekly[0] is the session region (not unrelated text).
+    if (beforeWeekly.length > 1) {
+      sessionData = parseUsageSection(beforeWeekly[0]);
+    }
+  }
   if (sessionData) {
     usage.session = { label: 'Current session', ...sessionData };
     addPaceData(usage.session, 'session');