@maintainer-pro/ai-bridge 0.1.29 → 0.1.31

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@maintainer-pro/ai-bridge",
-  "version": "0.1.29",
+  "version": "0.1.31",
   "description": "Local bridge daemon that pairs a machine to Maintainer Pro and configures multiple client sandboxes.",
   "keywords": [
     "maintainer-pro",
@@ -28,7 +28,8 @@
     "node": ">=22"
   },
   "dependencies": {
-    "@maintainer-pro/ai-cli": "^0.1.15",
-    "@maintainer-pro/ai-server": "^0.1.8"
+    "@maintainer-pro/ai-cli": "^0.1.16",
+    "@maintainer-pro/ai-server": "^0.1.8",
+    "ws": "^8.21.3"
   }
 }

package/src/daemon.mjs

@@ -43,9 +43,21 @@ import {
   mergeCookieHeader,
   storeCorsCookies,
 } from "./cors-cookies.mjs";
+import { WebSocket as WsWebSocket } from "ws";
 
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
 const requireFromHere = createRequire(import.meta.url);
+
+/**
+ * Node 22+ has a global WHATWG WebSocket. Node 20 (still common on partner
+ * machines) does not — `new WebSocket()` throws "WebSocket is not defined".
+ * Fall back to the `ws` package, which exposes the same addEventListener API.
+ */
+const WebSocketImpl =
+  typeof globalThis.WebSocket === "function"
+    ? globalThis.WebSocket
+    : WsWebSocket;
+const usingWsFallback = WebSocketImpl === WsWebSocket;
 const PACKAGE_VERSION = readPackageVersion();
 const PACKAGE_VERSIONS = readPackageVersions();
 const HEARTBEAT_MS = 15_000;
