@cydm/magic-shell-agent-node 0.1.11 → 0.1.13

package/dist/adapters/pty-adapter.js

@@ -1,15 +1,53 @@
 import { spawn } from "node-pty";
-import { existsSync } from "node:fs";
-import { dirname } from "path";
+import { existsSync, readFileSync } from "node:fs";
+import { createRequire } from "node:module";
+import path, { dirname } from "node:path";
 import { fileURLToPath } from "url";
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = dirname(__filename);
-function resolveExecutableCommand(command) {
+const require = createRequire(import.meta.url);
+const DEFAULT_WINDOWS_SHELL = process.env.ComSpec || "C:\\Windows\\System32\\cmd.exe";
+function quoteWindowsArg(value) {
+    if (!value)
+        return "\"\"";
+    if (!/[\s"]/u.test(value))
+        return value;
+    return `"${value.replace(/"/g, '\\"')}"`;
+}
+function resolvePackageBinScript(packageName, binName) {
+    try {
+        const packageJsonPath = require.resolve(`${packageName}/package.json`);
+        const packageDir = path.dirname(packageJsonPath);
+        const pkg = JSON.parse(readFileSync(packageJsonPath, "utf8"));
+        const binField = typeof pkg.bin === "string"
+            ? pkg.bin
+            : pkg.bin && typeof pkg.bin[binName] === "string"
+                ? pkg.bin[binName]
+                : null;
+        if (!binField)
+            return null;
+        const entry = path.resolve(packageDir, binField);
+        return existsSync(entry) ? entry : null;
+    }
+    catch {
+        return null;
+    }
+}
+function resolveWindowsCommand(command, args) {
     if (!command || process.platform !== "win32") {
-        return command;
+        return { command, args };
+    }
+    if (command === "pie") {
+        const pieEntry = resolvePackageBinScript("@cydm/pie", "pie");
+        if (pieEntry) {
+            return {
+                command: process.execPath,
+                args: [pieEntry, ...args],
+            };
+        }
     }
     if (command.includes("\\") || command.includes("/") || /^[a-zA-Z]:/.test(command)) {
-        return command;
+        return { command, args };
     }
     const pathEntries = (process.env.PATH || "").split(";").filter(Boolean);
     const pathext = (process.env.PATHEXT || ".COM;.EXE;.BAT;.CMD")
@@ -19,20 +57,34 @@ function resolveExecutableCommand(command) {
     for (const entry of pathEntries) {
         const bareCandidate = `${entry}\\${command}`;
         if (existsSync(bareCandidate)) {
-            return bareCandidate;
+            return { command: bareCandidate, args };
         }
         for (const ext of pathext) {
             const candidate = `${entry}\\${command}${ext.toLowerCase()}`;
             if (existsSync(candidate)) {
-                return candidate;
+                const lowerExt = ext.toLowerCase();
+                if (lowerExt === ".cmd" || lowerExt === ".bat") {
+                    return {
+                        command: DEFAULT_WINDOWS_SHELL,
+                        args: ["/d", "/s", "/c", [quoteWindowsArg(candidate), ...args.map(quoteWindowsArg)].join(" ")],
+                    };
+                }
+                return { command: candidate, args };
             }
             const candidateUpper = `${entry}\\${command}${ext.toUpperCase()}`;
             if (existsSync(candidateUpper)) {
-                return candidateUpper;
+                const upperExt = ext.toUpperCase();
+                if (upperExt === ".CMD" || upperExt === ".BAT") {
+                    return {
+                        command: DEFAULT_WINDOWS_SHELL,
+                        args: ["/d", "/s", "/c", [quoteWindowsArg(candidateUpper), ...args.map(quoteWindowsArg)].join(" ")],
+                    };
+                }
+                return { command: candidateUpper, args };
             }
         }
     }
-    return command;
+    return { command, args };
 }
 export class PtyAdapter {
     name = "pty";
@@ -47,8 +99,8 @@ export class PtyAdapter {
     }
     async start(config) {
         const agentId = `pty-${Date.now()}-${Math.random().toString(36).slice(2, 8)}`;
-        const resolvedCommand = resolveExecutableCommand(config.command);
-        const pty = spawn(resolvedCommand, config.args || [], {
+        const resolved = resolveWindowsCommand(config.command, config.args || []);
+        const pty = spawn(resolved.command, resolved.args, {
             name: "xterm-256color",
             cols: 80,
             rows: 24,
@@ -86,7 +138,7 @@ export class PtyAdapter {
             this.agents.delete(agentId);
         });
         this.agents.set(agentId, agent);
-        console.log(`[PtyAdapter] Started ${agentId}: ${resolvedCommand}`);
+        console.log(`[PtyAdapter] Started ${agentId}: ${resolved.command}`);
         return agentId;
     }
     async stop(agentId) {

package/dist/plugin-loader.js

@@ -8,7 +8,7 @@ export function loadPlugin(path) {
     if (!existsSync(path)) {
         throw new Error(`Plugin file not found: ${path}`);
     }
-    const content = readFileSync(path, "utf-8");
+    const content = readFileSync(path, "utf-8").replace(/^\uFEFF/, "");
     const config = JSON.parse(content);
     const configDir = dirname(path);
     const repoRoot = dirname(configDir);

package/package.json

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