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

package/dist/adapters/pty-adapter.js

@@ -1,6 +1,5 @@
 import { spawn } from "node-pty";
-import { spawnSync } from "node:child_process";
-import { delimiter, dirname, extname, join } from "path";
+import { dirname } from "path";
 import { fileURLToPath } from "url";
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = dirname(__filename);
@@ -17,31 +16,13 @@ export class PtyAdapter {
     }
     async start(config) {
         const agentId = `pty-${Date.now()}-${Math.random().toString(36).slice(2, 8)}`;
-        const spawnCwd = config.cwd || process.cwd();
-        const spawnEnv = { ...process.env, ...config.env };
-        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)) {
-            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(spawnPlan.command, spawnPlan.args, {
-                name: "xterm-256color",
-                cols: 80,
-                rows: 24,
-                cwd: spawnCwd,
-                env: spawnEnv,
-            });
-        }
-        catch (error) {
-            console.error(`[PtyAdapter] Failed to start ${agentId}:`, error instanceof Error ? error.stack || error.message : error);
-            throw error;
-        }
+        const pty = spawn(config.command, config.args || [], {
+            name: "xterm-256color",
+            cols: 80,
+            rows: 24,
+            cwd: config.cwd || process.cwd(),
+            env: { ...process.env, ...config.env },
+        });
         const agent = {
             id: agentId,
             pty,
@@ -116,75 +97,3 @@ export class PtyAdapter {
         this.exitCallbacks.push(callback);
     }
 }
