@cydm/magic-shell-agent-node 0.1.7 → 0.1.8

package/dist/adapters/pty-adapter.js

@@ -1,5 +1,6 @@
 import { spawn } from "node-pty";
-import { delimiter, dirname, join } from "path";
+import { spawnSync } from "node:child_process";
+import { delimiter, dirname, extname, join } from "path";
 import { fileURLToPath } from "url";
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = dirname(__filename);
@@ -18,13 +19,18 @@ export class PtyAdapter {
         const agentId = `pty-${Date.now()}-${Math.random().toString(36).slice(2, 8)}`;
         const spawnCwd = config.cwd || process.cwd();
         const spawnEnv = { ...process.env, ...config.env };
-        console.log(`[PtyAdapter] Starting ${agentId}: command=${JSON.stringify(config.command)} args=${JSON.stringify(config.args || [])} cwd=${JSON.stringify(spawnCwd)} platform=${process.platform}`);
+        const spawnPlan = process.platform === "win32"
+            ? buildWindowsSpawnPlan(config.command, config.args || [], spawnEnv)
+            : { command: config.command, args: config.args || [] };
+        console.log(`[PtyAdapter] Starting ${agentId}: command=${JSON.stringify(spawnPlan.command)} args=${JSON.stringify(spawnPlan.args)} cwd=${JSON.stringify(spawnCwd)} platform=${process.platform}`);
         if (process.platform === "win32" && !isAbsoluteOrQualifiedCommand(config.command)) {
-            console.log(`[PtyAdapter] Windows bare command probe for ${agentId}: ${JSON.stringify(findWindowsCommandCandidates(config.command, spawnEnv.PATH))}`);
+            const pathValue = spawnEnv.Path || spawnEnv.PATH;
+            console.log(`[PtyAdapter] Windows bare command probe for ${agentId}: ${JSON.stringify(findWindowsCommandCandidates(config.command, pathValue))}`);
+            console.log(`[PtyAdapter] Windows spawn plan for ${agentId}: command=${JSON.stringify(spawnPlan.command)} args=${JSON.stringify(spawnPlan.args)}`);
         }
         let pty;
         try {
-            pty = spawn(config.command, config.args || [], {
+            pty = spawn(spawnPlan.command, spawnPlan.args, {
                 name: "xterm-256color",
                 cols: 80,
                 rows: 24,
@@ -116,7 +122,7 @@ function isAbsoluteOrQualifiedCommand(command) {
 function findWindowsCommandCandidates(command, pathValue) {
     if (!pathValue)
         return [];
-    const pathext = (process.env.PATHEXT || ".COM;.EXE;.BAT;.CMD;.PS1")
+    const pathext = ((process.env.PATHEXT || ".COM;.EXE;.BAT;.CMD;.PS1"))
         .split(";")
         .map((value) => value.trim())
         .filter(Boolean);
@@ -128,3 +134,57 @@ function findWindowsCommandCandidates(command, pathValue) {
     }
     return results.slice(0, 20);
 }
+function buildWindowsSpawnPlan(command, args, env) {
+    if (isAbsoluteOrQualifiedCommand(command)) {
+        return { command, args };
+    }
+    const resolved = resolveWindowsBareCommand(command, env);
+    if (resolved && isDirectlySpawnableWindowsBinary(resolved)) {
+        return { command: resolved, args };
+    }
+    const shellCommand = resolved || command;
+    return {
+        command: env.ComSpec || process.env.ComSpec || "cmd.exe",
+        args: ["/d", "/s", "/c", quoteWindowsCommand(shellCommand, args)],
+    };
+}
+function resolveWindowsBareCommand(command, env) {
+    const pathValue = env.Path || env.PATH;
+    if (!pathValue)
+        return null;
+    try {
+        const result = spawnSync("where", [command], {
+            env,
+            encoding: "utf8",
+            windowsHide: true,
+        });
+        if (result.status === 0) {
+            const first = String(result.stdout || "")
+                .split(/\r?\n/)
+                .map((line) => line.trim())
+                .find(Boolean);
+            if (first)
+                return first;
+        }
+    }
+    catch {
+        // Fall through to manual candidates.
+    }
+    const candidate = findWindowsCommandCandidates(command, pathValue).find(Boolean);
+    return candidate || null;
+}
+function isDirectlySpawnableWindowsBinary(command) {
+    const ext = extname(command).toLowerCase();
+    return ext === ".exe" || ext === ".com";
+}
+function quoteWindowsCommand(command, args) {
+    return [command, ...args].map(quoteWindowsArg).join(" ");
+}
+function quoteWindowsArg(value) {
+    if (value.length === 0)
+        return '""';
+    if (!/[\s"]/u.test(value))
+        return value;
+    const escaped = value.replace(/(\\*)"/g, '$1$1\\"').replace(/(\\+)$/g, "$1$1");
+    return `"${escaped}"`;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cydm/magic-shell-agent-node",
-  "version": "0.1.7",
+  "version": "0.1.8",
   "description": "Magic Shell Agent Node - Local agent connector",
   "homepage": "https://magicshell.ai",
   "keywords": [