claude-multiacc 2.0.23 → 2.0.24

package/README.md

@@ -380,6 +380,10 @@ 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.
 - **API-key logins are rejected** — ChatGPT subscription accounts only, matching the
   addon's no-API-keys rule.
 

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.
 """
 
@@ -121,9 +122,8 @@ 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))
         except Exception as error:

package/package.json

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

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"], 3)
+        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"], 2)
+        self.assertFalse((self.pool / "acct-01/.limited").exists())
+
+    def test_disabled_automation_does_not_query_or_spend_credits(self):
+        self.grant_credit()
+        self.run_scheduled(enabled="0")
+        self.assertEqual(self.server.state["credit_gets"], 0)
+        self.assertEqual(self.server.state["posts"], [])
+        self.assertTrue((self.pool / "acct-01/.limited").exists())
+
+
+if __name__ == "__main__":
+    unittest.main()