-function isAbsoluteOrQualifiedCommand(command) {
-    return command.includes("/") || command.includes("\\") || /\.(exe|cmd|bat|com|ps1)$/i.test(command);
-}
-function findWindowsCommandCandidates(command, pathValue) {
-    if (!pathValue)
-        return [];
-    const pathext = ((process.env.PATHEXT || ".COM;.EXE;.BAT;.CMD;.PS1"))
-        .split(";")
-        .map((value) => value.trim())
-        .filter(Boolean);
-    const results = [];
-    for (const dir of pathValue.split(delimiter).filter(Boolean)) {
-        for (const ext of ["", ...pathext]) {
-            results.push(join(dir, ext ? `${command}${ext}` : command));
-        }
-    }
-    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/dist/local-direct-server.js

@@ -23,12 +23,16 @@ function guessContentType(filePath) {
 }
 function findWorkbenchRoot() {
     const currentDir = path.dirname(fileURLToPath(import.meta.url));
+    const envOverride = process.env.MAGIC_SHELL_WORKBENCH_ROOT;
     const candidates = [
+        envOverride ? path.resolve(envOverride) : null,
         path.resolve(currentDir, "./workbench"),
+        path.resolve(currentDir, "../dist/workbench"),
+        path.resolve(currentDir, "../workbench"),
         path.resolve(currentDir, "../../../apps/web/src"),
         path.resolve(currentDir, "../../../../apps/web/src"),
         path.resolve(process.cwd(), "apps/web/src"),
-    ];
+    ].filter((value) => Boolean(value));
     for (const candidate of candidates) {
         if (existsSync(path.join(candidate, "index.html"))) {
             return candidate;

package/dist/node.d.ts

@@ -84,7 +84,6 @@ export declare class AgentNode {
     private sendControlResult;
     private buildRuntimeSnapshot;
     private buildPrimaryAgentStatus;
-    private getAvailableWorkerPluginNames;
     private isProtectedPrimarySession;
     private runSessionTurn;
     private runClaudeWorkerTurn;

package/dist/node.js

@@ -641,13 +641,12 @@ export class AgentNode {
                 const cwd = this.readString(payload.cwd) || message.cwd;
                 const displayName = this.readString(payload.displayName) || message.displayName;
                 const sessionId = this.readString(payload.sessionId) || message.target?.sessionId || generateSessionId();
-                console.log(`[AgentNode] control spawn_worker start: session=${sessionId} plugin=${pluginName} cwd=${JSON.stringify(cwd || "")} displayName=${JSON.stringify(displayName || "")} task=${JSON.stringify(taskSummary || "")}`);
                 try {
+                    console.log(`[AgentNode] spawn_worker request session=${sessionId} plugin=${pluginName} cwd=${cwd || ""}`);
                     await this.spawnWorker({ sessionId, pluginName, cwd, displayName, taskSummary });
                     if (taskSummary) {
                         this.rememberNodeSpawn(taskSummary, sessionId);
                     }
-                    console.log(`[AgentNode] control spawn_worker success: session=${sessionId} plugin=${pluginName}`);
                     this.sendControlResult(source, message.requestId, name, true, {
                         sessionId,
                         pluginName,
@@ -656,9 +655,11 @@ export class AgentNode {
                     });
                 }
                 catch (err) {
-                    console.error(`[AgentNode] control spawn_worker failed: session=${sessionId} plugin=${pluginName}`, err instanceof Error ? err.stack || err.message : err);
+                    console.error(`[AgentNode] spawn_worker failed session=${sessionId} plugin=${pluginName}:`, err);
                     this.sendControlResult(source, message.requestId, name, false, {
                         error: err instanceof Error ? err.message : String(err),
+                        sessionId,
+                        pluginName,
                     });
                 }
                 return;
@@ -973,7 +974,6 @@ export class AgentNode {
         return {
             pluginName: this.primaryAgent.pluginName,
             preferredWorkerPluginName: this.preferredWorkerPluginName,
-            availableWorkerPlugins: this.getAvailableWorkerPluginNames(),
             sessionId: this.primaryAgent.sessionId,
             status: this.primaryAgent.status,
             activityState: this.primaryAgent.activityState,
@@ -981,12 +981,6 @@ export class AgentNode {
             capabilities: this.primaryAgent.capabilities || [],
         };
     }
-    getAvailableWorkerPluginNames() {
-        return Array.from(this.plugins.values())
-            .map((plugin) => plugin.name)
-            .filter((name) => name !== this.primaryAgent.pluginName)
-            .sort((a, b) => a.localeCompare(b));
-    }
     isProtectedPrimarySession(sessionId) {
         return !!sessionId && sessionId === this.primaryAgent.sessionId;
     }

package/dist/plugin-loader.js

@@ -1,7 +1,6 @@
 import { readFileSync, readdirSync, existsSync } from "fs";
 import { join, extname, dirname, isAbsolute, resolve } from "path";
 import { fileURLToPath } from "url";
-import { createRequire } from "module";
 /**
  * 加载单个插件配置
  */
@@ -30,13 +29,12 @@ export function loadPlugin(path) {
     if (!["stdio", "pty", "rpc"].includes(config.type)) {
         throw new Error(`Plugin ${path} invalid type: ${config.type}`);
     }
-    const normalized = {
+    return {
         ...config,
         command: resolveCommandPath(config.command, configDir, repoRoot),
         args: resolveArgPaths(config.args, configDir, repoRoot),
         cwd: resolveOptionalPath(config.cwd, configDir, repoRoot),
     };
-    return maybeResolveBundledPieCommand(normalized, configDir, repoRoot);
 }
 function resolveOptionalPath(value, configDir, repoRoot) {
     if (!value)
@@ -84,62 +82,6 @@ function resolveArgPaths(args, configDir, repoRoot) {
         return arg;
     });
 }
-function maybeResolveBundledPieCommand(config, configDir, repoRoot) {
-    if (config.name !== "pie" || config.command !== "pie") {
-        return config;
-    }
-    const pieEntry = resolveInstalledPackageBin("@cydm/pie", configDir, repoRoot);
-    if (!pieEntry) {
-        return config;
-    }
-    return {
-        ...config,
-        command: process.execPath,
-        args: [pieEntry, ...(config.args || [])],
-    };
-}
-function resolveInstalledPackageBin(packageName, configDir, repoRoot) {
-    const requireFromHere = createRequire(import.meta.url);
-    try {
-        const packageJsonPath = requireFromHere.resolve(`${packageName}/package.json`);
-        const direct = readPackageBin(packageJsonPath);
-        if (direct)
-            return direct;
-    }
-    catch {
-        // Fall through to alternate roots below.
-    }
-    const searchRoots = [
-        configDir,
-        repoRoot,
-        process.cwd(),
-        dirname(fileURLToPath(import.meta.url)),
-    ];
-    for (const root of searchRoots) {
-        try {
-            const packageJsonPath = requireFromHere.resolve(`${packageName}/package.json`, { paths: [resolve(root)] });
-            const resolved = readPackageBin(packageJsonPath);
-            if (resolved)
-                return resolved;
-        }
-        catch {
-            continue;
-        }
-    }
-    return null;
-}
-function readPackageBin(packageJsonPath) {
-    const packageJson = JSON.parse(readFileSync(packageJsonPath, "utf-8"));
-    const packageRoot = dirname(packageJsonPath);
-    const binField = packageJson.bin;
-    const relativeBin = typeof binField === "string"
-        ? binField
-        : (binField && Object.values(binField)[0]) || null;
-    if (!relativeBin)
-        return null;
-    const binPath = resolve(packageRoot, relativeBin);
-    return existsSync(binPath) ? binPath : null;
-}
 /**
  * 扫描目录加载所有插件
  */

package/dist/workbench/index.html

@@ -2372,7 +2372,6 @@
 		let workers = [];
 		let preferredSessionId = localStorage.getItem('preferredSessionId');
 		let workerPollTimer = null;
-		let primaryAgent = null;
 		let selectedSpawnPlugin = readStoredSpawnPlugin();
 		let defaultSpawnCwd = localStorage.getItem('spawnCwd') || '';
 		let recentCwds = [];
@@ -2391,6 +2390,7 @@
 		let nodeDetailOpen = false;
 		let runtimeSummary = null;
 		let runtimeFocus = [];
+		let primaryAgent = null;
 		let pendingNodeReply = false;
 		let nodeTranscript = [{
 			id: `node-welcome-${Date.now()}`,
@@ -2429,45 +2429,18 @@
 			document.cookie = `${name}=${encodeURIComponent(value)}; path=/; max-age=${60 * 60 * 24 * 365}`;
 		}
 
-		function getAvailableSpawnPlugins() {
-			const plugins = Array.isArray(primaryAgent?.availableWorkerPlugins) && primaryAgent.availableWorkerPlugins.length
-				? primaryAgent.availableWorkerPlugins
-				: ['pie'];
-			return Array.from(new Set(plugins.filter((item) => typeof item === 'string' && item.length > 0)));
-		}
-
-		function normalizeSpawnPlugin(pluginName) {
-			const available = getAvailableSpawnPlugins();
-			if (pluginName && available.includes(pluginName)) return pluginName;
-			if (available.includes('pie')) return 'pie';
-			return available[0] || 'pie';
-		}
-
 		function readStoredSpawnPlugin() {
 			const cookieValue = readCookie('spawnPlugin');
 			const saved = cookieValue || localStorage.getItem('spawnPlugin') || 'pie';
-			return normalizeSpawnPlugin(saved);
+			return saved === 'claude-code' || saved === 'codex' ? saved : 'pie';
 		}
 
 		function persistSpawnPlugin(pluginName) {
-			selectedSpawnPlugin = normalizeSpawnPlugin(pluginName);
+			selectedSpawnPlugin = pluginName === 'claude-code' || pluginName === 'codex' ? pluginName : 'pie';
 			localStorage.setItem('spawnPlugin', selectedSpawnPlugin);
 			writeCookie('spawnPlugin', selectedSpawnPlugin);
 		}
 
-		function renderSpawnPluginOptions() {
-			const select = document.getElementById('spawnPlugin');
-			if (!select) return;
-			const available = getAvailableSpawnPlugins();
-			const current = normalizeSpawnPlugin(selectedSpawnPlugin);
-			select.innerHTML = available.map((pluginName) => (
-				`<option value="${escapeHtml(pluginName)}">${escapeHtml(getSpawnPluginLabel(pluginName))}</option>`
-			)).join('');
-			selectedSpawnPlugin = current;
-			select.value = current;
-			resetSpawnButton();
-		}
-
 		function loadRecentCwds() {
 			try {
 				const stored = readCookie('recentCwds') || localStorage.getItem('recentCwds') || '[]';
@@ -2577,7 +2550,7 @@
 		document.getElementById('nodeId').value = localStorage.getItem('nodeId') || '';
 		document.getElementById('password').value = localStorage.getItem('password') || '';
 		document.getElementById('spawnCwd').value = defaultSpawnCwd;
-		renderSpawnPluginOptions();
+		document.getElementById('spawnPlugin').value = selectedSpawnPlugin;
 		document.getElementById('spawnPlugin').addEventListener('change', (event) => {
 			persistSpawnPlugin(event.target.value || 'pie');
 			resetSpawnButton();
@@ -2618,17 +2591,6 @@
 			}
 		}
 
-		function setSpawnCwd(cwd, { remember = false } = {}) {
-			const next = (cwd || '').trim();
-			const input = document.getElementById('spawnCwd');
-			input.value = next;
-			defaultSpawnCwd = next;
-			localStorage.setItem('spawnCwd', defaultSpawnCwd);
-			if (remember && next) {
-				rememberCwd(next);
-			}
-		}
-
 		const searchParams = new URLSearchParams(window.location.search);
 		const inferredRelayUrl = inferDefaultRelayUrl();
 		document.getElementById('relayUrl').value = inferredRelayUrl;
@@ -3113,8 +3075,6 @@
 		function getSpawnPluginLabel(pluginName) {
 			if (pluginName === 'claude-code') return 'CLAUDE';
 			if (pluginName === 'codex') return 'CODEX';
-			if (pluginName === 'pie-unity') return 'PIE UNITY';
-			if (pluginName === 'echo') return 'ECHO';
 			return 'PIE';
 		}
 
@@ -3698,11 +3658,6 @@
 							pushNodeTranscript,
 							renderWorkers,
 							syncWorkerPluginPreference,
-							renderSpawnPluginOptions,
-							getSpawnCwd() {
-								return (document.getElementById('spawnCwd').value || '').trim();
-							},
-							setSpawnCwd,
 							setSessionDisplay(value) {
 								document.getElementById('session-display').textContent = value;
 							},

package/dist/workbench/runtime-control.js

@@ -19,7 +19,6 @@
 		ctx.runtimeSummary = snapshot.runtime || null;
 		ctx.runtimeFocus = snapshot.focus || [];
 		ctx.primaryAgent = snapshot.primary || null;
-		ctx.renderSpawnPluginOptions?.();
 		ctx.syncNodeTranscriptFromServer(snapshot.nodeHistory);
 
 		const liveSessionIds = new Set(ctx.workers.map((worker) => worker.sessionId));
@@ -106,21 +105,8 @@
 	}
 
 	function handleControlMessage(msg, ctx) {
-		if (msg.controlKind === "result" && msg.controlName === "spawn_worker") {
-			if (msg.ok === false) {
-				ctx.pendingSpawnSessionId = null;
-				ctx.pendingSpawnAutoAttach = true;
-				ctx.resetSpawnButton();
-				ctx.writeSystemNotice(`SPAWN FAILED: ${msg.payload?.error || msg.error || "Unknown error"}`);
-				ctx.renderWorkers();
-				return true;
-			}
-			return false;
-		}
-
 		if (msg.controlKind === "result" && msg.controlName === "get_primary_agent" && msg.payload && msg.payload.primary) {
 			ctx.primaryAgent = msg.payload.primary || null;
-			ctx.renderSpawnPluginOptions?.();
 			ctx.renderNodeHome();
 			return true;
 		}
@@ -148,6 +134,24 @@
 			return true;
 		}
 
+		if (msg.controlKind === "result" && msg.controlName === "spawn_worker") {
+			if (msg.ok === false) {
+				const requestedSessionId = msg.payload?.sessionId || msg.sessionId || ctx.pendingSpawnSessionId;
+				if (!requestedSessionId || requestedSessionId === ctx.pendingSpawnSessionId) {
+					ctx.pendingSpawnSessionId = null;
+					ctx.pendingSpawnAutoAttach = true;
+					ctx.resetSpawnButton();
+				}
+				ctx.writeSystemNotice(`WORKER SPAWN FAILED: ${msg.error || msg.payload?.error || "Unknown error"}`);
+				if (ctx.sessionId && ctx.sessionId === requestedSessionId) {
+					ctx.returnToPrimaryChat({ clearSession: true });
+				}
+				ctx.renderWorkers();
+				return true;
+			}
+			return true;
+		}
+
 		if (msg.controlKind === "result" && msg.controlName === "get_worker_detail" && msg.payload && msg.payload.worker) {
 			ctx.workerDetail = msg.payload.worker || null;
 			ctx.renderWorkerDetailPanel();
@@ -159,9 +163,6 @@
 			ctx.dirBrowserParentPath = msg.payload.parentPath || null;
 			ctx.dirBrowserRepoRoot = msg.payload.repoRoot || null;
 			ctx.dirBrowserEntries = msg.payload.entries || [];
-			if (!ctx.getSpawnCwd?.() && msg.payload.path) {
-				ctx.setSpawnCwd?.(msg.payload.path);
-			}
 			ctx.renderDirBrowser();
 			return true;
 		}
@@ -182,9 +183,6 @@
 			ctx.dirBrowserParentPath = msg.payload.parentPath || null;
 			ctx.dirBrowserRepoRoot = msg.payload.repoRoot || null;
 			ctx.dirBrowserEntries = msg.payload.entries || [];
-			if (!ctx.getSpawnCwd?.() && msg.payload.path) {
-				ctx.setSpawnCwd?.(msg.payload.path);
-			}
 			ctx.renderDirBrowser();
 			return true;
 		}

package/dist/workbench/runtime-messages.js

@@ -6,9 +6,6 @@
 				ctx.sessionId = null;
 				ctx.setSessionDisplay("----");
 				ctx.syncWorkerPluginPreference?.();
-				if (!ctx.getSpawnCwd?.()) {
-					ctx.requestDirBrowse?.();
-				}
 				ctx.requestWorkerList();
 				return true;
 

package/dist/worker-runtime.js

@@ -16,7 +16,6 @@ function normalizeWorkerCwd(cwd, pluginCwd) {
     return path.resolve(pluginCwd || process.cwd(), value);
 }
 export async function spawnManagedWorker(options, deps) {
-    console.log(`[WorkerRuntime] spawnManagedWorker start: session=${options.sessionId} plugin=${options.pluginName} cwd=${JSON.stringify(options.cwd || "")} displayName=${JSON.stringify(options.displayName || "")}`);
     const plugin = deps.plugins.get(options.pluginName);
     if (!plugin) {
         throw new Error(`Plugin not found: ${options.pluginName}`);
@@ -28,9 +27,7 @@ export async function spawnManagedWorker(options, deps) {
             : plugin.args,
         cwd: normalizeWorkerCwd(options.cwd, plugin.cwd),
     };
-    console.log(`[WorkerRuntime] resolved plugin: session=${options.sessionId} command=${JSON.stringify(runtimePlugin.command)} args=${JSON.stringify(runtimePlugin.args || [])} cwd=${JSON.stringify(runtimePlugin.cwd || process.cwd())}`);
     await deps.sessionManager.createSession(options.sessionId, runtimePlugin);
-    console.log(`[WorkerRuntime] session created: ${options.sessionId}`);
     const session = deps.sessionManager.getSession(options.sessionId);
     if (!session) {
         throw new Error(`Session failed to start: ${options.sessionId}`);
@@ -63,7 +60,6 @@ export async function spawnManagedWorker(options, deps) {
     deps.workerRegistry.updateWorkerStatus(session.agentId, "running", {
         startedAt: Date.now(),
     });
-    console.log(`[WorkerRuntime] worker record ready: session=${options.sessionId} agent=${session.agentId}`);
     return {
         type: "session",
         sessionId: options.sessionId,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cydm/magic-shell-agent-node",
-  "version": "0.1.8",
+  "version": "0.1.10",
   "description": "Magic Shell Agent Node - Local agent connector",
   "homepage": "https://magicshell.ai",
   "keywords": [
@@ -24,10 +24,11 @@
   "scripts": {
     "build": "tsc && node ./scripts/copy-default-plugins.mjs",
     "dev": "tsc --watch",
+    "prepack": "npm run build",
     "start": "node dist/node.js"
   },
   "dependencies": {
-    "@cydm/magic-shell-protocol": "0.1.2",
+    "@cydm/magic-shell-protocol": "0.1.1",
     "node-pty": "^1.1.0",
     "ws": "^8.18.0"
   },