claude-multiacc 1.0.14 → 1.0.16

package/lib/report.py

@@ -41,6 +41,25 @@ import sys
 import time
 
 SCHEMA = 'claude-multiacc/pool.v1'
+
+# Must match the SHIM's ranking window, or this document calls data "fresh" that
+# selection has already stopped ranking on. The two providers differ on purpose:
+# api.anthropic.com hands out Retry-After: 3600, so bin/claude trusts an hour;
+# bin/codex still uses 900 against chatgpt.com, which has not been measured.
+_STALE_DEFAULT = {'claude': 3600, 'codex': 900}
+
+
+def _stale_after(provider):
+    env = {'claude': 'CLAUDE_MULTIACC_STALE_AFTER',
+           'codex': 'CODEX_MULTIACC_STALE_AFTER'}.get(provider)
+    default = _STALE_DEFAULT.get(provider, 900)
+    try:
+        v = int(os.environ.get(env) or default) if env else default
+    except ValueError:
+        v = default
+    return v if v > 0 else default
+
+
 VALID_ID = re.compile(r'acct-\d{2}')
 
 
@@ -181,7 +200,7 @@ def _codex_credentials(d, jwt_claims):
     return 'machine-local', detail
 
 
-def _usage(d):
+def _usage(d, stale_after):
     lim = _load_json(os.path.join(d, 'limits.json'))
     if not lim:
         return None
@@ -200,6 +219,19 @@ def _usage(d):
         out['age_seconds'] = max(0, int(time.time() - float(fetched)))
     except (TypeError, ValueError):
         out['age_seconds'] = None
+    # Past this window the shim stops ranking on these numbers entirely (bin/claude
+    # STALE_AFTER). A panel that shows "weekly 2%" without it is reporting a number
+    # nothing is using — which is how an 11-day telemetry outage stayed invisible.
+    out['stale'] = out['age_seconds'] is None or out['age_seconds'] > stale_after
+    # The horizon a stale weekly reading stays true until (bin/claude stale_weekly).
+    # Absent on documents written before it existed, which is itself the signal that
+    # the reading cannot be used for degraded ranking.
+    if lim.get('weekly_resets_epoch'):
+        out['weekly_resets_epoch'] = lim['weekly_resets_epoch']
+    if lim.get('last_error'):
+        out['last_error'] = lim['last_error']
+        if lim.get('last_error_at'):
+            out['last_error_at'] = _iso(lim['last_error_at'])
     if lim.get('plan'):
         out['plan'] = lim['plan']
     if lim.get('retry_after'):
@@ -221,6 +253,44 @@ def _last_pick(root, aid):
     return last
 
 
+
+def telemetry_state(accounts, now=None):
+    """Three-state verdict on how the shim is CURRENTLY ranking this pool, over the
+    same candidate set bin/claude uses: the eligible accounts, or — when every one of
+    them is limit-marked — the valid ones it falls back to.
+
+      'fresh'    at least one candidate has telemetry inside the ranking window
+      'degraded' none do, but EVERY candidate still has a weekly reading whose bucket
+                 has not reset yet, so the shim ranks on those (all-or-nothing: one
+                 unusable reading and the comparison is not apples-to-apples)
+      'blind'    nothing usable anywhere — every account scores the same and selection
+                 is effectively a coin flip
+      'none'     no candidates at all; nothing to say
+
+    Kept here rather than beside either caller because `status` and `--json` disagreeing
+    with the shim is exactly how an eleven-day outage stayed invisible.
+    """
+    now = time.time() if now is None else now
+    usable = [a for a in accounts if a.get('status') in ('active', 'limited')]
+    cands = [a for a in usable if a.get('status') == 'active'] or usable
+    if not cands:
+        return 'none'
+    if any(a.get('usage') and not a['usage'].get('stale') for a in cands):
+        return 'fresh'
+    for a in cands:
+        u = a.get('usage') or {}
+        horizon = u.get('weekly_resets_epoch') or 0
+        pct = u.get('weekly_percent')
+        # bool is an int in Python but not a number to the shim's digit parser, so a
+        # document carrying `weekly_percent: true` must read as unusable HERE too —
+        # otherwise this says 'degraded' while the shim ranks blind.
+        if isinstance(horizon, bool) or isinstance(pct, bool) \
+                or not isinstance(horizon, (int, float)) or horizon <= now \
+                or not isinstance(pct, (int, float)):
+            return 'blind'
+    return 'degraded'
+
+
 def _account_row(root, a, aid, d, provider, jwt_claims, audit_account, now, kind, machine):
     """One account's row. Everything it reads is already tolerant; build() catches
     anything unexpected on top of that and degrades this account alone."""
@@ -256,7 +326,7 @@ def _account_row(root, a, aid, d, provider, jwt_claims, audit_account, now, kind
         'limit_reset_at': _iso(reset_epoch) if limited and reset_epoch else None,
         'limit_reset_epoch': reset_epoch if limited and reset_epoch else None,
         'limit_detail': marker_detail if limited else None,
-        'usage': _usage(d),
+        'usage': _usage(d, _stale_after(provider)),
     }
     if kind == 'status':
         row['last_picked'] = _last_pick(root, aid)
@@ -340,6 +410,15 @@ def build(root, provider, machine, kind='list'):
             'needs_login': sum(1 for a in accounts if a['needs_login']),
             'portable': sum(1 for a in accounts if a['portable']),
             'selectable': sum(1 for a in accounts if a['selectable']),
+            # The pool-wide verdict, so a dashboard can show the outage rather than a
+            # grid of reassuring percentages nothing is ranking on.
+            #   fresh    ranking on current data
+            #   degraded ranking on old-but-still-true weekly readings
+            #   blind    every account scores the same; selection is a coin flip
+            'telemetry': telemetry_state(accounts, now),
+            # Kept as its own boolean because a dashboard alerting on one field should
+            # not have to know the vocabulary. True ONLY for the coin-flip case.
+            'ranking_blind': telemetry_state(accounts, now) == 'blind',
         },
         'warnings': warnings,
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "claude-multiacc",
-  "version": "1.0.14",
+  "version": "1.0.16",
   "description": "Multi-account addon for Claude Code and OpenAI Codex CLI: every claude / claude -p and every codex / codex exec runs under a randomly-picked subscription account with the most usage headroom. Mirrors to a deploy server. No API keys.",
   "type": "module",
   "bin": {