@pwrdrvr/agent-acp 0.13.0 → 0.13.1

package/dist/index.js

@@ -6,6 +6,10 @@ import {
   ndJsonStream
 } from "@agentclientprotocol/sdk";
 import { noopLogger } from "@pwrdrvr/agent-core";
+import {
+  createCommandInvocation,
+  prependCommandDirToPath
+} from "@pwrdrvr/agent-transport";
 var AcpConnection = class {
   constructor(options) {
     this.options = options;
@@ -64,9 +68,12 @@ var AcpConnection = class {
     const { command, args, env } = this.options;
     const logger = this.logger;
     return (client) => {
-      const child = spawn(command, args, {
+      const launchEnv = prependCommandDirToPath(command, env ?? process.env);
+      const invocation = createCommandInvocation({ command, args, env: launchEnv });
+      const child = spawn(invocation.command, invocation.args, {
         stdio: ["pipe", "pipe", "pipe"],
-        ...env !== void 0 ? { env } : {}
+        env: launchEnv,
+        windowsVerbatimArguments: invocation.windowsVerbatimArguments
       });
       child.on("error", (error) => {
         logger.error("acp agent process error", { command, message: error.message });
@@ -2302,7 +2309,10 @@ import { readdirSync, realpathSync, statSync } from "fs";
 import { homedir as homedir4 } from "os";
 import path4 from "path";
 import { promisify } from "util";
-import { prependCommandDirToPath } from "@pwrdrvr/agent-transport";
+import {
+  createCommandInvocation as createCommandInvocation2,
+  prependCommandDirToPath as prependCommandDirToPath2
+} from "@pwrdrvr/agent-transport";
 var execFile = promisify(execFileCallback);
 async function discoverLocalAcpAgentInstances(options = {}) {
   const strategies = options.strategies ?? BUILT_IN_ACP_STRATEGIES;
@@ -2403,35 +2413,60 @@ function candidateCommands(strategy, env, listExecutables, override) {
   return out;
 }
 function canonicalize(command) {
-  if (!path4.isAbsolute(command)) return command;
+  if (!path4.isAbsolute(command)) {
+    return process.platform === "win32" ? command.toLowerCase() : command;
+  }
   try {
-    return realpathSync(command);
+    const canonical = realpathSync(command);
+    return process.platform === "win32" ? canonical.toLowerCase() : canonical;
   } catch {
-    return command;
+    return process.platform === "win32" ? command.toLowerCase() : command;
   }
 }
 function defaultListExecutables(command, env) {
-  if (process.platform === "win32") return [];
-  if (command.includes(path4.sep)) return [];
+  if (command.includes("/") || command.includes("\\")) return [];
   const found = [];
   const seenDir = /* @__PURE__ */ new Set();
   for (const dir of discoveryDirs(env)) {
-    if (dir.length === 0 || seenDir.has(dir)) continue;
-    seenDir.add(dir);
-    const candidate = path4.join(dir, command);
-    try {
-      const stat = statSync(candidate);
-      if (stat.isFile() && (stat.mode & 73) !== 0) {
-        found.push(candidate);
+    const normalizedDir = normalizePathEntry(dir);
+    const dirKey = process.platform === "win32" ? normalizedDir.toLowerCase() : normalizedDir;
+    if (normalizedDir.length === 0 || seenDir.has(dirKey)) continue;
+    seenDir.add(dirKey);
+    for (const commandName of executableCommandNames(command, env)) {
+      const candidate = path4.join(normalizedDir, commandName);
+      try {
+        const stat = statSync(candidate);
+        if (stat.isFile() && (process.platform === "win32" || (stat.mode & 73) !== 0)) {
+          found.push(candidate);
+        }
+      } catch {
       }
-    } catch {
     }
   }
   return found;
 }
+function executableCommandNames(command, env) {
+  if (process.platform !== "win32") return [command];
+  const extensions = (readWindowsEnv(env, "PATHEXT")?.trim() || ".COM;.EXE;.BAT;.CMD").split(";").map((extension) => extension.trim()).filter(Boolean).map((extension) => extension.startsWith(".") ? extension : `.${extension}`);
+  const commandExtension = path4.win32.extname(command);
+  if (commandExtension.length > 0 && extensions.some((extension) => extension.toLowerCase() === commandExtension.toLowerCase())) {
+    return [command];
+  }
+  return extensions.map((extension) => `${command}${extension}`);
+}
+function readWindowsEnv(env, name) {
+  const key = Object.keys(env).find((candidate) => candidate.toLowerCase() === name.toLowerCase());
+  return key ? env[key] : void 0;
+}
+function normalizePathEntry(entry) {
+  const trimmed = entry.trim();
+  const quoted = trimmed.match(/^"(.*)"$/);
+  return quoted?.[1] ?? trimmed;
+}
 function discoveryDirs(env) {
-  const pathValue = env.PATH ?? env.Path ?? "";
-  return [...pathValue.split(path4.delimiter), ...wellKnownAgentBinDirs(homedir4())];
+  const pathValue = process.platform === "win32" ? readWindowsEnv(env, "PATH") ?? "" : env.PATH ?? "";
+  const pathDirs = pathValue.split(path4.delimiter);
+  return process.platform === "win32" ? pathDirs : [...pathDirs, ...wellKnownAgentBinDirs(homedir4())];
 }
 function wellKnownAgentBinDirs(home = homedir4()) {
   return [
@@ -2469,12 +2504,15 @@ function ensureArgs(args, ensure) {
 }
 function makeDefaultProbe(env) {
   return async (command, args) => {
-    return await execFile(command, args, {
+    const launchEnv = prependCommandDirToPath2(command, env);
+    const invocation = createCommandInvocation2({ command, args, env: launchEnv });
+    return await execFile(invocation.command, invocation.args, {
       timeout: 5e3,
       maxBuffer: 1024 * 1024,
       // Prepend the candidate's own dir so a node-script CLI (e.g. an nvm-
       // installed `qwen`) finds its sibling `node` during the probe.
-      env: prependCommandDirToPath(command, env)
+      env: launchEnv,
+      windowsVerbatimArguments: invocation.windowsVerbatimArguments
     });
   };
 }