openclaw-navigator 4.3.0 → 4.3.2

package/cli.mjs

@@ -18,8 +18,8 @@ import { randomUUID } from "node:crypto";
 import { existsSync } from "node:fs";
 import { createServer } from "node:http";
 import { networkInterfaces, hostname, userInfo } from "node:os";
-import { fileURLToPath } from "node:url";
 import { dirname, join } from "node:path";
+import { fileURLToPath } from "node:url";
 // readline reserved for future interactive mode
 
 // ── Colors (ANSI) ──────────────────────────────────────────────────────────
@@ -659,7 +659,7 @@ ${BOLD}How it works:${RESET}
   console.log(`${BOLD}${GREEN}Bridge is running.${RESET} Waiting for Navigator to connect...`);
   console.log(`${DIM}Press Ctrl+C to stop.${RESET}\n`);
 
-  // ── Step 6 (optional): Start MCP server ─────────────────────────────
+  // ── Step 6 (optional): Start MCP server + register with mcporter ────
   let mcpProcess = null;
   if (withMcp) {
     const __dirname = dirname(fileURLToPath(import.meta.url));
@@ -682,7 +682,106 @@ ${BOLD}How it works:${RESET}
     });
 
     ok(`MCP server started (PID ${mcpProcess.pid}) — bridge: http://localhost:${port}`);
-    info(`  OpenClaw can connect via stdio to this process's MCP server`);
+
+    // ── 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.
+    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();
+      });
+
+      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");
+        }
+      });
+
+      reg.on("error", () => {
+        info("  mcporter not found — OC agent can still use the MCP server directly");
+      });
+    } catch {
+      // mcporter not installed — skip silently
+    }
+
+    // ── Auto-register with OpenClaw agent config (~/.openclaw/openclaw.json) ──
+    // The OC agent reads MCP servers from this file, not mcporter.
+    // This ensures the 15 Navigator tools show up in the agent's tool schema.
+    try {
+      const { readFileSync, writeFileSync, mkdirSync } = await import("node:fs");
+      const { homedir } = await import("node:os");
+      const ocDir = join(homedir(), ".openclaw");
+      const ocConfigPath = join(ocDir, "openclaw.json");
+
+      let ocConfig = {};
+      try {
+        ocConfig = JSON.parse(readFileSync(ocConfigPath, "utf8"));
+      } catch {
+        // File doesn't exist or invalid — start fresh
+      }
+
+      // Ensure the nested structure exists
+      if (!ocConfig.agents) ocConfig.agents = {};
+      if (!ocConfig.agents.defaults) ocConfig.agents.defaults = {};
+      if (!ocConfig.agents.defaults.mcp) ocConfig.agents.defaults.mcp = {};
+      if (!ocConfig.agents.defaults.mcp.servers) ocConfig.agents.defaults.mcp.servers = {};
+
+      // Check if navigator is already configured correctly
+      const existing = ocConfig.agents.defaults.mcp.servers.navigator;
+      const desired = {
+        command: process.execPath,
+        args: [mcpPath],
+        env: { NAVIGATOR_BRIDGE_URL: `http://localhost:${port}` },
+      };
+
+      const needsUpdate =
+        !existing ||
+        existing.command !== desired.command ||
+        JSON.stringify(existing.args) !== JSON.stringify(desired.args);
+
+      if (needsUpdate) {
+        ocConfig.agents.defaults.mcp.servers.navigator = desired;
+        mkdirSync(ocDir, { recursive: true });
+        writeFileSync(ocConfigPath, JSON.stringify(ocConfig, null, 2) + "\n", "utf8");
+        ok("Registered Navigator MCP in ~/.openclaw/openclaw.json (15 tools → OC agent)");
+        info("  Restart the OC gateway to pick up the new tools");
+      } else {
+        info("  Navigator already registered in ~/.openclaw/openclaw.json");
+      }
+    } catch (err) {
+      warn(`Could not auto-register with OpenClaw config: ${err.message}`);
+      info("  Manually add to ~/.openclaw/openclaw.json → agents.defaults.mcp.servers.navigator");
+    }
+
     console.log("");
   }
 

package/mcp.mjs

@@ -16,15 +16,11 @@
 
 import { Server } from "@modelcontextprotocol/sdk/server/index.js";
 import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js";
-import {
-  ListToolsRequestSchema,
-  CallToolRequestSchema,
-} from "@modelcontextprotocol/sdk/types.js";
+import { ListToolsRequestSchema, CallToolRequestSchema } from "@modelcontextprotocol/sdk/types.js";
 
 // ── Configuration ─────────────────────────────────────────────────────────
 
-const BRIDGE_URL =
-  process.env.NAVIGATOR_BRIDGE_URL ?? "http://localhost:18790";
+const BRIDGE_URL = process.env.NAVIGATOR_BRIDGE_URL ?? "http://localhost:18790";
 const POLL_INTERVAL_MS = 500;
 const DEFAULT_TIMEOUT_MS = 15_000;
 const WAIT_READY_TIMEOUT_MS = 20_000;
