dsh-grok-subscription 1.0.19 → 1.0.20

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 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.
+- **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. This plugin does not configure a proxy of its own. When a tunnel is required, set the standard `https_proxy` / `http_proxy` in the launching environment or in `~/.dsh/.env` (never in a project `.env`). `@deepseek-ai/dsh-http-proxy` then routes `fetch` and the `grok` CLI this plugin spawns. 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 请求**（走宿主 undici 的 fetch，不替换进程的全局调度器）和它启动的 **`grok` CLI**。其他插件、DSH 自身和其他 provider 继续用宿主原来的 `fetch`。想让整个 Harness 走代理时，用标准的 `https_proxy`（可写在 `~/.dsh/.env`，不要写进项目目录），宿主的 `@deepseek-ai/dsh-http-proxy` 会接管，本插件不再另加隧道。写好后重启客户端；登录链接会交给系统浏览器打开，面板里同时显示一次性验证码与可点链接。
+- **登录不弹浏览器 / 聊天报 `fetch failed` / 用量「Billing request timed out」**：这三件事都指向同一个原因——`accounts.x.ai` 与 `cli-chat-proxy.grok.com` 在部分网络里必须走隧道。插件不再自己配代理。需要隧道时，在启动环境或 `~/.dsh/.env` 里写标准变量 `https_proxy` / `http_proxy`（不要写进项目目录的 `.env`），宿主的 `@deepseek-ai/dsh-http-proxy` 会让 `fetch` 和本插件拉起的 `grok` CLI 一起走它。写好后重启客户端；登录链接会交给系统浏览器打开，面板里同时显示一次性验证码与可点链接。
 - **升级后界面没变化**：插件会继续运行旧的 `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.19",
+  subtitle: "\u7528 SuperGrok / X Premium\uFF08Grok Build\uFF09\u4F1A\u8BDD\uFF0C\u800C\u4E0D\u662F XAI_API_KEY\u3002\xB7 1.0.20",
   signedIn: "\u5DF2\u767B\u5F55",
   signedOut: "\u672A\u767B\u5F55",
   account: "\u8D26\u6237",
@@ -58,7 +58,7 @@ var zh = {
   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",
+  loginNoUrl: "\u6CA1\u62FF\u5230\u767B\u5F55\u94FE\u63A5\uFF1A\u8BF7\u786E\u8BA4 grok CLI \u80FD\u8BBF\u95EE x.ai\u3002\u684C\u9762\u7248\u9700\u8981\u4EE3\u7406\u65F6\uFF0C\u5728 ~/.dsh/.env \u8BBE\u7F6E https_proxy \u540E\u91CD\u542F\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",
@@ -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.19",
+  subtitle: "Use a SuperGrok / X Premium (Grok Build) session, not XAI_API_KEY. \xB7 1.0.20",
   signedIn: "Signed in",
   signedOut: "Signed out",
   account: "Account",
@@ -138,7 +138,7 @@ var en = {
   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.",
+  loginNoUrl: "No sign-in link was returned: make sure the grok CLI can reach x.ai. If the desktop app needs a proxy, set https_proxy in ~/.dsh/.env and restart.",
   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",

package/lib/index.js

@@ -42,9 +42,9 @@ var LOGIN_START_TIMEOUT_MS = 1e4;
 var LOGIN_HANDLER_TIMEOUT_MS = 2e4;
 
 // src/session.js
-import { existsSync as existsSync4 } from "node:fs";
+import { existsSync as existsSync3 } from "node:fs";
 import { spawn } from "node:child_process";
-import { join as join4 } from "node:path";
+import { join as join3 } from "node:path";
 
 // src/auth-file.js
 import { lstatSync, openSync, readFileSync, closeSync, constants as fsConstants } from "node:fs";
@@ -322,89 +322,6 @@ async function readResponseJson(response, options = {}) {
   return JSON.parse(await readResponseText(response, options));
 }
 
-// src/proxy.js
-import { existsSync as existsSync2 } from "node:fs";
-import { dirname, join as join2 } from "node:path";
-import { pathToFileURL } from "node:url";
-var HTTP_PROXY_PATTERN = /^https?:\/\//iu;
-var HOST_PROXY_PACKAGE = "@deepseek-ai/dsh-http-proxy";
-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) {
-    if (typeof candidate === "string" && candidate.trim()) return candidate.trim();
-  }
-  return void 0;
-}
-async function loadHostUndici() {
-  let dir = dirname(process.argv[1] ?? "");
-  for (let depth = 0; depth < 6 && dir && dir !== dirname(dir); depth++) {
-    const entry = join2(dir, "node_modules", "undici", "index.js");
-    if (existsSync2(entry)) {
-      try {
-        return await import(pathToFileURL(entry).href);
-      } catch {
-        break;
-      }
-    }
-    dir = dirname(dir);
-  }
-  try {
-    return await import("undici");
-  } catch {
-    return void 0;
-  }
-}
-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 {
-    return mod?.proxyRouteFor?.(GROK_ORIGIN)?.proxied === true;
-  } catch {
-    return false;
-  }
-}
-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 overlay = typeof mod?.proxyEnvironmentForChild === "function" ? mod.proxyEnvironmentForChild() : void 0;
-    return proxyOverlay(overlay);
-  } catch {
-    return void 0;
-  }
-}
-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 {
-    const dispatcher = new undici.ProxyAgent(url);
-    const fetchImpl = (input, init) => undici.fetch(input, { ...init, dispatcher });
-    cached = { url, fetch: fetchImpl };
-    return fetchImpl;
-  } catch {
-    return void 0;
-  }
-}
-
 // src/catalog.js
 var REASONING_LEVELS = Object.freeze(["low", "medium", "high", "xhigh"]);
 function asId(value) {
@@ -527,7 +444,7 @@ function toLlmModels(models) {
   });
 }
 async function fetchLiveCatalog(accessToken, options = {}) {
-  const fetchImpl = options.fetch ?? await grokFetch(options.env) ?? globalThis.fetch;
+  const fetchImpl = options.fetch ?? globalThis.fetch;
   const signal = options.signal ?? AbortSignal.timeout(options.timeoutMs ?? CATALOG_TIMEOUT_MS);
   const response = await fetchImpl(MODELS_V2_URL, {
     method: "GET",
@@ -773,8 +690,7 @@ async function fetchBillingUsageOnce(accessToken, options = {}) {
   let response;
   try {
     const signal = options.signal ?? AbortSignal.timeout(options.timeoutMs ?? USAGE_TIMEOUT_MS);
-    const tunnelFetch = options.fetch ? void 0 : await grokFetch(options.env);
-    response = await (tunnelFetch ?? fetchImpl)(BILLING_CREDITS_URL, {
+    response = await fetchImpl(BILLING_CREDITS_URL, {
       method: "GET",
       headers: {
         Accept: "application/json",
@@ -850,11 +766,11 @@ async function fetchBillingUsage(accessToken, options = {}) {
 }
 
 // src/adapter.js
-import { existsSync as existsSync3, readFileSync as readFileSync3 } from "node:fs";
+import { existsSync as existsSync2, readFileSync as readFileSync3 } from "node:fs";
 import { createRequire } from "node:module";
 import { homedir as homedir2 } from "node:os";
-import { dirname as dirname2, join as join3 } from "node:path";
-import { pathToFileURL as pathToFileURL2 } from "node:url";
+import { dirname, join as join2 } from "node:path";
+import { pathToFileURL } from "node:url";
 function withImportTimeout(promise, ms, message) {
   let timer;
   return Promise.race([
@@ -874,28 +790,28 @@ function hostModuleRoots(env = process.env, argv1 = process.argv[1]) {
   const override = env.DSH_GROK_PEER_ROOT;
   if (typeof override === "string" && override.trim()) push(override.trim());
   if (typeof argv1 === "string" && argv1) {
-    let dir = dirname2(argv1);
-    for (let depth = 0; depth < 6 && dir && dir !== dirname2(dir); depth++) {
-      push(join3(dir, "node_modules"));
-      dir = dirname2(dir);
+    let dir = dirname(argv1);
+    for (let depth = 0; depth < 6 && dir && dir !== dirname(dir); depth++) {
+      push(join2(dir, "node_modules"));
+      dir = dirname(dir);
     }
   }
   const prefix = env.NPM_CONFIG_PREFIX;
-  if (typeof prefix === "string" && prefix.trim()) push(join3(prefix.trim(), "lib", "node_modules"));
+  if (typeof prefix === "string" && prefix.trim()) push(join2(prefix.trim(), "lib", "node_modules"));
   if (typeof process.execPath === "string" && process.execPath) {
-    push(join3(dirname2(process.execPath), "..", "lib", "node_modules"));
+    push(join2(dirname(process.execPath), "..", "lib", "node_modules"));
   }
-  push(join3("/opt/homebrew", "lib", "node_modules"));
-  push(join3("/usr/local", "lib", "node_modules"));
+  push(join2("/opt/homebrew", "lib", "node_modules"));
+  push(join2("/usr/local", "lib", "node_modules"));
   for (const segment of ["Library/pnpm", ".local/share/pnpm", ".pnpm-global"]) {
-    push(join3(homedir2(), segment, "node_modules"));
+    push(join2(homedir2(), segment, "node_modules"));
   }
   if (typeof env.DSH_PORTABLE_HOME === "string" && env.DSH_PORTABLE_HOME.trim()) {
-    push(join3(env.DSH_PORTABLE_HOME.trim(), "node_modules"));
+    push(join2(env.DSH_PORTABLE_HOME.trim(), "node_modules"));
   }
-  push(join3(homedir2(), ".local", "lib", "node_modules"));
-  const dshHome = typeof env.DSH_HOME === "string" && env.DSH_HOME.trim() ? env.DSH_HOME.trim() : join3(homedir2(), ".dsh");
-  push(join3(dshHome, "profiles", "node_modules"));
+  push(join2(homedir2(), ".local", "lib", "node_modules"));
+  const dshHome = typeof env.DSH_HOME === "string" && env.DSH_HOME.trim() ? env.DSH_HOME.trim() : join2(homedir2(), ".dsh");
+  push(join2(dshHome, "profiles", "node_modules"));
   return roots;
 }
 function splitSpecifier(specifier) {
@@ -939,14 +855,14 @@ function resolveExportsTarget(exportsField, subpath) {
 function resolveHostSpecifierManually(root, specifier) {
   const { name: name2, subpath } = splitSpecifier(specifier);
   const candidates = [
-    join3(root, name2),
-    join3(root, "node_modules", name2),
-    join3(root, "@deepseek-ai", "dsh", "node_modules", name2),
-    join3(root, "node_modules", "@deepseek-ai", "dsh", "node_modules", name2)
+    join2(root, name2),
+    join2(root, "node_modules", name2),
+    join2(root, "@deepseek-ai", "dsh", "node_modules", name2),
+    join2(root, "node_modules", "@deepseek-ai", "dsh", "node_modules", name2)
   ];
   for (const pkgDir of candidates) {
-    const manifest = join3(pkgDir, "package.json");
-    if (!existsSync3(manifest)) continue;
+    const manifest = join2(pkgDir, "package.json");
+    if (!existsSync2(manifest)) continue;
     let pkg;
     try {
       pkg = JSON.parse(readFileSync3(manifest, "utf8"));
@@ -955,15 +871,15 @@ function resolveHostSpecifierManually(root, specifier) {
     }
     const target = pkg.exports !== void 0 ? resolveExportsTarget(pkg.exports, subpath) : subpath === "." ? pkg.module ?? pkg.main ?? "index.js" : void 0;
     if (typeof target !== "string" || !target) continue;
-    const file = join3(pkgDir, target);
-    if (existsSync3(file)) return file;
+    const file = join2(pkgDir, target);
+    if (existsSync2(file)) return file;
   }
   return void 0;
 }
 function resolveHostSpecifier(specifier, roots = hostModuleRoots()) {
   for (const root of roots) {
     try {
-      const resolved = createRequire(join3(root, "noop.js")).resolve(specifier);
+      const resolved = createRequire(join2(root, "noop.js")).resolve(specifier);
       if (typeof resolved === "string" && resolved) return resolved;
     } catch {
     }
@@ -979,7 +895,7 @@ async function optionalImport(specifier, options = {}) {
   const candidates = [specifier];
   if (!injected && !specifier.startsWith(".") && !specifier.startsWith("/") && !specifier.startsWith("file:")) {
     const resolved = resolveHostSpecifier(specifier, options.hostRoots ?? hostModuleRoots());
-    if (resolved) candidates.push(pathToFileURL2(resolved).href);
+    if (resolved) candidates.push(pathToFileURL(resolved).href);
   }
   for (const candidate of candidates) {
     try {
@@ -1194,7 +1110,6 @@ function jsonSafeChunk(value) {
   return out;
 }
 async function* streamResponsesUnsafe(options, token) {
-  const fetchImpl = await grokFetch() ?? globalThis.fetch;
   const headers = {
     Accept: "text/event-stream",
     "Content-Type": "application/json",
@@ -1220,7 +1135,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 fetchImpl(RESPONSES_URL, {
+  const response = await fetch(RESPONSES_URL, {
     method: "POST",
     headers,
     body: JSON.stringify(body),
@@ -1558,10 +1473,9 @@ function buildAuthConfig() {
     }
   };
 }
-function withEncryptedReasoningInclude(api, fetchImpl) {
+function withEncryptedReasoningInclude(api) {
   const inject2 = (options) => ({
     ...options,
-    ...typeof fetchImpl === "function" ? { fetch: fetchImpl } : {},
     samplingParams: {
       ...options?.samplingParams,
       include: ["reasoning.encrypted_content"]
@@ -1631,7 +1545,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." };
   }
-  responsesApi = withEncryptedReasoningInclude(responsesApi, await grokFetch());
+  responsesApi = withEncryptedReasoningInclude(responsesApi);
   const store = createStore(session);
   const authModels = piAi.createModels({
     credentials: store,
@@ -1722,54 +1636,17 @@ async function createGrokBuildAdapter(session, options = {}) {
 }
 
 // src/session.js
-function resolveGrokBin(env = process.env, exists = existsSync4) {
+function resolveGrokBin(env = process.env, exists = existsSync3) {
   if (typeof env.DSH_GROK_BIN === "string" && env.DSH_GROK_BIN.trim()) return env.DSH_GROK_BIN.trim();
-  const local = join4(grokHome(env), "bin", "grok");
+  const local = join3(grokHome(env), "bin", "grok");
   if (exists(local)) return local;
   return "grok";
 }
-function grokCliAvailable(env = process.env, exists = existsSync4) {
+function grokCliAvailable(env = process.env, exists = existsSync3) {
   const bin = resolveGrokBin(env, exists);
   if (bin.includes("/") || bin.includes("\\")) return exists(bin);
   const delimiter = process.platform === "win32" ? ";" : ":";
-  return String(env.PATH ?? "").split(delimiter).some((dir) => dir && exists(join4(dir, bin)));
-}
-var STANDARD_PROXY_NAMES = [
-  "http_proxy",
-  "https_proxy",
-  "all_proxy",
-  "no_proxy",
-  "HTTP_PROXY",
-  "HTTPS_PROXY",
-  "ALL_PROXY",
-  "NO_PROXY"
-];
-function cliProxyEnv(env = process.env) {
-  const base = env ?? process.env;
-  const declared = STANDARD_PROXY_NAMES.some((name2) => typeof base[name2] === "string" && base[name2].trim() !== "");
-  if (declared) return base;
-  const named = [base.GROK_CLI_PROXY, base.GROK_PROXY].find((value) => typeof value === "string" && value.trim() !== "");
-  const proxy = typeof named === "string" ? named.trim() : "";
-  if (!proxy) return base;
-  const bypass = typeof base.GROK_CLI_NO_PROXY === "string" && base.GROK_CLI_NO_PROXY.trim() ? base.GROK_CLI_NO_PROXY.trim() : "localhost,127.0.0.1,::1";
-  const httpish = /^https?:\/\//iu.test(proxy);
-  return {
-    ...base,
-    ...httpish ? { http_proxy: proxy, https_proxy: proxy } : {},
-    all_proxy: proxy,
-    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;
+  return String(env.PATH ?? "").split(delimiter).some((dir) => dir && exists(join3(dir, bin)));
 }
 function openExternal(url, options = {}) {
   const spawnFn = options.spawn ?? spawn;
@@ -1802,13 +1679,12 @@ async function spawnGrokLogin(options = {}) {
   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: childEnv
+        env: options.env ?? process.env
       });
     } catch (error) {
       reject(new Error(`Could not start grok CLI (${bin})`, { cause: error }));
@@ -1875,13 +1751,12 @@ 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: childEnv
+        env: options.env ?? process.env
       });
     } catch (error) {
       reject(new Error(`Could not start grok CLI (${bin})`, { cause: error }));
@@ -2248,7 +2123,7 @@ function createSessionService({
 import { spawn as spawn2 } from "node:child_process";
 import { readdir, readFile, realpath } from "node:fs/promises";
 import { homedir as homedir3 } from "node:os";
-import { join as join5 } from "node:path";
+import { join as join4 } from "node:path";
 import { fileURLToPath } from "node:url";
 var PACKAGE_NAME = PLUGIN_ID;
 var NPM_REGISTRY_LATEST_URL = `https://registry.npmjs.org/${PACKAGE_NAME}/latest`;
