dsh-grok-subscription 1.0.3 → 1.0.4

package/README.en.md

@@ -25,7 +25,7 @@ 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.3`.
+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.4`.
 
    ```sh
    dsh plugin --profile web add BaronCyrus/dsh-grok-subscription
@@ -89,7 +89,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.3
+dsh plugin --profile web add dsh-grok-subscription@1.0.4
 ```
 
 DSH handles target selection, the profile lock, dependency resolution, and bundle activation.

package/README.md

@@ -25,7 +25,7 @@
 
 ## 三步开始
 
-1. **安装插件**：在终端运行下面的命令；指定候选版本时填写完整的 `包名@版本`，例如 `dsh-grok-subscription@1.0.3`。
+1. **安装插件**：在终端运行下面的命令；指定候选版本时填写完整的 `包名@版本`，例如 `dsh-grok-subscription@1.0.4`。
 
    ```sh
    dsh plugin --profile web add BaronCyrus/dsh-grok-subscription
@@ -89,7 +89,7 @@ dsh plugin --profile web add BaronCyrus/dsh-grok-subscription
 也可以按 npm 上的已发布版本安装：
 
 ```sh
-dsh plugin --profile web add dsh-grok-subscription@1.0.3
+dsh plugin --profile web add dsh-grok-subscription@1.0.4
 ```
 
 目标选择、profile 锁、依赖解析和 bundle 激活均由 DSH 负责。

package/lib/client.js

@@ -20,8 +20,11 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/client.jsx
 var client_exports = {};
 __export(client_exports, {
+  GrokSubscriptionPanel: () => GrokSubscriptionPanel,
   GrokSubscriptionSection: () => GrokSubscriptionSection,
   RPC_CALL_TIMEOUT_MS: () => RPC_CALL_TIMEOUT_MS,
+  SectionBoundary: () => SectionBoundary,
+  UsagePanel: () => UsagePanel,
   apply: () => apply,
   callRpc: () => callRpc,
   inject: () => inject,
@@ -34,7 +37,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.3",
+  subtitle: "\u7528 SuperGrok / X Premium\uFF08Grok Build\uFF09\u4F1A\u8BDD\uFF0C\u800C\u4E0D\u662F XAI_API_KEY\u3002\xB7 1.0.4",
   signedIn: "\u5DF2\u767B\u5F55",
   signedOut: "\u672A\u767B\u5F55",
   account: "\u8D26\u6237",
@@ -54,6 +57,7 @@ var zh = {
   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",
+  renderError: "\u754C\u9762\u6E32\u67D3\u5931\u8D25",
   busy: "\u5904\u7406\u4E2D\u2026",
   busyCatalog: "\u6B63\u5728\u5237\u65B0\u6A21\u578B\u76EE\u5F55\u2026",
   busyUsage: "\u6B63\u5728\u5237\u65B0\u7528\u91CF\u2026",
@@ -83,7 +87,7 @@ var zh = {
 var en = {
   nav: "Grok Subscription",
   title: "Grok Subscription",
-  subtitle: "Use a SuperGrok / X Premium (Grok Build) session, not XAI_API_KEY. \xB7 1.0.3",
+  subtitle: "Use a SuperGrok / X Premium (Grok Build) session, not XAI_API_KEY. \xB7 1.0.4",
   signedIn: "Signed in",
   signedOut: "Signed out",
   account: "Account",
@@ -103,6 +107,7 @@ var en = {
   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",
+  renderError: "Failed to render this panel",
   busy: "Working\u2026",
   busyCatalog: "Refreshing model catalog\u2026",
   busyUsage: "Refreshing usage\u2026",
@@ -614,6 +619,32 @@ async function callRpc(rpc, endpoint, payload = {}) {
     if (timer) clearTimeout(timer);
   }
 }
+var SectionBoundary = class extends import_react2.Component {
+  constructor(props) {
+    super(props);
+    this.state = { error: void 0 };
+  }
+  static getDerivedStateFromError(error) {
+    return { error };
+  }
+  render() {
+    const { error } = this.state;
+    if (!error) return this.props.children;
+    const t = this.props.t;
+    return /* @__PURE__ */ (0, import_jsx_runtime2.jsxs)("section", { className: "grokSubscription", children: [
+      /* @__PURE__ */ (0, import_jsx_runtime2.jsx)("style", { children: SETTINGS_STYLE }),
+      /* @__PURE__ */ (0, import_jsx_runtime2.jsx)("div", { className: "gsHead", children: /* @__PURE__ */ (0, import_jsx_runtime2.jsx)("h2", { children: t("title") }) }),
+      /* @__PURE__ */ (0, import_jsx_runtime2.jsx)("div", { className: "gsCard", children: /* @__PURE__ */ (0, import_jsx_runtime2.jsxs)("p", { className: "gsStatus gsStatus--error", children: [
+        t("renderError"),
+        ": ",
+        error instanceof Error ? error.message : String(error)
+      ] }) })
+    ] });
+  }
+};
+function GrokSubscriptionPanel(props) {
+  return /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(SectionBoundary, { t: props.t, children: /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(GrokSubscriptionSection, { ...props }) });
+}
 function Chevron() {
   return /* @__PURE__ */ (0, import_jsx_runtime2.jsx)("svg", { className: "gsChevron", width: "12", height: "12", viewBox: "0 0 16 16", "aria-hidden": "true", children: /* @__PURE__ */ (0, import_jsx_runtime2.jsx)("path", { d: "M4 6l4 4 4-4", fill: "none", stroke: "currentColor", strokeWidth: "1.6", strokeLinecap: "round", strokeLinejoin: "round" }) });
 }
@@ -625,12 +656,16 @@ function Chip({ tone = "off", children }) {
 }
 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 usedNumber = ok && Number.isFinite(usage.usedPercent) ? usage.usedPercent : void 0;
+  const remainingNumber = ok && Number.isFinite(usage.remainingPercent) ? usage.remainingPercent : void 0;
+  const used = usedNumber !== void 0 ? formatPercent(usedNumber) : void 0;
+  const remaining = remainingNumber !== void 0 ? formatPercent(remainingNumber) : void 0;
   const resetLabel = usage?.periodEndLocal || usage?.periodEnd;
-  const gaugeValue = remaining ?? (used !== void 0 ? formatPercent(100 - Number(used)) : void 0);
-  const gaugeLabel = remaining !== void 0 ? t("usageRemaining") : t("usageUsed");
-  const fill = typeof gaugeValue === "number" && Number.isFinite(gaugeValue) ? Math.min(100, Math.max(0, gaugeValue)) : 0;
+  const gaugeNumber = remainingNumber ?? (usedNumber !== void 0 ? 100 - usedNumber : void 0);
+  const gaugeValue = gaugeNumber !== void 0 ? formatPercent(gaugeNumber) : void 0;
+  const gaugeLabel = remainingNumber !== void 0 ? t("usageRemaining") : t("usageUsed");
+  const fill = gaugeNumber === void 0 ? 0 : Math.min(100, Math.max(0, gaugeNumber));
+  const products = Array.isArray(usage?.productUsage) ? usage.productUsage : [];
   return /* @__PURE__ */ (0, import_jsx_runtime2.jsxs)("div", { className: "gsCard", children: [
     /* @__PURE__ */ (0, import_jsx_runtime2.jsx)("div", { className: "gsCardHead", children: /* @__PURE__ */ (0, import_jsx_runtime2.jsx)("h3", { children: t("usageTitle") }) }),
     ok && (used !== void 0 || remaining !== void 0) ? /* @__PURE__ */ (0, import_jsx_runtime2.jsxs)("div", { className: "gsGauge", children: [
@@ -660,11 +695,11 @@ function UsagePanel({ usage, t, usageBusy, onRefresh, signedIn }) {
       t("usageUnavailable"),
       usage?.reason ? `: ${usage.reason}` : ""
     ] }),
-    Array.isArray(usage.productUsage) && usage.productUsage.length > 0 ? /* @__PURE__ */ (0, import_jsx_runtime2.jsx)("div", { className: "gsRows", children: usage.productUsage.map((row, index) => /* @__PURE__ */ (0, import_jsx_runtime2.jsxs)("div", { className: "gsRow", children: [
+    products.length > 0 ? /* @__PURE__ */ (0, import_jsx_runtime2.jsx)("div", { className: "gsRows", children: products.map((row, index) => /* @__PURE__ */ (0, import_jsx_runtime2.jsxs)("div", { className: "gsRow", children: [
       /* @__PURE__ */ (0, import_jsx_runtime2.jsx)("span", { children: row.name ?? "\u2014" }),
       /* @__PURE__ */ (0, import_jsx_runtime2.jsx)("span", { className: "gsRowValue", children: typeof row.usedPercent === "number" ? `${formatPercent(row.usedPercent)}%` : "\u2014" })
     ] }, `${row.name ?? "row"}-${index}`)) }) : null,
-    usage.fetchedAt ? /* @__PURE__ */ (0, import_jsx_runtime2.jsxs)("p", { className: "gsHint", children: [
+    usage?.fetchedAt ? /* @__PURE__ */ (0, import_jsx_runtime2.jsxs)("p", { className: "gsHint", children: [
       t("usageFetchedAt"),
       ": ",
       usage.fetchedAt
@@ -879,7 +914,7 @@ function apply(ctx) {
     label: () => t("nav"),
     locale: LOCALE_NS,
     inject: () => ({ rpc, t })
-  }, GrokSubscriptionSection));
+  }, GrokSubscriptionPanel));
   const installDirectorySlots = (scope) => {
     let modelDirectories;
     try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-grok-subscription",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "description": "Use a SuperGrok or X Premium Grok Build subscription in DeepSeek Harness",
   "type": "module",
   "main": "./lib/index.js",
@@ -39,6 +39,7 @@
   },
   "scripts": {
     "build": "node scripts/build.mjs",
+    "pretest": "npm run build",
     "test": "node --test tests/*.test.mjs",
     "check": "npm test && npm run build"
   },
@@ -55,8 +56,12 @@
     "node": "^22.19.0 || >=24.0.0"
   },
   "peerDependencies": {
+    "@deepseek-ai/dsh-api-remotes": "^0.1.5-rc.2",
     "@deepseek-ai/dsh-client-connection": "^0.1.5-rc.2",
     "@deepseek-ai/dsh-client-locale": "^0.1.5-rc.2",
+    "@deepseek-ai/dsh-client-ui-conversation": "^0.1.5-rc.2",
+    "@deepseek-ai/dsh-client-ui-model-selection": "^0.1.5-rc.2",
+    "@deepseek-ai/dsh-client-ui-primitives": "^0.1.5-rc.2",
     "@deepseek-ai/dsh-client-ui-settings": "^0.1.5-rc.2",
     "@deepseek-ai/dsh-client-ui-slots": "^0.1.5-rc.2",
     "@deepseek-ai/dsh-credentials": "^0.1.5-rc.2",
@@ -66,11 +71,7 @@
     "@deepseek-ai/dsh-web": "^0.1.5-rc.2",
     "@earendil-works/pi-ai": "^0.82.1",
     "react": "^18.2.0",
-    "react-dom": "^18.2.0",
-    "@deepseek-ai/dsh-api-remotes": "^0.1.5-rc.2",
-    "@deepseek-ai/dsh-client-ui-conversation": "^0.1.5-rc.2",
-    "@deepseek-ai/dsh-client-ui-model-selection": "^0.1.5-rc.2",
-    "@deepseek-ai/dsh-client-ui-primitives": "^0.1.5-rc.2"
+    "react-dom": "^18.2.0"
   },
   "peerDependenciesMeta": {
     "@deepseek-ai/dsh-client-connection": {
@@ -123,7 +124,9 @@
     }
   },
   "devDependencies": {
-    "esbuild": "^0.25.0"
+    "esbuild": "^0.25.0",
+    "react": "^18.3.1",
+    "react-dom": "^18.3.1"
   },
   "author": "BaronCyrus",
   "repository": {