cdx-manager 0.9.15 → 0.10.0

package/src/codex_usage.py

@@ -65,6 +65,15 @@ def _format_reset_date(unix_seconds):
     return f"{MONTH_ABBR[dt.month - 1]} {dt.day} {str(dt.hour).zfill(2)}:{str(dt.minute).zfill(2)}"
 
 
+def _format_timestamp(unix_seconds):
+    if unix_seconds is None:
+        return None
+    try:
+        return datetime.fromtimestamp(int(unix_seconds), tz=timezone.utc).astimezone().isoformat()
+    except (TypeError, ValueError, OSError):
+        return None
+
+
 def _remaining_from_used_percent(value):
     if value is None:
         return None
@@ -84,7 +93,7 @@ def _get_window(snapshot, duration_mins):
     return {}
 
 
-def normalize_codex_rate_limit_snapshot(snapshot):
+def normalize_codex_rate_limit_snapshot(snapshot, reset_credits=None):
     if not snapshot:
         return None
 
@@ -101,6 +110,23 @@ def normalize_codex_rate_limit_snapshot(snapshot):
 
     reset_5h_at = _format_reset_date(five_hour.get("resetsAt") or five_hour.get("resets_at"))
     reset_week_at = _format_reset_date(weekly.get("resetsAt") or weekly.get("resets_at"))
+    reset_credits = reset_credits or {}
+    available_count = reset_credits.get("availableCount", reset_credits.get("available_count"))
+    try:
+        available_count = max(0, int(available_count)) if available_count is not None else None
+    except (TypeError, ValueError):
+        available_count = None
+    credit_rows = []
+    for credit in reset_credits.get("credits") or []:
+        if not isinstance(credit, dict) or credit.get("status") not in (None, "available"):
+            continue
+        credit_rows.append({
+            "id": credit.get("id"),
+            "title": credit.get("title"),
+            "description": credit.get("description"),
+            "granted_at": _format_timestamp(credit.get("grantedAt", credit.get("granted_at"))),
+            "expires_at": _format_timestamp(credit.get("expiresAt", credit.get("expires_at"))),
+        })
 
     raw_status_text = json.dumps(snapshot, sort_keys=True)
     return {
@@ -111,6 +137,8 @@ def normalize_codex_rate_limit_snapshot(snapshot):
             weekly.get("usedPercent", weekly.get("used_percent"))
         ),
         "credits": credit_balance,
+        "reset_credits_available": available_count,
+        "reset_credits": credit_rows,
         "reset_5h_at": reset_5h_at,
         "reset_week_at": reset_week_at,
         "reset_at": reset_week_at or reset_5h_at,
@@ -166,6 +194,32 @@ def fetch_codex_rate_limit_diagnostic(session, timeout=5, popen_factory=None):
 
 
 def _probe_codex_rate_limit_diagnostic(session, auth_home, timeout=5, popen_factory=None):
+    diagnostic = _request_codex_app_server(
+        auth_home,
+        "account/rateLimits/read",
+        None,
+        "rate_limits_read_failed",
+        timeout=timeout,
+        popen_factory=popen_factory,
+    )
+    if not diagnostic["ok"]:
+        return diagnostic
+    response = diagnostic["response"]
+    result = response.get("result") or {}
+    by_limit = result.get("rateLimitsByLimitId") or {}
+    snapshot = by_limit.get("codex") or result.get("rateLimits")
+    status = normalize_codex_rate_limit_snapshot(snapshot, result.get("rateLimitResetCredits"))
+    if not status:
+        return {
+            "ok": False,
+            "reason": "missing_rate_limits",
+            "status": None,
+            "response": response,
+        }
+    return {"ok": True, "reason": None, "status": status, "response": response}
+
+
+def _request_codex_app_server(auth_home, method, params, failure_reason, timeout=5, popen_factory=None):
     env = os.environ.copy()
     env["CODEX_HOME"] = auth_home
     popen_factory = popen_factory or subprocess.Popen
@@ -204,29 +258,18 @@ def _probe_codex_rate_limit_diagnostic(session, auth_home, timeout=5, popen_fact
         _write_json_line(process, {
             "jsonrpc": "2.0",
             "id": 2,
-            "method": "account/rateLimits/read",
-            "params": None,
+            "method": method,
+            "params": params,
         })
         response = _read_response(output, 2, timeout)
         if not response or response.get("error"):
             return {
                 "ok": False,
-                "reason": "rate_limits_read_failed",
-                "status": None,
-                "response": response,
-            }
-        result = response.get("result") or {}
-        by_limit = result.get("rateLimitsByLimitId") or {}
-        snapshot = by_limit.get("codex") or result.get("rateLimits")
-        status = normalize_codex_rate_limit_snapshot(snapshot)
-        if not status:
-            return {
-                "ok": False,
-                "reason": "missing_rate_limits",
+                "reason": failure_reason,
                 "status": None,
                 "response": response,
             }
-        return {"ok": True, "reason": None, "status": status, "response": response}
+        return {"ok": True, "reason": None, "status": None, "response": response}
     except FileNotFoundError as error:
         return {"ok": False, "reason": "codex_cli_not_found", "status": None, "error": str(error)}
     except (OSError, ValueError, BrokenPipeError) as error:
@@ -250,3 +293,25 @@ def fetch_codex_rate_limits(session, timeout=5, popen_factory=None):
         popen_factory=popen_factory,
     )
     return diagnostic.get("status") if diagnostic.get("ok") else None
