pocketshell 0.4.45__tar.gz → 0.4.46__tar.gz

{pocketshell-0.4.45 → pocketshell-0.4.46}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: pocketshell
-Version: 0.4.45
+Version: 0.4.46
 Summary: Unified server-side Python utility for the PocketShell Android client.
 Project-URL: Homepage, https://github.com/alexeygrigorev/pocketshell
 Project-URL: Issues, https://github.com/alexeygrigorev/pocketshell/issues
@@ -21,7 +21,7 @@ Requires-Python: >=3.11
 Requires-Dist: click>=8.2.0
 Requires-Dist: google-auth>=2.0.0
 Requires-Dist: pyyaml>=6.0
-Requires-Dist: quse==0.0.14
+Requires-Dist: quse==0.0.15
 Requires-Dist: tmuxctl>=0.3.5
 Provides-Extra: dev
 Requires-Dist: pytest>=8.4.0; extra == 'dev'

{pocketshell-0.4.45 → pocketshell-0.4.46}/pyproject.toml

@@ -14,7 +14,7 @@ name = "pocketshell"
 # scripts/check-pypi-version.sh enforces the stamped value matches the tag;
 # scripts/check-version-coupling.sh enforces the derivation itself is
 # single-sourced. See tools/pocketshell/README.md ("Version coupling").
-version = "0.4.45"
+version = "0.4.46"
 description = "Unified server-side Python utility for the PocketShell Android client."
 readme = "README.md"
 requires-python = ">=3.11"