@@ -2297,20 +2172,20 @@ async function findInstall({ dshHome, ownPackageJsonUrl }) {
   }
   let entries = [];
   try {
-    entries = await readdir(join5(dshHome, "profiles"), { withFileTypes: true });
+    entries = await readdir(join4(dshHome, "profiles"), { withFileTypes: true });
   } catch {
     entries = [];
   }
   const declared = [];
   for (const entry of entries) {
     if (!entry.isDirectory()) continue;
-    const profileDir = join5(dshHome, "profiles", entry.name);
-    const spec = (await readManifest(join5(profileDir, "package.json")))?.dependencies?.[PACKAGE_NAME];
+    const profileDir = join4(dshHome, "profiles", entry.name);
+    const spec = (await readManifest(join4(profileDir, "package.json")))?.dependencies?.[PACKAGE_NAME];
     if (typeof spec !== "string") continue;
     declared.push({ profile: entry.name, spec });
     if (ownReal === void 0) continue;
     try {
-      const installed = await realpath(join5(profileDir, "node_modules", PACKAGE_NAME, "package.json"));
+      const installed = await realpath(join4(profileDir, "node_modules", PACKAGE_NAME, "package.json"));
       if (installed === ownReal) return { kind: classifySpec(spec), profile: entry.name };
     } catch {
     }
@@ -2377,8 +2252,8 @@ 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 cached2;
+  const dshHome = typeof env.DSH_HOME === "string" && env.DSH_HOME !== "" ? env.DSH_HOME : join4(homedir3(), ".dsh");
+  let cached;
   let inFlight;
   let generation = 0;
   let updating = false;
@@ -2429,11 +2304,11 @@ function createGrokPluginManager({
   return Object.freeze({
     async read({ force = false, signal } = {}) {
       signal?.throwIfAborted();
-      if (!force && cached2 !== void 0 && now() - cached2.fetchedAt < ttlMs) return clone(cached2);
+      if (!force && cached !== void 0 && now() - cached.fetchedAt < ttlMs) return clone(cached);
       const createPending = (requestSignal) => {
         const observedGeneration = generation;
         return load(requestSignal).then((value) => {
-          if (generation === observedGeneration) cached2 = value;
+          if (generation === observedGeneration) cached = value;
           return value;
         });
       };
@@ -2476,7 +2351,7 @@ function createGrokPluginManager({
         }
         if (result.code !== 0) throw new Error("Grok plugin update failed");
         generation += 1;
-        cached2 = void 0;
+        cached = void 0;
         return { version: latest, profile: install.profile };
       } finally {
         updating = false;
@@ -2484,7 +2359,7 @@ function createGrokPluginManager({
     },
     invalidate() {
       generation += 1;
-      cached2 = void 0;
+      cached = void 0;
     }
   });
 }

package/package.json

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