aipex-mcp-bridge 2.0.0 → 2.0.1

package/dist/bridge.js

@@ -8,7 +8,7 @@ import {
 
 // src/bridge.ts
 import { randomUUID } from "crypto";
-import { createServer as createHttpServer } from "http";
+import { createServer as createHttpServer, request as httpRequest } from "http";
 import { Server as McpServer } from "@modelcontextprotocol/sdk/server/index.js";
 import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js";
 import {
@@ -86,13 +86,13 @@ Usage:
   aipex-mcp-bridge [options]
 
 Options:
+  --native-host      Run as Chrome Native Messaging host (set automatically by register)
   --port <port>      HTTP port for Streamable HTTP transport (default: ${DEFAULT_HTTP_PORT})
-  --stdio-only       Only serve via stdio, skip HTTP server
   --help, -h         Show this help message
   --version, -v      Show version
 
-The bridge is typically launched automatically by Chrome via Native Messaging,
-or by MCP clients (Cursor, Claude Desktop) via stdio.
+When run without --native-host, the bridge serves MCP via stdio (for Cursor, Claude, etc.)
+and forwards tool calls to the native host's HTTP server at localhost:${DEFAULT_HTTP_PORT}.
 `);
   process.exit(0);
 }
@@ -102,7 +102,6 @@ if (cliArgs.includes("--version") || cliArgs.includes("-v")) {
 }
 var portIdx = cliArgs.indexOf("--port");
 var HTTP_PORT = portIdx !== -1 ? parseInt(cliArgs[portIdx + 1], 10) : DEFAULT_HTTP_PORT;
-var STDIO_ONLY = cliArgs.includes("--stdio-only");
 if (isNaN(HTTP_PORT) || HTTP_PORT < 1 || HTTP_PORT > 65535) {
   process.stderr.write(`Invalid port number. Must be between 1 and 65535.
 `);
@@ -112,7 +111,7 @@ function log(msg) {
   process.stderr.write(`[aipex-bridge] ${msg}
 `);
 }
-var isLaunchedByChrome = !process.stdin.isTTY && !cliArgs.includes("--stdio-only") && !cliArgs.includes("--port");
+var IS_NATIVE_HOST = cliArgs.includes("--native-host");
 var pendingRequests = /* @__PURE__ */ new Map();
 function rejectAllPending(reason) {
   for (const [, entry] of pendingRequests) {
@@ -204,7 +203,7 @@ function handleExtensionMessage(msg) {
       log(`Unhandled extension message type: ${msg.type}`);
   }
 }
-async function fetchToolsFromExtension() {
+async function fetchToolsViaExtension() {
   try {
     const tools = await sendToExtension(
       { type: NativeMessageType.LIST_TOOLS, requestId: randomUUID() },
@@ -218,7 +217,7 @@ async function fetchToolsFromExtension() {
     return cachedTools;
   }
 }
-async function callToolOnExtension(name, args) {
+async function callToolViaExtension(name, args) {
   return sendToExtension(
     {
       type: NativeMessageType.CALL_TOOL,
@@ -229,14 +228,124 @@ async function callToolOnExtension(name, args) {
     TOOL_CALL_TIMEOUT_MS
   );
 }
-function createMcpServerInstance() {
+function httpPost(path, body, timeoutMs) {
+  return new Promise((resolve, reject) => {
+    const data = JSON.stringify(body);
+    const timer = setTimeout(() => {
+      reject(new Error(`HTTP request to native host timed out after ${timeoutMs}ms`));
+    }, timeoutMs);
+    const req = httpRequest(
+      {
+        hostname: "127.0.0.1",
+        port: HTTP_PORT,
+        path,
+        method: "POST",
+        headers: {
+          "Content-Type": "application/json",
+          "Content-Length": Buffer.byteLength(data)
+        }
+      },
+      (res) => {
+        const chunks = [];
+        res.on("data", (chunk) => chunks.push(chunk));
+        res.on("end", () => {
+          clearTimeout(timer);
+          const responseBody = Buffer.concat(chunks).toString("utf-8");
+          try {
+            resolve(JSON.parse(responseBody));
+          } catch {
+            resolve(responseBody);
+          }
+        });
+      }
+    );
+    req.on("error", (err) => {
+      clearTimeout(timer);
+      reject(err);
+    });
+    req.write(data);
+    req.end();
+  });
+}
+async function checkNativeHostHealth() {
+  try {
+    const result = await new Promise((resolve, reject) => {
+      const req = httpRequest(
+        {
+          hostname: "127.0.0.1",
+          port: HTTP_PORT,
+          path: "/health",
+          method: "GET",
+          timeout: 3e3
+        },
+        (res) => {
+          const chunks = [];
+          res.on("data", (chunk) => chunks.push(chunk));
+          res.on("end", () => {
+            try {
+              resolve(JSON.parse(Buffer.concat(chunks).toString("utf-8")));
+            } catch {
+              resolve(null);
+            }
+          });
+        }
+      );
+      req.on("error", reject);
+      req.on("timeout", () => {
+        req.destroy();
+        reject(new Error("timeout"));
+      });
+      req.end();
+    });
+    const health = result;
+    return health?.status === "ok" && health?.extensionConnected === true;
+  } catch {
+    return false;
+  }
+}
+async function fetchToolsViaHttp() {
+  try {
+    const jsonRpc = {
+      jsonrpc: "2.0",
+      id: randomUUID(),
+      method: "tools/list",
+      params: {}
+    };
+    const resp = await httpPost("/mcp", jsonRpc, EXTENSION_REQUEST_TIMEOUT_MS);
+    if (resp?.result?.tools) {
+      cachedTools = resp.result.tools;
+      return cachedTools;
+    }
+    return cachedTools;
+  } catch (err) {
+    log(`Failed to fetch tools via HTTP: ${err instanceof Error ? err.message : String(err)}`);
+    return cachedTools;
+  }
+}
+async function callToolViaHttp(name, args) {
+  const jsonRpc = {
+    jsonrpc: "2.0",
+    id: randomUUID(),
+    method: "tools/call",
+    params: { name, arguments: args }
+  };
+  return httpPost("/mcp", jsonRpc, TOOL_CALL_TIMEOUT_MS);
+}
+function createMcpServerInstance(useHttp) {
   const server = new McpServer(
     { name: "aipex-browser-tools", version: "2.0.0" },
     { capabilities: { tools: {} } }
   );
   server.setRequestHandler(ListToolsRequestSchema, async () => {
-    if (extensionConnected) {
-      await fetchToolsFromExtension();
+    if (useHttp) {
+      const healthy = await checkNativeHostHealth();
+      if (healthy) {
+        await fetchToolsViaHttp();
+      }
+    } else {
+      if (extensionConnected) {
+        await fetchToolsViaExtension();
+      }
     }
     if (cachedTools.length > 0) {
       return { tools: cachedTools };
@@ -258,32 +367,68 @@ function createMcpServerInstance() {
   });
   server.setRequestHandler(CallToolRequestSchema, async (request) => {
     const { name, arguments: args } = request.params;
-    if (!extensionConnected) {
-      return {
-        content: [{
-          type: "text",
-          text: "Error: AIPex Chrome extension is not connected. Please ensure the extension is running and native messaging is registered."
-        }],
-        isError: true
-      };
-    }
-    try {
-      const result = await callToolOnExtension(name, args || {});
-      const typedResult = result;
-      if (typedResult?.content) {
-        return typedResult;
+    if (useHttp) {
+      const healthy = await checkNativeHostHealth();
+      if (!healthy) {
+        return {
+          content: [{
+            type: "text",
+            text: "Error: AIPex native host is not running. Please ensure the Chrome extension is running and native messaging is registered (npm install -g aipex-mcp-bridge && aipex-mcp-bridge register)."
+          }],
+          isError: true
+        };
+      }
+      try {
+        const resp = await callToolViaHttp(name, args || {});
+        if (resp?.result) {
+          return resp.result;
+        }
+        if (resp?.error) {
+          return {
+            content: [{ type: "text", text: `Error: ${resp.error.message || JSON.stringify(resp.error)}` }],
+            isError: true
+          };
+        }
+        return {
+          content: [{ type: "text", text: JSON.stringify(resp, null, 2) }]
+        };
+      } catch (error) {
+        return {
+          content: [{
+            type: "text",
+            text: `Error: ${error instanceof Error ? error.message : String(error)}`
+          }],
+          isError: true
+        };
+      }
+    } else {
+      if (!extensionConnected) {
+        return {
+          content: [{
+            type: "text",
+            text: "Error: AIPex Chrome extension is not connected."
+          }],
+          isError: true
+        };
+      }
+      try {
+        const result = await callToolViaExtension(name, args || {});
+        const typedResult = result;
+        if (typedResult?.content) {
+          return typedResult;
+        }
+        return {
+          content: [{ type: "text", text: JSON.stringify(result, null, 2) }]
+        };
+      } catch (error) {
+        return {
+          content: [{
+            type: "text",
+            text: `Error: ${error instanceof Error ? error.message : String(error)}`
+          }],
+          isError: true
+        };
       }
-      return {
-        content: [{ type: "text", text: JSON.stringify(result, null, 2) }]
-      };
-    } catch (error) {
-      return {
-        content: [{
-          type: "text",
-          text: `Error: ${error instanceof Error ? error.message : String(error)}`
-        }],
-        isError: true
-      };
     }
   });
   return server;
@@ -305,19 +450,14 @@ async function startNativeMessagingMode() {
 }
 async function startStdioMcpMode() {
   log("Starting in stdio MCP mode (launched by MCP client)");
-  const server = createMcpServerInstance();
+  const server = createMcpServerInstance(true);
   const transport = new StdioServerTransport();
   await server.connect(transport);
-  if (!STDIO_ONLY) {
-    await startHttpMcpServer();
-    log(`stdio MCP server ready, HTTP also available on port ${HTTP_PORT}`);
-  } else {
-    log("stdio MCP server ready (HTTP disabled)");
-  }
+  log("stdio MCP server ready (tool calls proxy via HTTP to native host at localhost:" + HTTP_PORT + ")");
 }
 async function startHttpMcpServer() {
   const httpServer = createHttpServer(async (req, res) => {
-    res.setHeader("Access-Control-Allow-Origin", "chrome-extension://*");
+    res.setHeader("Access-Control-Allow-Origin", "*");
     res.setHeader("Access-Control-Allow-Methods", "POST, GET, DELETE, OPTIONS");
     res.setHeader("Access-Control-Allow-Headers", "Content-Type, mcp-session-id");
     res.setHeader("Access-Control-Expose-Headers", "mcp-session-id");
@@ -348,21 +488,11 @@ async function startHttpMcpServer() {
         res.end(JSON.stringify({ error: "Invalid JSON" }));
         return;
       }
-      const sessionId = req.headers["mcp-session-id"] || void 0;
-      let transport;
-      if (!sessionId) {
-        transport = new StreamableHTTPServerTransport({
-          sessionIdGenerator: () => randomUUID()
-        });
-        const server = createMcpServerInstance();
-        await server.connect(transport);
-      } else {
-        transport = new StreamableHTTPServerTransport({
-          sessionIdGenerator: void 0
-        });
-        const server = createMcpServerInstance();
-        await server.connect(transport);
-      }
+      const transport = new StreamableHTTPServerTransport({
+        sessionIdGenerator: () => randomUUID()
+      });
+      const server = createMcpServerInstance(false);
+      await server.connect(transport);
       await transport.handleRequest(req, res, parsed);
       return;
     }
@@ -383,11 +513,11 @@ async function startHttpMcpServer() {
 async function main() {
   const subcommand = cliArgs[0];
   if (subcommand === "register" || subcommand === "doctor" || subcommand === "fix-permissions" || subcommand === "unregister") {
-    const cli = await import("./cli-VTRZIIXB.js");
+    const cli = await import("./cli-M2UUOVPA.js");
     await cli.runCli(cliArgs);
     return;
   }
-  if (isLaunchedByChrome) {
+  if (IS_NATIVE_HOST) {
     await startNativeMessagingMode();
   } else {
     await startStdioMcpMode();

package/dist/{chunk-KWMK3JEL.js → chunk-3WJ3TSAN.js}

@@ -121,11 +121,11 @@ function createWrapperScript(nodePath, bridgePath) {
   const wrapperPath = join(wrapperDir, wrapperName);
   if (os === "win32") {
     writeFileSync(wrapperPath, `@echo off\r
-"${nodePath}" "${bridgePath}" %*\r
+"${nodePath}" "${bridgePath}" --native-host %*\r
 `);
   } else {
     writeFileSync(wrapperPath, `#!/bin/bash
-exec "${nodePath}" "${bridgePath}" "$@"
+exec "${nodePath}" "${bridgePath}" --native-host "$@"
 `);
     chmodSync(wrapperPath, 493);
   }

package/dist/{cli-VTRZIIXB.js → cli-M2UUOVPA.js}

@@ -122,11 +122,11 @@ function createWrapperScript(nodePath, bridgePath) {
   const wrapperPath = join(wrapperDir, wrapperName);
   if (os === "win32") {
     writeFileSync(wrapperPath, `@echo off\r
-"${nodePath}" "${bridgePath}" %*\r
+"${nodePath}" "${bridgePath}" --native-host %*\r
 `);
   } else {
     writeFileSync(wrapperPath, `#!/bin/bash
-exec "${nodePath}" "${bridgePath}" "$@"
+exec "${nodePath}" "${bridgePath}" --native-host "$@"
 `);
     chmodSync(wrapperPath, 493);
   }

package/dist/cli.js

@@ -3,7 +3,7 @@ import {
   register,
   runDiagnostics,
   unregister
-} from "./chunk-KWMK3JEL.js";
+} from "./chunk-3WJ3TSAN.js";
 import "./chunk-YZDMY4WS.js";
 
 // src/cli.ts

package/dist/register.js

@@ -3,7 +3,7 @@ import {
   register,
   runDiagnostics,
   unregister
-} from "./chunk-KWMK3JEL.js";
+} from "./chunk-3WJ3TSAN.js";
 import "./chunk-YZDMY4WS.js";
 export {
   fixPermissions,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aipex-mcp-bridge",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "description": "MCP bridge that connects AI agents (Cursor, Claude, VS Code Copilot, etc.) to the AIPex browser extension via Native Messaging",
   "type": "module",
   "bin": {