dsh-grok-subscription 0.1.13 → 1.0.1

package/README.md

@@ -25,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.13
+# dsh plugin --profile web add dsh-grok-subscription@1.0.1
 ```
 
 然后重启 `dsh web`，打开 **Settings → Grok 订阅**。也可以在设置页点击“CLI 登录”或“设备码登录”；设备码流程会在启动 DSH 的终端中显示提示。登录完成后点击“从 Grok CLI 拉取”可立即同步；Chat 模型列表会随之刷新。
@@ -46,15 +46,23 @@ npm test
 npm run build
 ```
 
+## v1.0.1
+
+修复 grok-build 路由「发第二条消息没有回复」：`/v1/responses` 只在 `response.output_item.added` 与 `function_call_arguments.done` 上给函数名，参数增量事件不带 `name`，于是工具调用块带着 `name: undefined` 发给宿主。DSH 会拒绝任何无法无损 JSON 序列化的流片段，并以「Assistant stream chunk must be losslessly JSON-serializable」结束整轮，界面上完全没有回复——走 grok-build 的工具调用轮次都会这样，纯文本回复则正常。现：按 call id 记住工具名；采用 `arguments.done` / `response.completed` 的权威参数；从终止快照恢复只出现在 `completed` 里的调用；用量合计保持有限值、错误状态仅在其为数字时附带；出口再统一剔除 `undefined` / 非有限值兜底。附 8 个基于真实抓包帧的回归测试。
+
+## v1.0.0
+
+首个稳定版，已发布 npm：`dsh-grok-subscription@1.0.0`。内置模型选择器现可通过 `model.reasoning`（efforts + defaultEffort）展示 Grok Build 的 reasoning effort 子菜单（low/medium/high/xhigh），与 Codex 一致。修复 duck `listModels`/`resolveModel` 此前省略该元数据的问题。
+
 ## v0.1.13
 
-Chat 输入区模型选择旁增加 Codex 风格的每周剩余额度徽章（如 `16%`）；悬停/点击显示「每周额度 剩余 N% · 重置于 M/D HH:mm」。仅在当前会话 provider 为 `grok-build` 且用量 `ok` 时显示。Settings 中 Pull/登录成功后会派发刷新事件更新徽章。本地 0.1.13 供复测，**未发 npm**。升级后请用新 token URL 硬刷新。
+Chat 输入区模型选择旁增加 Codex 风格的每周剩余额度徽章（如 `16%`）；悬停/点击显示「每周额度 剩余 N% · 重置于 M/D HH:mm」。仅在当前会话 provider 为 `grok-build` 且用量 `ok` 时显示。Settings 中 Pull/登录成功后会派发刷新事件更新徽章。已发布 npm：`dsh-grok-subscription@0.1.13`。升级后请用新 token URL 硬刷新。
 
 ## 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。
+修复 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。已发布 npm：`dsh-grok-subscription@0.1.12`。
 
 ## v0.1.10
 
@@ -119,15 +127,23 @@ dsh plugin --profile web add BaronCyrus/dsh-grok-subscription
 
 Reinstall after upgrades, restart `dsh web`, then open **Settings → Grok Subscription**.
 
+### v1.0.1
+
+Fixes "no reply after sending a second message" on the grok-build route: `/v1/responses` sends the function name only on `response.output_item.added` and `function_call_arguments.done`, never on the arguments delta, so tool-call chunks carried `name: undefined`. DSH rejects any stream chunk that is not losslessly JSON-serializable and ends the whole turn with "Assistant stream chunk must be losslessly JSON-serializable", leaving no reply in the UI; every tool-calling turn over grok-build failed this way while text-only replies looked fine. Now tool names are remembered by call id, arguments are adopted from `arguments.done` / `response.completed`, calls that appear only in the terminal snapshot are recovered, usage totals stay finite, an error status is attached only when numeric, and outgoing chunks are pruned of `undefined` / non-finite values. Adds 8 regression tests built from real captured frames.
+
+### v1.0.0
+
+First stable release, published to npm as `dsh-grok-subscription@1.0.0`. Stock model picker now shows Grok Build reasoning effort (low/medium/high/xhigh) via `model.reasoning` metadata (`efforts` + `defaultEffort`), matching Codex. Fixes duck `listModels`/`resolveModel` omitting that shape.
+
 ### v0.1.13
 
