dsh-grok-subscription 1.0.9 → 1.0.18

package/README.en.md

@@ -25,13 +25,13 @@ Models, reasoning effort, and weekly quota all stay inside DSH.
 
 ## Three-step start
 
-1. **Install the plugin.** Run the command below; to select a candidate version, enter the full `package@version`, for example `dsh-grok-subscription@1.0.9`.
+1. **Install the plugin.** Run the command below; to select a candidate version, enter the full `package@version`, for example `dsh-grok-subscription@1.0.10`.
 
    ```sh
    dsh plugin --profile web add BaronCyrus/dsh-grok-subscription
    ```
 
-2. **Sign in to the subscription.** Open **Settings → Grok Subscription** and click **CLI login** or **Device-code login**, then finish the official prompt in the terminal that started DSH. If you already ran `grok login` yourself, just click **Pull from Grok CLI** — nothing has to be pasted.
+2. **Sign in to the subscription.** Open **Settings → Grok Subscription** and click **CLI login** or **Device-code login**. The plugin runs the official `grok login`, hands the link the CLI prints to your browser, and shows the one-time code plus a clickable link in the panel; the session syncs itself once you authorize. If you already ran `grok login` yourself, just click **Pull from Grok CLI** — nothing has to be pasted.
 3. **Start using it.** Pick a model such as Grok 4.7 in the model picker. The round badge next to the picker shows weekly remaining quota, and the model menu offers reasoning effort levels.
 
 Restart `dsh web` after installing or upgrading, otherwise the old `lib/` keeps running.
@@ -91,7 +91,7 @@ dsh plugin --profile web add BaronCyrus/dsh-grok-subscription
 You can also install the version published on npm:
 
 ```sh
-dsh plugin --profile web add dsh-grok-subscription@1.0.9
+dsh plugin --profile web add dsh-grok-subscription@1.0.10
 ```
 
 DSH handles target selection, the profile lock, dependency resolution, and bundle activation.
@@ -146,7 +146,8 @@ Restart DSH manually afterwards, then:
 - Settings can show the used and remaining percentages the backend reports, and says so plainly instead of guessing when the read fails;
 - Supports CLI login, device-code login, pull from the Grok CLI, and logout;
 - Renews the access token automatically: near the end of its 6-hour life, or on a 401, it runs the official `grok` CLI and retries once, so a session never lapses mid-use; the chat model list refreshes whenever sign-in state changes;
-- When subscription routing is unavailable it reports an error instead of silently switching to another paid route.
+- When subscription routing is unavailable it reports an error instead of silently switching to another paid route;
+- Prefix caching follows xAI's automatic prompt-cache semantics: one DSH session keeps a stable `prompt_cache_key`, tool definitions stay in a stable order, and the fallback adapter preserves and replays `reasoning.encrypted_content` unchanged. Server-side eviction can still miss, and the plugin never invents a hit rate.
 
 ### Composer quota
 
@@ -208,6 +209,7 @@ npx -y @deepseek-ai/dsh@0.1.5-rc.2 plugin --profile web remove dsh-grok-subscrip
 
 - **`dsh` is not recognized**: the official npm route never creates a global `dsh` command — use the full `npx -y @deepseek-ai/dsh@0.1.5-rc.2 ...` command above;
 - **The model list is empty**: nothing is exposed while signed out. Finish signing in, then click **Pull from Grok CLI**;
+- **Sign-in opens no browser / chat fails with `fetch failed` / usage says "Billing request timed out"**: all three have one cause — `accounts.x.ai` and `cli-chat-proxy.grok.com` need a tunnel on some networks. Add `GROK_PROXY=http://127.0.0.1:10808` to `~/.dsh/.env`: it applies to **this plugin's Grok requests** (catalog, usage, chat) and to the **`grok` CLI** it spawns (sign-in, renewal), while DSH and every other provider stay direct — an `http_proxy` line there would route them all through the tunnel and break them whenever it is down. Restart the client afterwards; the sign-in link is handed to your browser and the panel also shows the one-time code and a clickable link. Standard proxy variables already present in the environment are inherited by the CLI too;
 - **Nothing changed after upgrading**: the plugin keeps running the old `lib/` — reinstall the plugin, restart `dsh web`, and hard-refresh (Ctrl+Shift+R);
 - **It reports `auth.json` permissions**: apply the `chmod 600` above; the plugin refuses symlinks and group- or other-readable files;
 - **"No reply" after sending a message**: upgrade to `1.0.1` or later. `1.0.0` had a defect where tool-calling turns aborted with a non-serializable stream chunk, leaving no reply in the UI at all.

package/README.md

