claude-multiacc 2.0.23 → 2.0.25

package/README.md

@@ -380,6 +380,18 @@ Codex-specific notes:
   `CODEX_MULTIACC_AUTO_RESET=0` only for emergency rollback/testing.
   A finished-limit verdict takes precedence over a conflicting percentage. The
   redemption key excludes unused model windows whose reset clocks move between reads.
+  Eligible accounts, including spent ones, check the credit endpoint every five
+  minutes even if the usage summary still says zero credits. A newly granted reset
+  is redeemed during that pass and clears the old limit; no-credit results are
+  checked again next pass, without waiting for the weekly reset date.
+  All authenticated accounts also report `usage.reset_credits_available` and
+  `usage.reset_credits_fetched_at` (ISO 8601) in `list/status/limits --json`.
+  The count comes from the credit endpoint, including below 95% used and with
+  automatic redemption disabled. The scheduled usage cadence bounds these reads.
+  Redemption shares that read, then reads back the remaining count after a POST;
+  no subtraction or embedded usage summary substitutes for provider evidence.
+  Zero means no available resets; missing fields mean the read was unavailable.
+  Credit identifiers remain local and selection does not use these fields.
 - **API-key logins are rejected** — ChatGPT subscription accounts only, matching the
   addon's no-API-keys rule.
 

package/bin/codex-accounts

@@ -1068,7 +1068,7 @@ import base64, datetime, json, os, sys, time, urllib.request
 root, threshold, quiet, url, force, lib_dir = (sys.argv[1], int(sys.argv[2]),
     sys.argv[3] == '1', sys.argv[4], sys.argv[5] == '1', sys.argv[6])
 sys.path.insert(0, lib_dir)
-from codex_reset import try_auto_redeem
+from codex_reset_telemetry import refresh_reset_credits
 now = time.time()
 # Don't re-fetch an account whose data is younger than this (endpoint rate-limits).
 MIN_FETCH_INTERVAL = int(os.environ.get('CODEX_MULTIACC_MIN_FETCH', '240'))
@@ -1564,15 +1564,17 @@ for acct in manifest.get('accounts', []):
     weeklyp = max(weekly) if weekly else None
     sessionp = max(session) if session else None
     try:
-        reset_result = try_auto_redeem(d, aid, maxp, data, url, headers, say, int(now))
+        reset_result, reset_view = refresh_reset_credits(d, aid, maxp, data, url, headers, say, int(now))
     except Exception as e:
         say(f'{aid}: usage reset automation failed unexpectedly ({type(e).__name__}); failing open')
         reset_result = {'status': 'error'}
+        reset_view = {}
     # Internal only (see win_bucket): limits.json keeps the bucket shape every reader
     # — the shim, lib/report.py, app-robot — already knows.
     for b in buckets:
         b.pop('_reset_known', None)
     out = {'fetched_at': int(now), 'source': 'chatgpt'}
+    out.update(reset_view)
     if live:
         out['max_percent'] = maxp
     if weeklyp is not None:

package/lib/codex_reset.py

@@ -1,8 +1,9 @@
 """Automatic redemption of earned Codex usage-limit reset credits.
 
 The Codex CLI exposes reset credits through the same authenticated backend as
-usage telemetry.  This module is called only after a fresh usage response says
-an account has 5% or less remaining.  A pending idempotency key is written
+usage telemetry. Each scheduled eligible usage pass reads the credit endpoint,
+even when the usage response's embedded credit summary is empty or out of date.
+A pending idempotency key is written
 before the mutation so a lost response can be retried without spending twice.
 """
 
@@ -110,7 +111,7 @@ def _redeem_request_id(account_id: str, usage: dict, headers: dict, now: int) ->
 
 def try_auto_redeem(account_dir: str, account_id: str, used_percent: int,
                     usage: dict, usage_url: str, headers: dict, say,
-                    now: int | None = None) -> dict:
+                    now: int | None = None, credit_details: dict | None = None) -> dict:
     """Redeem one available reset and return a non-secret outcome document."""
     current = int(now if now is not None else time.time())
     finished, _ = reset_windows(usage, RESET_AT_USED_PERCENT)