-Chat 输入区模型选择旁增加 Codex 风格的每周剩余额度徽章（如 `16%`）；悬停/点击显示「每周额度 剩余 N% · 重置于 M/D HH:mm」。仅在当前会话 provider 为 `grok-build` 且用量 `ok` 时显示。Settings 中 Pull/登录成功后会派发刷新事件更新徽章。本地 0.1.13 供复测，**未发 npm**。升级后请用新 token URL 硬刷新。
+Chat 输入区模型选择旁增加 Codex 风格的每周剩余额度徽章（如 `16%`）；悬停/点击显示「每周额度 剩余 N% · 重置于 M/D HH:mm」。仅在当前会话 provider 为 `grok-build` 且用量 `ok` 时显示。Settings 中 Pull/登录成功后会派发刷新事件更新徽章。已发布 npm：`dsh-grok-subscription@0.1.13`。升级后请用新 token URL 硬刷新。
 
 ## 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。
+修复 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。已发布 npm：`dsh-grok-subscription@0.1.12`。
 
 ## v0.1.10
 

package/lib/client.js

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

package/lib/index.js

@@ -325,6 +325,7 @@ function fallbackModels() {
     maxTokens: 5e5,
     reasoning: true,
     reasoningEfforts: id === "grok-4.5" ? ["low", "medium", "high"] : ["low", "medium", "high", "xhigh"],
+    defaultEffort: "high",
     source: "fallback"
   }));
 }
@@ -362,13 +363,28 @@ function toPiModels(models) {
     };
   });
 }
