dsh-grok-subscription 1.0.7 → 1.0.9

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.7`.
+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`.
 
    ```sh
    dsh plugin --profile web add BaronCyrus/dsh-grok-subscription
@@ -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.7
+dsh plugin --profile web add dsh-grok-subscription@1.0.9
 ```
 
 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.7`。
+1. **安装插件**：在终端运行下面的命令；指定候选版本时填写完整的 `包名@版本`，例如 `dsh-grok-subscription@1.0.9`。
 
    ```sh
    dsh plugin --profile web add BaronCyrus/dsh-grok-subscription
@@ -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.7
+dsh plugin --profile web add dsh-grok-subscription@1.0.9
 ```
 
 目标选择、profile 锁、依赖解析和 bundle 激活均由 DSH 负责。

package/lib/client.js

@@ -38,7 +38,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.7",
+  subtitle: "\u7528 SuperGrok / X Premium\uFF08Grok Build\uFF09\u4F1A\u8BDD\uFF0C\u800C\u4E0D\u662F XAI_API_KEY\u3002\xB7 1.0.9",
   signedIn: "\u5DF2\u767B\u5F55",
   signedOut: "\u672A\u767B\u5F55",
   account: "\u8D26\u6237",
@@ -95,7 +95,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.7",
+  subtitle: "Use a SuperGrok / X Premium (Grok Build) session, not XAI_API_KEY. \xB7 1.0.9",
   signedIn: "Signed in",
   signedOut: "Signed out",
   account: "Account",

package/lib/index.js

@@ -1166,11 +1166,31 @@ async function* streamResponsesUnsafe(options, token) {
       }
       const responseUsage = payload.response?.usage ?? payload.usage;
       if (responseUsage) {
+        const details = responseUsage.input_tokens_details ?? responseUsage.prompt_tokens_details ?? {};
+        const cachedTokens = finiteOr(details.cached_tokens, 0);
+        const cacheWriteTokens = finiteOr(details.cache_write_tokens, 0);
+        const promptTotal = finiteOr(
+          responseUsage.input_tokens ?? responseUsage.prompt_tokens,
+          0
+        );
+        const outputTokens = finiteOr(
+          responseUsage.output_tokens ?? responseUsage.completion_tokens,
+          0
+        );
         usage = {
-          inputTokens: finiteOr(responseUsage.input_tokens ?? responseUsage.prompt_tokens, 0),
-          outputTokens: finiteOr(responseUsage.output_tokens ?? responseUsage.completion_tokens, 0)
+          // The provider folds cache hits into the prompt count, while DSH's
+          // fields are disjoint: billed input = inputTokens + cacheRead +
+          // cacheWrite. Subtracting is what makes the host's "cache hit" figure
+          // real instead of a permanent 0%. Both cache fields stay numeric so
+          // consumers can always add them up.
+          inputTokens: Math.max(0, promptTotal - cachedTokens - cacheWriteTokens),
+          outputTokens,
+          cacheReadTokens: cachedTokens,
+          cacheWriteTokens
         };
-        usage.totalTokens = finiteOr(responseUsage.total_tokens, usage.inputTokens + usage.outputTokens);
+        const reasoningTokens = finiteOr(responseUsage.output_tokens_details?.reasoning_tokens, void 0);
+        if (reasoningTokens !== void 0) usage.reasoningTokens = reasoningTokens;
+        usage.totalTokens = finiteOr(responseUsage.total_tokens, promptTotal + outputTokens);
       }
       finish = mapFinish(payload.response?.status === "incomplete" ? "length" : "stop");
       if (toolBlocks.size) finish = { kind: "tool-calls" };
@@ -1244,7 +1264,9 @@ function createDuckAdapter(session, adapterOptions = {}) {
         provider,
         id: model,
         name: found?.name ?? model,
-        inputModalities: ["text"],
+        // The host gates prompt attachment admission on resolveModelInfo, NOT on
+        // listModels, so this must match the catalog's modality map exactly.
+        inputModalities: supportsImageInput(model) ? ["text", "image"] : ["text"],
         context: { contextWindow: raw?.contextWindow ?? 5e5 }
       };
       const reasoning = reasoningInfoOf(raw);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-grok-subscription",
-  "version": "1.0.7",
+  "version": "1.0.9",
   "description": "Use a SuperGrok or X Premium Grok Build subscription in DeepSeek Harness",
   "type": "module",
   "main": "./lib/index.js",