+
+
+def consume_codex_rate_limit_reset_credit(session, idempotency_key, credit_id=None, timeout=5, popen_factory=None):
+    auth_home = session.get("authHome")
+    if not auth_home:
+        return {"ok": False, "reason": "missing_auth_home", "outcome": None}
+    with codex_auth_lock(auth_home) as acquired:
+        if not acquired:
+            return {"ok": False, "reason": "auth_locked", "outcome": None}
+        params = {"idempotencyKey": idempotency_key}
+        if credit_id:
+            params["creditId"] = credit_id
+        diagnostic = _request_codex_app_server(
+            auth_home,
+            "account/rateLimitResetCredit/consume",
+            params,
+            "reset_consume_failed",
+            timeout=timeout,
+            popen_factory=popen_factory,
+        )
+        result = (diagnostic.get("response") or {}).get("result") or {}
+        return {**diagnostic, "outcome": result.get("outcome")}

package/src/provider_runtime.py

@@ -1,3 +1,4 @@
+import errno
 import json
 import os
 import re
@@ -881,6 +882,14 @@ def _format_probe_failure(session, spec, error):
             f"Install {command} and retry cdx add {session['name']}.",
             127,
         )
+    if isinstance(error, OSError) and error.errno == errno.ENOEXEC:
+        target = getattr(error, "filename", None) or command
+        return CdxError(
+            f"Failed to check login status for {session['name']}: {target} is not a valid executable "
+            f"(corrupted install, wrong architecture, or a script missing its shebang). "
+            f"Reinstall {command} and retry.",
+            126,
+        )
     message = getattr(error, "message", None) or str(error)
     return CdxError(f"Failed to check login status for {session['name']}: {message}")
 
