@aiden-ade/sandbox-agent 0.1.12 → 0.1.13

package/dist/index.cjs

@@ -5304,17 +5304,39 @@ function buildPlanModePrefix(promptText) {
     promptText
   ].join("\n");
 }
-function spawnCli(command, args, context) {
+function planCliSpawn(command, args, env = process.env) {
   const isWindows = process.platform === "win32";
-  return (0, import_child_process.spawn)(command, args, {
+  const comSpec = env.ComSpec ?? process.env.ComSpec ?? "cmd.exe";
+  if (isWindows && /\.(cmd|bat)$/i.test(command)) {
+    return {
+      file: comSpec,
+      args: ["/d", "/s", "/c", command, ...args],
+      shell: false,
+      windowsHide: true
+    };
+  }
+  if (isWindows && /[\\/]/.test(command) && /\.exe$/i.test(command)) {
+    return { file: command, args, shell: false, windowsHide: true };
+  }
+  return {
+    file: command,
+    args,
+    shell: isWindows,
+    windowsHide: isWindows ? true : void 0
+  };
+}
+function spawnCli(command, args, context) {
+  const plan = planCliSpawn(command, args, context.env);
+  return (0, import_child_process.spawn)(plan.file, plan.args, {
     cwd: context.cwd,
     env: context.env,
     stdio: ["pipe", "pipe", "pipe"],
-    shell: isWindows,
+    shell: plan.shell,
+    windowsHide: plan.windowsHide,
     // Detached on Unix creates a new process group so we can kill the entire tree
     // (CLI tools spawn child processes for tool execution that would otherwise be orphaned).
     // On Windows, detached opens a new console — shell mode handles grouping instead.
-    detached: !isWindows
+    detached: process.platform !== "win32"
   });
 }
 function createGenericCliBackend(options) {
@@ -7186,6 +7208,7 @@ var import_node_os2 = require("os");
 
 // src/cli-executable.ts
 var import_node_fs = require("fs");
+var import_node_child_process = require("child_process");
 var import_node_os = require("os");
 var import_node_path = require("path");
 var PROVIDER_CLI_COMMANDS = {
@@ -7200,6 +7223,54 @@ var BACKEND_CLI_COMMANDS = {
   gemini_cli: "gemini",
   gemini: "gemini"
 };
+var resolvedCliCache = /* @__PURE__ */ new Map();
+function getDaemonCliEnvironment() {
+  return augmentCliPath(process.env);
+}
+function cacheResolvedCli(command, resolvedPath) {
+  resolvedCliCache.set(command, resolvedPath);
+}
+function getCachedResolvedCli(command) {
+  return resolvedCliCache.get(command);
+}
+function resolveViaWhere(command, env) {
+  if ((0, import_node_os.platform)() !== "win32") return null;
+  const whereExe = (0, import_node_path.join)(env.SystemRoot ?? process.env.SystemRoot ?? "C:\\Windows", "System32", "where.exe");
+  if (!(0, import_node_fs.existsSync)(whereExe)) return null;
+  const result = (0, import_node_child_process.spawnSync)(whereExe, [command], {
+    encoding: "utf8",
+    env,
+    windowsHide: true,
+    timeout: 3e3
+  });
+  if (result.error || result.status !== 0) return null;
+  for (const line of result.stdout.split(/\r?\n/)) {
+    const trimmed = line.trim();
+    if (!trimmed) continue;
+    if (isRunnableFile(trimmed)) return trimmed;
+  }
+  return null;
+}
+function runCliVersionProbe(executable, env, args = ["--version"]) {
+  const isWin = (0, import_node_os.platform)() === "win32";
+  if (isWin && /\.(cmd|bat)$/i.test(executable)) {
+    const comSpec = env.ComSpec ?? process.env.ComSpec ?? "cmd.exe";
+    return (0, import_node_child_process.spawnSync)(comSpec, ["/d", "/s", "/c", executable, ...args], {
+      encoding: "utf8",
+      timeout: 3e3,
+      env,
+      windowsHide: true
+    });
+  }
+  const useShell = isWin && !/[\\/]/.test(executable);
+  return (0, import_node_child_process.spawnSync)(executable, args, {
+    encoding: "utf8",
+    timeout: 3e3,
+    env,
+    shell: useShell,
+    windowsHide: isWin ? true : void 0
+  });
+}
 function pathSeparator() {
   return (0, import_node_os.platform)() === "win32" ? ";" : ":";
 }
@@ -7251,9 +7322,15 @@ function augmentCliPath(env) {
     PATH: missing.length > 0 ? `${missing.join(pathSeparator())}${pathSeparator()}${basePath}` : basePath
   };
 }
-function resolveCliExecutable(command, env = process.env) {
+function resolveCliExecutable(command, env = getDaemonCliEnvironment()) {
   const trimmed = command.trim();
   if (!trimmed) return null;
+  const cached = resolvedCliCache.get(trimmed);
+  if (cached && isRunnableFile(cached)) return cached;
+  if ((trimmed.includes("/") || trimmed.includes("\\")) && isRunnableFile(trimmed)) {
+    resolvedCliCache.set(trimmed, trimmed);
+    return trimmed;
+  }
   const enriched = augmentCliPath(env);
   const home = enriched.HOME || enriched.USERPROFILE || (0, import_node_os.homedir)();
   const isWin = (0, import_node_os.platform)() === "win32";
@@ -7282,24 +7359,39 @@ function resolveCliExecutable(command, env = process.env) {
   for (const candidate of candidates) {
     if (seen.has(candidate)) continue;
     seen.add(candidate);
-    if (isRunnableFile(candidate)) return candidate;
+    if (isRunnableFile(candidate)) {
+      resolvedCliCache.set(trimmed, candidate);
+      return candidate;
+    }
+  }
+  const viaWhere = resolveViaWhere(trimmed, enriched);
+  if (viaWhere) {
+    resolvedCliCache.set(trimmed, viaWhere);
+    return viaWhere;
   }
   return null;
 }
-function resolveProviderCliCommand(provider) {
+function resolveProviderCliCommand(provider, env = getDaemonCliEnvironment()) {
   const spec = PROVIDER_CLI_COMMANDS[provider];
   const override = process.env[spec.envVar]?.trim();
   if (override) {
-    return resolveCliExecutable(override) ?? (isRunnableFile(override) ? override : null);
+    const resolved2 = resolveCliExecutable(override, env) ?? (isRunnableFile(override) ? override : null);
+    if (resolved2) cacheResolvedCli(spec.command, resolved2);
+    return resolved2;
   }
-  return resolveCliExecutable(spec.command);
+  const resolved = resolveCliExecutable(spec.command, env);
+  if (resolved) cacheResolvedCli(spec.command, resolved);
+  return resolved;
 }
-function resolveBackendRuntimeCommand(backendKind, env = process.env) {
+function resolveBackendRuntimeCommand(backendKind, env = getDaemonCliEnvironment()) {
   if (!backendKind) return void 0;
   const command = BACKEND_CLI_COMMANDS[backendKind];
   if (!command) return void 0;
+  const cached = getCachedResolvedCli(command);
+  if (cached && isRunnableFile(cached)) return cached;
   const envOverride = command === "codex" ? env.AIDEN_CODEX_PATH : command === "claude" ? env.AIDEN_CLAUDE_PATH : command === "gemini" ? env.AIDEN_GEMINI_PATH : void 0;
   const resolved = resolveCliExecutable(envOverride?.trim() || command, env);
+  if (resolved) cacheResolvedCli(command, resolved);
   return resolved ?? void 0;
 }
 
@@ -7434,7 +7526,7 @@ var CoreAgent = class _CoreAgent extends BaseMachineAgent {
     for (const [key, value2] of Object.entries(process.env)) {
       if (value2 !== void 0) env[key] = value2;
     }
-    const augmented = augmentCliPath(env);
+    const augmented = getDaemonCliEnvironment();
     if ((0, import_node_os2.platform)() !== "win32") {
       const home = augmented.HOME ?? "/home/user";
       const extraPaths = [`${home}/.local/node/bin`, `${home}/.local/bin`];
@@ -11269,7 +11361,7 @@ var WSClient = class {
 };
 
 // src/version.ts
-var AGENT_VERSION = "0.1.12";
+var AGENT_VERSION = "0.1.13";
 
 // src/sandbox.ts
 async function runSandbox(config) {
@@ -11450,7 +11542,6 @@ var import_node_http = __toESM(require("http"), 1);
 var import_node_crypto = require("crypto");
 var import_node_os3 = require("os");
 var import_node_path2 = require("path");
-var import_node_child_process = require("child_process");
 var PRODUCTION_API_URL = "https://api.aiden-platform.com";
 var PRODUCTION_WS_URL = "wss://ws.aiden-platform.com";
 var LOCAL_API_URL = "http://localhost:8400";
@@ -11519,12 +11610,10 @@ function sleep(ms) {
   return new Promise((resolve2) => setTimeout(resolve2, ms));
 }
 function commandVersion(command, args = ["--version"]) {
-  const executable = resolveCliExecutable(command) ?? command;
-  const result = (0, import_node_child_process.spawnSync)(executable, args, {
-    encoding: "utf8",
-    timeout: 3e3,
-    env: augmentCliPath(process.env)
-  });
+  const env = getDaemonCliEnvironment();
+  const executable = command === "claude" ? resolveProviderCliCommand("claude_cli", env) : command === "codex" ? resolveProviderCliCommand("codex", env) : command === "gemini" ? resolveProviderCliCommand("gemini", env) : resolveCliExecutable(command, env);
+  if (!executable) return void 0;
+  const result = runCliVersionProbe(executable, env, args);
   if (result.error || result.status !== 0) return void 0;
   return (result.stdout || result.stderr).split("\n")[0]?.trim() || void 0;
 }
@@ -11795,7 +11884,7 @@ async function startDaemon(args) {
     if (!runtimeCommand && backendKind) {
       socket.emit("agent.rejected", {
         runId: payload.runId,
-        message: `CLI command not found for ${backendKind}. Install it or set the full path via AIDEN_CODEX_PATH / AIDEN_CLAUDE_PATH / AIDEN_GEMINI_PATH.`
+        message: `CLI command not found for ${backendKind}. Install the provider CLI and restart the daemon.`
       });
       return;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aiden-ade/sandbox-agent",
-  "version": "0.1.12",
+  "version": "0.1.13",
   "type": "module",
   "bin": {
     "aiden-agent": "./dist/index.cjs"
@@ -11,21 +11,22 @@
   "publishConfig": {
     "access": "public"
   },
+  "scripts": {
+    "build": "tsup",
+    "dev": "tsx src/index.ts",
+    "prepack": "pnpm build",
+    "test": "vitest run",
+    "type-check": "tsc --noEmit"
+  },
   "dependencies": {},
   "devDependencies": {
+    "@aiden/agent-core": "workspace:*",
+    "@aiden/shared": "workspace:*",
     "socket.io-client": "^4.8.0",
     "socket.io": "^4.8.0",
     "@types/node": "^22.0.0",
     "tsup": "^8.5.1",
     "tsx": "^4.19.0",
-    "typescript": "~5.9.3",
-    "@aiden/agent-core": "0.1.0",
-    "@aiden/shared": "0.1.0"
-  },
-  "scripts": {
-    "build": "tsup",
-    "dev": "tsx src/index.ts",
-    "test": "vitest run",
-    "type-check": "tsc --noEmit"
+    "typescript": "~5.9.3"
   }
-}
+}