@leadbay/mcp 0.17.1 → 0.17.3

package/dist/installer-gui.js

@@ -3,7 +3,6 @@
 // installer/installer-gui.ts
 import { createServer as createServer2 } from "http";
 import { randomUUID } from "crypto";
-import { realpathSync } from "fs";
 import { resolve as resolvePath } from "path";
 import { fileURLToPath } from "url";
 
@@ -27,7 +26,7 @@ function buildClaudeCodeAddArgs(token, region, includeWrite, telemetryEnabled, l
   if (localBinPath) {
     args.push("--", "node", localBinPath);
   } else {
-    args.push("--", "npx", "-y", "@leadbay/mcp@latest");
+    args.push("--", "npx", "-y", "-p", "@leadbay/mcp@latest", "leadbay-mcp");
   }
   return args;
 }
@@ -107,7 +106,7 @@ async function installInJsonConfig(configPath, token, region, includeWrite, tele
       LEADBAY_TELEMETRY_ENABLED: telemetryEnabled ? "true" : "false"
     };
     if (!includeWrite) env.LEADBAY_MCP_WRITE = "0";
-    parsed.mcpServers.leadbay = localBinPath ? { command: "node", args: [localBinPath], env } : { command: "npx", args: ["-y", "@leadbay/mcp@latest"], env };
+    parsed.mcpServers.leadbay = localBinPath ? { command: "node", args: [localBinPath], env } : { command: "npx", args: ["-y", "-p", "@leadbay/mcp@latest", "leadbay-mcp"], env };
     const tmp = configPath + ".tmp";
     writeFileSync(tmp, JSON.stringify(parsed, null, 2) + "\n", "utf8");
     const { renameSync, chmodSync } = await import("fs");
@@ -874,7 +873,7 @@ async function oauthLogin(opts) {
 }
 
 // installer/installer-gui.ts
-var VERSION = "0.17.1";
+var VERSION = "0.17.3";
 var PORT = Number(process.env.LEADBAY_INSTALLER_PORT ?? 0);
 var sessions = /* @__PURE__ */ new Map();
 var OAUTH_BASE_URLS = {
@@ -1043,7 +1042,7 @@ async function install(body) {
   ].join("\n");
   return { ok: results.some((result) => result.ok), output: sanitizeOutput(output), results };
 }
