dsh-grok-subscription 0.1.3 → 0.1.12

package/README.md

@@ -10,7 +10,9 @@
 - 登录后从 `GET https://cli-chat-proxy.grok.com/v1/models-v2` 获取账号可用模型；实时目录不可用或为空时使用小型静态目录（包含 `grok-4.7`）。`grok-4.7` 优先来自实时 `models-v2` 返回。
 - 未登录时仍注册 adapter，但模型列表为 **0**（fail closed）。
 - 设置页显示脱敏账户、登录状态、模型与最近一次目录错误，并提供 CLI 登录、设备码登录、从 Grok CLI 拉取、退出登录。
-- Pull / 登录 / 退出 / 目录刷新后通过 `llm/adapters-updated` 通知 Web 客户端刷新 Chat / New Session 模型选择器。
+- **实验性用量显示**：登录后从未文档化的 `GET /v1/billing?format=credits` 读取 `config.creditUsagePercent`（兼容顶层）与周期结束时间；失败时显示「不可用」且**绝不编造百分比**。不影响 Chat。
+- Pull / 登录 / 退出 / 目录刷新后通过 `llm/adapters-updated` 通知 Web 客户端刷新 Chat / New Session 模型选择器（emit 延后，避免与 Pull RPC 重入）。
+- 设置页 Pull **零出站网络、内存优先**：只读本地 auth.json，同步写入 `memoryAccessToken` 后立即返回；credentials.set / credentialRef 延后（带超时），不堵 Pull RPC；目录与用量由后台及客户端 fire-and-forget 的 `catalog/refresh` / `usage/refresh` 更新（不占用全局 busy）；`status` / `currentToken` 优先内存。
 
 ## 安装
 
@@ -23,7 +25,7 @@ dsh plugin --profile web add BaronCyrus/dsh-grok-subscription
 # 或本地路径
 # dsh plugin --profile web add /absolute/path/to/dsh-grok-subscription
 # 或 npm（发布后）
-# dsh plugin --profile web add dsh-grok-subscription@0.1.3
+# dsh plugin --profile web add dsh-grok-subscription@0.1.12
 ```
 
 然后重启 `dsh web`，打开 **Settings → Grok 订阅**。也可以在设置页点击“CLI 登录”或“设备码登录”；设备码流程会在启动 DSH 的终端中显示提示。登录完成后点击“从 Grok CLI 拉取”可立即同步；Chat 模型列表会随之刷新。
@@ -44,6 +46,40 @@ npm test
 npm run build
 ```
 