@@ -121,11 +122,11 @@ def try_auto_redeem(account_dir: str, account_id: str, used_percent: int,
         return {"status": "cooldown", "outcome": state.get("outcome")}
     list_url, consume_url = _reset_urls(usage_url)
     if disposition == "new":
-        summary = usage.get("rate_limit_reset_credits")
-        if isinstance(summary, dict) and int(summary.get("available_count") or 0) <= 0:
-            return {"status": "no_credit"}
+        # Newly granted credits can precede the usage response's embedded summary.
+        # The scheduled usage cadence bounds these reads, including spent accounts.
         try:
-            available_count, credit_id = _credit_to_redeem(_request(list_url, headers))
+            details = credit_details if credit_details is not None else _request(list_url, headers)
+            available_count, credit_id = _credit_to_redeem(details)
         except Exception as error:
             say(f"{account_id}: usage reset availability failed ({type(error).__name__}); failing open")
             return {"status": "error"}

package/lib/codex_reset_telemetry.py

@@ -0,0 +1,34 @@
+"""Observe reset allowances at the usage cadence, independently of redemption eligibility."""
+
+import time
+
+from codex_reset import _request, _reset_urls, try_auto_redeem
+
+
+def _read_credits(url, headers, account_id, say):
+    try:
+        details = _request(url, headers)
+        count = details.get("available_count")
+        if type(count) is not int or not 0 <= count <= 1_000_000:
+            raise ValueError("invalid reset allowance")
+        return details, {"reset_credits_available": count,
+                         "reset_credits_fetched_at": int(time.time())}
+    except Exception as error:
+        say(f"{account_id}: usage reset availability failed ({type(error).__name__})")
+        return {}, {}
+
+
+def refresh_reset_credits(account_dir, account_id, used_percent, usage, usage_url, headers, say, now):
+    """Read all accounts, share the GET with redemption, then read back after a mutation.
+
+    Failed reads omit the count; neither an embedded summary nor subtraction proves
+    the remaining allowance after another machine may have redeemed a credit.
+    Disabling automatic redemption still permits this read-only telemetry.
+    """
+    list_url, _ = _reset_urls(usage_url)
+    details, view = _read_credits(list_url, headers, account_id, say)
+    result = try_auto_redeem(account_dir, account_id, used_percent, usage, usage_url,
+                             headers, say, now, credit_details=details)
+    if result.get("status") not in {"not_eligible", "cooldown", "no_credit", "error"}:
+        _, view = _read_credits(list_url, headers, account_id, say)
+    return result, view

package/lib/report.py

@@ -242,6 +242,10 @@ def _usage(d, stale_after):
     out = {'fetched_at': _iso(fetched), 'source': lim.get('source'),
            'max_percent': lim.get('max_percent'), 'weekly_percent': lim.get('weekly_percent'),
            'session_percent': lim.get('session_percent'), 'buckets': buckets}
+    reset_count = lim.get('reset_credits_available')
+    reset_stamp = _iso(lim.get('reset_credits_fetched_at'))
+    if type(reset_count) is int and 0 <= reset_count <= 1_000_000 and reset_stamp:
+        out.update(reset_credits_available=reset_count, reset_credits_fetched_at=reset_stamp)
     try:
         out['age_seconds'] = max(0, int(time.time() - float(fetched)))
     except (TypeError, ValueError):

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "claude-multiacc",
-  "version": "2.0.23",
+  "version": "2.0.25",
   "description": "Unified Claude Code and OpenAI Codex subscription pooling with quota-aware selection.",
   "type": "module",
   "bin": {

package/tests/test_codex_reset.py

@@ -50,6 +50,10 @@ class ResetHandler(BaseHTTPRequestHandler):
         length = int(self.headers.get("Content-Length") or 0)
         state["posts"].append(json.loads(self.rfile.read(length)))
         status, body = state["responses"].pop(0)
+        if status == 200 and body.get("code") == "reset":
+            state["credits"]["available_count"] -= 1
+        if "credits_after_post" in state:
+            state["credits"] = state["credits_after_post"]
         encoded = json.dumps(body).encode()
         self.send_response(status)
         self.send_header("Content-Type", "application/json")
@@ -144,7 +148,7 @@ class CodexResetIntegrationTest(CodexPoolSandbox, unittest.TestCase):
             "rate_limit_reset_credits": {"available_count": 1}}
         result = self.run_limits()
         self.assertEqual(result.returncode, 0, result.stderr)
-        self.assertEqual(self.server.state["credit_gets"], 0)
+        self.assertEqual(self.server.state["credit_gets"], 1)
         self.assertEqual(self.server.state["posts"], [])
         self.assertFalse((self.pool / "acct-01/.usage-reset.json").exists())
 
@@ -167,7 +171,7 @@ class CodexResetIntegrationTest(CodexPoolSandbox, unittest.TestCase):
         self.assertEqual(len(self.server.state["posts"]), 2)
         keys = [request["redeem_request_id"] for request in self.server.state["posts"]]
         self.assertEqual(keys[0], keys[1])
-        self.assertEqual(self.server.state["credit_gets"], 1)
+        self.assertEqual(self.server.state["credit_gets"], 4)
 
 
 class CodexMarkerNamesOneBucketTest(CodexPoolSandbox, unittest.TestCase):

package/tests/test_codex_reset_polling.py

@@ -0,0 +1,94 @@
+"""Scheduled passes discover newly granted resets despite an old usage summary."""
+
+import json
+import os
+import subprocess
+import time
+import unittest
+
+import test_codex_reset as fixtures
+
+
+class ResetPollingTest(fixtures.CodexPoolSandbox, unittest.TestCase):
+    def setUp(self):
+        super().setUp()
+        now = int(time.time())
+        self.server.state["usage"] = {"rate_limit": {"allowed": False, "limit_reached": True,
+            "primary_window": {"used_percent": 100, "limit_window_seconds": 604800,
+                               "reset_at": now + 6 * 86400}},
+            "rate_limit_reset_credits": {"available_count": 0}}
+        self.server.state["credits"] = {"available_count": 0, "credits": []}
+
+    def run_scheduled(self, enabled="1"):
+        base = f"http://127.0.0.1:{self.server.server_port}/wham"
+        env = dict(os.environ, CODEX_ACCOUNTS_ROOT=str(self.pool), CODEX_MULTIACC_NO_SYNC="1",
+                   CODEX_MULTIACC_AUTO_RESET=enabled, CODEX_MULTIACC_USAGE_URL=f"{base}/usage",
+                   PYTHONDONTWRITEBYTECODE="1")
+        for key in ("CODEX_MULTIACC_MIN_FETCH", "CODEX_MULTIACC_RESET_CREDITS_URL",
+                    "CODEX_MULTIACC_RESET_CONSUME_URL"):
+            env.pop(key, None)
+        result = subprocess.run([fixtures.REPO / "bin/codex-accounts", "limits", "--quiet"],
+                                capture_output=True, text=True, env=env, timeout=20, check=False)
+        self.assertEqual(result.returncode, 0, result.stderr)
+
+    def next_pass(self):
+        path = self.pool / "acct-01/limits.json"
+        usage = json.loads(path.read_text())
+        usage["fetched_at"] = int(time.time()) - 301
+        path.write_text(json.dumps(usage))
+
+    def grant_credit(self):
+        self.server.state["credits"] = {"available_count": 1, "credits": [
+            {"id": "newly-granted", "status": "available", "expires_at": "2099-01-01T00:00:00Z"}]}
+        self.server.state["responses"] = [(200, {"code": "reset", "windows_reset": 1})]
+
+    def test_limited_account_polls_again_and_uses_a_new_credit(self):
+        self.run_scheduled()
+        self.assertEqual(self.server.state["credit_gets"], 1)
+        marker = self.pool / "acct-01/.limited"
+        self.assertTrue(marker.exists())
+        self.assertEqual(self.server.state["posts"], [])
+        self.run_scheduled()
+        self.assertEqual(self.server.state["credit_gets"], 1)  # Normal fetch cadence still applies.
+        self.next_pass()
+        self.run_scheduled()
+        self.assertEqual(self.server.state["credit_gets"], 2)
+        self.assertTrue(marker.exists())
+        self.grant_credit()
+        self.next_pass()
+        self.run_scheduled()
+        self.assertEqual(self.server.state["credit_gets"], 4)
+        self.assertEqual(self.server.state["posts"][0]["credit_id"], "newly-granted")
+        self.assertFalse(marker.exists())
+        receipt = json.loads((self.pool / "acct-01/.usage-reset.json").read_text())
+        self.assertEqual(receipt["state"], "complete")
+        usage = json.loads((self.pool / "acct-01/limits.json").read_text())
+        self.assertEqual(usage["fetched_at"], 0)  # Pre-reset exhaustion cannot exclude it again.
+
+    def test_malformed_usage_summary_does_not_hide_a_credit(self):
+        self.server.state["usage"]["rate_limit_reset_credits"]["available_count"] = "unknown"
+        self.grant_credit()
+        self.run_scheduled()
+        self.assertEqual(len(self.server.state["posts"]), 1)
+
+    def test_credit_lookup_failure_preserves_limit_and_retries_next_pass(self):
+        self.server.state["credits"] = []  # An unreadable credit response is not a reset.
+        self.run_scheduled()
+        self.assertTrue((self.pool / "acct-01/.limited").exists())
+        self.assertEqual(self.server.state["posts"], [])
+        self.grant_credit()
+        self.next_pass()
+        self.run_scheduled()
+        self.assertEqual(self.server.state["credit_gets"], 3)
+        self.assertFalse((self.pool / "acct-01/.limited").exists())
+
+    def test_disabled_automation_reports_without_spending_credits(self):
+        self.grant_credit()
+        self.run_scheduled(enabled="0")
+        self.assertEqual(self.server.state["credit_gets"], 1)
+        self.assertEqual(self.server.state["posts"], [])
+        self.assertTrue((self.pool / "acct-01/.limited").exists())
+
+
+if __name__ == "__main__":
+    unittest.main()

package/tests/test_codex_reset_reporting.py

@@ -0,0 +1,82 @@
+"""The public pool report carries measured allowances for active and limited accounts."""
+
+import json
+import os
+import subprocess
+import time
+import unittest
+
+import test_codex_reset as fixtures
+
+
+class ResetReportingTest(fixtures.CodexPoolSandbox, unittest.TestCase):
+    def report(self, used=60, enabled="1"):
+        self.server.state["usage"] = {"rate_limit": {"allowed": True,
+            "primary_window": {"used_percent": used, "limit_window_seconds": 604800,
+                               "reset_at": int(time.time()) + 86400}},
+            "rate_limit_reset_credits": {"available_count": 0}}
+        base = f"http://127.0.0.1:{self.server.server_port}/wham"
+        env = dict(os.environ, CODEX_ACCOUNTS_ROOT=str(self.pool), CODEX_MULTIACC_NO_SYNC="1",
+                   CODEX_MULTIACC_AUTO_RESET=enabled, CODEX_MULTIACC_USAGE_URL=f"{base}/usage",
+                   PYTHONDONTWRITEBYTECODE="1")
+        for key in ("CODEX_MULTIACC_RESET_CREDITS_URL", "CODEX_MULTIACC_RESET_CONSUME_URL"):
+            env.pop(key, None)
+        result = subprocess.run([fixtures.REPO / "bin/codex-accounts", "limits", "--force", "--json"],
+                                capture_output=True, text=True, env=env, timeout=20, check=False)
+        self.assertEqual(result.returncode, 0, result.stderr)
+        self.assertNotIn("private-credit", result.stdout)
+        return json.loads(result.stdout)["accounts"][0]
+
+    def test_active_account_reports_credits_without_redeeming(self):
+        self.server.state["credits"] = {"available_count": 3, "credits": [
+            {"id": "private-credit", "status": "available"}]}
+        account = self.report()
+        self.assertEqual(account["usage"]["reset_credits_available"], 3)
+        self.assertTrue(account["usage"]["reset_credits_fetched_at"].endswith("Z"))
+        self.assertEqual(self.server.state["credit_gets"], 1)
+        self.assertEqual(self.server.state["posts"], [])
+
+    def test_spent_account_reports_real_zero(self):
+        self.server.state["credits"] = {"available_count": 0, "credits": []}
+        account = self.report(100)
+        self.assertTrue(account["limited"])
+        self.assertEqual(account["usage"]["reset_credits_available"], 0)
+
+    def test_redemption_reports_readback_instead_of_pre_reset_allowance(self):
+        self.server.state["credits"] = {"available_count": 2, "credits": []}
+        self.server.state["responses"] = [(200, {"code": "reset", "windows_reset": 1})]
+        account = self.report(100)
+        self.assertEqual(account["usage"]["reset_credits_available"], 1)
+        self.assertTrue(account["usage"]["reset_credits_fetched_at"])
+        self.assertEqual(self.server.state["credit_gets"], 2)
+        self.assertEqual(len(self.server.state["posts"]), 1)
+
+    def test_failed_or_invalid_reads_clear_previous_allowance_without_hiding_usage(self):
+        self.server.state["credits"] = {"available_count": 2}
+        self.report()
+        for count in (None, "2", True, -1, 1.5, 1_000_001):
+            with self.subTest(count=count):
+                self.server.state["credits"] = {"available_count": count}
+                usage = self.report()["usage"]
+                self.assertNotIn("reset_credits_available", usage)
+                self.assertNotIn("reset_credits_fetched_at", usage)
+                self.assertEqual(usage["weekly_percent"], 60)
+        self.assertEqual(self.server.state["posts"], [])
+
+    def test_disabled_redemption_still_reports_allowance(self):
+        self.server.state["credits"] = {"available_count": 2}
+        self.assertEqual(self.report(100, enabled="0")["usage"]["reset_credits_available"], 2)
+        self.assertEqual(self.server.state["posts"], [])
+
+    def test_failed_readback_does_not_reuse_the_allowance_before_redemption(self):
+        self.server.state["credits"] = {"available_count": 2, "credits": []}
+        self.server.state["credits_after_post"] = []
+        self.server.state["responses"] = [(200, {"code": "reset", "windows_reset": 1})]
+        account = self.report(100)
+        self.assertFalse(account["limited"])
+        self.assertNotIn("reset_credits_available", account["usage"])
+        self.assertEqual(len(self.server.state["posts"]), 1)
+
+
+if __name__ == "__main__":
+    unittest.main()