@liustack/modlens 3.17.3 → 3.18.0

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # Changelog
 
+## 3.18.0 - 2026-08-16
+
+- **Windows: the CLI providers start again, and a shim is now read by recognising it rather than parsing it ([#43](https://github.com/liustack/modlens/issues/43)).** npm installs a compiled CLI as a `.cmd` that runs the `.exe` beside it, and handing that `.cmd` to spawn is the `EINVAL` that broke the `claude-cli` fallback and the `opencode` reuse probe. The first attempt at this classified each line of the batch file against a whitelist and reasoned about the ones it recognised. Review found eight defects in it, every one the same shape: a line cannot be judged on its own, because whether it runs at all is a property of the file. The last was an `IF EXIST` whose condition is false, where `cmd` runs nothing and the reader still produced a plan that launched the provider. Trading a loud failure for a silent wrong action is worse than the bug being fixed, so that version was withdrawn from 3.17.1 rather than shipped.
+  What ships instead recognises the exact shapes the two real generators emit, each with its own fixed recipe, and declines everything else. npm's Node shim is two templates rather than one, because the `PATHEXT` edit changes meaning between them: through `cmd-shim` 9.0.1 it sits inside `SETLOCAL` while the execution line begins with `endLocal`, so it is undone before the lookup and before the child starts, and honouring it would reproduce a bug npm fixed in 9.0.2; from 9.0.2 it rides the execution line after `endLocal`, where it applies to either arm. pnpm writes it inside the `ELSE` block and never calls `endlocal`, so it applies to that arm alone. npm's native template calls no `ENDLOCAL` at all, so its child inherits the `dp0` the prologue set, and the plan carries it.
+  A bare `node` is now resolved the way `cmd` resolves it, which Windows CI settled rather than reasoning: the working directory before `PATH` unless `NoDefaultCurrentDirectoryInExePath` says otherwise, relative `PATH` entries anchored to that directory, `PATHEXT` extensions before the bare name, and a hit that is itself a batch file declined. There is no `process.execPath` fallback, which would run a different Node than the shell whenever a portable install or an overridden `PATH` is involved.
+  The existence test never takes its operand from the file: each recipe tests the one candidate it is about to run, built from the shim's own directory, and the file has to name exactly that. A path captured out of an untrusted file and handed to the filesystem is a file-existence oracle, and a UNC or device path turns a check into network I/O and authentication that reading a local shim never authorised. Relative, drive-relative, root-relative, UNC and device paths are refused before the file is opened. Existence is tri-state, because `existsSync` folds a permission error into "absent" and absent decides which program runs.
+  **What this costs.** Shims outside the recognised set are now declined and left to the original `EINVAL` rather than being run a way that might differ from your shell. Current npm and pnpm installs are covered. Not covered: `cmd-shim` 1.0.1 through 2.1.0 and 3.0.2, `@zkochan/cmd-shim` 2.x through 5.1.0, newer pnpm shims carrying `progArgs`, a pnpm shim whose pinned `nodeExecPath` is itself a `.cmd` or `.bat`, an npm shebang using a separated argument value such as `--require ./preload.cjs`, and a shim whose own relative target text contains a space. A directory with a space in its name is fine: that space lives in `%dp0%` and expands at run time. If one of those is yours, the issue tracker is the place, and a fork is a reasonable answer too, since Windows fixes here move at the speed of CI rather than of a developer with the machine in front of them.
+- **`PATH` is read the way each platform reads it.** Building a child environment by spreading `process.env` produces a plain object, and that object is case-sensitive even on Windows, where the key is usually spelled `Path`. Every CLI could then read as missing. One shared rule now covers the outer command lookup, the lookup inside a shim recipe, and the environment a plan hands the child: exact name on POSIX, folded name on Windows, with the spelling Node itself would pass.
+
 ## 3.17.3 - 2026-08-16
 
 - **Windows: a successful read is no longer thrown away by its own cleanup ([#50](https://github.com/liustack/modlens/issues/50)).** The reporter saw `kimi-cli` run its full 45 seconds, finish the turn, and then fail with `EPERM` on a path that turned out to be modlens's own throwaway directory. It is not a kimi permission problem and no amount of granting it access would have helped: that directory is the provider's working directory, and Windows will not delete a directory a live process still holds open as its current directory. Something still held it when kimi's output arrived, which is ordinary: modlens stops waiting once the direct child exits, so a descendant, a language server, or a short-lived handle can outlive the output. `rmSync` threw, the throw came out of the `finally` that runs cleanup, and it replaced a perfectly good result with a failed attempt. Removal is best effort now, with one retry for the handle that is released a moment later, and a directory that still cannot go is left in the system temp directory for the OS to collect. Every subprocess provider was exposed to this on Windows, not just `kimi-cli`; kimi only made it reliable enough to notice. Thanks to @StarChen-Cycler, whose report pinned the failing path to the workdir itself, which is what made the cause findable.

package/README.md

@@ -34,7 +34,7 @@ Issues are welcome any time: [open one](https://github.com/liustack/modlens/issu
 
 ## Highlights
 
-**🥇 The first vision plugin for DeepSeek Harness (dsh):** one command, `npx -y @deepseek-ai/dsh plugin --profile web add @liustack/modlens@3.17.3`, and the text-only DeepSeek model behind dsh reads images through a native `modlens_read_image` tool. Updating is the same command again. The version is named rather than `@latest` on purpose: pnpm 11 holds back releases published in the last 24 hours and resolves the tag against what survives, so `@latest` would install whatever shipped a day ago ([details](docs/harness-setup.md#keeping-it-up-to-date)).
+**🥇 The first vision plugin for DeepSeek Harness (dsh):** one command, `npx -y @deepseek-ai/dsh plugin --profile web add @liustack/modlens@3.18.0`, and the text-only DeepSeek model behind dsh reads images through a native `modlens_read_image` tool. Updating is the same command again. The version is named rather than `@latest` on purpose: pnpm 11 holds back releases published in the last 24 hours and resolves the tag against what survives, so `@latest` would install whatever shipped a day ago ([details](docs/harness-setup.md#keeping-it-up-to-date)).
 
 Pasting an image works two ways. **① Just paste.** On a text-only model the pasted image lands as a private temp file and its path enters the composer — the same interaction OpenCode and Pi ship — and the `modlens_read_image` tool takes it from there. **② Pick a `(modlens vision)` entry** in the model selector (it remembers your choice, so once is enough), then paste: the thumbnail stays visible in your message, closer to the Codex app feel, and the image is converted to structured evidence at request time, answered by the same underlying route. The plugin auto-discovers every provider route carrying text-only DeepSeek or GLM models and adds a wrapped entry per route (a stock install gets **`DeepSeek-V4-Flash (modlens vision)`** and **`DeepSeek-V4-Pro (modlens vision)`**; extra routes like opencode-go or zai get their own); the two families' own vision models are excluded automatically. Which paste route applies is the host's per-model call: only a model its metadata positively confirms text-only is taken over, anything unconfirmed is left alone, so vision models keep their native paste ([details](docs/harness-setup.md)).
 
@@ -169,6 +169,8 @@ npx -y skills add liustack/vibemaster -g
 
 The projects worth recommending in the DeepSeek Harness ecosystem.
 
+- 🖥️ **[DeepSeek Harness Desktop](https://github.com/anywhere-labs/deepseek-harness-desktop)** — A desktop front end for DeepSeek Harness. Start and manage the Harness service on your own machine without installing Node.js or running a command. A plugin market, remote control from a phone, and IM channels are on its roadmap. [Site](https://www.dshdesktop.cn)
+  为 DeepSeek Harness 生态打造的现代化桌面端。不用配置 Node.js，也不用敲命令，就能启动和管理本机的 Harness 服务。后续还会支持插件市场、移动端远程控制和 IM Channels。[官网](https://www.dshdesktop.cn)
 - 🛒 **[dsh-market](https://github.com/dsh-market/dsh-market)** — The plugin market inside DeepSeek Harness. Browse 800+ community plugins with category filters and screenshot previews, one-click install and update, and live theme switching. Most need no restart.
   DeepSeek Harness 的可视化插件市场。设置页里直接逛社区全部 800+ 插件：分类筛选、截图预览、一键安装与更新、主题即点即换，装完多数免重启。
 

package/README.zh-CN.md

@@ -34,7 +34,7 @@ DeepSeek 和 GLM 的主力对话模型是纯文本的，无法进行图片识别
 
 ## 亮点
 
-**🥇 全网第一个支持 DeepSeek Harness（dsh）的外挂视觉识别插件：**一条命令 `npx -y @deepseek-ai/dsh plugin --profile web add @liustack/modlens@3.17.3`，dsh 背后的纯文本 DeepSeek 模型即可通过原生 `modlens_read_image` 工具读图。更新就是再跑一遍同一条命令。这里点名版本号而不用 `@latest` 是有意的：pnpm 11 会扣住最近 24 小时内发布的版本，dist-tag 只在剩下的里面解析，用 `@latest` 装到的会是一天前发布的那个（[细节](docs/harness-setup.zh-CN.md#保持更新)）。
+**🥇 全网第一个支持 DeepSeek Harness（dsh）的外挂视觉识别插件：**一条命令 `npx -y @deepseek-ai/dsh plugin --profile web add @liustack/modlens@3.18.0`，dsh 背后的纯文本 DeepSeek 模型即可通过原生 `modlens_read_image` 工具读图。更新就是再跑一遍同一条命令。这里点名版本号而不用 `@latest` 是有意的：pnpm 11 会扣住最近 24 小时内发布的版本，dist-tag 只在剩下的里面解析，用 `@latest` 装到的会是一天前发布的那个（[细节](docs/harness-setup.zh-CN.md#保持更新)）。
 
 DeepSeek Harness 粘贴识图有两种玩法。
 
@@ -69,7 +69,7 @@ agy                                                           # 浏览器完成
 **DeepSeek Harness（dsh）用户不走 skill 流程**，本包就是原生 dsh 插件：
 
 ```sh
-npx -y @deepseek-ai/dsh plugin --profile web add @liustack/modlens@3.17.3
+npx -y @deepseek-ai/dsh plugin --profile web add @liustack/modlens@3.18.0
 ```
 
 装完即有 `modlens_read_image` 工具，选「(modlens vision)」模型变体即可直接粘贴识图。引擎配置同样在 `~/.modlens`，详见[宿主接入](docs/harness-setup.zh-CN.md)。
@@ -181,6 +181,8 @@ Codex 桌面 App 中识别一张推文截图。作者、配文、照片内容（
 
 DeepSeek Harness 生态里最值得推荐的项目。
 
+- 🖥️ **[DeepSeek Harness Desktop](https://github.com/anywhere-labs/deepseek-harness-desktop)** — 为 DeepSeek Harness 生态打造的现代化桌面端。不用配置 Node.js，也不用敲命令，就能启动和管理本机的 Harness 服务。后续还会支持插件市场、移动端远程控制和 IM Channels。[官网](https://www.dshdesktop.cn)
+  A desktop front end for DeepSeek Harness. Start and manage the Harness service on your own machine without installing Node.js or running a command. A plugin market, remote control from a phone, and IM channels are on its roadmap. [Site](https://www.dshdesktop.cn)
 - 🛒 **[dsh-market](https://github.com/dsh-market/dsh-market)** — DeepSeek Harness 的可视化插件市场。设置页里直接逛社区全部 800+ 插件：分类筛选、截图预览、一键安装与更新、主题即点即换，装完多数免重启。
   The plugin market inside DeepSeek Harness. Browse 800+ community plugins with category filters and screenshot previews, one-click install and update, and live theme switching. Most need no restart.
 

package/dist/main.js

@@ -1863,6 +1863,57 @@ function maskKey(key) {
   }
   return `${key.slice(0, 6)}...${key.slice(-2)}`;
 }
+function envValue(env, name, platform = process.platform) {
+  if (platform !== "win32") {
+    return env[name];
+  }
+  const key = windowsKeyFor(env, name);
+  return key === void 0 ? void 0 : env[key];
+}
+function windowsKeyFor(env, name) {
+  const folded = name.toUpperCase();
+  return enumerateEnvKeys(env).sort().find((candidate) => candidate.toUpperCase() === folded);
+}
+function enumerateEnvKeys(env) {
+  const keys = [];
+  for (const key in env) {
+    keys.push(key);
+  }
+  return keys;
+}
+function canonicalWindowsEnv(env) {
+  const seen = /* @__PURE__ */ new Set();
+  const entries = [];
+  for (const key of enumerateEnvKeys(env).sort()) {
+    const folded = key.toUpperCase();
+    if (seen.has(folded)) {
+      continue;
+    }
+    seen.add(folded);
+    const value = env[key];
+    if (value !== void 0) {
+      entries.push([key, value]);
+    }
+  }
+  return Object.fromEntries(entries);
+}
+function withWindowsEnvAssignment(env, name, value) {
+  const canonical = canonicalWindowsEnv(env);
+  const key = windowsKeyFor(canonical, name) ?? name;
+  const folded = name.toUpperCase();
+  const rest = Object.fromEntries(
+    Object.entries(canonical).filter(([candidate]) => candidate.toUpperCase() !== folded)
+  );
+  return { ...rest, [key]: value };
+}
+function withoutWindowsEnvVariable(env, name) {
+  const folded = name.toUpperCase();
+  return Object.fromEntries(
+    Object.entries(canonicalWindowsEnv(env)).filter(
+      ([candidate]) => candidate.toUpperCase() !== folded
+    )
+  );
+}
 const PROVIDER_DESCRIPTORS = [
   {
     name: "antigravity-cli",
@@ -1902,8 +1953,11 @@ const PROVIDER_DESCRIPTORS = [
   }
 ];
 function findOnPath(bin, env) {
-  const dirs = (env.PATH ?? "").split(path.delimiter).filter(Boolean);
-  const suffixes = process.platform === "win32" ? [...(env.PATHEXT ?? ".COM;.EXE;.BAT;.CMD").split(";").filter(Boolean), ""] : [""];
+  const dirs = (envValue(env, "PATH") ?? "").split(path.delimiter).filter(Boolean);
+  const suffixes = process.platform === "win32" ? [
+    ...(envValue(env, "PATHEXT") ?? ".COM;.EXE;.BAT;.CMD").split(";").filter(Boolean),
+    ""
+  ] : [""];
   for (const dir of dirs) {
     for (const suffix of suffixes) {
       const full = path.join(dir, bin + suffix);
@@ -1965,190 +2019,253 @@ function providerChain(kind, config2, env = process.env) {
   }
   return names.filter((name) => providerAvailable(name, config2, env)).map((name) => resolveProvider(name));
 }
-function tokenizeCmdLine(line) {
-  const pattern = /(?:"[^"]*"|[^\s"])+/g;
-  const args = line.match(pattern) ?? [];
-  if (line.replace(pattern, "").trim() !== "") {
-    return null;
+function existenceOf(target) {
+  try {
+    fs.statSync(target);
+    return "present";
+  } catch (error) {
+    return error.code === "ENOENT" ? "absent" : "unknown";
   }
-  return args.map((raw, index) => {
-    const text = index === 0 ? raw.replace(/^@/, "") : raw;
-    const whole = /^"([^"]*)"$/.exec(text);
-    return whole ? { value: whole[1], quoted: true } : { value: text, quoted: false };
-  });
 }
-function expandShimPath(token, shimDir) {
-  const relative = /^%~?dp0%?\\?(.*)$/i.exec(token);
-  if (relative) {
-    return path.win32.join(shimDir, relative[1]);
-  }
-  if (path.win32.isAbsolute(token)) {
-    return token;
+const REAL_DEPS = {
+  platform: process.platform,
+  readFileSync: (p) => fs.readFileSync(p, "utf-8"),
+  resolveOnPath: findOnPath,
+  existence: existenceOf
+};
+const PATHEXT_EDIT = /^@?SET PATHEXT=%PATHEXT:;\.([A-Z]+);=;%$/;
+function withPathextEdit(env, removed) {
+  const canonical = canonicalWindowsEnv(env);
+  const key = Object.keys(canonical).find((name) => name.toUpperCase() === "PATHEXT");
+  const current = key === void 0 ? "" : canonical[key] ?? "";
+  const needle = new RegExp(`;\\.${removed};`, "gi");
+  const edited = current.replace(needle, ";");
+  if (edited === "") {
+    return withoutWindowsEnvVariable(canonical, "PATHEXT");
+  }
+  return withWindowsEnvAssignment(canonical, "PATHEXT", edited);
+}
+const DEFAULT_PATHEXT = ".COM;.EXE;.BAT;.CMD";
+function resolveLikeCmd(name, env, cwd, deps) {
+  const effectiveEnv = canonicalWindowsEnv(env);
+  const exts = (Object.entries(effectiveEnv).find(([key]) => key.toUpperCase() === "PATHEXT")?.[1] ?? DEFAULT_PATHEXT).split(";").map((ext) => ext.trim()).filter(Boolean);
+  const skipCwd = Object.keys(effectiveEnv).some(
+    (key) => key.toUpperCase() === "NODEFAULTCURRENTDIRECTORYINEXEPATH"
+  );
+  const pathValue = Object.entries(effectiveEnv).find(([key]) => key.toUpperCase() === "PATH")?.[1] ?? "";
+  const effectiveCwd = cwd ?? process.cwd();
+  const dirs = [
+    ...skipCwd ? [] : [effectiveCwd],
+    ...pathValue.split(";").filter(Boolean).map((dir) => path.win32.resolve(effectiveCwd, dir))
+  ];
+  for (const dir of dirs) {
+    for (const suffix of [...exts, ""]) {
+      const candidate = path.win32.join(dir, `${name}${suffix}`);
+      const found = deps.existence(candidate);
+      if (found === "unknown") {
+        return null;
+      }
+      if (found === "present") {
+        return /\.(cmd|bat)$/i.test(candidate) ? null : candidate;
+      }
+    }
   }
   return null;
 }
-const CMD_SYNTAX = /"|%~?\d/;
-const CMD_CONTROL = /[\^&|<>()]/;
-function literalToken(token, shimDir) {
-  const text = token.value;
-  if (CMD_SYNTAX.test(text) || !token.quoted && CMD_CONTROL.test(text)) {
-    return null;
+function templatePath(text, shimDir) {
+  const rooted = /^%(?:dp0%|~dp0)\\?(.*)$/i.exec(text);
+  if (!rooted) {
+    return path.win32.isAbsolute(text) && !text.includes("%") ? text : null;
   }
-  const substituted = text.replace(/%dp0%|%~dp0/gi, `${shimDir}\\`);
-  if (substituted.includes("%")) {
+  const rest = rooted[1];
+  if (rest.includes("%") || rest === "") {
     return null;
   }
-  return /^(%dp0%|%~dp0)/i.test(text) ? path.win32.normalize(substituted) : substituted;
+  return path.win32.normalize(path.win32.join(shimDir, rest));
 }
-function isNodeInterpreter(token) {
-  return /^node(\.exe)?$/i.test(path.win32.basename(token));
+function isFullyQualifiedLocalPath(target) {
+  return /^[A-Za-z]:[\\/]/.test(target);
 }
-function carriesForeignEnv(content) {
-  const setRe = /^\s*@?SET\s+"?([A-Za-z_][A-Za-z0-9_]*)=/gim;
-  let match;
-  while ((match = setRe.exec(content)) !== null) {
-    const name = match[1].toLowerCase();
-    if (name !== "dp0" && name !== "_prog" && name !== "pathext") {
-      return true;
-    }
+const FLAG = /^--?[A-Za-z0-9][-A-Za-z0-9._]*(?:=[-A-Za-z0-9._/\\:]+)?$/;
+function interpreterTail(middle, shimDir) {
+  const tokens = middle.trim().split(/\s+/).filter((token) => token !== "");
+  if (tokens.length === 0) {
+    return null;
   }
-  return false;
+  const quoted = /^"([^"]*)"$/.exec(tokens[tokens.length - 1]);
+  if (!quoted) {
+    return null;
+  }
+  const entry = templatePath(quoted[1], shimDir);
+  if (entry === null) {
+    return null;
+  }
+  const flags = tokens.slice(0, -1);
+  return flags.every((flag) => FLAG.test(flag)) ? [...flags, entry] : null;
 }
-function progIsNode(content, shimDir) {
-  const progRe = /^\s*@?SET\s+"?_prog=([^"\r\n]*)"?/gim;
-  const values = [];
-  let match;
-  while ((match = progRe.exec(content)) !== null) {
-    values.push(match[1].trim());
-  }
-  if (values.length === 0) {
-    return { ok: false };
-  }
-  let absolute;
-  for (const value of values) {
-    const expanded = expandShimPath(value, shimDir) ?? value;
-    if (!isNodeInterpreter(expanded)) {
-      return { ok: false };
-    }
-    if (path.win32.isAbsolute(value)) {
-      absolute = value;
-    }
-  }
-  return { ok: true, ...absolute ? { absolute } : {} };
-}
-const STRUCTURAL_LINE = [
-  /^\s*$/,
-  /^\s*@?ECHO\s+off\s*$/i,
-  /^\s*@?SETLOCAL\s*$/i,
-  /^\s*@?ENDLOCAL\s*$/i,
-  /^\s*GOTO\s+\S+\s*$/i,
-  /^\s*:\S+\s*$/,
-  /^\s*EXIT\s+\/b\s*$/i,
-  /^\s*CALL\s+:\S+\s*$/i,
-  /^\s*@?SET\s+dp0=%~dp0\s*$/i,
-  /^\s*@?SET\s+"?_prog=[^"\r\n]*"?\s*$/i,
-  /^\s*@?SET\s+PATHEXT=%PATHEXT:[^%]*%\s*$/i,
-  /^\s*@?IF\s+EXIST\s+"[^"]*"\s*\(\s*$/i,
-  /^\s*\)\s*ELSE\s*\(\s*$/i,
-  /^\s*\)\s*$/
-];
-function parseCmdShimTarget(cmdPath, content) {
-  const shimDir = path.win32.dirname(cmdPath);
-  if (carriesForeignEnv(content)) {
+function nodeRecipe(shimDir, tail2, effective, env, cwd, deps) {
+  const local = path.win32.join(shimDir, "node.exe");
+  const found = deps.existence(local);
+  if (found === "unknown") {
     return null;
   }
-  const lines = content.split(/\r?\n/);
-  const executionLines = [];
-  for (const line of lines) {
-    if (STRUCTURAL_LINE.some((pattern) => pattern.test(line))) {
-      continue;
-    }
-    if (!line.includes("%*")) {
-      return null;
-    }
-    executionLines.push(line);
+  if (found === "present") {
+    return {
+      command: local,
+      args: tail2,
+      ...effective.present === env ? {} : { env: effective.present }
+    };
+  }
+  const resolved = resolveLikeCmd("node", effective.absent, cwd, deps);
+  return resolved === null ? null : {
+    command: resolved,
+    args: tail2,
+    ...effective.absent === env ? {} : { env: effective.absent }
+  };
+}
+const NPM_PROLOGUE = [
+  "@ECHO off",
+  "GOTO start",
+  ":find_dp0",
+  "SET dp0=%~dp0",
+  "EXIT /b",
+  ":start",
+  "SETLOCAL",
+  "CALL :find_dp0"
+];
+const NPM_PREFIX = "endLocal & goto #_undefined_# 2>NUL || title %COMSPEC% & ";
+const NPM_EXEC_LEGACY = /^"%_prog%"(.*)%\*$/;
+const NPM_EXEC_CURRENT = /^set PATHEXT=%PATHEXT:;\.([A-Z]+);=;% & "%_prog%"(.*)%\*$/;
+const NPM_NATIVE_EXEC = /^"([^"]*)"\s+%\*$/;
+const PNPM_IF = /^@IF EXIST "([^"]*)" \($/;
+const PNPM_ARM = /^"([^"]*)"(.*)%\*$/;
+const PNPM_BARE_ARM = /^node(.*)%\*$/;
+const PNPM_ONELINE = /^@"([^"]*)"(.*)%\*$/;
+function normalizeLines(content) {
+  const lines = content.split(/\r?\n/).map((line) => line.trim());
+  while (lines.length > 0 && lines[lines.length - 1] === "") {
+    lines.pop();
+  }
+  return lines;
+}
+function matchNpm(lines, shimDir, env, cwd, deps) {
+  if (lines.length < NPM_PROLOGUE.length) {
+    return null;
   }
-  if (executionLines.length === 0) {
+  if (!NPM_PROLOGUE.every((expected, index) => lines[index] === expected)) {
     return null;
   }
-  let agreed = null;
-  for (const line of executionLines) {
-    const parsed = parseExecutionLine(line, content, shimDir);
-    if (!parsed) {
+  const body = lines.slice(NPM_PROLOGUE.length).filter((line) => line !== "");
+  if (body.length === 1) {
+    const native = NPM_NATIVE_EXEC.exec(body[0]);
+    if (!native) {
       return null;
     }
-    if (agreed && !sameTarget(agreed, parsed)) {
+    const target = templatePath(native[1], shimDir);
+    if (target === null || !/\.exe$/i.test(target)) {
       return null;
     }
-    agreed ??= parsed;
+    const normalizedDir = path.win32.normalize(shimDir);
+    const dp0 = normalizedDir.endsWith("\\") ? normalizedDir : `${normalizedDir}\\`;
+    return {
+      command: target,
+      args: [],
+      env: withWindowsEnvAssignment(env, "dp0", dp0)
+    };
   }
-  return agreed;
-}
-function sameTarget(a, b) {
-  return a.nodeExec === b.nodeExec && a.args.length === b.args.length && a.args.every((value, index) => value === b.args[index]);
+  if (body[0] !== 'IF EXIST "%dp0%\\node.exe" (') return null;
+  if (body[1] !== 'SET "_prog=%dp0%\\node.exe"') return null;
+  if (body[2] !== ") ELSE (") return null;
+  if (body[3] !== 'SET "_prog=node"') return null;
+  if (body.length === 7) {
+    if (!PATHEXT_EDIT.test(body[4])) return null;
+    if (body[5] !== ")") return null;
+    if (!body[6].startsWith(NPM_PREFIX)) return null;
+    const exec = NPM_EXEC_LEGACY.exec(body[6].slice(NPM_PREFIX.length));
+    if (!exec) return null;
+    const tail2 = interpreterTail(exec[1], shimDir);
+    return tail2 === null ? null : nodeRecipe(shimDir, tail2, { present: env, absent: env }, env, cwd, deps);
+  }
+  if (body.length === 6) {
+    if (body[4] !== ")") return null;
+    if (!body[5].startsWith(NPM_PREFIX)) return null;
+    const exec = NPM_EXEC_CURRENT.exec(body[5].slice(NPM_PREFIX.length));
+    if (!exec) return null;
+    const tail2 = interpreterTail(exec[2], shimDir);
+    if (tail2 === null) return null;
+    const edited = withPathextEdit(env, exec[1]);
+    return nodeRecipe(shimDir, tail2, { present: edited, absent: edited }, env, cwd, deps);
+  }
+  return null;
 }
-function parseExecutionLine(line, content, shimDir) {
-  {
-    const tokens = tokenizeCmdLine(line);
-    if (!tokens) {
-      return null;
-    }
-    const forwardIndex = tokens.findIndex((token) => !token.quoted && token.value === "%*");
-    if (forwardIndex < 2 || forwardIndex !== tokens.length - 1) {
+function matchPnpm(lines, shimDir, env, cwd, deps) {
+  if (lines[0] !== "@SETLOCAL") {
+    return null;
+  }
+  const body = lines.slice(1).filter((line) => line !== "");
+  if (body.length === 1) {
+    const one = PNPM_ONELINE.exec(body[0]);
+    if (!one) {
       return null;
     }
-    const runTokens = tokens.slice(0, forwardIndex);
-    const lastAmp = runTokens.reduce(
-      (found, token, index) => !token.quoted && token.value === "&" ? index : found,
-      -1
-    );
-    let words = lastAmp >= 0 ? runTokens.slice(lastAmp + 1) : runTokens;
-    if (words.length < 2) {
+    const program2 = templatePath(one[1], shimDir);
+    if (program2 === null) {
       return null;
     }
-    let nodeExec;
-    if (/^-S(\.exe)?$/i.test(path.win32.basename(words[0].value))) {
-      words = words.slice(1);
-    }
-    const interpreter = words[0].value;
-    if (interpreter === "%_prog%") {
-      const prog = progIsNode(content, shimDir);
-      if (!prog.ok) {
-        return null;
-      }
-      nodeExec = prog.absolute;
-    } else {
-      const expanded = expandShimPath(interpreter, shimDir) ?? interpreter;
-      if (!isNodeInterpreter(expanded)) {
-        return null;
-      }
-      if (path.win32.isAbsolute(interpreter)) {
-        nodeExec = interpreter;
-      }
-    }
-    const args = [];
-    let expandable = true;
-    for (const word of words.slice(1)) {
-      const expanded = literalToken(word, shimDir);
-      if (expanded === null) {
-        expandable = false;
-        break;
-      }
-      args.push(expanded);
-    }
-    if (!expandable || args.length === 0) {
-      return null;
+    if (one[2].trim() === "") {
+      return /\.exe$/i.test(program2) ? { command: program2, args: [] } : null;
     }
-    return { args, ...nodeExec ? { nodeExec } : {} };
+    const tail22 = interpreterTail(one[2], shimDir);
+    return tail22 === null || /\.(cmd|bat)$/i.test(program2) ? null : { command: program2, args: tail22 };
   }
+  if (body.length !== 6) {
+    return null;
+  }
+  const opened = PNPM_IF.exec(body[0]);
+  if (!opened) return null;
+  const local = path.win32.join(shimDir, "node.exe");
+  const candidate = templatePath(opened[1], shimDir);
+  if (candidate === null || candidate.toLowerCase() !== local.toLowerCase()) {
+    return null;
+  }
+  const present = PNPM_ARM.exec(body[1]);
+  if (!present) return null;
+  const presentProgram = templatePath(present[1], shimDir);
+  if (presentProgram === null || presentProgram.toLowerCase() !== local.toLowerCase()) {
+    return null;
+  }
+  if (body[2] !== ") ELSE (") return null;
+  const edit = PATHEXT_EDIT.exec(body[3]);
+  if (!edit) return null;
+  const absent = PNPM_BARE_ARM.exec(body[4]);
+  if (!absent) return null;
+  if (body[5] !== ")") return null;
+  const tail2 = interpreterTail(present[2], shimDir);
+  const otherTail = interpreterTail(absent[1], shimDir);
+  if (tail2 === null || otherTail === null || tail2.join(" ") !== otherTail.join(" ")) {
+    return null;
+  }
+  return nodeRecipe(
+    shimDir,
+    tail2,
+    { present: env, absent: withPathextEdit(env, edit[1]) },
+    env,
+    cwd,
+    deps
+  );
 }
-const REAL_DEPS = {
-  platform: process.platform,
-  readFileSync: (p) => fs.readFileSync(p, "utf-8"),
-  resolveOnPath: findOnPath,
-  execPath: process.execPath
-};
-function resolveSpawnPlan(command, args, env = process.env, deps = REAL_DEPS) {
+function recognizeShim(cmdPath, content, env, cwd, deps = REAL_DEPS) {
+  if (!isFullyQualifiedLocalPath(cmdPath)) {
+    return null;
+  }
+  const shimDir = path.win32.dirname(cmdPath);
+  const lines = normalizeLines(content);
+  if (lines.length === 0) {
+    return null;
+  }
+  return matchNpm(lines, shimDir, env, cwd, deps) ?? matchPnpm(lines, shimDir, env, cwd, deps);
+}
+function resolveSpawnPlan(command, args, env = process.env, cwd, deps = REAL_DEPS) {
   if (deps.platform !== "win32") {
     return { command, args };
   }
@@ -2159,19 +2276,23 @@ function resolveSpawnPlan(command, args, env = process.env, deps = REAL_DEPS) {
   if (!/\.(cmd|bat)$/i.test(path.win32.basename(resolved))) {
     return { command: resolved, args };
   }
+  if (!isFullyQualifiedLocalPath(resolved)) {
+    return { command: resolved, args };
+  }
   let content;
   try {
     content = deps.readFileSync(resolved);
   } catch {
     return { command: resolved, args };
   }
-  const target = parseCmdShimTarget(resolved, content);
-  if (!target) {
+  const recipe = recognizeShim(resolved, content, env, cwd, deps);
+  if (recipe === null) {
     return { command: resolved, args };
   }
   return {
-    command: target.nodeExec ?? deps.execPath,
-    args: [...target.args, ...args]
+    command: recipe.command,
+    args: [...recipe.args, ...args],
+    ...recipe.env ? { env: recipe.env } : {}
   };
 }
 const VISION_MODEL_PATTERNS = [
@@ -2214,7 +2335,11 @@ function defaultRunCli(bin, args, timeoutMs) {
   return execFileSync(plan.command, plan.args, {
     encoding: "utf-8",
     timeout: timeoutMs,
-    stdio: "pipe"
+    stdio: "pipe",
+    // A recognised shim hands back the whole environment its child would
+    // have got, so the probe runs under what the shell would have given
+    // it rather than under ours (issue #43).
+    ...plan.env ? { env: plan.env } : {}
   });
 }
 function timed(run) {
@@ -2798,7 +2923,8 @@ function fetchPiKey(piPath, modelId, provider, timeoutMs) {
     const key = execFileSync(plan.command, plan.args, {
       encoding: "utf-8",
       stdio: ["ignore", "pipe", "pipe"],
-      timeout: timeoutMs
+      timeout: timeoutMs,
+      ...plan.env ? { env: plan.env } : {}
     }).trim();
     if (!key) {
       throw new Error("empty");
@@ -3134,13 +3260,20 @@ function emptyWorkdir() {
 function runCommand(providerName, invocation, timeoutMs, describeFailure) {
   const runStartedAt = Date.now();
   return new Promise((resolve, reject) => {
-    const plan = resolveSpawnPlan(invocation.command, invocation.args);
+    const childEnv = invocation.env ? { ...process.env, ...invocation.env } : void 0;
+    const plan = resolveSpawnPlan(
+      invocation.command,
+      invocation.args,
+      childEnv ?? process.env,
+      invocation.cwd
+    );
+    const spawnEnv = plan.env ?? childEnv;
     const child = spawn(plan.command, plan.args, {
       cwd: invocation.cwd,
       stdio: ["ignore", "pipe", "pipe"],
       // A provider may mark its own child, which is how kimi-cli tells a
       // modlens started by kimi that running kimi again would loop.
-      ...invocation.env ? { env: { ...process.env, ...invocation.env } } : {}
+      ...spawnEnv ? { env: spawnEnv } : {}
     });
     const outDecoder = new TextDecoder("utf-8");
     const errDecoder = new TextDecoder("utf-8");
@@ -4432,7 +4565,7 @@ function parsePositiveInt(raw, flag) {
   }
   return Number.parseInt(raw, 10);
 }
-program.name("modlens").description("Plug-in vision for text-only LLMs: image in, structured JSON evidence out").version("3.17.3");
+program.name("modlens").description("Plug-in vision for text-only LLMs: image in, structured JSON evidence out").version("3.18.0");
 program.command("analyze", { isDefault: true }).description("Analyze an image into structured JSON evidence (default command)").requiredOption("-i, --input <path|url>", "Input image path or https URL").option("-o, --output <path>", "Write result JSON to a file").option("-m, --model <name>", "Provider model name").option("-p, --provider <name>", `Vision provider (${listProviders().join(", ")})`).option("--prompt <text>", "Extra focus for this image").option("--timeout <ms>", "Provider timeout in milliseconds", "180000").option("--provider-bin <path>", "Provider binary path (default: agy)").option("--workdir <path>", "Working directory for the provider").option(
   "--extra-body <json>",
   `JSON merged into the API request body, e.g. '{"thinking":{"type":"disabled"}}'`
@@ -4542,7 +4675,7 @@ program.command("doctor").description(
       configPath: CONFIG_PATH,
       // Lets doctor name an installed skill copy that is older than
       // the CLI reporting on it (issue #33).
-      version: "3.17.3"
+      version: "3.18.0"
     });
     const output = options.json ? JSON.stringify(report, null, 2) : renderDoctorReport(report);
     process.stdout.write(`${output}

package/docs/harness-setup.md

@@ -55,7 +55,7 @@ OpenCode with DeepSeek: `opencode auth login`, pick DeepSeek and paste the key (
 dsh is different from the other harnesses: modlens plugs in as a native tool, not a prompt-triggered skill. The package itself is a dsh bundle, so one command installs it into a profile:
 
 ```sh
-npx -y @deepseek-ai/dsh plugin --profile web add @liustack/modlens@3.17.3
+npx -y @deepseek-ai/dsh plugin --profile web add @liustack/modlens@3.18.0
 ```
 
 This registers a `modlens_read_image` tool whose schema reaches the model on every request (no trigger heuristics), runs the modlens CLI shipped inside the same package, and returns the structured evidence as the tool's canonical JSON output. Engines, reuse grants, and guard rules stay in `~/.modlens/config.json`, shared with every other harness. dsh is in developer preview and its plugin surface may change; the plugin keeps its touch small (raw tool registration, the llm adapter surface for the vision variants, the attachment reader, and one agent pre-step hook) and degrades loudly if any of them moves.
@@ -81,7 +81,7 @@ modlens ships often, and both install shapes freeze at whatever version they
 got. On dsh, re-run the install with the version named:
 
 ```sh
-npx -y @deepseek-ai/dsh plugin --profile <name> add @liustack/modlens@3.17.3
+npx -y @deepseek-ai/dsh plugin --profile <name> add @liustack/modlens@3.18.0
 ```
 
 `npm view @liustack/modlens version` prints the current one, and this page is

package/docs/harness-setup.zh-CN.md

@@ -55,7 +55,7 @@ OpenCode 接 DeepSeek：执行 `opencode auth login`，选择 DeepSeek 并粘贴
 dsh 与其他 harness 不同：modlens 以原生工具的形式接入，而不是靠提示词触发的 skill。本包自身就是一个 dsh bundle，一条命令即可装进某个 profile：
 
 ```sh
-npx -y @deepseek-ai/dsh plugin --profile web add @liustack/modlens@3.17.3
+npx -y @deepseek-ai/dsh plugin --profile web add @liustack/modlens@3.18.0
 ```
 
 这会注册一个 `modlens_read_image` 工具，它的 schema 随每次请求抵达模型（不靠触发启发式），运行同一个包里自带的 modlens CLI，并把结构化证据作为工具的标准 JSON 输出返回。引擎、复用授权和 guard 规则仍在 `~/.modlens/config.json` 里，与其他所有 harness 共享。dsh 还在开发者预览阶段，插件接口可能变化。这个插件刻意保持很小的接触面（原生工具注册、视觉变体所用的 llm 适配层、附件读取器，以及一个 agent 执行前钩子），其中任何一处变动，它都会大声报错而不是无声退化。
@@ -71,7 +71,7 @@ dsh 的网页用户面前没有终端，所以引擎设置有一张卡片，在*
 modlens 发布很频繁，而两种安装形态都会冻结在装进来的那个版本上。dsh 上重跑一遍安装即可，版本号要点名：
 
 ```sh
-npx -y @deepseek-ai/dsh plugin --profile <name> add @liustack/modlens@3.17.3
+npx -y @deepseek-ai/dsh plugin --profile <name> add @liustack/modlens@3.18.0
 ```
 
 `npm view @liustack/modlens version` 可以查到当前版本号，本页的版本号则由发布流程自动写入。

package/docs/troubleshooting.md

@@ -163,7 +163,7 @@ simply lands on an older one. Name the exact version instead, which pnpm treats
 as a deliberate request rather than a resolution:
 
 ```sh
-npx -y @deepseek-ai/dsh plugin --profile <name> add @liustack/modlens@3.17.3
+npx -y @deepseek-ai/dsh plugin --profile <name> add @liustack/modlens@3.18.0
 ```
 
 `npm view @liustack/modlens version` prints the current one. pnpm 11 installs a named
@@ -178,7 +178,7 @@ file:
 
 ```yaml
 minimumReleaseAgeExclude:
-  - '@liustack/modlens@3.17.3'
+  - '@liustack/modlens@3.18.0'
 ```
 
 Or lift the gate for a single command, which lifts it for everything that

package/docs/troubleshooting.zh-CN.md

@@ -144,7 +144,7 @@ dsh profile 装到的是旧版 modlens。`dsh.bundle` 声明从 3.9.0 起才存
 `@latest` 绕不开这一层，本页早先的说法是错的。冷静期先把候选版本过滤掉，dist-tag 才在剩下的里面解析，于是它直接落到了更旧的那个上。改成写死精确版本号，pnpm 会把它当作一次明确的指定，而不是一次解析：
 
 ```sh
-npx -y @deepseek-ai/dsh plugin --profile <name> add @liustack/modlens@3.17.3
+npx -y @deepseek-ai/dsh plugin --profile <name> add @liustack/modlens@3.18.0
 ```
 
 `npm view @liustack/modlens version` 可以查到当前版本号。pnpm 11 会装上被点名的版本，11.1.3 起还会把它作为一条已批准的例外写进该 profile 的 `pnpm-workspace.yaml`，其余所有包和 modlens 以后的版本仍然留在窗口后面。
@@ -153,7 +153,7 @@ npx -y @deepseek-ai/dsh plugin --profile <name> add @liustack/modlens@3.17.3
 
 ```yaml
 minimumReleaseAgeExclude:
-  - '@liustack/modlens@3.17.3'
+  - '@liustack/modlens@3.18.0'
 ```
 
 或者只为这一条命令解除冷静期，注意它解除的是这条命令解析到的所有包，不只 modlens：

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@liustack/modlens",
-    "version": "3.17.3",
+    "version": "3.18.0",
     "description": "Plug-in vision for text-only LLMs, powered by the free Antigravity CLI",
     "type": "module",
     "bin": {

package/skills/modlens/SKILL.md

@@ -20,11 +20,11 @@ powershell -ExecutionPolicy Bypass -File <skill-dir>\scripts\run.ps1 <args>
 
 It resolves a working runtime (PATH `modlens`, then `npx`, then `bunx`) and forwards your arguments unchanged. Exit 78 means no runtime: relay the `nextSteps` from its stderr JSON instead of retrying.
 
-If your harness forbids running scripts, reason through the same order by hand and run the first line that works (the pinned version is 3.17.3):
+If your harness forbids running scripts, reason through the same order by hand and run the first line that works (the pinned version is 3.18.0):
 
-1. A `modlens` on `PATH` whose major version is 3 and is at least 3.17.3: `modlens <args>`.
-2. Otherwise, if `npx` exists: `npx --yes --package @liustack/modlens@3.17.3 modlens <args>`.
-3. Otherwise, if `bunx` exists: `bunx --bun @liustack/modlens@3.17.3 <args>`.
+1. A `modlens` on `PATH` whose major version is 3 and is at least 3.18.0: `modlens <args>`.
+2. Otherwise, if `npx` exists: `npx --yes --package @liustack/modlens@3.18.0 modlens <args>`.
+3. Otherwise, if `bunx` exists: `bunx --bun @liustack/modlens@3.18.0 <args>`.
 4. Otherwise tell the user no JavaScript runtime was found and that installing Node 22.19+ (https://nodejs.org) or Bun (https://bun.sh) is the next step. Do not claim modlens itself failed.
 
 `references/runtime.md` documents the pin and the diagnostic fields.

package/skills/modlens/references/runtime.md

@@ -8,7 +8,7 @@ shell syntax.
 
 ## Pinned version
 
-- Pinned CLI version: 3.17.3
+- Pinned CLI version: 3.18.0
 - npm package: `@liustack/modlens`
 - CLI binary name: `modlens`
 

package/skills/modlens/scripts/run.ps1

@@ -24,7 +24,7 @@ $ErrorActionPreference = 'Stop'
 # package.json version, and the release script rewrites it on every bump.
 $Package = '@liustack/modlens'
 $Bin = 'modlens'
-$Pinned = '3.17.3'
+$Pinned = '3.18.0'
 # -------------------------------------------------------------------------------
 
 $NativeNote = 'no native artifact is published for this tool yet; phase A ships npm launch paths only'

package/skills/modlens/scripts/run.sh

@@ -22,7 +22,7 @@ set -eu
 # package.json version, and the release script rewrites it on every bump.
 PKG="@liustack/modlens"
 BIN="modlens"
-PINNED="3.17.3"
+PINNED="3.18.0"
 # -------------------------------------------------------------------------------
 
 NATIVE_NOTE="no native artifact is published for this tool yet; phase A ships npm launch paths only"