+function reasoningInfoOf(model) {
+  if (model?.reasoning === false) return void 0;
+  const efforts = Array.isArray(model?.reasoningEfforts) && model.reasoningEfforts.length ? model.reasoningEfforts : ["low", "medium", "high", "xhigh"];
+  const title = (id) => `${id.charAt(0).toUpperCase()}${id.slice(1)}`;
+  const preferred = model?.defaultEffort && efforts.includes(model.defaultEffort) ? model.defaultEffort : efforts.includes("high") ? "high" : efforts[efforts.length - 1];
+  return {
+    efforts: efforts.map((id) => ({ id, name: title(id) })),
+    defaultEffort: preferred
+  };
+}
 function toLlmModels(models) {
-  return models.map((model) => ({
-    provider: PROVIDER_ID,
-    id: model.id,
-    name: model.name,
-    inputModalities: ["text"]
-  }));
+  return models.map((model) => {
+    const info = {
+      provider: PROVIDER_ID,
+      id: model.id,
+      name: model.name,
+      inputModalities: ["text"]
+    };
+    const reasoning = reasoningInfoOf(model);
+    if (reasoning) info.reasoning = reasoning;
+    return info;
+  });
 }
 async function fetchLiveCatalog(accessToken, options = {}) {
   const fetchImpl = options.fetch ?? globalThis.fetch;
@@ -772,7 +788,31 @@ function mapFinish(reason) {
   if (reason === "length" || reason === "max_tokens") return { kind: "max-tokens" };
   return { kind: "stop" };
 }
-async function* streamResponses(options, token) {
+function finiteOr(value, fallback) {
+  return typeof value === "number" && Number.isFinite(value) ? value : fallback;
+}
+function jsonSafeChunk(value) {
+  if (value === null) return null;
+  const type = typeof value;
+  if (type === "string" || type === "boolean") return value;
+  if (type === "number") return Number.isFinite(value) && !Object.is(value, -0) ? value : void 0;
+  if (type !== "object") return void 0;
+  if (Array.isArray(value)) {
+    const list = [];
+    for (const item of value) {
+      const safe = jsonSafeChunk(item);
+      if (safe !== void 0) list.push(safe);
+    }
+    return list;
+  }
+  const out = {};
+  for (const [key, item] of Object.entries(value)) {
+    const safe = jsonSafeChunk(item);
+    if (safe !== void 0) out[key] = safe;
+  }
+  return out;
+}
+async function* streamResponsesUnsafe(options, token) {
   const headers = {
     Accept: "text/event-stream",
     "Content-Type": "application/json",
@@ -823,8 +863,24 @@ async function* streamResponses(options, token) {
   let reasoningContent = "";
   let nextIndex = 0;
   const toolBlocks = /* @__PURE__ */ new Map();
+  const toolNames = /* @__PURE__ */ new Map();
   let usage;
   let finish = { kind: "stop" };
+  const toolIdOf = (payload) => {
+    const id = payload?.item_id ?? payload?.call_id ?? payload?.id;
+    return typeof id === "string" && id ? id : void 0;
+  };
+  const learnToolName = (id, name2) => {
+    if (typeof id !== "string" || !id || typeof name2 !== "string" || !name2) return;
+    toolNames.set(id, name2);
+    const tool = toolBlocks.get(id);
+    if (tool) tool.name = name2;
+  };
+  const adoptToolArguments = (id, value) => {
+    if (typeof id !== "string" || typeof value !== "string" || !value) return;
+    const tool = toolBlocks.get(id);
+    if (tool && value.length > tool.arguments.length) tool.arguments = value;
+  };
   const flushSse = function* (raw) {
     const lines = raw.split("\n");
     let event = "message";
@@ -864,12 +920,33 @@ async function* streamResponses(options, token) {
       yield { type: "reasoning-delta", index: reasoningIndex, text: String(delta) };
       return;
     }
+    if (type === "response.output_item.added" || type === "response.output_item.done") {
+      const item = payload.item;
+      if (item?.type === "function_call") {
+        learnToolName(item.id, item.name);
+        learnToolName(item.call_id, item.name);
+        adoptToolArguments(item.id, item.arguments);
+      }
+      return;
+    }
+    if (type === "response.function_call_arguments.done") {
+      const id = toolIdOf(payload);
+      learnToolName(id, payload.name);
+      adoptToolArguments(id, payload.arguments);
+      return;
+    }
     if (type === "response.function_call_arguments.delta") {
-      const id = payload.item_id ?? payload.call_id ?? payload.id;
+      const id = toolIdOf(payload);
       if (!id) return;
       let tool = toolBlocks.get(id);
       if (!tool) {
-        tool = { index: nextIndex++, id, name: payload.name ?? payload.item?.name, arguments: "" };
+        tool = {
+          index: nextIndex++,
+          id,
+          // Never leave this undefined: an unserializable chunk aborts the turn.
+          name: toolNames.get(id) ?? "tool",
+          arguments: ""
+        };
         toolBlocks.set(id, tool);
         yield { type: "block-start", index: tool.index, blockType: "tool-call" };
       }
@@ -879,20 +956,38 @@ async function* streamResponses(options, token) {
       return;
     }
     if (type === "response.completed") {
+      for (const item of payload.response?.output ?? []) {
+        if (item?.type !== "function_call") continue;
+        learnToolName(item.id, item.name);
+        learnToolName(item.call_id, item.name);
+        const id = typeof item.id === "string" && item.id ? item.id : void 0;
+        if (id && !toolBlocks.has(id)) {
+          const tool = { index: nextIndex++, id, name: toolNames.get(id) ?? "tool", arguments: "" };
+          toolBlocks.set(id, tool);
+          yield { type: "block-start", index: tool.index, blockType: "tool-call" };
+        }
+        adoptToolArguments(id, item.arguments);
+      }
       const responseUsage = payload.response?.usage ?? payload.usage;
       if (responseUsage) {
         usage = {
-          inputTokens: responseUsage.input_tokens ?? responseUsage.prompt_tokens ?? 0,
-          outputTokens: responseUsage.output_tokens ?? responseUsage.completion_tokens ?? 0,
-          totalTokens: responseUsage.total_tokens
+          inputTokens: finiteOr(responseUsage.input_tokens ?? responseUsage.prompt_tokens, 0),
+          outputTokens: finiteOr(responseUsage.output_tokens ?? responseUsage.completion_tokens, 0)
         };
+        usage.totalTokens = finiteOr(responseUsage.total_tokens, usage.inputTokens + usage.outputTokens);
       }
       finish = mapFinish(payload.response?.status === "incomplete" ? "length" : "stop");
       if (toolBlocks.size) finish = { kind: "tool-calls" };
     }
     if (type === "response.failed" || type === "error") {
-      const message = payload.error?.message ?? payload.message ?? "Grok Build stream failed";
-      finish = { kind: "error", failure: { message, code: "PROVIDER", status: payload.error?.status } };
+      const raw2 = payload.error?.message ?? payload.message;
+      const failure = {
+        message: typeof raw2 === "string" && raw2 ? raw2 : "Grok Build stream failed",
+        code: "PROVIDER"
+      };
+      const status = finiteOr(payload.error?.status, void 0);
+      if (status !== void 0) failure.status = status;
+      finish = { kind: "error", failure };
     }
   };
   for await (const chunk of response.body) {
@@ -921,6 +1016,12 @@ async function* streamResponses(options, token) {
   if (usage) yield { type: "usage", usage };
   yield { type: "finish", reason: finish };
 }
+async function* streamResponses(options, token) {
+  for await (const chunk of streamResponsesUnsafe(options, token)) {
+    const safe = jsonSafeChunk(chunk);
+    if (safe) yield safe;
+  }
+}
 function visiblePiModels(session) {
   if (session.publicAccount()?.signedIn !== true) return [];
   return toPiModels(session.models()).map((model) => model.provider === PROVIDER_ID ? model : { ...model, provider: PROVIDER_ID });
@@ -942,13 +1043,18 @@ function createDuckAdapter(session) {
     },
     async resolveModel(provider, model) {
       const found = list().find((item) => item.id === model);
-      return {
+      const raw = session.publicAccount()?.signedIn === true ? session.models().find((item) => item.id === model) : void 0;
+      const info = {
         provider,
         id: model,
         name: found?.name ?? model,
         inputModalities: ["text"],
-        context: { contextWindow: 5e5 }
+        context: { contextWindow: raw?.contextWindow ?? 5e5 }
       };
+      const reasoning = reasoningInfoOf(raw);
+      if (reasoning) info.reasoning = reasoning;
+      else if (found?.reasoning) info.reasoning = found.reasoning;
+      return info;
     },
     async prepareCall(provider, model, signal) {
       const resolved = await this.resolveModel(provider, model, signal);
@@ -971,17 +1077,13 @@ function createDuckAdapter(session) {
         yield* streamResponses(options, token);
       } catch (error) {
         const aborted = options.signal?.aborted === true;
-        yield {
-          type: "finish",
-          reason: {
-            kind: aborted ? "aborted" : "error",
-            failure: {
-              message: error instanceof Error ? error.message : "Grok Build request failed",
-              code: aborted ? "ABORTED" : "PROVIDER",
-              status: error?.status
-            }
-          }
+        const failure = {
+          message: error instanceof Error ? error.message : "Grok Build request failed",
+          code: aborted ? "ABORTED" : "PROVIDER"
         };
+        const status = finiteOr(error?.status, void 0);
+        if (status !== void 0) failure.status = status;
+        yield { type: "finish", reason: { kind: aborted ? "aborted" : "error", failure } };
       }
     }
   };
@@ -1145,7 +1247,8 @@ async function createGrokBuildAdapter(session, options = {}) {
     requestImagePixelBudget: REQUEST_IMAGE_PIXEL_BUDGET,
     requestImageMaxBytes: REQUEST_IMAGE_MAX_BYTES,
     cacheRetention: "short",
-    transport: "sse"
+    transport: "sse",
+    reasoning: "high"
   });
   const LlmError = dshLlm?.LlmError;
   const adapter = new dshPi.PiAiAdapter({

package/package.json

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