dsh-grok-subscription 1.0.18 → 1.0.19

package/README.en.md

@@ -209,7 +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;
+- **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 only to **this plugin's own Grok requests** (the host undici's `fetch`; the process-wide dispatcher is never replaced) and to the **`grok` CLI** it spawns. Every other plugin, DSH itself, and every other provider keep the host's original `fetch`. To proxy the whole Harness, set the standard `https_proxy` (in `~/.dsh/.env`, never in a project `.env`): `@deepseek-ai/dsh-http-proxy` takes over and this plugin adds no tunnel of its own. 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.
 - **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

@@ -209,7 +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 继承；
+- **登录不弹浏览器 / 聊天报 `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 请求**（走宿主 undici 的 fetch，不替换进程的全局调度器）和它启动的 **`grok` CLI**。其他插件、DSH 自身和其他 provider 继续用宿主原来的 `fetch`。想让整个 Harness 走代理时，用标准的 `https_proxy`（可写在 `~/.dsh/.env`，不要写进项目目录），宿主的 `@deepseek-ai/dsh-http-proxy` 会接管，本插件不再另加隧道。写好后重启客户端；登录链接会交给系统浏览器打开，面板里同时显示一次性验证码与可点链接。
 - **升级后界面没变化**：插件会继续运行旧的 `lib/`，请重新安装插件并重启 `dsh web`，然后硬刷新（Ctrl+Shift+R）；
 - **提示 `auth.json` 权限不正确**：按上面的 `chmod 600` 处理；插件拒绝读取符号链接或组/其他用户可读的文件；
 - **出现「没有回复」**：请升级到 `1.0.1` 或更高版本。`1.0.0` 存在一个缺陷：工具调用轮次会因流片段无法无损序列化而整轮中止，界面上完全没有回复。

package/lib/client.js

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

package/lib/index.js

@@ -326,11 +326,11 @@ async function readResponseJson(response, options = {}) {
 import { existsSync as existsSync2 } from "node:fs";
 import { dirname, join as join2 } from "node:path";
 import { pathToFileURL } from "node:url";
-var GROK_API_HOSTS = Object.freeze(["cli-chat-proxy.grok.com"]);
 var HTTP_PROXY_PATTERN = /^https?:\/\//iu;
 var HOST_PROXY_PACKAGE = "@deepseek-ai/dsh-http-proxy";
-var installed;
-var dependencies = { undici: void 0, hostProxies: void 0 };
+var GROK_ORIGIN = "https://cli-chat-proxy.grok.com/";
+var cached;
+var dependencies = { undici: void 0, hostProxies: void 0, hostProxyEnv: void 0 };
 function apiProxyUrl(env = process.env) {
   const named = [env?.GROK_API_PROXY, env?.GROK_PROXY];
   for (const candidate of named) {
@@ -338,13 +338,6 @@ function apiProxyUrl(env = process.env) {
   }
   return void 0;
 }
-function hostOf(origin) {
-  try {
-    return new URL(origin).hostname;
-  } catch {
-    return "";
-  }
-}
 async function loadHostUndici() {
   let dir = dirname(process.argv[1] ?? "");
   for (let depth = 0; depth < 6 && dir && dir !== dirname(dir); depth++) {
@@ -364,55 +357,51 @@ async function loadHostUndici() {
     return void 0;
   }
 }
-async function hostProxiesGrok() {
+async function hostProxyModule() {
+  try {
+    return await import(HOST_PROXY_PACKAGE);
+  } catch {
+    return void 0;
+  }
+}
+async function hostAlreadyProxiesGrok() {
   if (typeof dependencies.hostProxies === "function") return dependencies.hostProxies();
+  const mod = await hostProxyModule();
   try {
-    const mod = await import(HOST_PROXY_PACKAGE);
-    const route = mod?.proxyRouteFor?.(`https://${GROK_API_HOSTS[0]}/`);
-    return route?.proxied === true;
+    return mod?.proxyRouteFor?.(GROK_ORIGIN)?.proxied === true;
   } catch {
     return false;
   }
 }