-async function streamInstall(url, res) {
+async function streamInstall(url, res, onDone) {
   cleanupSessions();
   res.writeHead(200, {
     "content-type": "text/event-stream; charset=utf-8",
@@ -1055,16 +1054,23 @@ async function streamInstall(url, res) {
   const includeWrite = url.searchParams.get("write") !== "0";
   const telemetryEnabled = url.searchParams.get("telemetry") !== "0";
   const emit = (level, message) => sendSse(res, { level, message: sanitizeOutput(message) });
+  const abort = (msg) => {
+    emit("done", msg);
+    res.end();
+  };
+  const finish = (msg) => {
+    emit("done", msg);
+    res.end();
+    onDone?.();
+  };
   if (!session) {
     emit("error", "Login expired. Go back and sign in again.");
-    emit("done", "Install stopped.");
-    res.end();
+    abort("Install stopped.");
     return;
   }
   if (!clientIds.length) {
     emit("error", "Select at least one agent.");
-    emit("done", "Install stopped.");
-    res.end();
+    abort("Install stopped.");
     return;
   }
   emit("info", `Connected to ${session.accountLabel}.`);
@@ -1075,8 +1081,7 @@ async function streamInstall(url, res) {
   const selectedHasOnlyManualSetup = selected.length > 0 && selected.every(isManualSetupClient);
   if (!selected.length) {
     emit("error", "No selected agents were detected on this machine.");
-    emit("done", "Install stopped.");
-    res.end();
+    abort("Install stopped.");
     return;
   }
   let okCount = 0;
@@ -1090,11 +1095,16 @@ async function streamInstall(url, res) {
       emit("error", `${result.label}: ${result.message}`);
     }
   }
-  emit(okCount > 0 ? "success" : "error", selectedHasOnlyManualSetup ? "Manual ChatGPT setup instructions ready." : `${okCount}/${selected.length} agent(s) installed, updated, or prepared.`);
-  emit("done", selectedHasOnlyManualSetup ? "Follow the manual setup instructions shown above." : "Restart your MCP client(s) to pick up the new server.");
-  res.end();
+  const summary = selectedHasOnlyManualSetup ? "Manual ChatGPT setup instructions ready." : `${okCount}/${selected.length} agent(s) installed, updated, or prepared.`;
+  const closing = selectedHasOnlyManualSetup ? "Follow the manual setup instructions shown above." : "Restart your MCP client(s) to pick up the new server.";
+  emit(okCount > 0 ? "success" : "error", summary);
+  if (okCount > 0) {
+    finish(closing);
+  } else {
+    abort(closing);
+  }
 }
-async function streamUninstall(url, res) {
+async function streamUninstall(url, res, onDone) {
   res.writeHead(200, {
     "content-type": "text/event-stream; charset=utf-8",
     "cache-control": "no-cache, no-transform",
@@ -1102,18 +1112,25 @@ async function streamUninstall(url, res) {
   });
   const clientIds = (url.searchParams.get("clients") ?? "").split(",").filter(Boolean);
   const emit = (level, message) => sendSse(res, { level, message });
+  const abort = (msg) => {
+    emit("done", msg);
+    res.end();
+  };
+  const finish = (msg) => {
+    emit("done", msg);
+    res.end();
+    onDone?.();
+  };
   if (!clientIds.length) {
     emit("error", "Select at least one agent.");
-    emit("done", "Uninstall stopped.");
-    res.end();
+    abort("Uninstall stopped.");
     return;
   }
   const detected = await detectClients();
   const selected = detected.filter((c) => clientIds.includes(c.id));
   if (!selected.length) {
     emit("error", "No selected agents were detected on this machine.");
-    emit("done", "Uninstall stopped.");
-    res.end();
+    abort("Uninstall stopped.");
     return;
   }
   let okCount = 0;
@@ -1137,8 +1154,7 @@ async function streamUninstall(url, res) {
     }
   }
   emit(okCount > 0 ? "success" : "error", `${okCount}/${selected.length} agent(s) removed.`);
-  emit("done", "Restart your MCP client(s) to complete the removal.");
-  res.end();
+  finish("Restart your MCP client(s) to complete the removal.");
 }
 function pageUninstallHtml() {
   return `<!doctype html>
@@ -1310,67 +1326,43 @@ function pageHtml() {
 }
 async function openBrowser(url) {
   const { spawn: spawn4 } = await import("child_process");
-  const command = process.platform === "darwin" ? "open" : process.platform === "win32" ? "cmd" : "xdg-open";
-  const args = process.platform === "win32" ? ["/c", "start", "", url] : [url];
-  const child = spawn4(command, args, { stdio: "ignore", detached: true });
-  child.unref();
-}
-async function startInstallerGui(options = {}) {
-  let expectedHost = `127.0.0.1:${(options.port ?? PORT) || 0}`;
-  const server = createServer2(async (req, res) => {
-    if (!isAllowedOrigin(req, expectedHost)) {
-      sendJson(res, 403, { ok: false, error: "forbidden" });
-      return;
-    }
+  const trySpawn = (command, args) => new Promise((resolve) => {
     try {
-      if (req.method === "GET" && req.url === "/") {
-        const raw = pageHtml();
-        res.writeHead(200, { "content-type": "text/html; charset=utf-8", "content-length": Buffer.byteLength(raw) });
-        res.end(raw);
-        return;
-      }
-      if (req.method === "GET" && req.url === "/api/status") {
-        sendJson(res, 200, {
-          os: formatInstallOsLabel(),
-          hostedMcpUrl: HOSTED_MCP_URL,
-          clients: await clientsWithConfiguredStatus()
-        });
-        return;
-      }
-      if (req.method === "POST" && req.url === "/api/oauth-login") {
-        sendJson(res, 200, await loginWithOAuth());
-        return;
-      }
-      if (req.method === "POST" && req.url === "/api/install") {
-        sendJson(res, 200, await install(await readJson(req)));
-        return;
-      }
-      if (req.method === "GET" && req.url?.startsWith("/api/install-stream")) {
-        await streamInstall(new URL(req.url, "http://127.0.0.1"), res);
-        return;
-      }
-      sendJson(res, 404, { ok: false, error: "not found" });
-    } catch (err) {
-      sendJson(res, 500, { ok: false, error: err?.message ?? String(err) });
+      const child = spawn4(command, args, { stdio: "ignore", detached: true });
+      child.unref();
+      child.on("error", () => resolve(false));
+      child.on("close", (code) => resolve(code === 0));
+    } catch {
+      resolve(false);
     }
   });
-  return await new Promise((resolve, reject) => {
-    server.once("error", reject);
-    server.listen(options.port ?? PORT, "127.0.0.1", async () => {
-      server.off("error", reject);
-      const address = server.address();
-      const port = typeof address === "object" && address ? address.port : options.port ?? PORT;
-      expectedHost = `127.0.0.1:${port}`;
-      const url = `http://127.0.0.1:${port}/`;
-      process.stderr.write(`Leadbay MCP installer GUI: ${url}
+  if (process.platform === "darwin") {
+    await trySpawn("open", [url]);
+    return;
+  }
+  if (process.platform === "win32") {
+    await trySpawn("cmd", ["/c", "start", "", url]);
+    return;
+  }
+  const candidates = ["xdg-open", "sensible-browser", "google-chrome", "chromium-browser", "firefox"];
+  for (const cmd of candidates) {
+    if (await trySpawn(cmd, [url])) return;
+  }
+  process.stderr.write(`
+  Open this URL in your browser to continue:
+  ${url}
+
 `);
-      if (options.openBrowser !== false) await openBrowser(url).catch(() => void 0);
-      resolve({ url, close: () => new Promise((closeResolve, closeReject) => server.close((err) => err ? closeReject(err) : closeResolve())) });
-    });
-  });
 }
-async function startUninstallerGui(options = {}) {
+function makeGuiServer(options, pageContent, extraRoutes, logLabel) {
   let expectedHost = `127.0.0.1:${(options.port ?? PORT) || 0}`;
+  let resolveDone;
+  const done = new Promise((r) => {
+    resolveDone = r;
+  });
+  const onDone = () => setTimeout(() => {
+    resolveDone();
+  }, 1500);
   const server = createServer2(async (req, res) => {
     if (!isAllowedOrigin(req, expectedHost)) {
       sendJson(res, 403, { ok: false, error: "forbidden" });
@@ -1378,28 +1370,18 @@ async function startUninstallerGui(options = {}) {
     }
     try {
       if (req.method === "GET" && req.url === "/") {
-        const raw = pageUninstallHtml();
+        const raw = pageContent();
         res.writeHead(200, { "content-type": "text/html; charset=utf-8", "content-length": Buffer.byteLength(raw) });
         res.end(raw);
         return;
       }
-      if (req.method === "GET" && req.url === "/api/status") {
-        sendJson(res, 200, {
-          os: formatInstallOsLabel(),
-          clients: await clientsWithConfiguredStatus()
-        });
-        return;
-      }
-      if (req.method === "GET" && req.url?.startsWith("/api/uninstall-stream")) {
-        await streamUninstall(new URL(req.url, "http://127.0.0.1"), res);
-        return;
-      }
+      if (await extraRoutes(req, res, onDone)) return;
       sendJson(res, 404, { ok: false, error: "not found" });
     } catch (err) {
       sendJson(res, 500, { ok: false, error: err?.message ?? String(err) });
     }
   });
-  return await new Promise((resolve, reject) => {
+  return new Promise((resolve, reject) => {
     server.once("error", reject);
     server.listen(options.port ?? PORT, "127.0.0.1", async () => {
       server.off("error", reject);
@@ -1407,37 +1389,46 @@ async function startUninstallerGui(options = {}) {
       const port = typeof address === "object" && address ? address.port : options.port ?? PORT;
       expectedHost = `127.0.0.1:${port}`;
       const url = `http://127.0.0.1:${port}/`;
-      process.stderr.write(`Leadbay MCP uninstaller GUI: ${url}
+      process.stderr.write(`Leadbay MCP ${logLabel} GUI: ${url}
 `);
       if (options.openBrowser !== false) await openBrowser(url).catch(() => void 0);
-      resolve({ url, close: () => new Promise((closeResolve, closeReject) => server.close((err) => err ? closeReject(err) : closeResolve())) });
+      resolve({ url, done, close: () => new Promise((res, rej) => server.close((e) => e ? rej(e) : res())) });
     });
   });
 }
-async function main() {
-  const uninstall = process.argv.includes("--uninstall");
-  const handle = uninstall ? await startUninstallerGui({ openBrowser: !process.argv.includes("--no-open") }) : await startInstallerGui({ openBrowser: !process.argv.includes("--no-open") });
-  await new Promise((resolve) => {
-    process.once("SIGINT", () => resolve());
-    process.once("SIGTERM", () => resolve());
-  });
-  await handle.close().catch(() => void 0);
+function startInstallerGui(options = {}) {
+  return makeGuiServer(options, pageHtml, async (req, res, onDone) => {
+    if (req.method === "GET" && req.url === "/api/status") {
+      sendJson(res, 200, { os: formatInstallOsLabel(), hostedMcpUrl: HOSTED_MCP_URL, clients: await clientsWithConfiguredStatus() });
+      return true;
+    }
+    if (req.method === "POST" && req.url === "/api/oauth-login") {
+      sendJson(res, 200, await loginWithOAuth());
+      return true;
+    }
+    if (req.method === "POST" && req.url === "/api/install") {
+      sendJson(res, 200, await install(await readJson(req)));
+      return true;
+    }
+    if (req.method === "GET" && req.url?.startsWith("/api/install-stream")) {
+      await streamInstall(new URL(req.url, "http://127.0.0.1"), res, onDone);
+      return true;
+    }
+    return false;
+  }, "installer");
 }
-var isEntrypoint = (() => {
-  try {
-    const entry = process.argv[1];
-    if (!entry) return false;
-    return realpathSync(fileURLToPath(import.meta.url)) === realpathSync(entry);
-  } catch {
+function startUninstallerGui(options = {}) {
+  return makeGuiServer(options, pageUninstallHtml, async (req, res, onDone) => {
+    if (req.method === "GET" && req.url === "/api/status") {
+      sendJson(res, 200, { os: formatInstallOsLabel(), clients: await clientsWithConfiguredStatus() });
+      return true;
+    }
+    if (req.method === "GET" && req.url?.startsWith("/api/uninstall-stream")) {
+      await streamUninstall(new URL(req.url, "http://127.0.0.1"), res, onDone);
+      return true;
+    }
     return false;
-  }
-})();
-if (isEntrypoint) {
-  main().catch((err) => {
-    process.stderr.write(`leadbay-mcp-installer: ${err?.message ?? err}
-`);
-    process.exit(1);
-  });
+  }, "uninstaller");
 }
 export {
   install,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leadbay/mcp",
-  "version": "0.17.1",
+  "version": "0.17.3",
   "mcpName": "io.github.leadbay/leadbay-mcp",
   "description": "Model Context Protocol (MCP) server for Leadbay — AI lead discovery, qualification, and enrichment for Claude Desktop, Cursor, and Claude Code.",
   "type": "module",
@@ -28,9 +28,8 @@
     "test": "vitest run",
     "test:smoke": "vitest run --config vitest.smoke.config.ts",
     "prepublishOnly": "pnpm run build && pnpm run typecheck && pnpm run test",
-    "installer": "pnpm run build && electron --no-sandbox installer/electron-main.cjs",
-    "installer:gui": "pnpm run installer",
-    "installer:gui:web": "pnpm run build && node dist/installer-gui.js"
+    "installer": "pnpm run build && node dist/installer-electron.js",
+    "installer:gui": "pnpm run installer"
   },
   "dependencies": {
     "@hono/node-server": "^1.13.7",