agy-statusblocks 0.1.3 → 0.1.5

package/dist/segments/usage.js

@@ -39,6 +39,9 @@ function inferWindowSuffix(resetSec) {
         return '7d';
     return '5h';
 }
+function is3pKey(lower) {
+    return lower === '3p' || lower.startsWith('3p-') || lower.startsWith('3p_') || lower.startsWith('3p ');
+}
 function shortenBucketLabel(rawKey, resetSec = 0) {
     const k = rawKey.trim();
     const lower = k.toLowerCase();
@@ -47,6 +50,9 @@ function shortenBucketLabel(rawKey, resetSec = 0) {
         : lower.includes('5h') || lower.includes('5-hour')
             ? '5h'
             : inferWindowSuffix(resetSec);
+    // "3p-5h" / "3p-weekly": Antigravity's third-party (Claude/GPT) pool
+    if (is3pKey(lower))
+        return explicitWin ? `claude ${explicitWin}` : 'claude';
     if (lower.includes('claude') && (lower.includes('gpt') || lower.includes('pool') || (!lower.includes('sonnet') && !lower.includes('opus') && !lower.includes('haiku')))) {
         return explicitWin ? `claude ${explicitWin}` : 'claude';
     }
@@ -75,7 +81,7 @@ function shortenBucketLabel(rawKey, resetSec = 0) {
 }
 function bucketPool(key) {
     const k = key.toLowerCase();
-    if (k.includes('claude') || k.includes('sonnet') || k.includes('opus') || k.includes('haiku') || k.includes('gpt'))
+    if (is3pKey(k) || k.includes('claude') || k.includes('sonnet') || k.includes('opus') || k.includes('haiku') || k.includes('gpt'))
         return 'claude';
     if (k.includes('argon'))
         return 'argon';
@@ -83,7 +89,7 @@ function bucketPool(key) {
         return 'gemini';
     return 'other';
 }
-function isActiveModelBucket(key, data) {
+function isActiveModelBucket(key, data, hasExplicitArgonBucket = false) {
     const k = key.toLowerCase();
     const mName = (data.model?.display_name ?? '').toLowerCase();
     const mId = (data.model?.id ?? '').toLowerCase();
@@ -94,7 +100,11 @@ function isActiveModelBucket(key, data) {
             return true;
     }
     // If active model is Sonnet/Opus and bucket is a shared Claude/GPT pool
-    if ((mName.includes('claude') || mName.includes('sonnet') || mName.includes('opus')) && bucketPool(key) === 'claude') {
+    if ((mName.includes('claude') || mName.includes('sonnet') || mName.includes('opus') || mName.includes('gpt')) && bucketPool(key) === 'claude') {
+        return true;
+    }
+    // Native Gemini model (including Gemini 4 Argon when no dedicated argon bucket exists) uses the Gemini pool
+    if (mName.includes('gemini') && (!mName.includes('argon') || !hasExplicitArgonBucket) && bucketPool(key) === 'gemini') {
         return true;
     }
     return false;
@@ -105,12 +115,20 @@ function extractLimits(data) {
     if (data.quota && typeof data.quota === 'object') {
         const entries = Object.entries(data.quota)
             .filter(([, bucket]) => bucket && typeof bucket === 'object' && !bucket.disabled);
+        const hasExplicitArgonBucket = entries.some(([k]) => bucketPool(k) === 'argon');
         // Sort active model's bucket first, then prefer showing distinct pools (Gemini/Argon + Claude), then by highest utilization
         entries.sort(([keyA, a], [keyB, b]) => {
-            const actA = isActiveModelBucket(keyA, data) ? 1 : 0;
-            const actB = isActiveModelBucket(keyB, data) ? 1 : 0;
+            const actA = isActiveModelBucket(keyA, data, hasExplicitArgonBucket) ? 1 : 0;
+            const actB = isActiveModelBucket(keyB, data, hasExplicitArgonBucket) ? 1 : 0;
             if (actA !== actB)
                 return actB - actA;
+            if (actA && actB) {
+                // Within the active pool, show the short window (5h) before the weekly one
+                const weeklyA = /weekly|7d/i.test(keyA) ? 1 : 0;
+                const weeklyB = /weekly|7d/i.test(keyB) ? 1 : 0;
+                if (weeklyA !== weeklyB)
+                    return weeklyA - weeklyB;
+            }
             const pctA = typeof a.remaining_fraction === 'number' ? (1 - a.remaining_fraction) * 100 : (a.used_percentage ?? 0);
             const pctB = typeof b.remaining_fraction === 'number' ? (1 - b.remaining_fraction) * 100 : (b.used_percentage ?? 0);
             return pctB - pctA;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agy-statusblocks",
-  "version": "0.1.3",
+  "version": "0.1.5",
   "description": "Opinionated, adaptive block-based status line for Antigravity CLI (agy) with bin-packing layout, rate limit tracking, and live agent telemetry",
   "type": "module",
   "bin": {