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

package/dist/index.d.ts

@@ -1,2 +1,3 @@
 export { AgentNode, type NodeOptions, main as runAgentNode } from "./node.js";
 export { getDefaultPluginDir } from "./plugin-loader.js";
+export { getMagicShellCliPath, getPackagedPluginDir, getPrimaryPieExtensionDistDir, getWorkbenchRoot } from "./runtime-assets.js";

package/dist/index.js

@@ -1,2 +1,3 @@
 export { AgentNode, main as runAgentNode } from "./node.js";
 export { getDefaultPluginDir } from "./plugin-loader.js";
+export { getMagicShellCliPath, getPackagedPluginDir, getPrimaryPieExtensionDistDir, getWorkbenchRoot } from "./runtime-assets.js";

package/dist/local-direct-server.js

@@ -1,8 +1,8 @@
 import { createServer } from "node:http";
 import { existsSync, createReadStream } from "node:fs";
 import path from "node:path";
-import { fileURLToPath } from "node:url";
 import { WebSocketServer, WebSocket } from "ws";
+import { getWorkbenchRoot } from "./runtime-assets.js";
 function createConnectionId() {
     return `local-${Date.now()}-${Math.random().toString(36).slice(2, 8)}`;
 }
@@ -21,25 +21,6 @@ function guessContentType(filePath) {
         return "image/png";
     return "text/plain; charset=utf-8";
 }
