claude-multiacc 2.0.45 → 2.0.46

package/bin/codex

@@ -1363,8 +1363,21 @@ fi
 pick="$PICK_DIR"
 # A probe answers here, before anything that would count as a launch: no rotation
 # memory, no limits kick, no pick line in selection.log — and never an exec.
+# A limited tier also names when it lifts (resets_at=<epoch>, only when known): hard is
+# the soonest reset among the exhausted accounts, soft the picked account's own marker.
+# This is the machine twin of the tty-only notice above — callers read stdout, and a
+# service's stderr stays byte-clean.
 if [ "$AR_PROBE" = "1" ]; then
-  printf 'pick=%s tier=%s\n' "${pick##*/}" "$AR_TIER"
+  ar_reset=0
+  case "$AR_TIER" in
+    hard) ar_reset="$best_reset" ;;
+    soft) ar_reset="$(limited_reset_of "$pick")" ;;
+  esac
+  if [ "$ar_reset" -gt 0 ] 2>/dev/null; then
+    printf 'pick=%s tier=%s resets_at=%s\n' "${pick##*/}" "$AR_TIER" "$ar_reset"
+  else
+    printf 'pick=%s tier=%s\n' "${pick##*/}" "$AR_TIER"
+  fi
   exit 0
 fi
 # Remember the pick so the NEXT run does not hand back the same account. An explicit

package/docs/AUTORESUME.md

@@ -293,6 +293,12 @@ CLAUDE_MULTIACC_AR_PROBE=1 CLAUDE_MULTIACC_AR_AVOID=acct-07:1790000000 claude
   - `soft`: only the all-limited fallback;
   - `hard`: only exhausted accounts are left;
   - `none`: nothing is usable; exit 3.
+- **`resets_at`** (codex only): a `soft` or `hard` answer may end with
+  ` resets_at=<epoch>`, when that tier's reset is known. For `hard` it is the soonest
+  reset among the exhausted accounts. For `soft` it is the picked account's own reset.
+  An `eligible` answer never carries it. This is the machine-readable form of the
+  terminal-only "every usable account is at a limit" notice; stderr stays empty.
+  Parsers must accept trailing `key=value` fields.
 - **What the probe runs:** the same candidate loop as a launch, including marker upkeep
   and its log lines, stopping before exec.
 - **Environment:** run it with no `CLAUDE_CONFIG_DIR`, `CLAUDE_ACCOUNT` or

package/lib/autoresume.py

@@ -1118,10 +1118,13 @@ def probe_env(environ, provider, avoid):
 
 
 def parse_probe(out):
-    """The probe's ``pick=<acct> tier=<eligible|soft|hard|none>`` -> (pick, tier)."""
+    """The probe's ``pick=<acct> tier=<eligible|soft|hard|none>`` -> (pick, tier).
+
+    Trailing ``key=value`` fields (the codex shim's ``resets_at=<epoch>``) are accepted
+    and ignored here."""
     pick, tier = "", ""
     for line in (out or "").split("\n"):
-        m = re.match(r"^pick=(\S*) tier=(\S+)\s*$", line.strip())
+        m = re.match(r"^pick=(\S*) tier=(\S+)(?:\s+\w+=\S*)*\s*$", line.strip())
         if m:
             pick, tier = m.group(1), m.group(2)
     if pick and not ACCT_RE.match(pick):

package/package.json

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

package/tests/run-tests.sh

@@ -5695,6 +5695,10 @@ cxlj 99 10 99 > "$CX/acct-01/limits.json"
 cxlj 7 100 100 > "$CX/acct-02/limits.json"
 out="$(codex 2>&1)"
 check "codex: a still-serving limited account beats an exhausted one with more headroom" "CFG=acct-01" "$out"
+out="$(CODEX_MULTIACC_AR_PROBE=1 codex 2>&1)"; rc=$?
+[ "$rc:$out" = "0:pick=acct-01 tier=soft resets_at=$((now+3600))" ] \
+  && t_ok "codex probe: a soft pick carries its own marker's resets_at" \
+  || t_fail "codex probe soft resets_at" "rc=$rc out=$out"
 # The codex-review case (2026-09-04): the exhausted account is the only one INSIDE the
 # session gate; the gate must not resurrect it over a still-serving account outside it.
 printf '%s\nbucket=7d percent=100 marked_at=x reason=limits\n' "$((now+3600))" > "$CX/acct-01/.limited"
@@ -5713,6 +5717,12 @@ printf '%s\nbucket=5h percent=100 marked_at=x reason=limits\n' "$((now+7200))" >
 printf '%s\nbucket=5h percent=100 marked_at=x reason=limits\n' "$((now+600))" > "$CX/acct-02/.limited"
 out="$(codex 2>&1)"
 check "codex: all exhausted: the soonest reset is handed out" "CFG=acct-02" "$out"
+# The probe is the machine channel for the tty-only notice: it names the soonest reset,
+# and its stderr stays empty.
+out="$(CODEX_MULTIACC_AR_PROBE=1 codex 2>"$WORK/cx-probe.err")"; rc=$?
+[ "$rc:$out" = "0:pick=acct-02 tier=hard resets_at=$((now+600))" ] && [ ! -s "$WORK/cx-probe.err" ] \
+  && t_ok "codex probe: all exhausted answers tier=hard resets_at=<soonest reset>, stderr clean" \
+  || t_fail "codex probe hard resets_at" "rc=$rc out=$out err=$(cat "$WORK/cx-probe.err")"
 grep -q "all-exhausted resets_in=" "$CX/selection.log" \
   && t_ok "codex: the all-exhausted pick is logged with its reset" || t_fail "codex all-exhausted log" "no line"
 rm -f "$CX"/acct-*/.limited "$CX"/acct-*/limits.json

package/tests/test_autoresume.py

@@ -697,7 +697,13 @@ class StateTests(unittest.TestCase):
         self.assertEqual(ar.parse_probe("noise\npick=acct-02 tier=eligible\n"),
                          ("acct-02", "eligible"))
         self.assertEqual(ar.parse_probe("pick= tier=none\n"), ("", "none"))
-        for bad in ("", "pick=acct-02", "pick=../x tier=eligible", "pick=acct-02 tier=great"):
+        # The codex shim appends resets_at=<epoch> to a limited tier; old lines still parse.
+        self.assertEqual(ar.parse_probe("pick=acct-03 tier=hard resets_at=1790000000\n"),
+                         ("acct-03", "hard"))
+        self.assertEqual(ar.parse_probe("pick=acct-03 tier=soft resets_at=1790000000"),
+                         ("acct-03", "soft"))
+        for bad in ("", "pick=acct-02", "pick=../x tier=eligible", "pick=acct-02 tier=great",
+                    "pick=acct-02 tier=hard resets_at", "pick=acct-02 tier=hard x y"):
             self.assertEqual(ar.parse_probe(bad), ("", ""), bad)
         self.assertTrue(ar.probe_allows("quota", "acct-02", "eligible", "acct-01"))
         self.assertFalse(ar.probe_allows("quota", "acct-01", "eligible", "acct-01"))