@@ -65,11 +61,7 @@ async function bridgePost(path, body) {
  * @param {number} [timeout] - max wait in ms
  * @returns {Promise<object|null>} matched event or null on timeout
  */
-async function waitForEvent(
-  predicate,
-  startTime,
-  timeout = DEFAULT_TIMEOUT_MS,
-) {
+async function waitForEvent(predicate, startTime, timeout = DEFAULT_TIMEOUT_MS) {
   const deadline = Date.now() + timeout;
 
   while (Date.now() < deadline) {
@@ -128,8 +120,7 @@ async function sendCommand(command, payload, poll) {
   if (poll.eventType) {
     predicate = (e) => e.type === poll.eventType;
   } else if (poll.commandName) {
-    predicate = (e) =>
-      e.type === "command.result" && e.data?.command === poll.commandName;
+    predicate = (e) => e.type === "command.result" && e.data?.command === poll.commandName;
   } else {
     return { ok: true, commandId: postResult.commandId, command };
   }
@@ -198,8 +189,7 @@ const TOOLS = [
   },
   {
     name: "navigator_close_tab",
-    description:
-      "Close a browser tab by its index or ID. Returns immediately after queuing.",
+    description: "Close a browser tab by its index or ID. Returns immediately after queuing.",
     inputSchema: {
       type: "object",
       properties: {
@@ -212,20 +202,17 @@ const TOOLS = [
   // ── Poll by event type ──
   {
     name: "navigator_list_tabs",
-    description:
-      "List all open tabs in the Navigator browser with their URLs, titles, and IDs.",
+    description: "List all open tabs in the Navigator browser with their URLs, titles, and IDs.",
     inputSchema: { type: "object", properties: {} },
   },
   {
     name: "navigator_snapshot",
-    description:
-      "Get a snapshot of the browser state — active tab, URL, title, and full tab list.",
+    description: "Get a snapshot of the browser state — active tab, URL, title, and full tab list.",
     inputSchema: { type: "object", properties: {} },
   },
   {
     name: "navigator_get_text",
-    description:
-      "Get the text content of the active page (equivalent to document.body.innerText).",
+    description: "Get the text content of the active page (equivalent to document.body.innerText).",
     inputSchema: { type: "object", properties: {} },
   },
 
@@ -247,8 +234,7 @@ const TOOLS = [
   },
   {
     name: "navigator_fill",
-    description:
-      "Fill an input field with text. Waits for confirmation from the browser.",
+    description: "Fill an input field with text. Waits for confirmation from the browser.",
     inputSchema: {
       type: "object",
       properties: {
@@ -273,16 +259,14 @@ const TOOLS = [
       properties: {
         selector: {
           type: "string",
-          description:
-            "CSS selector of the form or an element inside it (submits closest form)",
+          description: "CSS selector of the form or an element inside it (submits closest form)",
         },
       },
     },
   },
   {
     name: "navigator_scroll",
-    description:
-      "Scroll the page in a direction (up/down/top/bottom) or by exact pixel offsets.",
+    description: "Scroll the page in a direction (up/down/top/bottom) or by exact pixel offsets.",
     inputSchema: {
       type: "object",
       properties: {
@@ -389,28 +373,18 @@ async function handleTool(name, args) {
 
       // ── Poll by event type ──
       case "navigator_list_tabs":
-        return jsonResult(
-          await sendCommand("tabs.list", {}, { eventType: "tabs.list" }),
-        );
+        return jsonResult(await sendCommand("tabs.list", {}, { eventType: "tabs.list" }));
 
       case "navigator_snapshot":
-        return jsonResult(
-          await sendCommand("snapshot", {}, { eventType: "snapshot" }),
-        );
+        return jsonResult(await sendCommand("snapshot", {}, { eventType: "snapshot" }));
 
       case "navigator_get_text":
-        return jsonResult(
-          await sendCommand("page.content", {}, { eventType: "page.content" }),
-        );
+        return jsonResult(await sendCommand("page.content", {}, { eventType: "page.content" }));
 
       // ── Poll by command.result ──
       case "navigator_click":
         return jsonResult(
-          await sendCommand(
-            "click",
-            { selector: args.selector },
-            { commandName: "click" },
-          ),
+          await sendCommand("click", { selector: args.selector }, { commandName: "click" }),
         );
 
       case "navigator_fill":
@@ -442,25 +416,15 @@ async function handleTool(name, args) {
 
       case "navigator_execute_js":
         return jsonResult(
-          await sendCommand(
-            "execute",
-            { code: args.code },
-            { commandName: "execute" },
-          ),
+          await sendCommand("execute", { code: args.code }, { commandName: "execute" }),
         );
 
       case "navigator_get_html":
-        return jsonResult(
-          await sendCommand("page.html", {}, { commandName: "page.html" }),
-        );
+        return jsonResult(await sendCommand("page.html", {}, { commandName: "page.html" }));
 
       case "navigator_query_element":
         return jsonResult(
-          await sendCommand(
-            "dom.query",
-            { selector: args.selector },
-            { commandName: "dom.query" },
-          ),
+          await sendCommand("dom.query", { selector: args.selector }, { commandName: "dom.query" }),
         );
 
       case "navigator_wait_ready":

package/package.json

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