-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;
-        }
-    }
-    return null;
-}
 export class LocalDirectServer {
     options;
     delegate;
@@ -47,7 +28,7 @@ export class LocalDirectServer {
     wsServer = new WebSocketServer({ noServer: true });
     connections = new Map();
     sessionToConnections = new Map();
-    workbenchRoot = findWorkbenchRoot();
+    workbenchRoot = getWorkbenchRoot();
     constructor(options, delegate) {
         this.options = options;
         this.delegate = delegate;

package/dist/node.js

@@ -1,3 +1,4 @@
+import { createRequire } from "node:module";
 import { WebSocketClient } from "./ws-client.js";
 import { SessionManager } from "./session-manager.js";
 import { LocalDirectServer } from "./local-direct-server.js";
@@ -16,9 +17,10 @@ import { runClaudeExec } from "./claude-exec.js";
 import { codexNeedsTrustConfirmation, getLastCodexWorkerMessage, isCodexReadyForTask, isCodexWorker, summarizeCodexWorkerOutput, } from "./codex-worker.js";
 import { runCodexExec } from "./codex-exec.js";
 import { extractTerminalMetadata, normalizeWorkerTitleCandidate, } from "./terminal-metadata.js";
-import { existsSync } from "node:fs";
+import { chmodSync, existsSync, readdirSync } from "node:fs";
 import os from "node:os";
 import path from "node:path";
+const require = createRequire(import.meta.url);
 function generateSessionId() {
     return `session-${Date.now()}-${Math.random().toString(36).slice(2, 8)}`;
 }
@@ -84,6 +86,7 @@ export class AgentNode {
         console.log(`[AgentNode] Starting...`);
         console.log(`[AgentNode] Node ID: ${this.options.nodeId}`);
         console.log(`[AgentNode] Relay: ${this.options.relayUrl}`);
+        ensureSpawnHelperExecutable();
         // 1. 加载插件
         this.plugins = loadPlugins({ dir: this.options.pluginDir });
         if (this.plugins.size === 0) {
@@ -1933,6 +1936,34 @@ Environment Variables:
   MAGIC_SHELL_DISABLE_LOCAL_DIRECT Set to 1 to disable the local direct server
 `);
 }
+function ensureSpawnHelperExecutable() {
+    try {
+        const pkgPath = require.resolve("node-pty/package.json");
+        const prebuildRoot = path.join(path.dirname(pkgPath), "prebuilds");
+        if (!existsSync(prebuildRoot))
+            return;
+        for (const entry of walk(prebuildRoot)) {
+            if (path.basename(entry) === "spawn-helper") {
+                chmodSync(entry, 0o755);
+            }
+        }
+    }
+    catch {
+        // Ignore best-effort fixups during startup.
+    }
+}
+function walk(dir) {
+    const files = [];
+    for (const entry of readdirSync(dir, { withFileTypes: true })) {
+        const fullPath = path.join(dir, entry.name);
+        if (entry.isDirectory()) {
+            files.push(...walk(fullPath));
+            continue;
+        }
+        files.push(fullPath);
+    }
+    return files;
+}
 // 主函数
 async function main() {
     const options = parseArgs();

package/dist/plugin-loader.js

@@ -1,7 +1,7 @@
 import { readFileSync, readdirSync, existsSync } from "fs";
 import { join, extname, dirname, isAbsolute, resolve } from "path";
-import { fileURLToPath } from "url";
 import { createRequire } from "module";
+import { getPackagedPluginDir } from "./runtime-assets.js";
 const require = createRequire(import.meta.url);
 /**
  * 加载单个插件配置
@@ -39,9 +39,6 @@ export function loadPlugin(path) {
     });
 }
 function normalizePluginConfigForRuntime(config) {
-    if (process.platform !== "win32") {
-        return config;
-    }
     if (config.name === "pie") {
         const pieEntry = resolvePackageBinEntry("@cydm/pie", "pie");
         if (pieEntry) {
@@ -52,6 +49,9 @@ function normalizePluginConfigForRuntime(config) {
             };
         }
     }
+    if (process.platform !== "win32") {
+        return config;
+    }
     if ((config.name === "claude-code" || config.name === "codex") && isShellCommand(config.command)) {
         return {
             ...config,
@@ -174,18 +174,9 @@ export function loadPlugins(options) {
  * 获取默认插件目录
  */
 export function getDefaultPluginDir() {
-    // 优先使用环境变量
-    if (process.env.MAGIC_SHELL_PLUGINS_DIR) {
-        return process.env.MAGIC_SHELL_PLUGINS_DIR;
-    }
-    const packagePluginDir = resolve(dirname(fileURLToPath(import.meta.url)), "..", "plugins");
-    if (existsSync(packagePluginDir)) {
-        return packagePluginDir;
-    }
-    const distPluginDir = resolve(dirname(fileURLToPath(import.meta.url)), "plugins");
-    if (existsSync(distPluginDir)) {
-        return distPluginDir;
+    const pluginDir = getPackagedPluginDir();
+    if (pluginDir) {
+        return pluginDir;
     }
-    // 回退到当前工作目录的 plugins，兼容仓库内开发
-    return join(process.cwd(), "plugins");
+    throw new Error("Magic Shell plugin assets are unavailable. Set MAGIC_SHELL_PLUGINS_DIR or run from a built source checkout.");
 }

package/dist/primary-agent-bridge.d.ts

@@ -55,7 +55,6 @@ export interface PrimarySessionSnapshot {
     lastMessageRole?: string;
     lastAssistantHasToolCall?: boolean;
 }
-export declare function getPrimaryPieExtensionDistDir(): string;
 export declare function withPrimaryPieExtensionPath(plugin: PluginConfig): PluginConfig;
 export declare function buildPrimaryPrompt(text: string, context: PrimaryAgentPromptContext): string;
 export declare function buildPrimarySessionPrompt(text: string, context: PrimarySessionPromptContext): string;

package/dist/primary-agent-bridge.js

@@ -2,20 +2,50 @@ import { spawn } from "node:child_process";
 import fs from "node:fs";
 import os from "node:os";
 import path from "node:path";
-import { fileURLToPath } from "node:url";
-export function getPrimaryPieExtensionDistDir() {
-    const currentDir = path.dirname(fileURLToPath(import.meta.url));
-    const repoRoot = path.resolve(currentDir, "..", "..", "..");
-    return path.join(repoRoot, "packages", "primary-pie-extension", "dist");
+import { getMagicShellCliPath, getPrimaryPieExtensionDistDir } from "./runtime-assets.js";
+function getPrimaryPieExtensionPackageDir(extensionRoot) {
+    const packagedDir = path.join(extensionRoot, "magic-shell-agent");
+    if (fs.existsSync(path.join(packagedDir, "package.json"))) {
+        return packagedDir;
+    }
+    if (fs.existsSync(path.join(extensionRoot, "package.json"))) {
+        return extensionRoot;
+    }
+    return null;
+}
+function ensurePieExtensionDiscovery(extensionRoot) {
+    const extensionPackageDir = getPrimaryPieExtensionPackageDir(extensionRoot);
+    if (!extensionPackageDir) {
+        throw new Error(`Primary PIE extension package is missing under ${extensionRoot}`);
+    }
+    const targetDir = path.join(os.homedir(), ".pie", "extensions", path.basename(extensionPackageDir));
+    fs.rmSync(targetDir, { recursive: true, force: true });
+    fs.mkdirSync(path.dirname(targetDir), { recursive: true });
+    fs.cpSync(extensionPackageDir, targetDir, { recursive: true });
+    return targetDir;
 }
 export function withPrimaryPieExtensionPath(plugin) {
     if (plugin.name !== "pie") {
         return plugin;
     }
     const extensionDir = getPrimaryPieExtensionDistDir();
+    if (!extensionDir) {
+        throw new Error("Primary PIE extension assets are unavailable. Use the packaged @cydm/magic-shell runtime or build packages/primary-pie-extension first.");
+    }
+    const cliPath = getMagicShellCliPath();
+    if (!cliPath) {
+        throw new Error("Magic Shell CLI runtime is unavailable for the primary PIE extension. Start the node via `magic-shell node start` or set MAGIC_SHELL_CLI_PATH.");
+    }
+    const installedExtensionDir = ensurePieExtensionDiscovery(extensionDir);
     return {
         ...plugin,
         args: [...(plugin.args || []), "--extension-path", extensionDir],
+        env: {
+            ...(plugin.env || {}),
+            MAGIC_SHELL_CLI_PATH: cliPath,
+            MAGIC_SHELL_PRIMARY_EXTENSION_DIR: extensionDir,
+            MAGIC_SHELL_PRIMARY_EXTENSION_PACKAGE_DIR: installedExtensionDir,
+        },
     };
 }
 export function buildPrimaryPrompt(text, context) {