+## v0.1.12
+
+升级后请用 `dsh web` 新打印的带 token URL 打开，并硬刷新（Ctrl+Shift+R），避免旧 `/plugins` client 缓存。
+
+修复 0.1.11 实机：Settings → Plugins 仍卡在「Reading plugins…」，Pull 等到客户端 45s 超时。根因是 `status` / `currentToken` 仍可能无超时地 `await credentials.resolve` 与裸 `import('@deepseek-ai/dsh-credentials')`，楔住连接桥后 Plugins 清单也跟着挂。现：`credentialRefOf` 用 timed `optionalImport`；resolve 硬超时（默认 1.5s）；`status` 先内存 / auth.json，再可选 credentials；宿主 RPC 每端点 8s 硬超时；`llm/adapters-updated` 一律延后；`inject` 保持 `['llm','web']`；客户端缺 connection 软跳过，RPC 客户端超时降至 12s。本地 0.1.12 供复测，未发 npm。
+
+## v0.1.10
+
+修复 0.1.9 实机：Pull 仍可能 45s 超时，且 **Settings → Plugins** 卡在 `Reading plugins…`（宿主 Settings/RPC 通道被楔住）。根因是 `apply`/`boot` 路径会 `await` 无超时的动态 `import`（`pi-ai` / `dsh-llm-pi-ai` / schemastery），且 `inject` 含 sticky 的 `credentials`。现 `inject` 收窄为 `['llm','web']`；`apply` 同步注册 duck adapter 后立即返回；schemastery / `session.pull` / pi-ai 升级全部 `setImmediate` 延后；所有动态 import 硬超时（默认 2.5s），超时则保持 duck。保留 0.1.9 内存优先 Pull 与 0.1.8 客户端 fire-and-forget。
+
+## v0.1.9
+
+修复 0.1.8 实机：Pull RPC 本身卡到客户端 45s 超时。根因是零网络 Pull 仍 `await storeToken` → `credentialRefOf()`（动态 import `@deepseek-ai/dsh-credentials`）无超时，import/set 与 DSH credentials 死锁时会拖死整个 Pull。现会话服务持有 `memoryAccessToken`；Pull 成功路径同步写入内存后立即返回，credentials 持久化与 clear 全部 `scheduleDeferred`；`currentToken` / `status` 优先内存。客户端仍保持 0.1.8 的 fire-and-forget 刷新行为。
+
+## v0.1.8
+
+修复 0.1.7 实机：Pull 成功后客户端仍 await `usage/refresh` 并占用全局 busy，导致 Working… 卡住、按钮一直 disabled。现 Pull/登录成功后立即清 busy 并显示成功提示；`catalog/refresh` 与 `usage/refresh` 为 fire-and-forget（不置全局 busy）。仅「刷新用量」按钮使用本地 `usageBusy`。`fetchBillingUsage` 增加独立于 AbortSignal 的硬 `Promise.race` 超时（默认 8s）；空 JSON `{}` 与非 JSON Content-Type 会写入更明确的不可用原因。
+
+## v0.1.7
+
+修复设置页 Pull 仍卡住 Working…（0.1.6 去掉 billing 后仍可能卡在 `credentials.set` 或 `loadCatalog`）：Pull 关键路径**零出站网络**，`storeToken` 硬超时（默认 5s），立即返回缓存目录/用量；后台 kick `refreshCatalog` + `refreshUsage`；客户端在 Pull 成功后另行 `catalog/refresh` 与 `usage/refresh`（独立 busy 文案）。`notifyCatalogChange` 仍仅延后触发。
+
+## v0.1.6
+
+修复设置页 Pull 卡住 Working…、用量长期「不可用」：Pull 关键路径不再等待 billing；`status()` 只返回缓存用量；Pull 成功后由客户端另行 `usage/refresh`；`llm/adapters-updated` 延后发出；客户端 RPC 增加超时保护。解析逻辑仍沿用 0.1.5 的 config.* 兼容。
+
+## v0.1.5
+
+修复实验性用量解析：官方 `/v1/billing?format=credits` 实际把 `creditUsagePercent`、`currentPeriod`、`productUsage` 放在 `config` 下（非顶层）。0.1.4 因严格读顶层字段在 QA 中显示「不可用」。现同时接受 `config.*` 与顶层；不可用原因会附带顶层 key 名以便排查。**绝不编造百分比。**
+
+## v0.1.4
+
+实验性 SuperGrok 周用量显示：设置页新增「用量（实验性）」区块，只读请求 `GET https://cli-chat-proxy.grok.com/v1/billing?format=credits`（与现有 OAuth + CLI fingerprint 请求头相同）。解析 `config.creditUsagePercent` / 顶层 `creditUsagePercent` 与 `config.currentPeriod.end`；RPC 提供 `usage` / `usage/refresh`，永不回传 token。失败 fail-closed 为「不可用」。**账单 API 未公开文档，可能随时变更。**
+
 ## v0.1.3
 
 修复多轮 Chat 中助手正文不显示的问题：自定义 Responses 流在 `block-end` 时把已累计的 text/reasoning 写成空字符串，Harness `BlockAssembler` 会用空块覆盖流式增量，导致第 2 轮起界面只见思考（如 “Deep diving…”）不见正文。同时为 `grok-build` 强制 `include: reasoning.encrypted_content`（与 pi-ai 对 `xai` 的处理对齐），保证推理密文可回放。
@@ -66,11 +102,12 @@ v0.1.0 范围仍适用：仅文本/工具调用所需的 Responses 流、账号
 - 这是社区插件，不是 xAI、Grok 或 DeepSeek 官方产品。
 - 订阅账号用于非官方客户端可能处于供应商条款灰色地带；**只使用你自己的账号**，风险自担。
 - 官方文档没有发布完整 HTTP wire protocol；代理协议、请求头、模型 ID 或权限规则可能随时改变。
+- 用量面板依赖的 `/v1/billing?format=credits` **未公开文档**，属实验性功能；字段形状或可用性可能变化，失败时仅显示不可用。
 - 设置页发起 CLI 登录时，浏览器/设备码提示由官方 CLI 处理；远程部署请优先用 `grok login --device-auth`。
 
 ## English
 