@@ -25,13 +25,13 @@
 
 ## 三步开始
 
-1. **安装插件**：在终端运行下面的命令；指定候选版本时填写完整的 `包名@版本`，例如 `dsh-grok-subscription@1.0.9`。
+1. **安装插件**：在终端运行下面的命令；指定候选版本时填写完整的 `包名@版本`，例如 `dsh-grok-subscription@1.0.10`。
 
    ```sh
    dsh plugin --profile web add BaronCyrus/dsh-grok-subscription
    ```
 
-2. **登录订阅**：打开 **设置 → Grok 订阅**，点击 **CLI 登录** 或 **设备码登录**，在启动 DSH 的终端里完成官方提示。已经自己跑过 `grok login` 的话，直接点 **从 Grok CLI 拉取** 即可，不需要粘贴任何 token。
+2. **登录订阅**：打开 **设置 → Grok 订阅**，点击 **CLI 登录** 或 **设备码登录**。插件会运行官方 `grok login`，把 CLI 打印的登录链接交给浏览器，并在面板里显示一次性验证码与可点的链接；授权完成后自动同步。已经自己跑过 `grok login` 的话，直接点 **从 Grok CLI 拉取** 即可，不需要粘贴任何 token。
 3. **开始使用**：在模型选择器中选择 Grok 4.7 等模型。输入框旁的圆形徽章显示每周剩余额度，模型菜单里有推理档位。
 
 安装或升级后需要重启 `dsh web`，否则会继续运行旧的 `lib/`。
@@ -91,7 +91,7 @@ dsh plugin --profile web add BaronCyrus/dsh-grok-subscription
 也可以按 npm 上的已发布版本安装：
 
 ```sh
-dsh plugin --profile web add dsh-grok-subscription@1.0.9
+dsh plugin --profile web add dsh-grok-subscription@1.0.10
 ```
 
 目标选择、profile 锁、依赖解析和 bundle 激活均由 DSH 负责。
@@ -146,7 +146,8 @@ dsh --profile web --dump-config
 - 设置页可查看服务端返回的用量与剩余百分比，失败时明确提示而不是显示猜测值；
 - 支持 CLI 登录、设备码登录、从 Grok CLI 拉取和登出；登录状态变化后 Chat 模型列表自动刷新；
 - access token 到期自动续期：临近 6 小时有效期或收到 401 时，调用官方 `grok` CLI 刷新会话并重试一次，不会中途要求手动重新登录；
-- 订阅路由不可用时明确报错，不会静默切换到其他付费路由。
+- 订阅路由不可用时明确报错，不会静默切换到其他付费路由；
+- 前缀缓存按 xAI 的自动缓存语义优化：同一 DSH 会话使用稳定的 `prompt_cache_key`，工具定义保持稳定顺序，回退适配器会保存并原样回放 `reasoning.encrypted_content`。缓存仍可能因服务端逐出而失效，插件不虚构命中率。
 
 ### 输入框额度
 
@@ -208,6 +209,7 @@ npx -y @deepseek-ai/dsh@0.1.5-rc.2 plugin --profile web remove dsh-grok-subscrip
 
 - **`dsh` 无法识别**：官方 npm 方式本来就不会创建全局 `dsh` 命令，请使用上面的完整 `npx -y @deepseek-ai/dsh@0.1.5-rc.2 ...` 命令；
 - **模型列表是空的**：未登录时插件不暴露任何模型。先完成登录，再点 **从 Grok CLI 拉取**；
+- **登录不弹浏览器 / 聊天报 `fetch failed` / 用量「Billing request timed out」**：这三件事都指向同一个原因——`accounts.x.ai` 与 `cli-chat-proxy.grok.com` 在部分网络里必须走隧道。在 `~/.dsh/.env` 写一行 `GROK_PROXY=http://127.0.0.1:10808` 即可：它只作用于**本插件的 Grok 请求**（模型目录、用量、聊天）和它启动的 **`grok` CLI**（登录、续期），DSH 自身与其他 provider 仍走直连——把 `http_proxy` 写在这里会让所有 provider 一起走隧道，隧道一停就全连不上。写好后重启客户端；登录链接会交给系统浏览器打开，面板里同时显示一次性验证码与可点链接。环境里已有的标准代理变量同样会被 CLI 继承；
 - **升级后界面没变化**：插件会继续运行旧的 `lib/`，请重新安装插件并重启 `dsh web`，然后硬刷新（Ctrl+Shift+R）；
 - **提示 `auth.json` 权限不正确**：按上面的 `chmod 600` 处理；插件拒绝读取符号链接或组/其他用户可读的文件；
 - **出现「没有回复」**：请升级到 `1.0.1` 或更高版本。`1.0.0` 存在一个缺陷：工具调用轮次会因流片段无法无损序列化而整轮中止，界面上完全没有回复。

