@maintainer-pro/ai-bridge 0.1.21 → 0.1.23

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@maintainer-pro/ai-bridge",
-  "version": "0.1.21",
+  "version": "0.1.23",
   "description": "Local bridge daemon that pairs a machine to Maintainer Pro and configures multiple client sandboxes.",
   "keywords": [
     "maintainer-pro",
@@ -28,7 +28,7 @@
     "node": ">=22"
   },
   "dependencies": {
-    "@maintainer-pro/ai-cli": "^0.1.12",
+    "@maintainer-pro/ai-cli": "^0.1.13",
     "@maintainer-pro/ai-server": "^0.1.7"
   }
 }

package/src/daemon.mjs

@@ -16,6 +16,7 @@ import os from "node:os";
 import path from "node:path";
 import readline from "node:readline";
 import { fileURLToPath, pathToFileURL } from "node:url";
+import { createRequire } from "node:module";
 import { createLogger, ensureProjectDataDir } from "@maintainer-pro/ai-cli";
 import { findIife, startAiServer } from "@maintainer-pro/ai-server";
 import {
@@ -39,7 +40,9 @@ import {
 } from "./discarded-tunnels.mjs";
 
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
+const requireFromHere = createRequire(import.meta.url);
 const PACKAGE_VERSION = readPackageVersion();
+const PACKAGE_VERSIONS = readPackageVersions();
 const HEARTBEAT_MS = 15_000;
 const WS_PING_MS = 10_000;
 const WS_RECONNECT_MIN_MS = 1_000;
@@ -157,6 +160,53 @@ function readPackageVersion() {
   }
 }
 
+function readDepPackageVersion(name) {
+  const files = [];
+  try {
+    files.push(requireFromHere.resolve(`${name}/package.json`));
+  } catch {
+    /* try nested next */
+  }
+  try {
+    const serverDir = path.dirname(
+      requireFromHere.resolve("@maintainer-pro/ai-server/package.json")
+    );
+    files.push(path.join(serverDir, "node_modules", name, "package.json"));
+    files.push(path.join(serverDir, "..", name.replace("@maintainer-pro/", ""), "package.json"));
+  } catch {
+    /* ignore */
+  }
+  for (const file of files) {
+    try {
+      const pkg = JSON.parse(fs.readFileSync(file, "utf8"));
+      if (typeof pkg.version === "string" && pkg.version) return pkg.version;
+    } catch {
+      /* try next */
+    }
+  }
+  return null;
+}
+
+function readPackageVersions() {
+  return {
+    bridge: PACKAGE_VERSION,
+    cli: readDepPackageVersion("@maintainer-pro/ai-cli"),
+    server: readDepPackageVersion("@maintainer-pro/ai-server"),
+    ui: readDepPackageVersion("@maintainer-pro/ai-ui"),
+  };
+}
+
+function formatPackageVersions(versions = PACKAGE_VERSIONS) {
+  return [
+    versions.bridge && `bridge ${versions.bridge}`,
+    versions.cli && `cli ${versions.cli}`,
+    versions.server && `server ${versions.server}`,
+    versions.ui && `ui ${versions.ui}`,
+  ]
+    .filter(Boolean)
+    .join(" · ");
+}
+
 async function warnIfBridgeOutdated() {
   const fromWorkspace = path
     .normalize(__dirname)
@@ -2325,6 +2375,7 @@ function bridgeEmbedConfigJs(ws) {
     logLevel: "debug",
     maintainerProUrl: bridgeCfg?.adminUrl || "",
     maintainerProApiKey: String(store.clientKey || "").trim(),
+    versions: PACKAGE_VERSIONS,
   };
   return `window.__MAINTAINER_PRO__=${JSON.stringify(payload)};`;
 }
