pi-mcp-adapter 5.2.0 → 5.3.1

package/utils.ts

@@ -1,5 +1,5 @@
 import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
-import { spawnSync } from "node:child_process";
+import { spawnSync, type SpawnSyncOptionsWithStringEncoding } from "node:child_process";
 import { existsSync, realpathSync } from "node:fs";
 import { homedir, platform } from "node:os";
 import { dirname, extname, isAbsolute, join, relative, resolve, sep } from "node:path";
@@ -180,6 +180,41 @@ export function interpolateEnvRecord(values: Record<string, string> | undefined,
 const COMMAND_SECRET_TIMEOUT_MS = 10_000;
 const COMMAND_SECRET_MAX_OUTPUT_BYTES = 1024 * 1024;
 
+let windowsCommandBash: string | null | undefined;
+
+function isLegacyWslBash(path: string): boolean {
+  return /^[a-z]:\\windows\\(?:system32|sysnative)\\bash\.exe$/.test(path.replace(/\//g, "\\").toLowerCase());
+}
+
+function findWindowsBash(): string | null {
+  const installs = [process.env.ProgramFiles, process.env["ProgramFiles(x86)"]]
+    .filter((dir): dir is string => Boolean(dir))
+    .map(dir => `${dir}\\Git\\bin\\bash.exe`);
+  const found = installs.find(path => existsSync(path));
+  if (found) return found;
+  try {
+    const result = spawnSync("where", ["bash.exe"], { encoding: "utf8", timeout: 5000, windowsHide: true });
+    if (result.status !== 0 || !result.stdout) return null;
+    return result.stdout.split(/\r?\n/)
+      .map(line => line.trim())
+      .find(path => path && !isLegacyWslBash(path) && existsSync(path)) ?? null;
+  } catch {
+    return null;
+  }
+}
+
+/**
+ * On Windows, the bash used to run `!command` values: Git Bash in its standard
+ * install locations, then bash.exe on PATH (skipping the legacy WSL launcher),
+ * as Pi does. Undefined elsewhere or when none is found, so callers keep the
+ * platform default shell.
+ */
+export function getWindowsCommandBash(): string | undefined {
+  if (process.platform !== "win32") return undefined;
+  if (windowsCommandBash === undefined) windowsCommandBash = findWindowsBash();
+  return windowsCommandBash ?? undefined;
+}
+
 /** Resolve a secret value, executing only a single leading `!` command marker. */
 export function resolveCommandSecret(value: string, context: string): string;
 export function resolveCommandSecret(value: undefined, context: string): undefined;
@@ -189,14 +224,17 @@ export function resolveCommandSecret(value: string | undefined, context: string)
   if (value.startsWith("!!")) return interpolateEnvVars(value.slice(1));
   if (!value.startsWith("!")) return interpolateEnvVars(value);
 
-  const result = spawnSync(value.slice(1), {
-    shell: true,
+  const options: SpawnSyncOptionsWithStringEncoding = {
     encoding: "utf8",
     timeout: COMMAND_SECRET_TIMEOUT_MS,
     maxBuffer: COMMAND_SECRET_MAX_OUTPUT_BYTES,
     stdio: ["ignore", "pipe", "ignore"],
     windowsHide: true,
-  });
+  };
+  const bash = getWindowsCommandBash();
+  const result = bash === undefined
+    ? spawnSync(value.slice(1), { ...options, shell: true })
+    : spawnSync(bash, ["-c", value.slice(1)], { ...options, shell: false });
   if (result.error) {
     const code = (result.error as NodeJS.ErrnoException).code;
     const reason = code === "ETIMEDOUT"