@@ -43,16 +43,19 @@ dependencies = [
     # Usage backend + single source of truth for the unified provider schema
     # (issue #1318). Pinned exactly: `pocketshell usage --json` expects quse's
     # provider-keyed `--json` document and fails loudly on schema drift, so the
-    # version is frozen, not a range. The published 0.0.14 wheel is the
-    # five-provider legacy shape with `short_term` / `long_term` records. The
-    # host boundary translates those records into canonical `windows`; it also
-    # accepts a separate top-level `windows` producer contract for newer or
-    # custom producers, without treating that shape as PyPI 0.0.14 provenance.
-    # Canonical-only providers such as OpenCode Go belong to that separate
-    # contract, not to the published-wheel provider list. 0.0.13 (#2195)
-    # historically added the `grok` provider; 0.0.11 (#1564) labeled each
-    # Codex window from its actual `limit_window_seconds`.
-    "quse==0.0.14",
+    # version is frozen, not a range. The published 0.0.15 wheel (upstream
+    # a86959e, issue #2293) is the six-provider CANONICAL producer: every
+    # record already carries the top-level `windows` map the Android parser
+    # reads, so the host boundary only injects the provider key and forwards
+    # the record unchanged. #2283's `short_term` / `long_term` translation for
+    # the older wheel is hard-cut (D22) — a legacy-shaped record now fails
+    # loudly. 0.0.15 is also the first published wheel that reports the `go`
+    # provider (OpenCode on the Go backend), so the OpenCode Go quota finally
+    # reaches the Usage panel; it is a provider of the pinned wheel, not a
+    # separate producer contract. 0.0.13 (#2195) historically added the `grok`
+    # provider; 0.0.11 (#1564) labeled each Codex window from its actual
+    # `limit_window_seconds`.
+    "quse==0.0.15",
     # FCM HTTP v1 push delivery (#690): service-account OAuth2 bearer minting
     # for `pocketshell push` / the `usage --capture` reset-push send. Imported
     # lazily and fail-soft — a host without it (or without a Firebase
@@ -128,9 +131,10 @@ exclude = [
 [tool.uv]
 # Keep the lockfile's reproducibility cutoff project-local. The host may have
 # a rolling global `exclude-newer` policy that predates deliberately pinned
-# releases (quse 0.0.14 and tmuxctl 0.3.5); this exact value is also the
-# `uv.lock` options cutoff and must be used when checking this lock.
-exclude-newer = "2026-08-27T22:00:00Z"
+# releases (quse 0.0.15 and tmuxctl 0.3.5); this exact value is also the
+# `uv.lock` options cutoff and must be used when checking this lock. Moved
+# past quse 0.0.15's 2026-08-28T12:09:07Z PyPI upload for issue #2293.
+exclude-newer = "2026-08-28T22:00:00Z"
 
 [tool.pytest.ini_options]
 testpaths = ["tests"]

{pocketshell-0.4.45 → pocketshell-0.4.46}/src/pocketshell/engines.py

@@ -280,7 +280,12 @@ def builtin_manifests() -> tuple[EngineManifest, ...]:
             harness="opencode",
             label="OpenCode",
             provider_mark="OpenCode",
-            usage_provider="opencode",
+            # Issue #2293: `usage_provider` names the quse provider whose quota
+            # belongs to this engine, and quse has no provider called
+            # "opencode" — the OpenCode-on-Go backend is reported as `go`
+            # (quse.opencode_go_quota). The old value would have made
+            # `pocketshell usage opencode` fail with "Unknown provider".
+            usage_provider="go",
             launch=LaunchSpec(argv=("opencode",)),
         ),
         EngineManifest(

{pocketshell-0.4.45 → pocketshell-0.4.46}/src/pocketshell/usage.py

@@ -4,17 +4,25 @@ Implementation delegates to the **pinned** `quse` CLI via `subprocess.run`
 and normalizes its provider-keyed `--json` document into the per-provider
 NDJSON the Android app consumes. Human output is proxied verbatim.
 
-The pinned PyPI `quse==0.0.14` contract is a five-provider, provider-keyed
-object whose records carry legacy `short_term` / `long_term` windows. PocketShell
-owns the narrow producer-boundary translation: it injects the provider name and
-maps those records to the canonical `windows` map consumed by Android. A
-separate canonical producer contract is also accepted for newer or custom host
-producers that already emit a top-level `windows` map; that support does not
-change the published-wheel provenance or claim OpenCode Go for the pinned
-wheel. The Android parser never reads the legacy fields. A schema mismatch
-(non-JSON / non-object payload, malformed window container, or missing both
-canonical and legacy window fields) raises loudly rather than silently
-emptying the panel.
+The pinned PyPI `quse==0.0.15` contract (upstream a86959e, issue #2293) is a
+six-provider, provider-keyed object whose records ALREADY carry the canonical
+top-level `windows` map the Android parser reads — `claude`, `codex`,
+`copilot`, `go` (OpenCode on the Go backend), `grok`, `zai`. PocketShell's
+producer boundary is therefore a passthrough: it injects the provider name
+from the object key and forwards the record unchanged. It never re-derives
+quota values, reset times, window labels, or provider details.
+
+#2283's `short_term` / `long_term` translation existed only because the
+published wheel lagged quse HEAD; with the pin at 0.0.15 that producer no
+longer exists, so the translation is hard-cut (D22) and a legacy-shaped record
+now fails loudly. A schema mismatch (non-JSON / non-object payload, malformed
+window container, or a missing canonical `windows` map) raises rather than
+silently emptying the panel.
+
+`pocketshell usage` keeps NO provider allowlist of its own: the positional
+`provider` argument is forwarded verbatim to the pinned quse, which owns
+provider validation and its error message. That is why "Unknown provider 'go'"
+was only ever fixable by bumping the pin.
 
 quse is a hard dependency of pocketshell (see `pyproject.toml`), so its
 console-script ships in the SAME bin directory as the running interpreter.
@@ -184,90 +192,43 @@ def _canonicalize_quse_record(
 ) -> dict[str, Any]:
     """Normalize one provider record at the PocketShell producer boundary.
 
-    The pinned PyPI wheel uses the legacy ``short_term`` / ``long_term`` shape;
-    that translation is deliberately confined to this host boundary. Newer or
-    custom producers may already provide canonical ``windows`` records, which
-    are passed through verbatim. Neither branch re-derives provider values,
-    reset times, or labels. A provider must provide one of those two shapes.
+    The pinned ``quse==0.0.15`` wheel IS the canonical producer: every record
+    already carries the top-level ``windows`` map the Android parser reads. The
+    only thing this boundary does is inject the ``provider`` name that quse
+    keeps in the object key — quse's ``--json`` document is provider-keyed and
+    the app wire is one self-describing record per line. Nothing else is
+    touched: windows, percentages, reset times, ``rolling`` flags and
+    provider-owned ``details`` are forwarded verbatim.
+
+    Fail loud (D22 hard cut): a record without a canonical ``windows`` object
+    is a schema drift — most plausibly a stale/shadowed quse — and must surface
+    as an error, not be silently re-shaped. There is deliberately no
+    ``short_term`` / ``long_term`` fallback here any more (#2283 → #2293).
     """
-    if "windows" in record:
-        windows = record["windows"]
-        if not isinstance(windows, dict):
-            raise ValueError(
-                f"quse provider '{provider}' top-level 'windows' is not a JSON object"
-            )
-        if "short_term" in record or "long_term" in record:
-            raise ValueError(
-                f"quse provider '{provider}' mixes canonical 'windows' with "
-                "legacy short_term/long_term fields"
-            )
-        return {"provider": provider, **record}
-    if "short_term" not in record and "long_term" not in record:
+    if "windows" not in record:
         raise ValueError(
-            f"quse provider '{provider}' is missing canonical 'windows' or both "
-            "legacy window fields 'short_term' and 'long_term'"
+            f"quse provider '{provider}' is missing the canonical 'windows' map"
         )
-
-    windows: dict[str, dict[str, Any]] = {}
-    for source_key in ("short_term", "long_term"):
-        if source_key not in record or record[source_key] is None:
-            continue
-        source_window = record[source_key]
-        if not isinstance(source_window, dict):
-            raise ValueError(
-                f"quse provider '{provider}' field '{source_key}' is not a JSON object"
-            )
-        if "percent_remaining" not in source_window:
-            raise ValueError(
-                f"quse provider '{provider}' field '{source_key}' is missing "
-                "percent_remaining"
-            )
-        if "reset_at" not in source_window:
-            raise ValueError(
-                f"quse provider '{provider}' field '{source_key}' is missing reset_at"
-            )
-        # Legacy quse represents a span that does not apply to a provider with
-        # a null percentage. Omit it at this compatibility boundary; canonical
-        # producers may retain that source span and the Android parser omits
-        # its non-renderable row.
-        if source_window["percent_remaining"] is None:
-            continue
-        label = source_window.get("window") or source_key
-        if not isinstance(label, str) or not label.strip():
-            raise ValueError(
-                f"quse provider '{provider}' field '{source_key}' has an invalid window label"
-            )
-        if label in windows:
-            raise ValueError(
-                f"quse provider '{provider}' has duplicate window label '{label}'"
-            )
-        windows[label] = {
-            "percent_remaining": source_window["percent_remaining"],
-            "reset_at": source_window["reset_at"],
-        }
-
-    flattened: dict[str, Any] = {"provider": provider, **record}
-    flattened.pop("short_term", None)
-    flattened.pop("long_term", None)
-    flattened["windows"] = windows
-    return flattened
+    if not isinstance(record["windows"], dict):
+        raise ValueError(
+            f"quse provider '{provider}' top-level 'windows' is not a JSON object"
+        )
+    return {"provider": provider, **record}
 
 
 def normalize_usage_stdout(stdout: str) -> str:
     """Flatten quse's provider-keyed object into per-provider NDJSON.
 
-    Published `quse==0.0.14` records use legacy ``short_term`` /
-    ``long_term`` fields and receive the one explicit producer-boundary
-    translation to the app-facing ``windows`` map. A separate canonical
-    top-level ``windows`` producer record passes through unchanged. This
-    function never invents percentages or reset times, and Android receives
-    only the canonical map.
+    Published ``quse==0.0.15`` records already carry the canonical top-level
+    ``windows`` map, so each record passes through unchanged apart from the
+    injected ``provider`` key. This function never invents percentages or
+    reset times.
 
     Strict / fail-loud: non-JSON stdout, a non-object top-level payload, a
-    non-object provider value, or malformed producer window fields all raise
-    ``ValueError`` so a schema mismatch fails visibly instead of silently
-    emptying the usage panel. Empty/blank stdout passes through untouched (the
-    caller decides what an empty read means).
+    non-object provider value, or a record missing/mis-typing the canonical
+    ``windows`` map all raise ``ValueError`` so a schema mismatch fails visibly
+    instead of silently emptying the usage panel. Empty/blank stdout passes
+    through untouched (the caller decides what an empty read means).
     """
     if not stdout.strip():
         return stdout

pocketshell-0.4.46/tests/data/quse-0.0.15-usage.json

@@ -0,0 +1,226 @@
+{
+  "claude": {
+    "details": {
+      "limit_reached": false,
+      "subscription": null,
+      "windows": {
+        "five_hour": {
+          "reset_at": "2026-08-28T16:20:00Z",
+          "used_percent": 6.0
+        },
+        "seven_day": {
+          "reset_at": "2026-09-03T15:00:00Z",
+          "used_percent": 10.0
+        }
+      }
+    },
+    "error": null,
+    "status": "ok",
+    "windows": {
+      "5h": {
+        "percent_remaining": 94.0,
+        "reset_at": "2026-08-28T16:20:00Z",
+        "rolling": false
+      },
+      "7d": {
+        "percent_remaining": 90.0,
+        "reset_at": "2026-09-03T15:00:00Z"
+      },
+      "monthly": {
+        "percent_remaining": null,
+        "reset_at": null
+      }
+    }
+  },
+  "codex": {
+    "details": {
+      "limit_reached": false,
+      "reset_credits": [
+        {
+          "expires_at": "2026-09-21T00:13:17Z",
+          "status": "available",
+          "title": "Full reset"
+        }
+      ],
+      "reset_credits_available": 1,
+      "reset_credits_error": null,
+      "windows": {
+        "primary_window": {
+          "limit_window_seconds": 604800,
+          "present": true,
+          "reset_at": "2026-09-03T16:26:48Z",
+          "used_percent": 13.0
+        },
+        "secondary_window": {
+          "limit_window_seconds": null,
+          "present": false,
+          "reset_at": null,
+          "used_percent": 0.0
+        }
+      }
+    },
+    "error": null,
+    "status": "ok",
+    "windows": {
+      "5h": {
+        "percent_remaining": null,
+        "reset_at": null,
+        "rolling": false
+      },
+      "7d": {
+        "percent_remaining": 87.0,
+        "reset_at": "2026-09-03T16:26:48Z"
+      },
+      "monthly": {
+        "percent_remaining": null,
+        "reset_at": null
+      }
+    }
+  },
+  "copilot": {
+    "details": {
+      "limit_reached": true,
+      "premium_entitlement": 1500,
+      "premium_percent_remaining": 0.0,
+      "premium_remaining": -1
+    },
+    "error": null,
+    "status": "ok",
+    "windows": {
+      "5h": {
+        "percent_remaining": null,
+        "reset_at": null,
+        "rolling": false
+      },
+      "7d": {
+        "percent_remaining": null,
+        "reset_at": null
+      },
+      "monthly": {
+        "percent_remaining": 0.0,
+        "reset_at": "2026-09-01T00:00:00Z"
+      }
+    }
+  },
+  "go": {
+    "details": {
+      "limit_reached": false,
+      "max_used_percent": 64.0
+    },
+    "error": null,
+    "status": "ok",
+    "windows": {
+      "5h": {
+        "percent_remaining": 36.0,
+        "reset_at": "2026-08-28T13:36:26Z",
+        "rolling": true
+      },
+      "7d": {
+        "percent_remaining": 74.0,
+        "reset_at": "2026-08-31T00:00:00Z"
+      },
+      "monthly": {
+        "percent_remaining": 86.0,
+        "reset_at": "2026-09-22T06:20:28Z"
+      }
+    }
+  },
+  "grok": {
+    "details": {
+      "has_grok_code_access": true,
+      "is_unified_billing_user": true,
+      "limit_reached": true,
+      "on_demand_cap": 0.0,
+      "on_demand_used": 0.0,
+      "prepaid_balance": 0.0,
+      "product_usage": [
+        {
+          "product": "GrokBuild",
+          "usage_percent": 100.0
+        }
+      ],
+      "resets": [
+        {
+          "expires_at": "2026-09-12T18:49:00Z",
+          "token_id": "restok_vpYDqo"
+        }
+      ],
+      "resets_available": 1,
+      "resets_error": null,
+      "windows": {
+        "monthly": {
+          "limit": null,
+          "present": false,
+          "reset_at": null,
+          "used": null,
+          "used_percent": null
+        },
+        "weekly": {
+          "limit": 0.0,
+          "present": true,
+          "reset_at": "2026-09-01T00:08:17Z",
+          "used": 0.0,
+          "used_percent": 100.0
+        }
+      }
+    },
+    "error": null,
+    "status": "ok",
+    "windows": {
+      "5h": {
+        "percent_remaining": null,
+        "reset_at": null,
+        "rolling": false
+      },
+      "7d": {
+        "percent_remaining": 0.0,
+        "reset_at": "2026-09-01T00:08:17Z"
+      },
+      "monthly": {
+        "percent_remaining": null,
+        "reset_at": null
+      }
+    }
+  },
+  "zai": {
+    "details": {
+      "limit_reached": false,
+      "max_used_percent": 45.0,
+      "windows": {
+        "five_hour": {
+          "limit": null,
+          "present": true,
+          "remaining": null,
+          "reset_at": null,
+          "used_percent": 1.0,
+          "window_hours": 5
+        },
+        "weekly": {
+          "limit": null,
+          "present": true,
+          "remaining": null,
+          "reset_at": "2026-09-03T14:04:58Z",
+          "used_percent": 45.0,
+          "window_hours": null
+        }
+      }
+    },
+    "error": null,
+    "status": "ok",
+    "windows": {
+      "5h": {
+        "percent_remaining": 99.0,
+        "reset_at": null,
+        "rolling": true
+      },
+      "7d": {
+        "percent_remaining": 55.0,
+        "reset_at": "2026-09-03T14:04:58Z"
+      },
+      "monthly": {
+        "percent_remaining": null,
+        "reset_at": null
+      }
+    }
+  }
+}

pocketshell-0.4.46/tests/data/quse-0.0.15-usage.ndjson

@@ -0,0 +1,6 @@
+{"details": {"limit_reached": false, "subscription": null, "windows": {"five_hour": {"reset_at": "2026-08-28T16:20:00Z", "used_percent": 6.0}, "seven_day": {"reset_at": "2026-09-03T15:00:00Z", "used_percent": 10.0}}}, "error": null, "provider": "claude", "status": "ok", "windows": {"5h": {"percent_remaining": 94.0, "reset_at": "2026-08-28T16:20:00Z", "rolling": false}, "7d": {"percent_remaining": 90.0, "reset_at": "2026-09-03T15:00:00Z"}, "monthly": {"percent_remaining": null, "reset_at": null}}}
+{"details": {"limit_reached": false, "reset_credits": [{"expires_at": "2026-09-21T00:13:17Z", "status": "available", "title": "Full reset"}], "reset_credits_available": 1, "reset_credits_error": null, "windows": {"primary_window": {"limit_window_seconds": 604800, "present": true, "reset_at": "2026-09-03T16:26:48Z", "used_percent": 13.0}, "secondary_window": {"limit_window_seconds": null, "present": false, "reset_at": null, "used_percent": 0.0}}}, "error": null, "provider": "codex", "status": "ok", "windows": {"5h": {"percent_remaining": null, "reset_at": null, "rolling": false}, "7d": {"percent_remaining": 87.0, "reset_at": "2026-09-03T16:26:48Z"}, "monthly": {"percent_remaining": null, "reset_at": null}}}
+{"details": {"limit_reached": true, "premium_entitlement": 1500, "premium_percent_remaining": 0.0, "premium_remaining": -1}, "error": null, "provider": "copilot", "status": "ok", "windows": {"5h": {"percent_remaining": null, "reset_at": null, "rolling": false}, "7d": {"percent_remaining": null, "reset_at": null}, "monthly": {"percent_remaining": 0.0, "reset_at": "2026-09-01T00:00:00Z"}}}
+{"details": {"limit_reached": false, "max_used_percent": 64.0}, "error": null, "provider": "go", "status": "ok", "windows": {"5h": {"percent_remaining": 36.0, "reset_at": "2026-08-28T13:36:26Z", "rolling": true}, "7d": {"percent_remaining": 74.0, "reset_at": "2026-08-31T00:00:00Z"}, "monthly": {"percent_remaining": 86.0, "reset_at": "2026-09-22T06:20:28Z"}}}
+{"details": {"has_grok_code_access": true, "is_unified_billing_user": true, "limit_reached": true, "on_demand_cap": 0.0, "on_demand_used": 0.0, "prepaid_balance": 0.0, "product_usage": [{"product": "GrokBuild", "usage_percent": 100.0}], "resets": [{"expires_at": "2026-09-12T18:49:00Z", "token_id": "restok_vpYDqo"}], "resets_available": 1, "resets_error": null, "windows": {"monthly": {"limit": null, "present": false, "reset_at": null, "used": null, "used_percent": null}, "weekly": {"limit": 0.0, "present": true, "reset_at": "2026-09-01T00:08:17Z", "used": 0.0, "used_percent": 100.0}}}, "error": null, "provider": "grok", "status": "ok", "windows": {"5h": {"percent_remaining": null, "reset_at": null, "rolling": false}, "7d": {"percent_remaining": 0.0, "reset_at": "2026-09-01T00:08:17Z"}, "monthly": {"percent_remaining": null, "reset_at": null}}}
+{"details": {"limit_reached": false, "max_used_percent": 45.0, "windows": {"five_hour": {"limit": null, "present": true, "remaining": null, "reset_at": null, "used_percent": 1.0, "window_hours": 5}, "weekly": {"limit": null, "present": true, "remaining": null, "reset_at": "2026-09-03T14:04:58Z", "used_percent": 45.0, "window_hours": null}}}, "error": null, "provider": "zai", "status": "ok", "windows": {"5h": {"percent_remaining": 99.0, "reset_at": null, "rolling": true}, "7d": {"percent_remaining": 55.0, "reset_at": "2026-09-03T14:04:58Z"}, "monthly": {"percent_remaining": null, "reset_at": null}}}

pocketshell-0.4.46/tests/data/quse-0.0.15-usage.provenance.txt

@@ -0,0 +1,32 @@
+Fixture provenance for quse==0.0.15 (issue #2293)
+
+Source package: the PyPI wheel quse-0.0.15-py3-none-any.whl
+PyPI upload: 2026-08-28T12:09:07Z
+Wheel SHA-256: a9138ed2e4f12a01812103332fe27b94de9f96a2413212c59558052481815793
+Upstream commit: a86959edeef1c78a2a0084d3488fca487135b1b0
+  ("Add unified Go and quota output" — the unified `windows` map + the `go`
+  provider). 0.0.14 predates it; see issue #2274 / #2283 for the interim
+  translate-at-the-boundary design this release retires.
+
+Capture command (using the published wheel, not a checkout):
+  PYTHONPATH=<unpacked quse-0.0.15 wheel> <python> -c \
+    'from quse.cli import main; raise SystemExit(main(["--json"]))'
+Captured: 2026-08-28 on the maintainer's dev box (real live provider data).
+
+Observed published contract:
+  providers: claude, codex, copilot, go, grok, zai
+  record fields: details, error, status, windows
+  every record carries the canonical top-level `windows` map keyed by
+  quse.usage.CANONICAL_WINDOWS = ("5h", "7d", "monthly"); the `5h` entry also
+  carries `rolling: bool`. A span that does not apply to a provider is present
+  with `percent_remaining: null` rather than omitted.
+  no `short_term` / `long_term` fields on any record
+
+Because 0.0.15 IS the canonical producer, `pocketshell usage --json` performs no
+schema translation any more: `_canonicalize_quse_record` injects the provider
+key and forwards the record verbatim. The sibling file
+`quse-0.0.15-usage.ndjson` is the EXACT output of
+`normalize_usage_stdout(quse-0.0.15-usage.json)` and is byte-compared against
+the producer in tests/test_usage.py, and mirrored into
+shared/core-usage/src/test/resources/ so the Android parser test consumes the
+real producer bytes rather than a Kotlin re-implementation.

{pocketshell-0.4.45 → pocketshell-0.4.46}/tests/test_daemon.py

@@ -285,9 +285,12 @@ def test_usage_fetch_round_trip(
     provider-keyed output into per-provider NDJSON (issue #1318)."""
     fake_bin = tmp_path / "bin"
     python_exe = _fake_python_bin(fake_bin)
-    # Published quse 0.0.14 emits a provider-keyed short/long object; the
-    # daemon applies the producer-boundary canonical windows translation.
-    payload = '{"codex": {"status": "ok", "short_term": {"percent_remaining": 77.0, "reset_at": null, "window": "5h"}}}\n'
+    # Published quse 0.0.15 emits a provider-keyed CANONICAL object; the
+    # daemon injects the provider key and forwards the record unchanged.
+    payload = (
+        '{"codex": {"status": "ok", '
+        '"windows": {"5h": {"percent_remaining": 77.0, "reset_at": null, "rolling": false}}}}\n'
+    )
     _write_fake_quse(fake_bin, payload=payload)
 
     proc = _spawn_daemon(sandbox_socket, python_exe=python_exe)
@@ -323,12 +326,15 @@ def test_two_concurrent_clients_cache_hit_is_faster(
     python_exe = _fake_python_bin(fake_bin)
     payload = (
         '{"codex": {"status": "ok", '
-        '"short_term": {"percent_remaining": null, "reset_at": null, "window": null}, '
-        '"long_term": {"percent_remaining": null, "reset_at": null, "window": null}}}\n'
+        '"windows": {"5h": {"percent_remaining": null, "reset_at": null, "rolling": false}, '
+        '"7d": {"percent_remaining": null, "reset_at": null}, '
+        '"monthly": {"percent_remaining": null, "reset_at": null}}}}\n'
     )
     # The daemon flattens the provider-keyed payload into NDJSON before
     # caching; the cold and warm responses both carry this flattened form.
-    flattened = '{"provider": "codex", "status": "ok", "windows": {}}\n'
+    flattened = (
+        '{"provider": "codex", "status": "ok", "windows": {"5h": {"percent_remaining": null, "reset_at": null, "rolling": false}, "7d": {"percent_remaining": null, "reset_at": null}, "monthly": {"percent_remaining": null, "reset_at": null}}}\n'
+    )
     _write_fake_quse(fake_bin, payload=payload, sleep_secs=0.3)
 
     proc = _spawn_daemon(sandbox_socket, python_exe=python_exe)
@@ -400,8 +406,9 @@ def test_no_cache_param_bypasses_cache(
         "n=$((n+1))\n"
         f'echo "$n" > {counter_file}\n'
         'printf \'{"x": {"status": "ok", "call": %s, '
-        '"short_term": {"percent_remaining": null, "reset_at": null, "window": null}, '
-        '"long_term": {"percent_remaining": null, "reset_at": null, "window": null}}}\\n\' "$n"\n'
+        '"windows": {"5h": {"percent_remaining": null, "reset_at": null, "rolling": false}, '
+        '"7d": {"percent_remaining": null, "reset_at": null}, '
+        '"monthly": {"percent_remaining": null, "reset_at": null}}}}\\n\' "$n"\n'
     )
     script.chmod(0o755)
 
@@ -519,13 +526,15 @@ def test_no_daemon_flag_skips_daemon_probe(
     # path answered (issue #1318: provider-keyed payloads).
     daemon_payload = (
         '{"fromdaemon": {"status": "ok", '
-        '"short_term": {"percent_remaining": null, "reset_at": null, "window": null}, '
-        '"long_term": {"percent_remaining": null, "reset_at": null, "window": null}}}\n'
+        '"windows": {"5h": {"percent_remaining": null, "reset_at": null, "rolling": false}, '
+        '"7d": {"percent_remaining": null, "reset_at": null}, '
+        '"monthly": {"percent_remaining": null, "reset_at": null}}}}\n'
     )
     subprocess_payload = (
         '{"fromsubprocess": {"status": "ok", '
-        '"short_term": {"percent_remaining": null, "reset_at": null, "window": null}, '
-        '"long_term": {"percent_remaining": null, "reset_at": null, "window": null}}}\n'
+        '"windows": {"5h": {"percent_remaining": null, "reset_at": null, "rolling": false}, '
+        '"7d": {"percent_remaining": null, "reset_at": null}, '
+        '"monthly": {"percent_remaining": null, "reset_at": null}}}}\n'
     )
     _write_fake_quse(fake_bin, payload=subprocess_payload)
 
@@ -569,13 +578,15 @@ def test_usage_uses_daemon_by_default(
     fake_bin.mkdir()
     daemon_payload = (
         '{"fromdaemon": {"status": "ok", '
-        '"short_term": {"percent_remaining": null, "reset_at": null, "window": null}, '
-        '"long_term": {"percent_remaining": null, "reset_at": null, "window": null}}}\n'
+        '"windows": {"5h": {"percent_remaining": null, "reset_at": null, "rolling": false}, '
+        '"7d": {"percent_remaining": null, "reset_at": null}, '
+        '"monthly": {"percent_remaining": null, "reset_at": null}}}}\n'
     )
     subprocess_payload = (
         '{"fromsubprocess": {"status": "ok", '
-        '"short_term": {"percent_remaining": null, "reset_at": null, "window": null}, '
-        '"long_term": {"percent_remaining": null, "reset_at": null, "window": null}}}\n'
+        '"windows": {"5h": {"percent_remaining": null, "reset_at": null, "rolling": false}, '
+        '"7d": {"percent_remaining": null, "reset_at": null}, '
+        '"monthly": {"percent_remaining": null, "reset_at": null}}}}\n'
     )
     _write_fake_quse(fake_bin, payload=subprocess_payload)
 
@@ -612,8 +623,9 @@ def test_usage_falls_through_when_daemon_absent(
     fake_bin.mkdir()
     payload = (
         '{"fromsubprocess": {"status": "ok", '
-        '"short_term": {"percent_remaining": null, "reset_at": null, "window": null}, '
-        '"long_term": {"percent_remaining": null, "reset_at": null, "window": null}}}\n'
+        '"windows": {"5h": {"percent_remaining": null, "reset_at": null, "rolling": false}, '
+        '"7d": {"percent_remaining": null, "reset_at": null}, '
+        '"monthly": {"percent_remaining": null, "reset_at": null}}}}\n'
     )
     _write_fake_quse(fake_bin, payload=payload)
     monkeypatch.setattr(