@@ -4834,6 +4885,7 @@ async function sendHeartbeat(cfg, folders, localStates) {
     hostname: os.hostname(),
     platform: `${os.platform()}-${os.arch()}`,
     bridgeVersion: PACKAGE_VERSION,
+    packageVersions: PACKAGE_VERSIONS,
     folders,
     issues: await buildIssues(cfg, localStates),
     workspaces: localStates.map((st) => ({
@@ -4866,6 +4918,7 @@ function buildLightHeartbeatPayload(cfg, folders) {
     hostname: os.hostname(),
     platform: `${os.platform()}-${os.arch()}`,
     bridgeVersion: PACKAGE_VERSION,
+    packageVersions: PACKAGE_VERSIONS,
     folders,
   };
 }
@@ -4887,6 +4940,7 @@ async function buildHeartbeatPayload(cfg, folders, localStates) {
     hostname: os.hostname(),
     platform: `${os.platform()}-${os.arch()}`,
     bridgeVersion: PACKAGE_VERSION,
+    packageVersions: PACKAGE_VERSIONS,
     folders,
     issues: await buildIssues(cfg, localStates),
     workspaces: localStates.map((st) => ({
@@ -5021,6 +5075,7 @@ async function pairFlow(args) {
     hostname: os.hostname(),
     platform: `${os.platform()}-${os.arch()}`,
     bridgeVersion: PACKAGE_VERSION,
+    packageVersions: PACKAGE_VERSIONS,
     name: os.hostname(),
   });
 
@@ -5048,9 +5103,9 @@ async function main() {
     process.exit(0);
   }
 
-  logger.debug(
-    { logLevel: logger.level, nodeEnv: process.env.NODE_ENV },
-    "bridge starting"
+  logger.info(
+    { versions: PACKAGE_VERSIONS },
+    `bridge v${PACKAGE_VERSION} starting (${formatPackageVersions()})`
   );
   void warnIfBridgeOutdated();
 

package/src/share-rewrite.mjs

@@ -274,6 +274,33 @@ function mappedUrlForPort(portUrls, port) {
   return dest ? String(dest).replace(/\/$/, "") : "";
 }
 
+function backendShareBase(portUrls) {
+  if (!portUrls || typeof portUrls !== "object") return "";
+  for (const dest of Object.values(portUrls)) {
+    const url = String(dest || "").replace(/\/$/, "");
+    if (!url) continue;
+    try {
+      const slug = new URL(url).pathname.split("/").filter(Boolean)[2] || "";
+      if (slug === "backend" || slug.startsWith("backend-")) return url;
+    } catch {
+      if (/\/backend(?:-[^/]+)?$/i.test(url)) return url;
+    }
+  }
+  return "";
+}
+
+function shareBaseForPath(path, publicBase, portUrls) {
+  const pathname = String(path || "").split("?")[0] || "/";
+  if (
+    isShareAssetPath(pathname) ||
+    pathname.startsWith("/_next/") ||
+    pathname.startsWith("/@")
+  ) {
+    return publicBase;
+  }
+  return backendShareBase(portUrls) || publicBase;
+}
+
 function isProbablyUtf8Text(buf) {
   if (!Buffer.isBuffer(buf) || !buf.length || buf.length > 8 * 1024 * 1024) {
     return false;
@@ -410,7 +437,7 @@ function rewriteHeaderUrls(headers, publicBase, port, portUrls) {
       if (lower === "set-cookie" || lower === "content-length" || lower === "content-encoding") {
         continue;
       }
-      headers[key] = rewriteShareOriginPaths(headers[key], publicBase);
+      headers[key] = rewriteShareOriginPaths(headers[key], publicBase, portUrls);
     }
   }
 }
@@ -448,7 +475,7 @@ export function prefixShareOriginUrl(value, publicBase) {
   }
 }
 
-export function rewriteShareOriginPaths(text, publicBase) {
+export function rewriteShareOriginPaths(text, publicBase, portUrls) {
   if (!text || !publicBase) return text;
   let origin = "";
   try {
@@ -461,15 +488,24 @@ export function rewriteShareOriginPaths(text, publicBase) {
   const originSlashEsc = origin
     .replace(/\//g, "\\/")
     .replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+  const baseFor = function (matched) {
+    let path = "/";
+    try {
+      path = new URL(matched).pathname || "/";
+    } catch {
+      /* keep */
+    }
+    return shareBaseForPath(path, publicBase, portUrls);
+  };
   let out = String(text);
   out = out.replace(new RegExp(originEsc + "/(?!p/)[^\\s'\"<>\\\\]+", "gi"), function (matched) {
-    return prefixShareOriginUrl(matched, publicBase);
+    return prefixShareOriginUrl(matched, baseFor(matched));
   });
   out = out.replace(
     new RegExp(originSlashEsc + "\\\\/(?!p/)[^\\s'\"<>]+", "gi"),
     function (matched) {
       const unescaped = matched.replace(/\\\//g, "/");
-      return prefixShareOriginUrl(unescaped, publicBase).replace(/\//g, "\\/");
+      return prefixShareOriginUrl(unescaped, baseFor(unescaped)).replace(/\//g, "\\/");
     }
   );
   return out;
@@ -495,7 +531,18 @@ function rewriteLocation(value, publicBase, port, portUrls) {
     }
     const fromPorts = rewriteMappedLocalUrls(String(value), portUrls);
     if (fromPorts !== String(value)) return fromPorts;
-    if (publicBase) return prefixShareOriginUrl(String(value), publicBase);
+    if (publicBase) {
+      let path = "/";
+      try {
+        path = new URL(String(value)).pathname || "/";
+      } catch {
+        /* keep */
+      }
+      return prefixShareOriginUrl(
+        String(value),
+        shareBaseForPath(path, publicBase, portUrls)
+      );
+    }
   } catch {
     /* keep */
   }
@@ -651,6 +698,19 @@ function isShareAssetPath(path) {
   );
 }
 
+function rewriteShareAsLocalEnv(body) {
+  let out = String(body);
+  out = out.replace(
+    /(\/\.\*localhost\.\*\/\.test\()([^)]+)(\))/g,
+    "($1$2$3||location.pathname.indexOf(\"/p/\")===0)"
+  );
+  out = out.replace(
+    /((?:window\.)?location\.hostname)\s*===\s*(['"])localhost\2/g,
+    "($1===$2localhost$2||location.pathname.indexOf(\"/p/\")===0)"
+  );
+  return out;
+}
+
 function prefixQuotedAssetPaths(body, pathPrefix) {
   if (!pathPrefix) return body;
   return String(body).replace(/(["'`])(\/(?!\/)[^"'`]*)/g, (full, q, path) => {
@@ -797,6 +857,7 @@ function prefixRootPaths(body, publicBase, contentType = "") {
   const css = mime === "text/css" || (!isCode && !html && /css/.test(mime));
   if (!html && !css) {
     let code = rewriteViteBaseLiterals(body, pathPrefix);
+    code = rewriteShareAsLocalEnv(code);
     code = prefixQuotedAssetPaths(code, pathPrefix);
     code = code.replace(
       /(?<![A-Za-z0-9])\/__nextjs_/g,
@@ -866,7 +927,7 @@ function isHtmlDocument(headers, body) {
 
 function isScriptRequestPath(path) {
   const p = String(path || "").split("?")[0]?.toLowerCase() || "";
-  return /\.(?:m?js|cjs)$/.test(p);
+  return /\.(?:m?[jt]sx?|cjs)$/.test(p);
 }
 
 function isScriptOrJsonBody(headers, path) {
@@ -1017,6 +1078,21 @@ function shareProxyShim(p, portMap, rewriteMappedLocalUrls) {
     } catch (e) {}
     return v;
   }
+  function backendBase() {
+    var map = portMap || {};
+    var keys = Object.keys(map);
+    for (var i = 0; i < keys.length; i++) {
+      var url = String(map[keys[i]] || "").replace(/\/$/, "");
+      if (!url) continue;
+      try {
+        var slug = new URL(url).pathname.split("/").filter(Boolean)[2] || "";
+        if (slug === "backend" || slug.indexOf("backend-") === 0) return url;
+      } catch (e) {
+        if (/\/backend(?:-[^/]+)?$/i.test(url)) return url;
+      }
+    }
+    return "";
+  }
   function addNav(v) {
     if (typeof v !== "string" || !v) return v;
     var mapped = mapLocal(v);
@@ -1038,10 +1114,27 @@ function shareProxyShim(p, portMap, rewriteMappedLocalUrls) {
     if (mapped !== v) return mapped;
     if (/^(https?:|wss?:)\/\//i.test(v)) {
       try {
-        var u = new URL(v);
-        if (!loopback(u.hostname)) return v;
+        var abs = new URL(v);
+        if (!loopback(abs.hostname)) return v;
       } catch (e) {}
     }
+    if (v.charAt(0) === "/" && v.charAt(1) !== "/") {
+      var backend = backendBase();
+      var path = v.split("?")[0];
+      if (path === "/api/v1" || path.indexOf("/api/v1/") === 0 || path.indexOf("/p/") === 0) {
+        return v;
+      }
+      if (
+        backend &&
+        !isAsset(path) &&
+        (/^\/sreo(?:\/|$)/i.test(path) || /^\/api(?:\/|$)/i.test(path))
+      ) {
+        try {
+          var rel = new URL(v, location.href);
+          return backend + rel.pathname + rel.search + rel.hash;
+        } catch (e) {}
+      }
+    }
     return addNav(v);
   }
   function mapSel(sel) {
@@ -1244,6 +1337,21 @@ function shareServiceWorkerMain(portMap, tokenRoot, rewriteMappedLocalUrls) {
       h === "localhost" || h === "127.0.0.1" || h === "::1" || h === "0.0.0.0"
     );
   }
+  function backendBase() {
+    var map = portMap || {};
+    var keys = Object.keys(map);
+    for (var i = 0; i < keys.length; i++) {
+      var url = String(map[keys[i]] || "").replace(/\/$/, "");
+      if (!url) continue;
+      try {
+        var slug = new URL(url).pathname.split("/").filter(Boolean)[2] || "";
+        if (slug === "backend" || slug.indexOf("backend-") === 0) return url;
+      } catch (e) {
+        if (/\/backend(?:-[^/]+)?$/i.test(url)) return url;
+      }
+    }
+    return "";
+  }
   function prefixWith(url, prefix) {
     if (!prefix) return url;
     try {
@@ -1252,9 +1360,19 @@ function shareServiceWorkerMain(portMap, tokenRoot, rewriteMappedLocalUrls) {
         if (!loopback(abs.hostname)) return url;
       }
       var u = new URL(url, self.location.href);
+      var path = u.pathname || "/";
+      var backend = backendBase();
+      if (path === "/api/v1" || path.indexOf("/api/v1/") === 0) return url;
+      if (path.indexOf("/p/") === 0) return url;
+      if (
+        backend &&
+        !/^(https?:|wss?:)\/\//i.test(url) &&
+        (/^\/sreo(?:\/|$)/i.test(path) || /^\/api(?:\/|$)/i.test(path))
+      ) {
+        return backend + path + (u.search || "") + (u.hash || "");
+      }
       if (u.origin !== self.location.origin) return url;
       if (u.pathname === "/" || u.pathname === "") return url;
-      if (u.pathname.indexOf("/p/") === 0) return url;
       if (u.pathname === prefix || u.pathname.indexOf(prefix + "/") === 0) return url;
       u.pathname = u.pathname === "/" ? prefix : prefix + u.pathname;
       return u.toString();
@@ -1420,7 +1538,7 @@ export function processShareHttpResponse(opts) {
     text = prefixRootPaths(text, publicBase, headers["content-type"] || "");
     mutated = true;
   }
-  if (Object.keys(portUrls).length && rewriteTextBody) {
+  if (Object.keys(portUrls).length && rewriteTextBody && !isScriptOrJsonBody(headers, path)) {
     const mapped = rewriteMappedLocalUrls(text, portUrls);
     if (mapped !== text) {
       text = mapped;
@@ -1428,7 +1546,7 @@ export function processShareHttpResponse(opts) {
     }
   }
   if (publicBase && rewriteTextBody && !isScriptOrJsonBody(headers, path)) {
-    const prefixed = rewriteShareOriginPaths(text, publicBase);
+    const prefixed = rewriteShareOriginPaths(text, publicBase, portUrls);
     if (prefixed !== text) {
       text = prefixed;
       mutated = true;