quotacap 0.0.27 → 0.0.28

package/dist/adapters/grok.js

@@ -35,35 +35,73 @@ function parseGrokReset(raw, now) {
     }
     return dt.toISOString();
 }
+function validPct(v) {
+    return Number.isFinite(v) && v >= 0 && v <= 100;
+}
 export function parseGrokTui(text, now = new Date()) {
     const cleaned = stripAnsi(text);
-    const planMatch = cleaned.match(/Weekly lim[i!l]t\s*\(([^)]+)\)/i);
+    // The TUI writes "Weekly lim", repositions the cursor, then writes
+    // "t (Tier)", so after ANSI stripping the header reads "Weekly limt".
+    // The [i!l] class stays optional to keep tolerating past glitch variants.
+    const headerRe = /Weekly\s+lim[i!l]?t\s*\(([^)]+)\)/gi;
     let plan = "unknown";
-    if (planMatch) {
-        plan = planMatch[1].trim();
+    let lastHeaderIdx = -1;
+    for (const m of cleaned.matchAll(headerRe)) {
+        if (m.index === undefined)
+            continue;
+        plan = m[1].trim();
+        lastHeaderIdx = m.index;
     }
-    else {
+    if (lastHeaderIdx < 0) {
         const tier = cleaned.match(/\b(SuperGrok|Grok\s+Pro|Grok\s+Enterprise|Grok\s+Basic)\b/i);
         if (tier)
             plan = tier[1].trim();
     }
-    const pctRe = /Weekly lim[i!l]t[^\n%]*?(\d+)%/i;
-    const mPct = cleaned.match(pctRe);
     let usedPct = null;
-    if (mPct) {
-        const v = parseInt(mPct[1], 10);
-        if (Number.isFinite(v) && v >= 0 && v <= 100)
-            usedPct = v;
+    // 1. Dialog header: first percent in a bounded window after the LAST
+    // header (later renders supersede earlier ones). The bar percent sits on
+    // the line below the header, so this must span newlines.
+    if (lastHeaderIdx >= 0) {
+        const after = cleaned.slice(lastHeaderIdx, lastHeaderIdx + 1200);
+        const m = after.match(/(\d{1,3})%/);
+        if (m) {
+            const v = parseInt(m[1], 10);
+            if (validPct(v))
+                usedPct = v;
+        }
     }
+    // 2. Legacy same-line form ("Weekly limit (Tier) 26%"), excluding the
+    // startup status line "Weekly limit left: N%", which reports REMAINING
+    // quota with inverted semantics. Last valid match wins.
     if (usedPct === null) {
-        const barRe = /[█░▓▓]+\s*(\d+)%/;
-        const b = cleaned.match(barRe);
-        if (b) {
-            const v = parseInt(b[1], 10);
-            if (Number.isFinite(v) && v >= 0 && v <= 100)
+        const lineRe = /Weekly\s+lim[i!l]?t[^\n%]*?(\d{1,3})%/gi;
+        for (const m of cleaned.matchAll(lineRe)) {
+            if (/left/i.test(m[0]))
+                continue;
+            const v = parseInt(m[1], 10);
+            if (validPct(v))
                 usedPct = v;
         }
     }
+    // 3. Bare progress-bar percent. Last valid match wins.
+    if (usedPct === null) {
+        const barRe = /[█░▓▒]+\s*(\d{1,3})%/g;
+        for (const m of cleaned.matchAll(barRe)) {
+            const v = parseInt(m[1], 10);
+            if (validPct(v))
+                usedPct = v;
+        }
+    }
+    // 4. Status-line remaining figure ("Weekly limit left: N%") converted to
+    // used. Last valid match wins.
+    if (usedPct === null) {
+        const leftRe = /Weekly\s+lim[i!l]?t\s+left\s*:?\s*(\d{1,3})%/gi;
+        for (const m of cleaned.matchAll(leftRe)) {
+            const v = parseInt(m[1], 10);
+            if (validPct(v))
+                usedPct = 100 - v;
+        }
+    }
     if (usedPct === null)
         throw new Error("grok: weekly percent not found in TUI output");
     let creditsUsd;
@@ -73,11 +111,13 @@ export function parseGrokTui(text, now = new Date()) {
         if (Number.isFinite(v) && v >= 0)
             creditsUsd = v;
     }
-    const mReset = cleaned.match(/Resets:\s*([A-Za-z]+\s+\d+,\s*\d+:\d+)/i);
+    const resetRe = /Resets:\s*([A-Za-z]+\s+\d+,\s*\d+:\d+)/gi;
+    let resetsRaw = null;
+    for (const m of cleaned.matchAll(resetRe))
+        resetsRaw = m[1].trim();
     let resetsAt = null;
     let estimated = false;
-    if (mReset) {
-        const resetsRaw = mReset[1].trim();
+    if (resetsRaw) {
         resetsAt = parseGrokReset(resetsRaw, now);
         if (!resetsAt)
             throw new Error(`grok: bad resets timestamp "${resetsRaw}"`);
@@ -115,7 +155,10 @@ export const grokAdapter = {
             rows: 50,
             settleDelayMs: 5000,
             input: "/usage\r",
-            completionRegex: /Weekly lim|Credits:/i,
+            // Wait for the usage dialog (tier header or Resets line), not the
+            // startup status line "Weekly limit left: N%", which matches /Weekly lim/
+            // and would complete before the dialog renders.
+            completionRegex: /Weekly\s+lim[i!l]?t\s*\(|Resets:|Credits:/i,
             timeoutMs: 14000,
             maxBytes: 256 * 1024,
             signal: adapterSignal("grok"),

package/dist/version.js

@@ -1,2 +1,2 @@
 // generated by scripts/build-embed.mjs — do not edit
-export const VERSION = "0.0.27";
+export const VERSION = "0.0.28";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "quotacap",
-  "version": "0.0.27",
+  "version": "0.0.28",
   "description": "Local quota tracker for AI coding plans with a dashboard, CLI, MCP server, and next-plan recommendations.",
   "license": "MIT",
   "keywords": [