-async function ensureApiRouting(env = process.env) {
-  const url = apiProxyUrl(env);
-  if (!url || !HTTP_PROXY_PATTERN.test(url)) return "direct";
-  if (installed?.url === url) return "plugin";
-  if (await hostProxiesGrok()) return "host";
-  const undici = dependencies.undici ?? await loadHostUndici();
-  const { Agent, Pool, ProxyAgent, getGlobalDispatcher, setGlobalDispatcher } = undici ?? {};
-  if (typeof Agent !== "function" || typeof setGlobalDispatcher !== "function") return "direct";
+var CHILD_PROXY_NAMES = ["http_proxy", "https_proxy", "all_proxy", "HTTP_PROXY", "HTTPS_PROXY", "ALL_PROXY"];
+function proxyOverlay(value) {
+  if (!value || typeof value !== "object") return void 0;
+  return CHILD_PROXY_NAMES.some((name2) => typeof value[name2] === "string" && value[name2].trim()) ? value : void 0;
+}
+async function hostProxyEnvironment() {
+  if (typeof dependencies.hostProxyEnv === "function") return proxyOverlay(dependencies.hostProxyEnv());
+  const mod = await hostProxyModule();
   try {
-    const tunnel = new ProxyAgent(url);
-    const routing = new Agent({
-      factory(origin, options) {
-        return GROK_API_HOSTS.includes(hostOf(origin)) ? tunnel : new Pool(origin, options);
-      }
-    });
-    const previous = typeof getGlobalDispatcher === "function" ? getGlobalDispatcher() : void 0;
-    setGlobalDispatcher(routing);
-    installed = {
-      url,
-      dispatcher: routing,
-      restore: () => {
-        if (previous !== void 0) setGlobalDispatcher(previous);
-        installed = void 0;
-      }
-    };
-    return "plugin";
+    const overlay = typeof mod?.proxyEnvironmentForChild === "function" ? mod.proxyEnvironmentForChild() : void 0;
+    return proxyOverlay(overlay);
   } catch {
-    return "direct";
+    return void 0;
   }
 }
-function resetApiRouting() {
-  const current = installed;
-  installed = void 0;
-  if (!current) return false;
+async function grokFetch(env = process.env) {
+  const url = apiProxyUrl(env);
+  if (!url || !HTTP_PROXY_PATTERN.test(url)) return void 0;
+  if (await hostAlreadyProxiesGrok()) return void 0;
+  if (cached?.url === url) return cached.fetch;
+  const undici = dependencies.undici ?? await loadHostUndici();
+  if (typeof undici?.fetch !== "function" || typeof undici?.ProxyAgent !== "function") return void 0;
   try {
-    current.restore();
-    return true;
+    const dispatcher = new undici.ProxyAgent(url);
+    const fetchImpl = (input, init) => undici.fetch(input, { ...init, dispatcher });
+    cached = { url, fetch: fetchImpl };
+    return fetchImpl;
   } catch {
-    return false;
+    return void 0;
   }
 }
 
@@ -538,8 +527,7 @@ function toLlmModels(models) {
   });
 }
 async function fetchLiveCatalog(accessToken, options = {}) {
-  await ensureApiRouting(options.env);
-  const fetchImpl = options.fetch ?? globalThis.fetch;
+  const fetchImpl = options.fetch ?? await grokFetch(options.env) ?? globalThis.fetch;
   const signal = options.signal ?? AbortSignal.timeout(options.timeoutMs ?? CATALOG_TIMEOUT_MS);
   const response = await fetchImpl(MODELS_V2_URL, {
     method: "GET",
@@ -784,9 +772,9 @@ async function fetchBillingUsageOnce(accessToken, options = {}) {
   }
   let response;
   try {
-    await ensureApiRouting(options.env);
     const signal = options.signal ?? AbortSignal.timeout(options.timeoutMs ?? USAGE_TIMEOUT_MS);
-    response = await fetchImpl(BILLING_CREDITS_URL, {
+    const tunnelFetch = options.fetch ? void 0 : await grokFetch(options.env);
+    response = await (tunnelFetch ?? fetchImpl)(BILLING_CREDITS_URL, {
       method: "GET",
       headers: {
         Accept: "application/json",
@@ -1206,7 +1194,7 @@ function jsonSafeChunk(value) {
   return out;
 }
 async function* streamResponsesUnsafe(options, token) {
-  await ensureApiRouting();
+  const fetchImpl = await grokFetch() ?? globalThis.fetch;
   const headers = {
     Accept: "text/event-stream",
     "Content-Type": "application/json",
@@ -1232,7 +1220,7 @@ async function* streamResponsesUnsafe(options, token) {
   const tools = cacheStableTools(options.tools);
   if (tools.length) body.tools = tools;
   if (options.reasoningEffort) body.reasoning = { effort: options.reasoningEffort };
-  const response = await fetch(RESPONSES_URL, {
+  const response = await fetchImpl(RESPONSES_URL, {
     method: "POST",
     headers,
     body: JSON.stringify(body),
@@ -1570,9 +1558,10 @@ function buildAuthConfig() {
     }
   };
 }
-function withEncryptedReasoningInclude(api) {
+function withEncryptedReasoningInclude(api, fetchImpl) {
   const inject2 = (options) => ({
     ...options,
+    ...typeof fetchImpl === "function" ? { fetch: fetchImpl } : {},
     samplingParams: {
       ...options?.samplingParams,
       include: ["reasoning.encrypted_content"]
@@ -1642,8 +1631,7 @@ async function createGrokBuildAdapter(session, options = {}) {
   if (!responsesApi) {
     return { adapter: asHostAdapter(duck), kind: "custom-mvp", note: "openai-responses API module is unavailable; using the custom adapter." };
   }
-  await ensureApiRouting();
-  responsesApi = withEncryptedReasoningInclude(responsesApi);
+  responsesApi = withEncryptedReasoningInclude(responsesApi, await grokFetch());
   const store = createStore(session);
   const authModels = piAi.createModels({
     credentials: store,
@@ -1772,6 +1760,17 @@ function cliProxyEnv(env = process.env) {
     no_proxy: bypass
   };
 }
+async function resolveCliEnv(env = process.env) {
+  const base = env ?? process.env;
+  const overlay = await hostProxyEnvironment();
+  if (!overlay) return cliProxyEnv(base);
+  const next = { ...base };
+  for (const [key, value] of Object.entries(overlay)) {
+    if (value === void 0) delete next[key];
+    else next[key] = value;
+  }
+  return next;
+}
 function openExternal(url, options = {}) {
   const spawnFn = options.spawn ?? spawn;
   const platform = options.platform ?? process.platform;
@@ -1797,18 +1796,19 @@ function openExternal(url, options = {}) {
 }
 var LOGIN_URL_PATTERN = /https?:\/\/[^\s<>"'`\\]+/u;
 var DEVICE_CODE_PATTERN = /\b([A-Z0-9]{4}-[A-Z0-9]{4})\b/u;
-function spawnGrokLogin(options = {}) {
+async function spawnGrokLogin(options = {}) {
   const spawnFn = options.spawn ?? spawn;
   const bin = resolveGrokBin(options.env, options.exists);
   const args = options.device ? ["login", "--device-auth"] : ["login"];
   const startTimeoutMs = typeof options.startTimeoutMs === "number" && options.startTimeoutMs > 0 ? options.startTimeoutMs : LOGIN_START_TIMEOUT_MS;
   const openUrl = options.openUrl ?? ((url) => openExternal(url, { spawn: options.openSpawn }));
+  const childEnv = await resolveCliEnv(options.env);
   return new Promise((resolve, reject) => {
     let child;
     try {
       child = spawnFn(bin, args, {
         stdio: options.stdio ?? ["ignore", "pipe", "pipe"],
-        env: cliProxyEnv(options.env)
+        env: childEnv
       });
     } catch (error) {
       reject(new Error(`Could not start grok CLI (${bin})`, { cause: error }));
@@ -1871,16 +1871,17 @@ function spawnGrokLogin(options = {}) {
     });
   });
 }
-function spawnGrokRefresh(options = {}) {
+async function spawnGrokRefresh(options = {}) {
   const spawnFn = options.spawn ?? spawn;
   const bin = resolveGrokBin(options.env, options.exists);
   const timeoutMs = typeof options.timeoutMs === "number" && options.timeoutMs > 0 ? options.timeoutMs : CLI_REFRESH_TIMEOUT_MS;
+  const childEnv = await resolveCliEnv(options.env);
   return new Promise((resolve, reject) => {
     let child;
     try {
       child = spawnFn(bin, ["models"], {
         stdio: options.stdio ?? "ignore",
-        env: cliProxyEnv(options.env)
+        env: childEnv
       });
     } catch (error) {
       reject(new Error(`Could not start grok CLI (${bin})`, { cause: error }));
@@ -2309,8 +2310,8 @@ async function findInstall({ dshHome, ownPackageJsonUrl }) {
     declared.push({ profile: entry.name, spec });
     if (ownReal === void 0) continue;
     try {
-      const installed2 = await realpath(join5(profileDir, "node_modules", PACKAGE_NAME, "package.json"));
-      if (installed2 === ownReal) return { kind: classifySpec(spec), profile: entry.name };
+      const installed = await realpath(join5(profileDir, "node_modules", PACKAGE_NAME, "package.json"));
+      if (installed === ownReal) return { kind: classifySpec(spec), profile: entry.name };
     } catch {
     }
   }
@@ -2377,7 +2378,7 @@ function createGrokPluginManager({
   if (typeof fetchImpl !== "function") throw new Error("Grok plugin manager requires fetch");
   if (typeof runCommand !== "function") throw new Error("Grok plugin manager requires runCommand");
   const dshHome = typeof env.DSH_HOME === "string" && env.DSH_HOME !== "" ? env.DSH_HOME : join5(homedir3(), ".dsh");
-  let cached;
+  let cached2;
   let inFlight;
   let generation = 0;
   let updating = false;
@@ -2428,11 +2429,11 @@ function createGrokPluginManager({
   return Object.freeze({
     async read({ force = false, signal } = {}) {
       signal?.throwIfAborted();
-      if (!force && cached !== void 0 && now() - cached.fetchedAt < ttlMs) return clone(cached);
+      if (!force && cached2 !== void 0 && now() - cached2.fetchedAt < ttlMs) return clone(cached2);
       const createPending = (requestSignal) => {
         const observedGeneration = generation;
         return load(requestSignal).then((value) => {
-          if (generation === observedGeneration) cached = value;
+          if (generation === observedGeneration) cached2 = value;
           return value;
         });
       };
@@ -2475,7 +2476,7 @@ function createGrokPluginManager({
         }
         if (result.code !== 0) throw new Error("Grok plugin update failed");
         generation += 1;
-        cached = void 0;
+        cached2 = void 0;
         return { version: latest, profile: install.profile };
       } finally {
         updating = false;
@@ -2483,7 +2484,7 @@ function createGrokPluginManager({
     },
     invalidate() {
       generation += 1;
-      cached = void 0;
+      cached2 = void 0;
     }
   });
 }
@@ -2760,18 +2761,6 @@ function apply(ctx, options = {}) {
       "grok-subscription: startup lifetime"
     );
   }
-  void ensureApiRouting().then((mode) => {
-    if (mode === "direct") return;
-    ctx.logger?.debug?.("Grok subscription API route: %s", mode);
-  }).catch((error) => {
-    ctx.logger?.debug?.(
-      "Grok subscription API route skipped: %s",
-      error instanceof Error ? error.message : "unknown"
-    );
-  });
-  if (typeof ctx.effect === "function") {
-    ctx.effect(() => () => resetApiRouting(), "grok-subscription: API proxy route");
-  }
   const notifyCatalogChange = () => {
     scheduleDeferred2(() => {
       if (!active) return;

package/package.json

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