@@ -915,7 +924,7 @@ def _probe_provider_auth(session, spawn_sync=None, env_override=None, trust_loca
             stdout = result.get("stdout") if isinstance(result, dict) else getattr(result, "stdout", "")
             stderr = result.get("stderr") if isinstance(result, dict) else getattr(result, "stderr", "")
             output = (stdout or "") + (stderr or "")
-    except FileNotFoundError as error:
+    except OSError as error:
         raise _format_probe_failure(session, spec, error) from error
     return spec["parser"](output)
 

package/src/session_service.py

@@ -29,6 +29,7 @@ RESERVED_SESSION_NAMES = {
     "configs",
     "cp",
     "disable",
+    "disk",
     "doctor",
     "enable",
     "export",
@@ -48,6 +49,7 @@ RESERVED_SESSION_NAMES = {
     "power",
     "ready",
     "repair",
+    "reset",
     "resume",
     "ren",
     "rename",
@@ -260,6 +262,8 @@ def _normalize_status_payload(payload=None):
         "remaining_5h_pct": _normalize_pct_value(payload.get("remaining_5h_pct")),
         "remaining_week_pct": _normalize_pct_value(payload.get("remaining_week_pct")),
         "credits": payload.get("credits"),
+        "reset_credits_available": payload.get("reset_credits_available"),
+        "reset_credits": payload.get("reset_credits"),
         "reset_5h_at": payload.get("reset_5h_at"),
         "reset_week_at": payload.get("reset_week_at"),
         "reset_at": payload.get("reset_at") or payload.get("reset_week_at") or payload.get("reset_5h_at"),
@@ -337,6 +341,8 @@ def _status_has_more_detail(candidate, current):
         "remaining_5h_pct",
         "remaining_week_pct",
         "credits",
+        "reset_credits_available",
+        "reset_credits",
         "reset_5h_at",
         "reset_week_at",
         "reset_at",
@@ -358,6 +364,8 @@ def _merge_status_payload(current, candidate):
         "remaining_5h_pct",
         "remaining_week_pct",
         "credits",
+        "reset_credits_available",
+        "reset_credits",
         "reset_5h_at",
         "reset_week_at",
         "reset_at",
@@ -1101,6 +1109,8 @@ def create_session_service(options=None):
             "remaining_5h_pct": _normalize_pct_value(row_status.get("remaining_5h_pct")) if row_status else None,
             "remaining_week_pct": _normalize_pct_value(row_status.get("remaining_week_pct")) if row_status else None,
             "credits": row_status.get("credits") if row_status else None,
+            "reset_credits_available": row_status.get("reset_credits_available") if row_status else None,
+            "reset_credits": row_status.get("reset_credits") if row_status else None,
             "available_pct": _compute_available_pct(row_status),
             "reset_5h_at": row_status.get("reset_5h_at") if row_status else None,
             "reset_week_at": row_status.get("reset_week_at") if row_status else None,

package/src/status_view.py

@@ -76,15 +76,15 @@ def _format_credits(value, empty="n/a"):
 def _format_status_rows(rows, use_color=False, small=False):
     has_provider = len({r["provider"] for r in rows}) > 1 and not small
     if small:
-        headers = ["SESSION", "STATUS", "OK", "5H", "WEEK", "RESET 5H", "RESET WEEK"]
+        headers = ["SESSION", "STATUS", "OK", "5H", "WEEK", "RESETS", "RESET 5H", "RESET WEEK"]
     elif has_provider:
-        headers = ["SESSION", "PROV.", "STATUS", "AUTH", "OK", "5H", "WEEK", "BLOCK", "CR", "RESET 5H", "RESET WEEK", "UPDATED"]
+        headers = ["SESSION", "PROV.", "STATUS", "AUTH", "OK", "5H", "WEEK", "BLOCK", "CR", "RESETS", "RESET 5H", "RESET WEEK", "UPDATED"]
     else:
-        headers = ["SESSION", "STATUS", "AUTH", "OK", "5H", "WEEK", "BLOCK", "CR", "RESET 5H", "RESET WEEK", "UPDATED"]
+        headers = ["SESSION", "STATUS", "AUTH", "OK", "5H", "WEEK", "BLOCK", "CR", "RESETS", "RESET 5H", "RESET WEEK", "UPDATED"]
     if not rows:
         if small:
-            return "SESSION  STATUS  OK  5H  WEEK  RESET 5H  RESET WEEK\nNo saved sessions yet."
-        return "SESSION  STATUS  OK  5H  WEEK  BLOCK  CR  RESET 5H  RESET WEEK  UPDATED\nNo saved sessions yet."
+            return "SESSION  STATUS  OK  5H  WEEK  RESETS  RESET 5H  RESET WEEK\nNo saved sessions yet."
+        return "SESSION  STATUS  OK  5H  WEEK  BLOCK  CR  RESETS  RESET 5H  RESET WEEK  UPDATED\nNo saved sessions yet."
     headers = [_style(header, "1", use_color) for header in headers]
     active_rows = [r for r in rows if r.get("enabled", True) is not False]
     priority = recommend_priority_rows(rows)
@@ -109,12 +109,13 @@ def _format_status_rows(rows, use_color=False, small=False):
             auth_color = "32" if auth == "logged" else "31" if auth == "logged out" else "2"
             base.append(_style(auth, auth_color, use_color))
         if r.get("enabled", True) is False:
-            usage_columns = [_style("-", "2", use_color)] * 5
+            usage_columns = [_style("-", "2", use_color)] * 6
         else:
             usage_columns = [
                 _style_pct(r.get("available_pct"), use_color),
                 _style_pct(r.get("remaining_5h_pct"), use_color),
                 _style_pct(r.get("remaining_week_pct"), use_color),
+                _style(str(r["reset_credits_available"]), "33", use_color) if r.get("reset_credits_available") is not None else _style("-", "2", use_color),
                 _style_reset_time(r.get("reset_5h_at"), use_color),
                 _style_reset_time(r.get("reset_week_at"), use_color),
             ]
@@ -367,8 +368,15 @@ def _format_status_detail(row, use_color=False):
         f"{_style('Week left:', '1', use_color)} {_style_pct(row.get('remaining_week_pct'), use_color)}",
         f"{_style('Block:', '1', use_color)} {_style(_format_blocking_quota(row), '33', use_color)}",
         f"{_style('Credits:', '1', use_color)} {_style(_format_credits(row.get('credits')), '33' if row.get('credits') is not None else '2', use_color)}",
+        f"{_style('Bonus resets:', '1', use_color)} {_style(str(row['reset_credits_available']), '33', use_color) if row.get('reset_credits_available') is not None else _style('-', '2', use_color)}",
+        f"{_style('Reset expiry:', '1', use_color)} {_style_reset_time(_nearest_reset_expiry(row), use_color)}",
         f"{_style('5h reset:', '1', use_color)} {_style_reset_time(row.get('reset_5h_at'), use_color)}",
         f"{_style('Week reset:', '1', use_color)} {_style_reset_time(row.get('reset_week_at'), use_color)}",
         f"{_style('Updated:', '1', use_color)} {_dim(_format_relative_age(row.get('updated_at')), use_color)}",
     ]
     return "\n".join(lines)
+
+
+def _nearest_reset_expiry(row):
+    values = [credit.get("expires_at") for credit in row.get("reset_credits") or [] if credit.get("expires_at")]
+    return min(values, key=lambda value: _parse_reset_timestamp(value) or float("inf")) if values else None