@@ -451,13 +463,30 @@ async function loadAiCli() {
 /** @type {{ at: number, ids: string[] } | null} */
 let cliProviderCache = null;
 
-async function detectCliProviders() {
-  if (cliProviderCache && Date.now() - cliProviderCache.at < 60_000) {
+function missingCliSetupText(folder) {
+  const folderLine = folder
+    ? `No coding agent CLI is available in this folder:\n  ${folder}`
+    : "No coding agent CLI found on this computer.";
+  return [
+    `${folderLine} Chat will not work until one is installed and reachable from this folder.`,
+    "",
+    "  • Cursor Agent CLI  —  https://cursor.com  (command: agent)",
+    "  • Claude Code       —  https://docs.anthropic.com/en/docs/claude-code  (command: claude)",
+    "  • Antigravity       —  https://antigravity.google/  (command: agy)",
+    "",
+    "Then either sign in and re-run the Maintainer Pro command from a terminal where that CLI works, or set the full path in this folder's .env:",
+    "  AI_CLI_PROVIDER=cursor",
+    "  AI_CLI_COMMAND=C:\\\\Users\\\\you\\\\AppData\\\\Local\\\\cursor-agent\\\\agent.cmd",
+  ].join("\n");
+}
+
+async function detectCliProviders(force = false) {
+  if (!force && cliProviderCache && Date.now() - cliProviderCache.at < 60_000) {
     return cliProviderCache.ids;
   }
   try {
-    const { resolveProvider } = await loadAiCli();
-    const provider = await resolveProvider({ preference: "auto" });
+    const cli = await loadAiCli();
+    const provider = await cli.resolveProvider({ preference: "auto" });
     cliProviderCache = { at: Date.now(), ids: [provider.id] };
     return cliProviderCache.ids;
   } catch {
@@ -466,6 +495,65 @@ async function detectCliProviders() {
   }
 }
 
+async function withCliProbe(result, folders) {
+  const roots = [...new Set((folders || []).filter(Boolean).map((row) => path.resolve(row)))];
+  let probe = { available: false };
+  for (const folder of roots) {
+    probe = await probeFolderCli(folder);
+    if (probe.available) break;
+  }
+  const folder = probe.folder || roots[0] || result.folderPath;
+  if (probe.available) {
+    log(
+      `coding agent CLI ready in ${folder} (${probe.providerId || "auto"}${
+        probe.source ? ` via ${probe.source}` : ""
+      })`
+    );
+  } else if (folder) {
+    activity(
+      result.sandboxId,
+      "warn",
+      `No coding agent CLI in ${folder}. Chat needs agent, claude, or agy — or AI_CLI_COMMAND in this folder's .env.`
+    );
+  }
+  return {
+    ...result,
+    missingCli: !probe.available,
+    cliProvider: probe.providerId || null,
+    cliCommand: probe.command || null,
+    warning: !probe.available
+      ? [result.warning, missingCliSetupText(folder)].filter(Boolean).join("\n\n")
+      : result.warning,
+  };
+}
+
+async function probeFolderCli(folder) {
+  const root = folder ? path.resolve(folder) : "";
+  if (!root) return { available: false };
+  try {
+    const cli = await loadAiCli();
+    if (typeof cli.probeCliInFolder === "function") {
+      return await cli.probeCliInFolder(root);
+    }
+    const provider = await cli.resolveProvider({
+      preference: "auto",
+      workspaceDir: root,
+    });
+    return { available: true, providerId: provider.id, folder: root };
+  } catch {
+    return { available: false, folder: root };
+  }
+}
+
+async function warnIfMissingCli() {
+  const ids = await detectCliProviders(true);
+  if (ids.length) {
+    log(`coding agent CLI ready (${ids.join(", ")})`);
+    return;
+  }
+  warn(missingCliSetupText());
+}
+
 async function resolveWorkspaceHostApps(ws, opts = {}) {
   const folders = workspaceFolders(ws);
   const folder = folders[0] || path.resolve(ws.folderPath || "");
@@ -2984,7 +3072,7 @@ function attachProxyLocalWs(id, socket) {
   try {
     socket.binaryType = "arraybuffer";
   } catch {
-    /* WHATWG WebSocket in Node 22 */
+    /* WHATWG WebSocket in Node 22; `ws` fallback on Node 20 */
   }
   proxyLocalSockets.set(id, socket);
   const announceOpen = () => {
@@ -3058,7 +3146,9 @@ function openProxyLocalWs(id, port, path, protocols) {
     let socket;
     try {
       // Vite HMR only accepts upgrades with subprotocol `vite-hmr` / `vite-ping`.
-      socket = proto.length ? new WebSocket(url, proto) : new WebSocket(url);
+      socket = proto.length
+        ? new WebSocketImpl(url, proto)
+        : new WebSocketImpl(url);
     } catch (err) {
       if (index + 1 < hosts.length) {
         tryHost(index + 1);
@@ -3714,11 +3804,18 @@ async function startAiServerForWorkspace(ws, opts = {}) {
 
   const storeEnv = await loadSandboxStoreEnv(ws, cfg);
   const folderEnv = readProjectEnvValues(folder);
+  const cliProbe = await probeFolderCli(folder);
   const dataDir = dataDirFor(folder, ws.sandboxId);
   const instanceEnv = {
     ...folderEnv,
     ...overrideEnv,
     ...storeEnv,
+    ...(cliProbe.command && !folderEnv.AI_CLI_COMMAND
+      ? { AI_CLI_COMMAND: cliProbe.command }
+      : {}),
+    ...(cliProbe.providerId && !folderEnv.AI_CLI_PROVIDER
+      ? { AI_CLI_PROVIDER: cliProbe.providerId }
+      : {}),
     AI_SERVER_URL: localAi,
     CORS_ORIGIN: overrideEnv.CORS_ORIGIN || folderEnv.CORS_ORIGIN || "",
     CORS_ORIGINS: overrideEnv.CORS_ORIGINS || folderEnv.CORS_ORIGINS || "",
@@ -4448,7 +4545,7 @@ async function setupWorkspace(cfg, action) {
     const host = workspaceHostReport(existingWs);
     const aiServerUp = await isChatServerOnPort(existingWs.port);
     log(`setup added folder ${resolved} sandbox=${shortId(sandboxId)}`);
-    return {
+    return await withCliProbe({
       sandboxId,
       folderPath: existingWs.folderPath,
       extraFolders: extra,
@@ -4476,7 +4573,9 @@ async function setupWorkspace(cfg, action) {
       reasons: ports.reasons || [],
       projectInfo: existingWs.projectInfo || null,
       ignorePaths: access.ignorePaths,
-    };
+    },
+      workspaceFolders(existingWs)
+    );
   }
 
   const client = configureClient({
@@ -4566,32 +4665,35 @@ async function setupWorkspace(cfg, action) {
   );
 
   const host = workspaceHostReport(entry);
-  return {
-    sandboxId,
-    folderPath: entry.folderPath,
-    extraFolders: entry.extraFolders || [],
-    addFolder: false,
-    port: entry.port,
-    appUrl: host.appUrl || entry.appUrl || appUrl,
-    origins: host.origins.length
-      ? host.origins
-      : [...new Set([corsOrigin, aiOrigin, entry.appUrl].filter(Boolean))],
-    wroteEnv: false,
-    clientKind: client.kind,
-    clientFiles: client.filesWritten,
-    clientNotes: client.notes,
-    aiServerUp,
-    startedHosts: [],
-    openUrl,
-    processIssues,
-    warning,
-    waitingForStart,
-    needsReview,
-    hostApps: ports.apps || entry.hostApps || [],
-    reasons: ports.reasons || [],
-    projectInfo,
-    ignorePaths: access.ignorePaths,
-  };
+  return await withCliProbe(
+    {
+      sandboxId,
+      folderPath: entry.folderPath,
+      extraFolders: entry.extraFolders || [],
+      addFolder: false,
+      port: entry.port,
+      appUrl: host.appUrl || entry.appUrl || appUrl,
+      origins: host.origins.length
+        ? host.origins
+        : [...new Set([corsOrigin, aiOrigin, entry.appUrl].filter(Boolean))],
+      wroteEnv: false,
+      clientKind: client.kind,
+      clientFiles: client.filesWritten,
+      clientNotes: client.notes,
+      aiServerUp,
+      startedHosts: [],
+      openUrl,
+      processIssues,
+      warning,
+      waitingForStart,
+      needsReview,
+      hostApps: ports.apps || entry.hostApps || [],
+      reasons: ports.reasons || [],
+      projectInfo,
+      ignorePaths: access.ignorePaths,
+    },
+    workspaceFolders(entry)
+  );
 }
 
 async function proposeSetupForWorkspace(ws, cfg, opts = {}) {
@@ -4738,16 +4840,28 @@ async function runActions(cfg, actions) {
           };
         }
       } else if (action.code === "recheck") {
+        cliProviderCache = null;
         const sandboxId = action.sandboxId || action.payload?.sandboxId;
         const ws = (cfg.workspaces || []).find((w) => w.sandboxId === sandboxId);
         if (!ws) {
           log(`${label} recheck: no local workspace`);
         }
+        const cli = await detectCliProviders(true);
+        const folderProbe = ws
+          ? await withCliProbe(
+              { sandboxId, folderPath: ws.folderPath },
+              workspaceFolders(ws)
+            )
+          : { missingCli: cli.length === 0 };
         const hostApps = ws
           ? await resolveWorkspaceHostApps(ws, { cfg, force: true, allowAi: false })
           : null;
         result = {
           recheckedAt: new Date().toISOString(),
+          cliProviders: cli,
+          missingCli: folderProbe.missingCli === true,
+          cliProvider: folderProbe.cliProvider || null,
+          cliCommand: folderProbe.cliCommand || null,
           hostApps: hostApps?.apps || [],
           projectInfo: ws?.projectInfo || null,
         };
@@ -5216,18 +5330,41 @@ function adminWsUrl(adminUrl, token) {
 async function buildIssues(cfg, workspaceStates) {
   /** @type {Array<Record<string, unknown>>} */
   const issues = [];
-  const cli = await detectCliProviders();
-  if (!cli.length) {
-    issues.push({
-      code: "missing_cli",
-      severity: "error",
-      title: "No coding agent CLI found",
-      message:
-        "PATH has no agent, claude, or agy. Chat turns will fail until one is installed.",
-      resolution: "Install and authenticate a CLI, then Recheck.",
-      actionCode: "recheck",
-      sandboxId: null,
-    });
+  if (workspaceStates.length) {
+    for (const st of workspaceStates) {
+      const ws = (cfg.workspaces || []).find((row) => row.sandboxId === st.sandboxId);
+      const folders = ws ? workspaceFolders(ws) : [st.folderPath].filter(Boolean);
+      let probe = { available: false, folder: folders[0] || st.folderPath };
+      for (const folder of folders) {
+        probe = await probeFolderCli(folder);
+        if (probe.available) break;
+      }
+      if (probe.available) continue;
+      issues.push({
+        code: "missing_cli",
+        severity: "error",
+        title: "No coding agent CLI in this folder",
+        message: missingCliSetupText(probe.folder || folders[0] || st.folderPath),
+        resolution:
+          "Install a CLI and re-run the Maintainer Pro command from a terminal where it works, or set AI_CLI_COMMAND in this folder's .env, then Check again.",
+        actionCode: "recheck",
+        sandboxId: st.sandboxId,
+      });
+    }
+  } else {
+    const cli = await detectCliProviders();
+    if (!cli.length) {
+      issues.push({
+        code: "missing_cli",
+        severity: "error",
+        title: "No coding agent CLI found",
+        message: missingCliSetupText(),
+        resolution:
+          "Install Cursor (agent), Claude Code (claude), or Antigravity (agy), sign in, then stop and re-run the Maintainer Pro command. Use Check again after it is on PATH.",
+        actionCode: "recheck",
+        sandboxId: null,
+      });
+    }
   }
   for (const st of workspaceStates) {
     if (st.aiServerUp || st.appsRunning || st.startingAi) continue;
@@ -5352,6 +5489,11 @@ async function main() {
     { versions: PACKAGE_VERSIONS },
     `bridge v${PACKAGE_VERSION} starting (${formatPackageVersions()})`
   );
+  if (usingWsFallback) {
+    log(
+      `Node ${process.versions.node} has no global WebSocket; using the ws package`
+    );
+  }
   void warnIfBridgeOutdated();
 
   let cfg = loadConfig() || {};
@@ -5377,6 +5519,7 @@ async function main() {
   log(
     `online via websocket (presence every ${HEARTBEAT_MS / 1000}s, ping every ${WS_PING_MS / 1000}s; reconnects until stopped)`
   );
+  await warnIfMissingCli();
   await restoreHostsAfterReconnect(cfg);
 
   /** @type {unknown[]} */
@@ -5391,6 +5534,7 @@ async function main() {
         const batch = claimedActions.splice(0, claimedActions.length);
         await runActions(cfg, batch);
       }
+      await sendPresenceOverWs();
     } catch (err) {
       warn(err instanceof Error ? err.message : String(err));
     } finally {
@@ -5702,7 +5846,7 @@ async function main() {
     /** @type {WebSocket} */
     let ws;
     try {
-      ws = new WebSocket(url);
+      ws = new WebSocketImpl(url);
     } catch (err) {
       warn(
         `websocket connect failed: ${