@cydm/magic-shell-agent-node 0.1.19 → 0.1.20

package/dist/adapters/pty-adapter.js

@@ -1,97 +1,29 @@
 import { spawn } from "node-pty";
-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);
-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, args };
-    }
-    if (command === "pie") {
-        const pieEntry = resolvePackageBinScript("@cydm/pie", "pie");
-        if (pieEntry) {
-            return {
-                command: process.execPath,
-                args: [pieEntry, ...args],
-            };
-        }
-    }
-    const lowerCommand = command.toLowerCase();
-    if (lowerCommand.endsWith(".cmd") || lowerCommand.endsWith(".bat")) {
-        return {
-            command: DEFAULT_WINDOWS_SHELL,
-            args: ["/d", "/s", "/c", [quoteWindowsArg(command), ...args.map(quoteWindowsArg)].join(" ")],
+import { resolveRuntimeCommand } from "../command-resolution.js";
+const STOP_TIMEOUT_MS = 5_000;
+function waitForPtyExit(agent) {
+    if (agent.stopPromise) {
+        return agent.stopPromise;
+    }
+    agent.stopPromise = new Promise((resolve) => {
+        let settled = false;
+        const finish = () => {
+            if (settled)
+                return;
+            settled = true;
+            resolve();
         };
-    }
-    if (command.includes("\\") || command.includes("/") || /^[a-zA-Z]:/.test(command)) {
-        return { command, args };
-    }
-    const pathEntries = (process.env.PATH || "").split(";").filter(Boolean);
-    const pathext = (process.env.PATHEXT || ".COM;.EXE;.BAT;.CMD")
-        .split(";")
-        .map((value) => value.trim())
-        .filter(Boolean);
-    for (const entry of pathEntries) {
-        const bareCandidate = `${entry}\\${command}`;
-        if (existsSync(bareCandidate)) {
-            return { command: bareCandidate, args };
-        }
-        for (const ext of pathext) {
-            const candidate = `${entry}\\${command}${ext.toLowerCase()}`;
-            if (existsSync(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)) {
-                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, args };
+        const timeout = setTimeout(() => {
+            console.warn(`[PtyAdapter] Timed out waiting for ${agent.id} to exit`);
+            finish();
+        }, STOP_TIMEOUT_MS);
+        timeout.unref?.();
+        agent.pty.onExit(() => {
+            clearTimeout(timeout);
+            finish();
+        });
+    });
+    return agent.stopPromise;
 }
 export class PtyAdapter {
     name = "pty";
@@ -106,7 +38,7 @@ export class PtyAdapter {
     }
     async start(config) {
         const agentId = `pty-${Date.now()}-${Math.random().toString(36).slice(2, 8)}`;
-        const resolved = resolveWindowsCommand(config.command, config.args || []);
+        const resolved = resolveRuntimeCommand(config.command, config.args || []);
         const pty = spawn(resolved.command, resolved.args, {
             name: "xterm-256color",
             cols: 80,
@@ -152,7 +84,9 @@ export class PtyAdapter {
         const agent = this.agents.get(agentId);
         if (!agent)
             return;
+        const exitPromise = waitForPtyExit(agent);
         agent.pty.kill();
+        await exitPromise;
         this.agents.delete(agentId);
         console.log(`[PtyAdapter] Stopped ${agentId}`);
     }

package/dist/adapters/rpc-adapter.js

@@ -1,4 +1,41 @@
 import { spawn } from "child_process";
+const STOP_TIMEOUT_MS = 5_000;
+function waitForProcessExit(agent) {
+    if (agent.stopPromise) {
+        return agent.stopPromise;
+    }
+    agent.stopPromise = new Promise((resolve) => {
+        if (agent.process.exitCode !== null || agent.process.killed) {
+            resolve();
+            return;
+        }
+        let settled = false;
+        const finish = () => {
+            if (settled)
+                return;
+            settled = true;
+            resolve();
+        };
+        const timeout = setTimeout(() => {
+            console.warn(`[RpcAdapter] Timed out waiting for ${agent.id} to exit`);
+            finish();
+        }, STOP_TIMEOUT_MS);
+        timeout.unref?.();
+        agent.process.once("close", () => {
+            clearTimeout(timeout);
+            finish();
+        });
+        agent.process.once("exit", () => {
+            clearTimeout(timeout);
+            finish();
+        });
+        agent.process.once("error", () => {
+            clearTimeout(timeout);
+            finish();
+        });
+    });
+    return agent.stopPromise;
+}
 export class RpcAdapter {
     name = "rpc";
     description = "JSON-RPC adapter for line-oriented RPC workers";
@@ -141,7 +178,9 @@ export class RpcAdapter {
         const agent = this.agents.get(agentId);
         if (!agent)
             return;
+        const exitPromise = waitForProcessExit(agent);
         agent.process.kill();
+        await exitPromise;
         this.agents.delete(agentId);
         console.log(`[RpcAdapter] Stopped ${agentId}`);
     }

package/dist/adapters/stdio-adapter.js

@@ -1,4 +1,41 @@
 import { spawn } from "child_process";
+const STOP_TIMEOUT_MS = 5_000;
+function waitForProcessExit(agent) {
+    if (agent.stopPromise) {
+        return agent.stopPromise;
+    }
+    agent.stopPromise = new Promise((resolve) => {
+        if (agent.process.exitCode !== null) {
+            resolve();
+            return;
+        }
+        let settled = false;
+        const finish = () => {
+            if (settled)
+                return;
+            settled = true;
+            resolve();
+        };
+        const timeout = setTimeout(() => {
+            console.warn(`[StdioAdapter] Timed out waiting for ${agent.id} to exit`);
+            finish();
+        }, STOP_TIMEOUT_MS);
+        timeout.unref?.();
+        agent.process.once("close", () => {
+            clearTimeout(timeout);
+            finish();
+        });
+        agent.process.once("exit", () => {
+            clearTimeout(timeout);
+            finish();
+        });
+        agent.process.once("error", () => {
+            clearTimeout(timeout);
+            finish();
+        });
+    });
+    return agent.stopPromise;
+}
 export class StdioAdapter {
     name = "stdio";
     description = "Stdio pipe adapter for CLI agents";
@@ -72,7 +109,9 @@ export class StdioAdapter {
         const agent = this.agents.get(agentId);
         if (!agent)
             return;
+        const exitPromise = waitForProcessExit(agent);
         agent.process.kill();
+        await exitPromise;
         this.agents.delete(agentId);
         console.log(`[StdioAdapter] Stopped ${agentId}`);
     }

package/dist/claude-exec.js

@@ -1,18 +1,22 @@
 import { spawn } from "node:child_process";
+import { resolveRuntimeCommand } from "./command-resolution.js";
+import { claudeNeedsTrustConfirmation } from "./claude-worker.js";
 export async function runClaudeExec(options) {
     return new Promise((resolve, reject) => {
-        const child = spawn("claude", [
+        const resolved = resolveRuntimeCommand("claude", [
             "-p",
             "--dangerously-skip-permissions",
             options.message,
-        ], {
+        ]);
+        const child = spawn(resolved.command, resolved.args, {
             cwd: options.cwd,
             env: process.env,
-            stdio: ["ignore", "pipe", "pipe"],
+            stdio: ["pipe", "pipe", "pipe"],
         });
         let stdout = "";
         let stderr = "";
         let settled = false;
+        let trustConfirmed = false;
         const finish = (handler) => {
             if (settled)
                 return;
@@ -22,9 +26,17 @@ export async function runClaudeExec(options) {
         };
         child.stdout.on("data", (chunk) => {
             stdout += chunk.toString();
+            if (!trustConfirmed && claudeNeedsTrustConfirmation([stdout, stderr].join("\n"))) {
+                trustConfirmed = true;
+                child.stdin?.write("\r");
+            }
         });
         child.stderr.on("data", (chunk) => {
             stderr += chunk.toString();
+            if (!trustConfirmed && claudeNeedsTrustConfirmation([stdout, stderr].join("\n"))) {
+                trustConfirmed = true;
+                child.stdin?.write("\r");
+            }
         });
         child.on("error", (error) => {
             finish(() => reject(error));

package/dist/codex-exec.js

@@ -1,4 +1,6 @@
 import { spawn } from "node:child_process";
+import { resolveRuntimeCommand } from "./command-resolution.js";
+import { codexNeedsTrustConfirmation } from "./codex-worker.js";
 function isRecord(value) {
     return !!value && typeof value === "object";
 }
@@ -32,7 +34,7 @@ export function extractCodexExecResult(rawOutput) {
 }
 export async function runCodexExec(options) {
     return new Promise((resolve, reject) => {
-        const child = spawn("codex", [
+        const resolved = resolveRuntimeCommand("codex", [
             "exec",
             "--json",
             "--skip-git-repo-check",
@@ -40,14 +42,16 @@ export async function runCodexExec(options) {
             "-C",
             options.cwd,
             options.message,
-        ], {
+        ]);
+        const child = spawn(resolved.command, resolved.args, {
             cwd: options.cwd,
             env: process.env,
-            stdio: ["ignore", "pipe", "pipe"],
+            stdio: ["pipe", "pipe", "pipe"],
         });
         let stdout = "";
         let stderr = "";
         let settled = false;
+        let trustConfirmed = false;
         const finish = (handler) => {
             if (settled)
                 return;
@@ -57,9 +61,17 @@ export async function runCodexExec(options) {
         };
         child.stdout.on("data", (chunk) => {
             stdout += chunk.toString();
+            if (!trustConfirmed && codexNeedsTrustConfirmation([stdout, stderr].join("\n"))) {
+                trustConfirmed = true;
+                child.stdin?.write("\r");
+            }
         });
         child.stderr.on("data", (chunk) => {
             stderr += chunk.toString();
+            if (!trustConfirmed && codexNeedsTrustConfirmation([stdout, stderr].join("\n"))) {
+                trustConfirmed = true;
+                child.stdin?.write("\r");
+            }
         });
         child.on("error", (error) => {
             finish(() => reject(error));

package/dist/command-resolution.d.ts

@@ -0,0 +1,4 @@
+export declare function resolveRuntimeCommand(command: string, args?: string[]): {
+    command: string;
+    args: string[];
+};

package/dist/command-resolution.js

@@ -0,0 +1,85 @@
+import { existsSync, readFileSync } from "node:fs";
+import { createRequire } from "node:module";
+import path from "node:path";
+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;
+    }
+}
+export function resolveRuntimeCommand(command, args = []) {
+    if (!command || process.platform !== "win32") {
+        return { command, args };
+    }
+    if (command === "pie") {
+        const pieEntry = resolvePackageBinScript("@cydm/pie", "pie");
+        if (pieEntry) {
+            return {
+                command: process.execPath,
+                args: [pieEntry, ...args],
+            };
+        }
+    }
+    const lowerCommand = command.toLowerCase();
+    if (lowerCommand.endsWith(".cmd") || lowerCommand.endsWith(".bat")) {
+        return {
+            command: DEFAULT_WINDOWS_SHELL,
+            args: ["/d", "/s", "/c", [quoteWindowsArg(command), ...args.map(quoteWindowsArg)].join(" ")],
+        };
+    }
+    if (command.includes("\\") || command.includes("/") || /^[a-zA-Z]:/.test(command)) {
+        return { command, args };
+    }
+    const pathEntries = (process.env.PATH || "").split(";").filter(Boolean);
+    const pathext = (process.env.PATHEXT || ".COM;.EXE;.BAT;.CMD")
+        .split(";")
+        .map((value) => value.trim())
+        .filter(Boolean);
+    for (const entry of pathEntries) {
+        const bareCandidate = `${entry}\\${command}`;
+        if (existsSync(bareCandidate)) {
+            return { command: bareCandidate, args };
+        }
+        for (const ext of pathext) {
+            const candidates = [
+                `${entry}\\${command}${ext.toLowerCase()}`,
+                `${entry}\\${command}${ext.toUpperCase()}`,
+            ];
+            for (const candidate of candidates) {
+                if (!existsSync(candidate))
+                    continue;
+                const lowerExt = path.extname(candidate).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 };
+            }
+        }
+    }
+    return { command, args };
+}

package/dist/node.js

@@ -307,9 +307,7 @@ export class AgentNode {
             sessionManager: this.sessionManager,
             workerRegistry: this.workerRegistry,
         });
-        if (!options.taskSummary) {
-            void this.primeInteractiveWorkerSession(options.sessionId).catch(() => { });
-        }
+        void this.primeInteractiveWorkerSession(options.sessionId).catch(() => { });
         if (options.taskSummary) {
             await this.dispatchInitialWorkerTask(options.sessionId, options.taskSummary);
         }

package/package.json

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