package/lib/client.js

@@ -26,6 +26,7 @@ __export(client_exports, {
   RPC_CALL_TIMEOUT_MS: () => RPC_CALL_TIMEOUT_MS,
   SectionBoundary: () => SectionBoundary,
   UsagePanel: () => UsagePanel,
+  VersionCard: () => VersionCard,
   apply: () => apply,
   callRpc: () => callRpc,
   inject: () => inject,
@@ -38,7 +39,7 @@ var import_react2 = require("react");
 var zh = {
   nav: "Grok \u8BA2\u9605",
   title: "Grok \u8BA2\u9605",
-  subtitle: "\u7528 SuperGrok / X Premium\uFF08Grok Build\uFF09\u4F1A\u8BDD\uFF0C\u800C\u4E0D\u662F XAI_API_KEY\u3002\xB7 1.0.9",
+  subtitle: "\u7528 SuperGrok / X Premium\uFF08Grok Build\uFF09\u4F1A\u8BDD\uFF0C\u800C\u4E0D\u662F XAI_API_KEY\u3002\xB7 1.0.18",
   signedIn: "\u5DF2\u767B\u5F55",
   signedOut: "\u672A\u767B\u5F55",
   account: "\u8D26\u6237",
@@ -53,8 +54,12 @@ var zh = {
   loginDevice: "\u8BBE\u5907\u7801\u767B\u5F55",
   pull: "\u4ECE Grok CLI \u62C9\u53D6",
   logout: "\u9000\u51FA\u767B\u5F55",
-  loginHint: "\u4F1A\u5728\u542F\u52A8 DSH \u7684\u7EC8\u7AEF\u4E2D\u8FD0\u884C grok login\u3002\u8BF7\u5728\u7EC8\u7AEF\u6216\u6D4F\u89C8\u5668\u4E2D\u5B8C\u6210\u6388\u6743\uFF0C\u7136\u540E\u7B49\u5F85\u540C\u6B65\u3002",
-  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",
+  loginHint: "\u70B9\u51FB\u540E\u5728\u672C\u673A\u8FD0\u884C grok login\uFF0C\u5E76\u628A CLI \u6253\u5370\u7684\u767B\u5F55\u94FE\u63A5\u4EA4\u7ED9\u6D4F\u89C8\u5668\uFF1B\u6388\u6743\u5B8C\u6210\u540E\u8FD9\u91CC\u4F1A\u81EA\u52A8\u540C\u6B65\u3002",
+  deviceHint: "\u8BBE\u5907\u7801\u767B\u5F55\u4F1A\u8BA9 CLI \u6253\u5370\u4E00\u6B21\u6027\u9A8C\u8BC1\u7801\u548C\u94FE\u63A5\u3002\u82E5\u6D4F\u89C8\u5668\u6CA1\u6709\u81EA\u52A8\u6253\u5F00\uFF0C\u70B9\u63D0\u793A\u91CC\u7684\u201C\u6253\u5F00\u767B\u5F55\u9875\u9762\u201D\u5E76\u786E\u8BA4\u9A8C\u8BC1\u7801\u3002",
+  loginWaiting: "\u7B49\u5F85\u6D4F\u89C8\u5668\u6388\u6743\u2026",
+  loginOpenBrowser: "\u6253\u5F00\u767B\u5F55\u9875\u9762",
+  loginNoUrl: "\u6CA1\u62FF\u5230\u767B\u5F55\u94FE\u63A5\uFF1A\u8BF7\u786E\u8BA4 grok CLI \u80FD\u8BBF\u95EE x.ai\uFF08\u684C\u9762\u7248\u901A\u5E38\u9700\u8981\u4EE3\u7406\uFF09\uFF0C\u7136\u540E\u91CD\u8BD5\u3002",
+  loginTimeout: "\u7B49\u5F85\u6388\u6743\u8D85\u65F6\uFF0C\u8BF7\u91CD\u65B0\u70B9\u51FB\u767B\u5F55\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",
   loginHelp: "\u767B\u5F55\u65B9\u5F0F\u8BF4\u660E",
   refreshCatalog: "\u5237\u65B0\u6A21\u578B\u76EE\u5F55",
@@ -90,12 +95,31 @@ var zh = {
   composerQuotaDetails: "\u6BCF\u5468\u989D\u5EA6",
   composerQuotaRemaining: "\u6BCF\u5468\u989D\u5EA6 \u5269\u4F59 {remaining}%",
   composerQuotaResets: "\u91CD\u7F6E\u4E8E {reset}",
-  composerQuotaResetUnknown: "\u91CD\u7F6E\u65F6\u95F4\u672A\u77E5"
+  composerQuotaResetUnknown: "\u91CD\u7F6E\u65F6\u95F4\u672A\u77E5",
+  versionTitle: "\u63D2\u4EF6\u7248\u672C",
+  versionCurrent: "\u5F53\u524D\u7248\u672C",
+  versionLatest: "\u6700\u65B0\u7248\u672C",
+  versionCheck: "\u68C0\u67E5\u66F4\u65B0",
+  versionChecking: "\u6B63\u5728\u68C0\u67E5\u66F4\u65B0\u2026",
+  versionFailed: "\u65E0\u6CD5\u68C0\u67E5\u6700\u65B0\u7248\u672C\u3002",
+  versionUpToDate: "\u5DF2\u662F\u6700\u65B0\u7248\u672C\u3002",
+  versionAvailable: "\u53D1\u73B0\u65B0\u7248\u672C v{version}\u3002",
+  versionLinked: "\u5F53\u524D\u4E3A\u672C\u5730\u5F00\u53D1\u5B89\u88C5\uFF0C\u8BF7\u5728\u63D2\u4EF6\u4ED3\u5E93\u62C9\u53D6\u6700\u65B0\u4EE3\u7801\u5E76\u91CD\u65B0\u6784\u5EFA\u3002",
+  versionManual: "\u8BF7\u5728\u7EC8\u7AEF\u8FD0\u884C dsh plugin --profile web add dsh-grok-subscription@latest \u5B8C\u6210\u66F4\u65B0\u3002",
+  versionUpdate: "\u66F4\u65B0\u63D2\u4EF6",
+  versionUpdating: "\u6B63\u5728\u66F4\u65B0\u2026",
+  versionUpdateFailed: "\u66F4\u65B0\u5931\u8D25\uFF0C\u8BF7\u91CD\u8BD5\u6216\u5728\u7EC8\u7AEF\u624B\u52A8\u66F4\u65B0\u3002",
+  versionUpdated: "\u5DF2\u66F4\u65B0\u5230 v{version}\u3002",
+  versionUpdatedHint: "\u65B0\u7248\u672C\u9700\u8981\u91CD\u542F DSH \u670D\u52A1\u624D\u80FD\u5B8C\u5168\u751F\u6548\uFF1B\u4EC5\u5237\u65B0\u754C\u9762\u4E0D\u4F1A\u66F4\u65B0\u5BBF\u4E3B\u8FDB\u7A0B\u4E2D\u5DF2\u52A0\u8F7D\u7684\u63D2\u4EF6\u3002",
+  versionRestart: "\u91CD\u542F DSH \u670D\u52A1",
+  versionRestartHint: "\u63D2\u4EF6\u65E0\u6CD5\u5B89\u5168\u5730\u91CD\u542F\u5BBF\u4E3B\u8FDB\u7A0B\uFF1A\u8BF7\u5728\u8FD0\u884C DSH \u7684\u7EC8\u7AEF\u6309 Ctrl+C \u7ED3\u675F\u8FDB\u7A0B\uFF0C\u518D\u91CD\u65B0\u8FD0\u884C dsh web\u3002",
+  versionRefresh: "\u5237\u65B0\u754C\u9762",
+  versionLater: "\u7A0D\u540E"
 };
 var en = {
   nav: "Grok Subscription",
   title: "Grok Subscription",
-  subtitle: "Use a SuperGrok / X Premium (Grok Build) session, not XAI_API_KEY. \xB7 1.0.9",
+  subtitle: "Use a SuperGrok / X Premium (Grok Build) session, not XAI_API_KEY. \xB7 1.0.18",
   signedIn: "Signed in",
   signedOut: "Signed out",
   account: "Account",
@@ -110,8 +134,12 @@ var en = {
   loginDevice: "Device-code login",
   pull: "Pull from Grok CLI",
   logout: "Log out",
-  loginHint: "Runs grok login in the terminal that started DSH. Finish the browser or CLI prompt there, then wait for sync.",
-  deviceHint: "The device-code prompt appears in the DSH terminal. You can also run grok login --device-auth yourself, then Pull from Grok CLI.",
+  loginHint: "Runs grok login on this machine and hands the link the CLI prints to your browser; the panel syncs itself once you authorize.",
+  deviceHint: "Device-code login makes the CLI print a one-time code and link. If no browser opened, use \u201COpen the sign-in page\u201D in the status line and confirm the code.",
+  loginWaiting: "Waiting for browser authorization\u2026",
+  loginOpenBrowser: "Open the sign-in page",
+  loginNoUrl: "No sign-in link was returned: make sure the grok CLI can reach x.ai (the desktop app usually needs a proxy), then retry.",
+  loginTimeout: "Timed out waiting for authorization; click sign-in again.",
   pullHint: "Reads ~/.grok/auth.json securely (refuses symlinks and group/other-readable files) and stores only the short-lived access token in DSH.",
   loginHelp: "How signing in works",
   refreshCatalog: "Refresh model catalog",
@@ -147,7 +175,26 @@ var en = {
   composerQuotaDetails: "Weekly quota",
   composerQuotaRemaining: "Weekly quota \xB7 {remaining}% left",
   composerQuotaResets: "Resets {reset}",
-  composerQuotaResetUnknown: "Reset time unknown"
+  composerQuotaResetUnknown: "Reset time unknown",
+  versionTitle: "Plugin version",
+  versionCurrent: "Current version",
+  versionLatest: "Latest version",
+  versionCheck: "Check for updates",
+  versionChecking: "Checking for updates\u2026",
+  versionFailed: "Could not check the latest version.",
+  versionUpToDate: "You are on the latest version.",
+  versionAvailable: "A new version v{version} is available.",
+  versionLinked: "Installed from a local checkout; pull and rebuild the plugin repository to update.",
+  versionManual: "Run dsh plugin --profile web add dsh-grok-subscription@latest in a terminal to update.",
+  versionUpdate: "Update plugin",
+  versionUpdating: "Updating\u2026",
+  versionUpdateFailed: "The update failed. Try again or update manually in a terminal.",
+  versionUpdated: "Updated to v{version}.",
+  versionUpdatedHint: "The new version takes full effect after a DSH restart; refreshing the page alone does not reload the plugin inside the host process.",
+  versionRestart: "Restart DSH",
+  versionRestartHint: "The plugin cannot safely restart its host process: press Ctrl+C in the terminal running DSH, then run dsh web again.",
+  versionRefresh: "Refresh page",
+  versionLater: "Later"
 };
 
 // src/rpc-contract.js
@@ -160,7 +207,9 @@ var RPC_ENDPOINTS = Object.freeze([
   "logout",
   "catalog/refresh",
   "usage",
-  "usage/refresh"
+  "usage/refresh",
+  "plugin/version",
+  "plugin/update"
 ]);
 function createRpcClient(transport) {
   return Object.freeze({
@@ -599,12 +648,14 @@ var inject = [
   "slots",
   "locale",
   "connection",
-  "settingsScope",
   "modelDirectories",
   "sessions",
   "remote"
 ];
 var RPC_CALL_TIMEOUT_MS = 12e3;
+var LOGIN_CALL_TIMEOUT_MS = 3e4;
+var LOGIN_POLL_INTERVAL_MS = 3e3;
+var LOGIN_POLL_TIMEOUT_MS = 10 * 6e4;
 function pickCopy(locale) {
   const language = typeof locale === "string" ? locale : locale?.language ?? locale?.lang;
   const resolved = language ?? (typeof navigator !== "undefined" ? navigator.language : "zh-CN");
@@ -620,7 +671,7 @@ function formatPercent(value) {
   const rounded = Math.round(value * 10) / 10;
   return Number.isInteger(rounded) ? String(rounded) : rounded.toFixed(1);
 }
-async function callRpc(rpc, endpoint, payload = {}) {
+async function callRpc(rpc, endpoint, payload = {}, timeoutMs = RPC_CALL_TIMEOUT_MS) {
   const controller = typeof AbortController !== "undefined" ? new AbortController() : void 0;
   let timer;
   try {
@@ -631,8 +682,8 @@ async function callRpc(rpc, endpoint, payload = {}) {
           controller?.abort();
         } catch {
         }
-        reject(new Error(`Request timed out after ${RPC_CALL_TIMEOUT_MS}ms`));
-      }, RPC_CALL_TIMEOUT_MS);
+        reject(new Error(`Request timed out after ${timeoutMs}ms`));
+      }, timeoutMs);
     });
     return unwrap(await Promise.race([call, timeout]));
   } finally {
@@ -687,6 +738,90 @@ function DiagnosticsRows({ diagnostics, t }) {
     ] })
   ] });
 }
+function fillTemplate2(template, values) {
+  return Object.entries(values).reduce(
+    (text, [key, value]) => text.replaceAll(`{${key}}`, value),
+    template
+  );
+}
+function VersionCard({ call, t }) {
+  const [info, setInfo] = (0, import_react2.useState)();
+  const [loading, setLoading] = (0, import_react2.useState)(true);
+  const [error, setError] = (0, import_react2.useState)(false);
+  const [updating, setUpdating] = (0, import_react2.useState)(false);
+  const [updateFailed, setUpdateFailed] = (0, import_react2.useState)(false);
+  const [updated, setUpdated] = (0, import_react2.useState)();
+  const [restartHint, setRestartHint] = (0, import_react2.useState)(false);
+  const generation = (0, import_react2.useRef)(0);
+  const load = (force) => {
+    const current = ++generation.current;
+    setLoading(true);
+    setError(false);
+    void call("plugin/version", { force }).then((value) => {
+      if (generation.current === current) setInfo(value);
+    }).catch(() => {
+      if (generation.current === current) setError(true);
+    }).finally(() => {
+      if (generation.current === current) setLoading(false);
+    });
+  };
+  (0, import_react2.useEffect)(() => {
+    load(false);
+    return () => {
+      generation.current += 1;
+    };
+  }, []);
+  const update = () => {
+    setUpdating(true);
+    setUpdateFailed(false);
+    void call("plugin/update").then((value) => {
+      setUpdated(value);
+      setRestartHint(false);
+    }).catch(() => setUpdateFailed(true)).finally(() => setUpdating(false));
+  };
+  const installKind = info?.install?.kind;
+  const showStatus = info !== void 0 && updated === void 0;
+  return /* @__PURE__ */ (0, import_jsx_runtime2.jsxs)("div", { className: "gsCard", children: [
+    /* @__PURE__ */ (0, import_jsx_runtime2.jsxs)("div", { className: "gsCardHead", children: [
+      /* @__PURE__ */ (0, import_jsx_runtime2.jsx)("h3", { children: t("versionTitle") }),
+      /* @__PURE__ */ (0, import_jsx_runtime2.jsx)("span", { className: "gsSpacer" }),
+      updated === void 0 ? /* @__PURE__ */ (0, import_jsx_runtime2.jsx)("button", { className: "gsBtn", type: "button", disabled: loading || updating, onClick: () => load(true), children: loading ? t("versionChecking") : t("versionCheck") }) : null
+    ] }),
+    loading && info === void 0 ? /* @__PURE__ */ (0, import_jsx_runtime2.jsx)("p", { className: "gsStatus gsStatus--busy", role: "status", children: t("versionChecking") }) : null,
+    error ? /* @__PURE__ */ (0, import_jsx_runtime2.jsx)("p", { className: "gsStatus gsStatus--error", role: "alert", children: t("versionFailed") }) : null,
+    info !== void 0 ? /* @__PURE__ */ (0, import_jsx_runtime2.jsxs)("div", { className: "gsRows", children: [
+      /* @__PURE__ */ (0, import_jsx_runtime2.jsxs)("div", { className: "gsRow", children: [
+        /* @__PURE__ */ (0, import_jsx_runtime2.jsx)("span", { children: t("versionCurrent") }),
+        /* @__PURE__ */ (0, import_jsx_runtime2.jsxs)("span", { className: "gsRowValue", children: [
+          "v",
+          info.current
+        ] })
+      ] }),
+      /* @__PURE__ */ (0, import_jsx_runtime2.jsxs)("div", { className: "gsRow", children: [
+        /* @__PURE__ */ (0, import_jsx_runtime2.jsx)("span", { children: t("versionLatest") }),
+        /* @__PURE__ */ (0, import_jsx_runtime2.jsxs)("span", { className: "gsRowValue", children: [
+          "v",
+          info.latest
+        ] })
+      ] })
+    ] }) : null,
+    showStatus ? /* @__PURE__ */ (0, import_jsx_runtime2.jsx)("p", { className: "gsStatus gsStatus--ok", role: "status", children: info.updateAvailable ? fillTemplate2(t("versionAvailable"), { version: info.latest }) : t("versionUpToDate") }) : null,
+    showStatus && info.updateAvailable && installKind === "npm" ? /* @__PURE__ */ (0, import_jsx_runtime2.jsx)("div", { className: "gsActions", children: /* @__PURE__ */ (0, import_jsx_runtime2.jsx)("button", { className: "gsBtn gsBtn--primary", type: "button", disabled: updating, onClick: update, children: updating ? t("versionUpdating") : t("versionUpdate") }) }) : null,
+    showStatus && installKind === "link" ? /* @__PURE__ */ (0, import_jsx_runtime2.jsx)("p", { className: "gsHint", children: t("versionLinked") }) : null,
+    showStatus && info.updateAvailable && installKind === "unknown" ? /* @__PURE__ */ (0, import_jsx_runtime2.jsx)("p", { className: "gsHint", children: t("versionManual") }) : null,
+    updateFailed ? /* @__PURE__ */ (0, import_jsx_runtime2.jsx)("p", { className: "gsStatus gsStatus--error", role: "alert", children: t("versionUpdateFailed") }) : null,
+    updated !== void 0 ? /* @__PURE__ */ (0, import_jsx_runtime2.jsxs)("div", { role: "status", children: [
+      /* @__PURE__ */ (0, import_jsx_runtime2.jsx)("p", { className: "gsStatus gsStatus--ok", children: fillTemplate2(t("versionUpdated"), { version: updated.version }) }),
+      /* @__PURE__ */ (0, import_jsx_runtime2.jsx)("p", { className: "gsHint", children: t("versionUpdatedHint") }),
+      restartHint ? /* @__PURE__ */ (0, import_jsx_runtime2.jsx)("p", { className: "gsHint", children: t("versionRestartHint") }) : null,
+      /* @__PURE__ */ (0, import_jsx_runtime2.jsxs)("div", { className: "gsActions", children: [
+        /* @__PURE__ */ (0, import_jsx_runtime2.jsx)("button", { className: "gsBtn", type: "button", onClick: () => setRestartHint(true), children: t("versionRestart") }),
+        /* @__PURE__ */ (0, import_jsx_runtime2.jsx)("button", { className: "gsBtn gsBtn--primary", type: "button", onClick: () => window.location.reload(), children: t("versionRefresh") }),
+        /* @__PURE__ */ (0, import_jsx_runtime2.jsx)("button", { className: "gsBtn", type: "button", onClick: () => setUpdated(void 0), children: t("versionLater") })
+      ] })
+    ] }) : null
+  ] });
+}
 function UsagePanel({ usage, t, usageBusy, onRefresh, signedIn }) {
   const ok = usage?.status === "ok";
   const usedNumber = ok && Number.isFinite(usage.usedPercent) ? usage.usedPercent : void 0;
@@ -751,6 +886,7 @@ function GrokSubscriptionSection({ rpc, t }) {
   const [error, setError] = (0, import_react2.useState)("");
   const [notice, setNotice] = (0, import_react2.useState)("");
   const [status, setStatus] = (0, import_react2.useState)(void 0);
+  const [loginPending, setLoginPending] = (0, import_react2.useState)(void 0);
   const initialUsageKick = (0, import_react2.useRef)(false);
   const applyPartial = (value) => {
     if (value?.account || value?.catalog || value?.usage) {
@@ -789,8 +925,29 @@ function GrokSubscriptionSection({ rpc, t }) {
     }).catch(() => {
     });
   };
+  (0, import_react2.useEffect)(() => {
+    if (!loginPending) return void 0;
+    const startedAt = Date.now();
+    const timer = setInterval(() => {
+      if (Date.now() - startedAt > LOGIN_POLL_TIMEOUT_MS) {
+        setLoginPending(void 0);
+        setError(t("loginTimeout"));
+        return;
+      }
+      void callRpc(rpc, "status", {}).then((value) => {
+        if (value?.account || value?.catalog || value?.usage) applyPartial(value);
+        if (value?.account?.signedIn !== true) return;
+        setLoginPending(void 0);
+        setNotice(t("loginOk"));
+        kickFollowUpRefresh();
+      }).catch(() => {
+      });
+    }, LOGIN_POLL_INTERVAL_MS);
+    return () => clearInterval(timer);
+  }, [loginPending, rpc]);
   const run = async (endpoint) => {
     const isUsageRefresh = endpoint === "usage/refresh";
+    const isLogin = endpoint === "login/cli" || endpoint === "login/device";
     if (isUsageRefresh) {
       setUsageBusy(true);
     } else {
@@ -800,7 +957,7 @@ function GrokSubscriptionSection({ rpc, t }) {
     setNotice("");
     let value;
     try {
-      value = await callRpc(rpc, endpoint, {});
+      value = await callRpc(rpc, endpoint, {}, isLogin ? LOGIN_CALL_TIMEOUT_MS : RPC_CALL_TIMEOUT_MS);
       if (value?.account || value?.catalog || value?.usage) {
         applyPartial(value);
       } else {
@@ -809,6 +966,9 @@ function GrokSubscriptionSection({ rpc, t }) {
       if (value?.ok === false && value.error) {
         setNotice("");
         setError(value.error);
+      } else if (value?.pending === true) {
+        setLoginPending({ url: value.loginUrl, code: value.userCode, warning: value.warning });
+        setNotice("");
       } else if (value?.ok !== false) {
         const successKey = {
           pull: "pullOk",
@@ -830,7 +990,7 @@ function GrokSubscriptionSection({ rpc, t }) {
       if (isUsageRefresh) setUsageBusy(false);
       else setBusy("");
     }
-    const shouldFollowUp = (endpoint === "pull" || endpoint === "login/cli" || endpoint === "login/device") && value?.ok !== false && !value?.error;
+    const shouldFollowUp = (endpoint === "pull" || endpoint === "login/cli" || endpoint === "login/device") && value?.ok !== false && !value?.error && value?.pending !== true;
     if (shouldFollowUp) kickFollowUpRefresh();
   };
   const account = status?.account;
@@ -850,12 +1010,24 @@ function GrokSubscriptionSection({ rpc, t }) {
         signedIn && account?.maskedAccount ? /* @__PURE__ */ (0, import_jsx_runtime2.jsx)("span", { className: "gsAccount", children: account.maskedAccount }) : null
       ] }),
       /* @__PURE__ */ (0, import_jsx_runtime2.jsxs)("div", { className: "gsActions", children: [
-        /* @__PURE__ */ (0, import_jsx_runtime2.jsx)("button", { className: "gsBtn gsBtn--primary", type: "button", disabled: Boolean(busy), onClick: () => void run("login/cli"), children: t("loginCli") }),
-        /* @__PURE__ */ (0, import_jsx_runtime2.jsx)("button", { className: "gsBtn", type: "button", disabled: Boolean(busy), onClick: () => void run("login/device"), children: t("loginDevice") }),
+        /* @__PURE__ */ (0, import_jsx_runtime2.jsx)("button", { className: "gsBtn gsBtn--primary", type: "button", disabled: Boolean(busy) || Boolean(loginPending), onClick: () => void run("login/cli"), children: t("loginCli") }),
+        /* @__PURE__ */ (0, import_jsx_runtime2.jsx)("button", { className: "gsBtn", type: "button", disabled: Boolean(busy) || Boolean(loginPending), onClick: () => void run("login/device"), children: t("loginDevice") }),
         /* @__PURE__ */ (0, import_jsx_runtime2.jsx)("button", { className: "gsBtn", type: "button", disabled: Boolean(busy), onClick: () => void run("pull"), children: t("pull") }),
         /* @__PURE__ */ (0, import_jsx_runtime2.jsx)("button", { className: "gsBtn gsBtn--danger", type: "button", disabled: Boolean(busy) || !signedIn, onClick: () => void run("logout"), children: t("logout") })
       ] }),
       busy ? /* @__PURE__ */ (0, import_jsx_runtime2.jsx)("p", { className: "gsStatus gsStatus--busy", children: t("busy") }) : null,
+      loginPending ? /* @__PURE__ */ (0, import_jsx_runtime2.jsxs)("p", { className: "gsStatus gsStatus--busy", children: [
+        t("loginWaiting"),
+        loginPending.code ? /* @__PURE__ */ (0, import_jsx_runtime2.jsxs)(import_jsx_runtime2.Fragment, { children: [
+          " \xB7 ",
+          /* @__PURE__ */ (0, import_jsx_runtime2.jsx)("code", { children: loginPending.code })
+        ] }) : null,
+        loginPending.url ? /* @__PURE__ */ (0, import_jsx_runtime2.jsxs)(import_jsx_runtime2.Fragment, { children: [
+          " \xB7 ",
+          /* @__PURE__ */ (0, import_jsx_runtime2.jsx)("a", { className: "gsLink", href: loginPending.url, target: "_blank", rel: "noreferrer", children: t("loginOpenBrowser") })
+        ] }) : null
+      ] }) : null,
+      loginPending?.warning ? /* @__PURE__ */ (0, import_jsx_runtime2.jsx)("p", { className: "gsStatus gsStatus--warn", children: t("loginNoUrl") }) : null,
       notice ? /* @__PURE__ */ (0, import_jsx_runtime2.jsx)("p", { className: "gsStatus gsStatus--ok", children: notice }) : null,
       error ? /* @__PURE__ */ (0, import_jsx_runtime2.jsxs)("p", { className: "gsStatus gsStatus--error", children: [
         t("error"),
@@ -877,6 +1049,18 @@ function GrokSubscriptionSection({ rpc, t }) {
         ] })
       ] })
     ] }),
+    /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(
+      VersionCard,
+      {
+        t,
+        call: (endpoint, payload) => callRpc(
+          rpc,
+          endpoint,
+          payload,
+          endpoint === "plugin/update" ? 19e4 : RPC_CALL_TIMEOUT_MS
+        )
+      }
+    ),
     /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(
       UsagePanel,
       {