-`dsh-grok-subscription` is a small community DSH plugin that reuses an official Grok Build CLI SuperGrok/X Premium session. It adds a separate `grok-build` route, calls the subscription Responses proxy, discovers models from `/v1/models-v2` (with a signed-in-only fallback including `grok-4.7`), and never exposes tokens to browser RPC. After Pull/login/logout the plugin emits `llm/adapters-updated` so the Chat model picker refreshes. Install locally with:
+`dsh-grok-subscription` is a small community DSH plugin that reuses an official Grok Build CLI SuperGrok/X Premium session. It adds a separate `grok-build` route, calls the subscription Responses proxy, discovers models from `/v1/models-v2` (with a signed-in-only fallback including `grok-4.7`), and never exposes tokens to browser RPC. Settings also shows an **experimental** weekly usage panel from the undocumented `/v1/billing?format=credits` endpoint (fail-closed; never invents percentages; chat is unaffected). After Pull/login/logout the plugin emits `llm/adapters-updated` so the Chat model picker refreshes. Install locally with:
 
 ```bash
 dsh plugin --profile web add BaronCyrus/dsh-grok-subscription
@@ -78,6 +115,36 @@ dsh plugin --profile web add BaronCyrus/dsh-grok-subscription
 
 Reinstall after upgrades, restart `dsh web`, then open **Settings → Grok Subscription**.
 
+### v0.1.12
+
+After upgrading, open the fresh token URL from `dsh web` and hard-refresh (Ctrl+Shift+R) so the old immutable `/plugins` client is not reused.
+
+修复 0.1.11 实机：Settings → Plugins 仍卡在「Reading plugins…」，Pull 等到客户端 45s 超时。根因是 `status` / `currentToken` 仍可能无超时地 `await credentials.resolve` 与裸 `import('@deepseek-ai/dsh-credentials')`，楔住连接桥后 Plugins 清单也跟着挂。现：`credentialRefOf` 用 timed `optionalImport`；resolve 硬超时（默认 1.5s）；`status` 先内存 / auth.json，再可选 credentials；宿主 RPC 每端点 8s 硬超时；`llm/adapters-updated` 一律延后；`inject` 保持 `['llm','web']`；客户端缺 connection 软跳过，RPC 客户端超时降至 12s。本地 0.1.12 供复测，未发 npm。
+
+## v0.1.10
+
+Fixes 0.1.9 live hang: Pull could still hit the 45s client timeout, and **Settings → Plugins** stuck on `Reading plugins…` (host Settings/RPC channel wedged). Root cause: `apply`/`boot` awaited untimed dynamic `import`s (`pi-ai` / `dsh-llm-pi-ai` / schemastery), and `inject` listed sticky `credentials`. Now `inject` is `['llm','web']`; `apply` synchronously registers a duck adapter and returns; schemastery / `session.pull` / pi-ai upgrade are deferred via `setImmediate`; every dynamic import has a hard timeout (default 2.5s) and falls back to duck. Keeps 0.1.9 memory-first Pull and 0.1.8 client fire-and-forget.
+
+### v0.1.9
+
+Fixes 0.1.8 live hang where the Pull RPC itself hit the client 45s timeout: zero-network Pull still awaited `storeToken` → `credentialRefOf()` (dynamic import of `@deepseek-ai/dsh-credentials`) with no timeout, so a credentials import/set deadlock stalled Pull. Session now keeps `memoryAccessToken`; success Pull writes memory and returns immediately, deferring credential persist/clear; `currentToken` / `status` prefer memory. Keeps 0.1.8 client fire-and-forget refresh behavior.
+
+### v0.1.8
+
+Fixes 0.1.7 live hang: after Pull the client no longer awaits `usage/refresh` while holding global busy (Working… / all buttons disabled). Pull/login clear busy and show success immediately; catalog + usage refresh are fire-and-forget. Only the Usage Refresh button uses local `usageBusy`. `fetchBillingUsage` has a hard Promise.race timeout (default 8s) independent of AbortSignal; empty `{}` and non-JSON Content-Type get clearer unavailable reasons.
+
+### v0.1.7
+Fixes Settings Pull hang after 0.1.6: zero-network Pull path, `storeToken` hard timeout (default 5s), returns cached catalog/usage immediately; background kick of `refreshCatalog` + `refreshUsage`; client follows up with `catalog/refresh` and `usage/refresh`. Catalog notify stays deferred.
+
+## v0.1.6
+Fixes Settings Pull hang (Working…) and stale Unavailable usage: Pull no longer awaits billing; `status()` returns cached usage only; client calls `usage/refresh` after successful Pull; catalog notify is deferred; client RPC has a safety timeout. Keeps 0.1.5 config.* parsing.
+
+### v0.1.5
+Fixes experimental usage parsing: live `/v1/billing?format=credits` nests `creditUsagePercent`, `currentPeriod`, and `productUsage` under `config` (not top-level). 0.1.4 failed QA with Unavailable. Parser now accepts `config.*` and top-level; unavailable reasons include top-level key names. Never invents percentages.
+
+### v0.1.4
+Experimental SuperGrok weekly usage in Settings: read-only `GET /v1/billing?format=credits` with the same OAuth + CLI fingerprint headers; shows used % and period end; RPC `usage` / `usage/refresh` never return tokens; fail closed to Unavailable. The billing API is undocumented and may change.
+
 ### v0.1.3
 Fixes multi-turn Chat where assistant body text vanished from turn 2 onward: the custom Responses SSE mapper ended text/reasoning blocks with empty strings, so Harness `BlockAssembler` replaced streamed deltas with blanks (UI could show "Deep diving…" then no body). Also forces `include: reasoning.encrypted_content` for `grok-build` so encrypted reasoning can replay on later turns. This is unofficial, may fall into a vendor-ToS gray area, and the undocumented wire protocol can change. Use your own account only.
 
@@ -90,6 +157,7 @@ Fixes multi-turn Chat where assistant body text vanished from turn 2 onward: the
 - `PiAiAdapter` 对 `grok-build` 路由的流式映射（若宿主没有 `@deepseek-ai/dsh-llm-pi-ai` / `@earendil-works/pi-ai`，插件会降级到自带的 Responses SSE MVP adapter）
 - 官方 CLI `grok login` / `grok login --device-auth` 从 Settings 按钮拉起后的终端交互
 - 实时 `GET /v1/models-v2` 是否返回 `grok-4.7`（目录为空时使用静态回退）
+- Settings「用量（实验性）」：登录后刷新是否显示已用 % 与周期结束时间；401/网络失败是否显示「不可用」且无假百分比；Chat 在用量失败时仍可正常对话
 
 ## 致谢 / Acknowledgments
 

package/lib/client.js

@@ -21,7 +21,9 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var client_exports = {};
 __export(client_exports, {
   GrokSubscriptionSection: () => GrokSubscriptionSection,
+  RPC_CALL_TIMEOUT_MS: () => RPC_CALL_TIMEOUT_MS,
   apply: () => apply,
+  callRpc: () => callRpc,
   inject: () => inject,
   pickCopy: () => pickCopy
 });
@@ -51,12 +53,26 @@ var zh = {
   deviceHint: "\u8BBE\u5907\u7801\u63D0\u793A\u4F1A\u51FA\u73B0\u5728 DSH \u7EC8\u7AEF\u3002\u4E5F\u53EF\u624B\u52A8\u8FD0\u884C grok login --device-auth\uFF0C\u5B8C\u6210\u540E\u70B9\u201C\u4ECE Grok CLI \u62C9\u53D6\u201D\u3002",
   pullHint: "\u5B89\u5168\u8BFB\u53D6 ~/.grok/auth.json\uFF08\u62D2\u7EDD\u7B26\u53F7\u94FE\u63A5\u4E0E\u7EC4/\u5176\u4ED6\u4EBA\u53EF\u8BFB\uFF09\uFF0C\u53EA\u628A\u77ED\u671F access token \u5199\u5165 DSH\u3002",
   busy: "\u5904\u7406\u4E2D\u2026",
+  busyCatalog: "\u6B63\u5728\u5237\u65B0\u6A21\u578B\u76EE\u5F55\u2026",
+  busyUsage: "\u6B63\u5728\u5237\u65B0\u7528\u91CF\u2026",
   error: "\u64CD\u4F5C\u5931\u8D25",
   pullOk: "\u5DF2\u4ECE Grok CLI \u62C9\u53D6\u6210\u529F",
   loginOk: "\u767B\u5F55\u5B8C\u6210\uFF0C\u4F1A\u8BDD\u5DF2\u540C\u6B65",
   logoutOk: "\u5DF2\u9000\u51FA\u767B\u5F55",
   cliMissing: "\u672A\u53D1\u73B0 grok CLI\u3002\u8BF7\u5148\u5B89\u88C5\u5B98\u65B9 CLI \u5E76\u8FD0\u884C grok login\uFF0C\u7136\u540E\u62C9\u53D6\u3002",
-  caveats: "\u793E\u533A\u63D2\u4EF6\uFF0C\u4E0D\u662F\u5B98\u65B9\u4EA7\u54C1\u3002\u8BA2\u9605\u7528\u4E8E\u975E\u5B98\u65B9\u5BA2\u6237\u7AEF\u53EF\u80FD\u5904\u4E8E\u4F9B\u5E94\u5546\u6761\u6B3E\u7070\u8272\u5730\u5E26\uFF1B\u53EA\u4F7F\u7528\u4F60\u81EA\u5DF1\u7684\u8D26\u53F7\u3002\u534F\u8BAE\u53EF\u80FD\u53D8\u5316\uFF0C\u56E0\u4E3A\u5B98\u65B9\u6587\u6863\u672A\u516C\u5F00\u5B8C\u6574 HTTP wire protocol\u3002"
+  caveats: "\u793E\u533A\u63D2\u4EF6\uFF0C\u4E0D\u662F\u5B98\u65B9\u4EA7\u54C1\u3002\u8BA2\u9605\u7528\u4E8E\u975E\u5B98\u65B9\u5BA2\u6237\u7AEF\u53EF\u80FD\u5904\u4E8E\u4F9B\u5E94\u5546\u6761\u6B3E\u7070\u8272\u5730\u5E26\uFF1B\u53EA\u4F7F\u7528\u4F60\u81EA\u5DF1\u7684\u8D26\u53F7\u3002\u534F\u8BAE\u53EF\u80FD\u53D8\u5316\uFF0C\u56E0\u4E3A\u5B98\u65B9\u6587\u6863\u672A\u516C\u5F00\u5B8C\u6574 HTTP wire protocol\u3002",
+  usageTitle: "\u7528\u91CF\uFF08\u5B9E\u9A8C\u6027\uFF09",
+  usageSubtitle: "\u6765\u81EA\u672A\u6587\u6863\u5316\u7684\u8BA2\u9605 billing API\uFF08/v1/billing?format=credits\uFF09\uFF0C\u4EC5\u4F9B\u53C2\u8003\uFF0C\u53EF\u80FD\u968F\u65F6\u5931\u6548\u3002",
+  usageUsed: "\u5DF2\u7528",
+  usageRemaining: "\u5269\u4F59\u7EA6",
+  usageReset: "\u5468\u671F\u7ED3\u675F / \u91CD\u7F6E",
+  usageUnavailable: "\u4E0D\u53EF\u7528",
+  usageRefresh: "\u5237\u65B0\u7528\u91CF",
+  usageOpenGrok: "\u5728 grok.com \u67E5\u770B\u7528\u91CF",
+  usageProduct: "\u4EA7\u54C1\u660E\u7EC6",
+  usageFetchedAt: "\u6700\u8FD1\u5237\u65B0",
+  usageRefreshOk: "\u7528\u91CF\u5DF2\u5237\u65B0",
+  catalogRefreshOk: "\u6A21\u578B\u76EE\u5F55\u5DF2\u5237\u65B0"
 };
 var en = {
   nav: "Grok Subscription",
@@ -80,12 +96,26 @@ var en = {
   deviceHint: "The device-code prompt appears in the DSH terminal. You can also run grok login --device-auth yourself, then Pull from Grok CLI.",
   pullHint: "Reads ~/.grok/auth.json securely (refuses symlinks and group/other-readable files) and stores only the short-lived access token in DSH.",
   busy: "Working\u2026",
+  busyCatalog: "Refreshing model catalog\u2026",
+  busyUsage: "Refreshing usage\u2026",
   error: "Request failed",
   pullOk: "Pulled from Grok CLI successfully",
   loginOk: "Signed in and session synced",
   logoutOk: "Signed out",
   cliMissing: "The grok CLI was not found. Install it, run grok login, then pull.",
-  caveats: "Community plugin, not an official product. Using a subscription from an unofficial client may be a vendor-ToS gray area; use your own account only. The protocol can change because official docs do not publish the full HTTP wire protocol."
+  caveats: "Community plugin, not an official product. Using a subscription from an unofficial client may be a vendor-ToS gray area; use your own account only. The protocol can change because official docs do not publish the full HTTP wire protocol.",
+  usageTitle: "Usage (experimental)",
+  usageSubtitle: "From the undocumented subscription billing API (/v1/billing?format=credits). Informational only; the endpoint may change or disappear.",
+  usageUsed: "Used",
+  usageRemaining: "Remaining \u2248",
+  usageReset: "Period end / reset",
+  usageUnavailable: "Unavailable",
+  usageRefresh: "Refresh usage",
+  usageOpenGrok: "View usage on grok.com",
+  usageProduct: "Product breakdown",
+  usageFetchedAt: "Last refreshed",
+  usageRefreshOk: "Usage refreshed",
+  catalogRefreshOk: "Model catalog refreshed"
 };
 
 // src/rpc-contract.js
@@ -96,7 +126,9 @@ var RPC_ENDPOINTS = Object.freeze([
   "login/device",
   "pull",
   "logout",
-  "catalog/refresh"
+  "catalog/refresh",
+  "usage",
+  "usage/refresh"
 ]);
 function createRpcClient(transport) {
   return Object.freeze({
@@ -115,6 +147,7 @@ function unwrap(response) {
 
 // src/constants.js
 var LOCALE_NS = "settings.grokSubscription";
+var USAGE_PAGE_URL = "https://grok.com/?_s=usage";
 var SESSION_AUTH_MODES = Object.freeze(["oidc", "external", "web_login", "grok"]);
 var API_KEY_AUTH_MODES = Object.freeze(["api_key"]);
 var STREAM_IDLE_TIMEOUT_MS = 10 * 60 * 1e3;
@@ -126,6 +159,7 @@ var FALLBACK_MODEL_IDS = Object.freeze(["grok-4.7", "grok-4.6", "grok-4.5"]);
 // src/client.jsx
 var import_jsx_runtime = require("react/jsx-runtime");
 var inject = ["slots", "locale", "connection", "settingsScope"];
+var RPC_CALL_TIMEOUT_MS = 12e3;
 function pickCopy(locale) {
   const language = typeof locale === "string" ? locale : locale?.language ?? locale?.lang;
   const resolved = language ?? (typeof navigator !== "undefined" ? navigator.language : "zh-CN");
@@ -136,30 +170,146 @@ function sourceLabel(source, t) {
   if (source === "fallback") return t("catalogSourceFallback");
   return t("catalogSourceSignedOut");
 }
+function formatPercent(value) {
+  if (typeof value !== "number" || !Number.isFinite(value)) return void 0;
+  const rounded = Math.round(value * 10) / 10;
+  return Number.isInteger(rounded) ? String(rounded) : rounded.toFixed(1);
+}
+async function callRpc(rpc, endpoint, payload = {}) {
+  const controller = typeof AbortController !== "undefined" ? new AbortController() : void 0;
+  let timer;
+  try {
+    const call = rpc.call(CHANNEL, endpoint, payload, controller?.signal);
+    const timeout = new Promise((_, reject) => {
+      timer = setTimeout(() => {
+        try {
+          controller?.abort();
+        } catch {
+        }
+        reject(new Error(`Request timed out after ${RPC_CALL_TIMEOUT_MS}ms`));
+      }, RPC_CALL_TIMEOUT_MS);
+    });
+    return unwrap(await Promise.race([call, timeout]));
+  } finally {
+    if (timer) clearTimeout(timer);
+  }
+}
+function UsagePanel({ usage, t, usageBusy, onRefresh, signedIn }) {
+  const ok = usage?.status === "ok";
+  const used = ok ? formatPercent(usage.usedPercent) : void 0;
+  const remaining = ok ? formatPercent(usage.remainingPercent) : void 0;
+  const resetLabel = usage?.periodEndLocal || usage?.periodEnd;
+  return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "usageBlock", children: [
+    /* @__PURE__ */ (0, import_jsx_runtime.jsx)("strong", { children: t("usageTitle") }),
+    /* @__PURE__ */ (0, import_jsx_runtime.jsx)("p", { className: "muted", children: t("usageSubtitle") }),
+    ok && used !== void 0 ? /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_jsx_runtime.Fragment, { children: [
+      /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("p", { children: [
+        t("usageUsed"),
+        ": ",
+        /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("strong", { children: [
+          used,
+          "%"
+        ] }),
+        remaining !== void 0 ? /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_jsx_runtime.Fragment, { children: [
+          " \xB7 ",
+          t("usageRemaining"),
+          " ",
+          remaining,
+          "%"
+        ] }) : null
+      ] }),
+      resetLabel ? /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("p", { className: "muted", children: [
+        t("usageReset"),
+        ": ",
+        resetLabel,
+        usage.periodEnd && usage.periodEndLocal ? /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_jsx_runtime.Fragment, { children: [
+          " (",
+          /* @__PURE__ */ (0, import_jsx_runtime.jsx)("code", { children: usage.periodEnd }),
+          ")"
+        ] }) : null
+      ] }) : null,
+      Array.isArray(usage.productUsage) && usage.productUsage.length > 0 ? /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { children: [
+        /* @__PURE__ */ (0, import_jsx_runtime.jsx)("p", { className: "muted", children: t("usageProduct") }),
+        /* @__PURE__ */ (0, import_jsx_runtime.jsx)("ul", { children: usage.productUsage.map((row, index) => /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("li", { children: [
+          row.name ?? "\u2014",
+          typeof row.usedPercent === "number" ? ` \xB7 ${formatPercent(row.usedPercent)}%` : ""
+        ] }, `${row.name ?? "row"}-${index}`)) })
+      ] }) : null,
+      usage.fetchedAt ? /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("p", { className: "muted", children: [
+        t("usageFetchedAt"),
+        ": ",
+        usage.fetchedAt
+      ] }) : null
+    ] }) : /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("p", { children: [
+      t("usageUnavailable"),
+      usage?.reason ? `: ${usage.reason}` : ""
+    ] }),
+    usageBusy ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)("p", { className: "muted", children: t("busyUsage") }) : null,
+    /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "row", children: [
+      /* @__PURE__ */ (0, import_jsx_runtime.jsx)("button", { type: "button", disabled: Boolean(usageBusy) || !signedIn, onClick: onRefresh, children: t("usageRefresh") }),
+      /* @__PURE__ */ (0, import_jsx_runtime.jsx)("a", { href: USAGE_PAGE_URL, target: "_blank", rel: "noreferrer", children: t("usageOpenGrok") })
+    ] })
+  ] });
+}
 function GrokSubscriptionSection({ rpc, t }) {
   const [busy, setBusy] = (0, import_react.useState)("");
+  const [usageBusy, setUsageBusy] = (0, import_react.useState)(false);
   const [error, setError] = (0, import_react.useState)("");
   const [notice, setNotice] = (0, import_react.useState)("");
   const [status, setStatus] = (0, import_react.useState)(void 0);
+  const initialUsageKick = (0, import_react.useRef)(false);
+  const applyPartial = (value) => {
+    if (value?.account || value?.catalog || value?.usage) {
+      setStatus((current) => ({ ...current, ...value }));
+    }
+  };
   const load = async () => {
-    const value = unwrap(await rpc.call(CHANNEL, "status", {}));
+    const value = await callRpc(rpc, "status", {});
     setStatus(value);
     setError("");
+    return value;
   };
   (0, import_react.useEffect)(() => {
-    void load().catch((item) => {
+    void load().then((value) => {
+      if (initialUsageKick.current) return;
+      if (value?.account?.signedIn !== true) return;
+      initialUsageKick.current = true;
+      void callRpc(rpc, "usage/refresh", {}).then((partial) => {
+        applyPartial(partial);
+      }).catch(() => {
+      });
+    }).catch((item) => {
       setNotice("");
       setError(item instanceof Error ? item.message : String(item));
     });
   }, [rpc]);
+  const kickFollowUpRefresh = () => {
+    void callRpc(rpc, "catalog/refresh", {}).then((partial) => {
+      applyPartial(partial);
+    }).catch(() => {
+    });
+    void callRpc(rpc, "usage/refresh", {}).then((partial) => {
+      applyPartial(partial);
+    }).catch(() => {
+    });
+  };
   const run = async (endpoint) => {
-    setBusy(endpoint);
+    const isUsageRefresh = endpoint === "usage/refresh";
+    if (isUsageRefresh) {
+      setUsageBusy(true);
+    } else {
+      setBusy(endpoint);
+    }
     setError("");
     setNotice("");
+    let value;
     try {
-      const value = unwrap(await rpc.call(CHANNEL, endpoint, {}));
-      if (value?.account || value?.catalog) setStatus((current) => ({ ...current, ...value }));
-      else await load();
+      value = await callRpc(rpc, endpoint, {});
+      if (value?.account || value?.catalog || value?.usage) {
+        applyPartial(value);
+      } else {
+        await load();
+      }
       if (value?.ok === false && value.error) {
         setNotice("");
         setError(value.error);
@@ -168,7 +318,8 @@ function GrokSubscriptionSection({ rpc, t }) {
           pull: "pullOk",
           "login/cli": "loginOk",
           "login/device": "loginOk",
-          logout: "logoutOk"
+          logout: "logoutOk",
+          "usage/refresh": "usageRefreshOk"
         }[endpoint];
         if (successKey) setNotice(t(successKey));
       }
@@ -176,8 +327,11 @@ function GrokSubscriptionSection({ rpc, t }) {
       setNotice("");
       setError(item instanceof Error ? item.message : String(item));
     } finally {
-      setBusy("");
+      if (isUsageRefresh) setUsageBusy(false);
+      else setBusy("");
     }
+    const shouldFollowUp = (endpoint === "pull" || endpoint === "login/cli" || endpoint === "login/device") && value?.ok !== false && !value?.error;
+    if (shouldFollowUp) kickFollowUpRefresh();
   };
   const account = status?.account;
   const catalog = status?.catalog;
@@ -189,11 +343,13 @@ function GrokSubscriptionSection({ rpc, t }) {
         .grokSubscription h2 { margin: 0 0 4px; font-size: 1.15rem; }
         .grokSubscription p, .grokSubscription li { line-height: 1.5; }
         .grokSubscription .muted { opacity: 0.78; font-size: 0.92rem; }
-        .grokSubscription .row { display: flex; flex-wrap: wrap; gap: 8px; }
+        .grokSubscription .row { display: flex; flex-wrap: wrap; gap: 8px; align-items: center; }
         .grokSubscription button { cursor: pointer; }
         .grokSubscription .error { color: #b42318; }
         .grokSubscription .notice { color: #067647; }
         .grokSubscription ul { margin: 0; padding-left: 1.2rem; }
+        .grokSubscription .usageBlock { display: grid; gap: 8px; padding: 10px 0; border-top: 1px solid color-mix(in srgb, currentColor 18%, transparent); }
+        .grokSubscription a { color: inherit; }
       ` }),
     /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { children: [
       /* @__PURE__ */ (0, import_jsx_runtime.jsx)("h2", { children: t("title") }),
@@ -223,6 +379,16 @@ function GrokSubscriptionSection({ rpc, t }) {
     /* @__PURE__ */ (0, import_jsx_runtime.jsx)("p", { className: "muted", children: t("deviceHint") }),
     /* @__PURE__ */ (0, import_jsx_runtime.jsx)("p", { className: "muted", children: t("pullHint") }),
     status?.cliAvailable === false ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)("p", { className: "muted", children: t("cliMissing") }) : null,
+    /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
+      UsagePanel,
+      {
+        usage: status?.usage,
+        t,
+        usageBusy,
+        signedIn,
+        onRefresh: () => void run("usage/refresh")
+      }
+    ),
     /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { children: [
       /* @__PURE__ */ (0, import_jsx_runtime.jsx)("strong", { children: t("models") }),
       /* @__PURE__ */ (0, import_jsx_runtime.jsx)("p", { className: "muted", children: sourceLabel(catalog?.source, t) }),
@@ -242,7 +408,20 @@ function GrokSubscriptionSection({ rpc, t }) {
 }
 function apply(ctx) {
   ctx.effect?.(() => ctx.locale?.register?.(LOCALE_NS, { zh, en }), "grok-subscription: copy");
-  const connection = ctx.get?.("connection") ?? ctx.connection;
+  let connection;
+  try {
+    connection = typeof ctx.get === "function" ? ctx.get("connection") : void 0;
+  } catch {
+    connection = void 0;
+  }
+  if (!connection) connection = ctx.connection;
+  if (!connection?.rpc) {
+    try {
+      ctx.logger?.warn?.("Grok subscription Settings section skipped: connection unavailable");
+    } catch {
+    }
+    return;
+  }
   const rpc = createRpcClient(connection.rpc);
   const bound = ctx.locale?.bind?.(LOCALE_NS);
   const t = (key) => {