openclaw-navigator 4.3.4 → 4.3.6

package/cli.mjs

@@ -772,53 +772,146 @@ ${BOLD}How it works:${RESET}
     ok(`MCP server started (PID ${mcpProcess.pid}) — bridge: http://localhost:${port}`);
 
     // ── Auto-register MCP server with mcporter (if available) ─────────
-    // This makes the 15 navigator tools discoverable by the OC agent.
-    // Uses --scope home so it persists in ~/.mcporter/mcporter.json.
+    // Writes directly to ~/.mcporter/mcporter.json for reliability.
+    //
+    // KEY FIX: We resolve stable paths instead of using process.execPath
+    // which may point to a temp npx cache (/Users/x/.npm/_npx/<hash>/node)
+    // that disappears after npx exits. We find the REAL node binary and
+    // the globally-installed mcp.mjs (or realpath of the current one).
     try {
-      const reg = spawn(
-        "mcporter",
-        [
-          "config",
-          "add",
-          "navigator",
-          "--command",
-          process.execPath,
-          "--arg",
-          mcpPath,
-          "--env",
-          `NAVIGATOR_BRIDGE_URL=http://localhost:${port}`,
-          "--description",
-          "Navigator browser control (15 tools: navigate, click, fill, read, etc.)",
-          "--scope",
-          "home",
-        ],
-        { stdio: ["ignore", "pipe", "pipe"] },
-      );
-
-      let regOut = "";
-      reg.stdout?.on("data", (d) => {
-        regOut += d.toString();
-      });
-      reg.stderr?.on("data", (d) => {
-        regOut += d.toString();
-      });
+      const { readFileSync, writeFileSync, mkdirSync, realpathSync } = await import("node:fs");
+      const { homedir } = await import("node:os");
+
+      // Resolve stable node binary (follow symlinks out of npx temp dir)
+      let stableNode;
+      try {
+        stableNode = realpathSync(process.execPath);
+      } catch {
+        stableNode = process.execPath;
+      }
+
+      // Resolve stable mcp.mjs path
+      let stableMcpPath;
+      try {
+        stableMcpPath = realpathSync(mcpPath);
+      } catch {
+        stableMcpPath = mcpPath;
+      }
 
-      reg.on("close", (code) => {
-        if (code === 0) {
-          ok("Registered MCP server with mcporter (15 browser tools available to OC agent)");
-        } else if (regOut.includes("already exists")) {
-          info("  mcporter: navigator server already registered");
-        } else {
-          // mcporter not installed or failed — that's fine, not required
-          info("  mcporter not found — OC agent can still use the MCP server directly");
+      // If paths are still in npx temp cache, try to find the real install
+      if (stableMcpPath.includes("_npx") || stableMcpPath.includes(".npm/_npx")) {
+        // Check if openclaw-navigator is installed globally
+        const nodeDir = dirname(stableNode);
+        const globalMcp = join(dirname(nodeDir), "lib/node_modules/openclaw-navigator/mcp.mjs");
+        if (existsSync(globalMcp)) {
+          stableMcpPath = globalMcp;
         }
-      });
+        // If still temp, that's OK — mcporter will use the path we give it
+        // and the bridge running alongside keeps the MCP server alive anyway
+      }
 
-      reg.on("error", () => {
-        info("  mcporter not found — OC agent can still use the MCP server directly");
-      });
-    } catch {
-      // mcporter not installed — skip silently
+      info(`  mcporter: node=${stableNode}`);
+      info(`  mcporter: mcp=${stableMcpPath}`);
+
+      // Write directly to ~/.mcporter/mcporter.json
+      const mcporterDir = join(homedir(), ".mcporter");
+      const mcporterConfigPath = join(mcporterDir, "mcporter.json");
+
+      let mcporterConfig = { mcpServers: {}, imports: [] };
+      try {
+        mcporterConfig = JSON.parse(readFileSync(mcporterConfigPath, "utf8"));
+        if (!mcporterConfig.mcpServers) {
+          mcporterConfig.mcpServers = {};
+        }
+      } catch {
+        // File doesn't exist or invalid — start fresh
+      }
+
+      // Set/update the navigator entry with stable paths
+      mcporterConfig.mcpServers.navigator = {
+        command: stableNode,
+        args: [stableMcpPath],
+        env: { NAVIGATOR_BRIDGE_URL: `http://localhost:${port}` },
+      };
+
+      mkdirSync(mcporterDir, { recursive: true });
+      writeFileSync(mcporterConfigPath, JSON.stringify(mcporterConfig, null, 2) + "\n", "utf8");
+      ok("Registered MCP server with mcporter (15 browser tools available)");
+      info(`  Config: ${mcporterConfigPath}`);
+    } catch (err) {
+      warn(`mcporter registration failed: ${err.message}`);
+      info("  You can manually configure mcporter for Navigator MCP");
+    }
+
+    // ── Install launchd auto-start (macOS only) ──────────────────────────
+    // Creates ~/Library/LaunchAgents/com.openclaw.navigator-bridge.plist
+    // so the bridge + MCP server starts automatically on login.
+    if (process.platform === "darwin") {
+      try {
+        const { writeFileSync: writePlist, existsSync: plistExists, mkdirSync: mkPlist } = await import("node:fs");
+        const { homedir: homeDir } = await import("node:os");
+        const home = homeDir();
+        const launchAgentsDir = join(home, "Library/LaunchAgents");
+        const plistPath = join(launchAgentsDir, "com.openclaw.navigator-bridge.plist");
+
+        // Resolve the stable node path (same one we found above for mcporter)
+        const { realpathSync: rp } = await import("node:fs");
+        let nodeForPlist;
+        try { nodeForPlist = rp(process.execPath); } catch { nodeForPlist = process.execPath; }
+
+        // Find npx next to the stable node
+        const npxForPlist = join(dirname(nodeForPlist), "npx");
+
+        const plistContent = `<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+    <key>Label</key>
+    <string>com.openclaw.navigator-bridge</string>
+    <key>ProgramArguments</key>
+    <array>
+        <string>${npxForPlist}</string>
+        <string>openclaw-navigator@latest</string>
+        <string>--mcp</string>
+        <string>--port</string>
+        <string>${port}</string>
+    </array>
+    <key>EnvironmentVariables</key>
+    <dict>
+        <key>PATH</key>
+        <string>${dirname(nodeForPlist)}:/usr/local/bin:/usr/bin:/bin:/opt/homebrew/bin</string>
+    </dict>
+    <key>RunAtLoad</key>
+    <true/>
+    <key>KeepAlive</key>
+    <true/>
+    <key>StandardOutPath</key>
+    <string>${home}/.openclaw/navigator-bridge.log</string>
+    <key>StandardErrorPath</key>
+    <string>${home}/.openclaw/navigator-bridge.log</string>
+    <key>WorkingDirectory</key>
+    <string>${home}</string>
+</dict>
+</plist>
+`;
+        mkPlist(launchAgentsDir, { recursive: true });
+        mkPlist(join(home, ".openclaw"), { recursive: true });
+        writePlist(plistPath, plistContent, "utf8");
+
+        // Load the service (unload first if already loaded)
+        try {
+          const { execSync: ex } = await import("node:child_process");
+          try { ex(`launchctl unload "${plistPath}" 2>/dev/null`, { stdio: "ignore" }); } catch { /* not loaded */ }
+          // Don't load now — we're already running. It'll start on next login.
+        } catch { /* launchctl not available */ }
+
+        ok("Auto-start installed — bridge will start on login");
+        info(`  Plist: ${plistPath}`);
+        info(`  Logs: ~/.openclaw/navigator-bridge.log`);
+        info(`  To disable: launchctl unload "${plistPath}"`);
+      } catch (err) {
+        info(`  Auto-start setup skipped: ${err.message}`);
+      }
     }
 
     console.log("");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openclaw-navigator",
-  "version": "4.3.4",
+  "version": "4.3.6",
   "description": "One-command bridge + tunnel for the Navigator browser — works on any machine, any OS",
   "keywords": [
     "browser",