dsh-plugin-wsl-env 0.7.4 → 0.7.5

package/CHANGELOG.md

@@ -12,6 +12,26 @@ reference below points at that record's numbering.
 
 ## [Unreleased]
 
+## [0.7.5] - 2026-10-05
+
+One theme: a failed environment probe retries instead of being trusted
+forever - the shell placeholder that used to pin bash onto every later
+command, and the hardcoded distro name that minted UNC identities.
+
+### Fixed
+
+- **A failed shell probe no longer pins `bash` for the executor's
+  lifetime.** `defaultShell` reported the literal `"bash"` when both probes
+  failed - a cold distro, a flaky first `wsl.exe` call - and the executor
+  cached that placeholder permanently: every later command ran bash on a
+  zsh distro, and the shell tool introduced itself as bash. The probes now
+  answer `undefined`; the executor caches only a real resolution and falls
+  back to bash per call, so the next command retries. `shell-env` follows:
+  an unresolved shell simply omits the `DSH_WSL_SHELL` fact instead of
+  presenting a guess as the distro's login shell. Alongside, `toWorldPath`
+  no longer mints UNC identities under the hardcoded `"Ubuntu"` fallback -
+  the pinned distro is a required option now, and every caller passes it.
+
 ## [0.7.4] - 2026-10-05
 
 One theme: the 0.2.0 review's engineering debt closes out - the five

package/lib/index.js

@@ -270,7 +270,13 @@ export class WslShellExecutor extends LocalBashExecutor {
   async shell() {
     if (this.resolvedShell.length === 0) {
       const distro = await this.distro();
-      this.resolvedShell = await defaultShell(distro, { wslPath: this.config.wslPath });
+      // An unresolvable shell is a retry, not a pin: a failed probe (a cold
+      // distro, a flaky first wsl.exe call) used to cache the "bash"
+      // placeholder for this executor's lifetime. The runtime fallback below
+      // keeps the command running; a later call resolves the real shell.
+      const resolved = await defaultShell(distro, { wslPath: this.config.wslPath });
+      if (resolved) this.resolvedShell = resolved;
+      return resolved ?? "bash";
     }
     return this.resolvedShell;
   }

package/lib/paths.js

@@ -221,14 +221,20 @@ export function toLinuxPath(value, options) {
  * Windows paths from the host all have to land somewhere real.
  *
  * @param value - the path to translate.
- * @param options - the pinned distro and the fallback directory for relative input.
+ * @param options - the PINNED DISTRO (required: a POSIX-absolute input mints
+ *   its UNC identity) and the fallback directory for relative input.
  * @returns an absolute host path (UNC for anything inside the distro).
  */
 export function toWorldPath(value, options) {
   const text = String(value ?? "");
   if (text.length === 0) return text;
   if (isWslUnc(text)) return toWindowsSlashes(text);
-  if (isPosixAbsolute(text)) return posixToUnc(options?.distro ?? "Ubuntu", text);
+  // No distro fallback: an identity minted under a guessed distro name would
+  // address a filesystem that does not exist.
+  if (isPosixAbsolute(text)) {
+    if (!options?.distro) return text;
+    return posixToUnc(options.distro, text);
+  }
   if (DRIVE_RE.test(text)) return toWindowsSlashes(text);
   // Any other UNC share is already a world path in its own right — the host
   // can open it directly, and joining it onto a base would name a file that

package/lib/shell-env.js

@@ -45,6 +45,9 @@ export async function apply(ctx, config = {}) {
   // result), so every fact has to be resolved up front, not per call.
   const configured = config.distro ?? "";
   const distro = configured.length > 0 ? configured : await defaultDistro();
+  // undefined when both probes failed (a cold distro): the fact is then
+  // simply absent, which beats presenting the "bash" placeholder as the
+  // distro's login shell for this process's lifetime.
   const shell = await defaultShell(distro);
   // The consumer is a shell running INSIDE the distro, so the fact is the POSIX
   // path, not the host-side world path.
@@ -87,12 +90,13 @@ export async function apply(ctx, config = {}) {
       // cross-distro guard) — so the honest resolution is no facts at all,
       // not another distro's home and shell presented as this session's.
       if (isAnotherDistrosUnc(cwd, distro)) return {};
-      return {
+      const facts = {
         DSH_WSL_DISTRO: distro,
-        DSH_WSL_SHELL: shell,
         DSH_WSL_HOME: home,
         DSH_WSL_PORTS: ports.join(","),
       };
+      if (shell !== undefined) facts.DSH_WSL_SHELL = shell;
+      return facts;
     },
   });
 

package/lib/wsl.js

@@ -325,10 +325,14 @@ export async function defaultShell(distro, options = {}) {
       return undefined;
     }
   };
+  // No "bash" placeholder: a failed probe (a cold distro, a flaky first
+  // `wsl.exe` call) used to be pinned as the literal shell for the
+  // executor's lifetime. `undefined` tells the caller both answers failed;
+  // it may retry later or fall back itself.
   return (
     (await ask('getent passwd "$(id -u)" | cut -d: -f7')) ??
     (await ask('printf %s "$SHELL"')) ??
-    "bash"
+    undefined
   );
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-plugin-wsl-env",
-  "version": "0.7.4",
+  "version": "0.7.5",
   "description": "让 DeepSeek Harness 以 WSL 子系统作为会话的执行环境：shell、文件读写与命令执行均在子系统内完成，目录选择器与 GUI 终端同样定位到子系统路径，并通过子系统内的 bubblewrap 对命令进行沙箱隔离",
   "keywords": [
     "deepseek-harness",