@maintainer-pro/ai-bridge 0.1.19 → 0.1.21

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@maintainer-pro/ai-bridge",
-  "version": "0.1.19",
+  "version": "0.1.21",
   "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.11",
+    "@maintainer-pro/ai-cli": "^0.1.12",
     "@maintainer-pro/ai-server": "^0.1.7"
   }
 }

package/src/daemon.mjs

@@ -257,7 +257,21 @@ function loadConfig() {
   const file = configPath();
   if (!fs.existsSync(file)) return null;
   try {
-    return JSON.parse(fs.readFileSync(file, "utf8"));
+    const cfg = JSON.parse(fs.readFileSync(file, "utf8"));
+    let dirty = false;
+    for (const ws of cfg.workspaces || []) {
+      const before = JSON.stringify(ws.hostApps || []);
+      const beforeProxy = JSON.stringify(ws.proxy || null);
+      stripAiServerFromWorkspace(ws);
+      if (
+        JSON.stringify(ws.hostApps || []) !== before ||
+        JSON.stringify(ws.proxy || null) !== beforeProxy
+      ) {
+        dirty = true;
+      }
+    }
+    if (dirty) saveConfig(cfg);
+    return cfg;
   } catch {
     return null;
   }
@@ -434,7 +448,7 @@ async function resolveWorkspaceHostApps(ws, opts = {}) {
       const match = previous.find((row) => row && row.id === app.id);
       return match ? { ...app, host: match.host === true || app.host === true } : app;
     });
-    ws.hostApps = result.apps;
+    ws.hostApps = listedHostApps(result.apps);
     if (opts.cfg) persistWorkspaceEntry(opts.cfg, ws);
     const summary = result.apps
       .map((app) => `${app.name}:${app.port}`)
@@ -455,19 +469,10 @@ async function resolveWorkspaceHostApps(ws, opts = {}) {
     activity(
       ws.sandboxId,
       "warn",
-      `port detect failed (${message}) — using AI server ${Number(ws.port) || 3100} so setup can continue`
+      `port detect failed (${message}) — no host apps listed yet`
     );
     if (!Array.isArray(ws.hostApps) || !ws.hostApps.length) {
-      ws.hostApps = [
-        {
-          id: "ai-server",
-          name: "AI server",
-          role: "ai-server",
-          port: Number(ws.port) || 3100,
-          source: "default",
-          locked: true,
-        },
-      ];
+      ws.hostApps = [];
     }
     return {
       apps: ws.hostApps,
@@ -763,8 +768,31 @@ function isLocalAppUrl(url) {
   }
 }
 
+function isAiServerApp(app) {
+  return Boolean(app && (app.role === "ai-server" || app.id === "ai-server"));
+}
+
+function listedHostApps(apps) {
+  return (Array.isArray(apps) ? apps : []).filter((app) => !isAiServerApp(app));
+}
+
+function stripAiServerFromWorkspace(ws) {
+  if (!ws || typeof ws !== "object") return ws;
+  if (Array.isArray(ws.hostApps)) ws.hostApps = listedHostApps(ws.hostApps);
+  if (ws.proxy && typeof ws.proxy === "object") {
+    if (ws.proxy.slugs && typeof ws.proxy.slugs === "object") {
+      delete ws.proxy.slugs["ai-server"];
+    }
+    if (ws.proxy.urls && typeof ws.proxy.urls === "object") {
+      delete ws.proxy.urls["ai-server"];
+    }
+  }
+  return ws;
+}
+
 function persistWorkspaceEntry(cfg, ws) {
   if (!cfg || !ws?.sandboxId) return;
+  stripAiServerFromWorkspace(ws);
   cfg.workspaces = cfg.workspaces || [];
   const index = cfg.workspaces.findIndex((row) => row.sandboxId === ws.sandboxId);
   if (index >= 0) cfg.workspaces[index] = { ...cfg.workspaces[index], ...ws };
@@ -1001,16 +1029,7 @@ function probeEmbedConfig(url, timeoutMs = 2500) {
 
 function sanitizeAiServerPort(ws) {
   if (!ws || typeof ws !== "object") return;
-  const apps = Array.isArray(ws.hostApps) ? ws.hostApps : [];
-  for (const app of apps) {
-    if (
-      app &&
-      (app.role === "ai-server" || app.id === "ai-server") &&
-      isAdminListenPort(app.port)
-    ) {
-      app.port = 3100;
-    }
-  }
+  if (Array.isArray(ws.hostApps)) ws.hostApps = listedHostApps(ws.hostApps);
   if (isAdminListenPort(ws.port)) ws.port = 3100;
 }
 
@@ -1304,10 +1323,6 @@ async function reconcileWorkspacePresence(ws, cfg, opts = {}) {
   // 3. Host + CORS origins for Maintainer Pro
   const host = workspaceHostReport(ws);
   const uiShare = proxyUrlForApp(ws, hostAppOf(ws) || { id: "ui", role: "ui", host: true });
-  const aiShare = proxyUrlForApp(ws, {
-    id: "ai-server",
-    role: "ai-server",
-  });
   if (uiShare) {
     host.appUrl = uiShare;
   } else if (probe.running) {
@@ -1316,12 +1331,9 @@ async function reconcileWorkspacePresence(ws, cfg, opts = {}) {
     );
     if (ui?.port) {
       host.appUrl = `http://localhost:${ui.port}`;
-    } else if (probe.chatUp) {
-      host.appUrl = `http://localhost:${probe.chatPort}`;
     }
   }
   if (uiShare && !host.origins.includes(uiShare)) host.origins.push(uiShare);
-  if (aiShare && !host.origins.includes(aiShare)) host.origins.push(aiShare);
   const proxyOrigin = String(ws?.proxy?.origin || "").replace(/\/$/, "");
   if (proxyOrigin && !host.origins.includes(proxyOrigin)) {
     host.origins.push(proxyOrigin);
@@ -1491,7 +1503,7 @@ function uniqueProxySlugs(apps) {
   const used = new Set();
   /** @type {Record<string, string>} */
   const slugs = {};
-  for (const app of apps || []) {
+  for (const app of listedHostApps(apps)) {
     let slug = proxySlugForApp(app);
     if (!slug || !app?.id) continue;
     if (used.has(slug)) {
@@ -1512,7 +1524,7 @@ function uniqueProxySlugs(apps) {
 }
 
 function sharePortUrls(ws) {
-  const apps = Array.isArray(ws?.hostApps) ? ws.hostApps : [];
+  const apps = listedHostApps(ws?.hostApps);
   /** @type {Record<string, string>} */
   const out = {};
   for (const app of apps) {
@@ -1547,8 +1559,10 @@ function applyAssignedProxy(ws, remote, cfg) {
 }
 
 function appsFrom(ws, remote) {
-  if (Array.isArray(ws?.hostApps) && ws.hostApps.length) return ws.hostApps;
-  if (Array.isArray(remote?.hostApps)) return remote.hostApps;
+  if (Array.isArray(ws?.hostApps) && ws.hostApps.length) {
+    return listedHostApps(ws.hostApps);
+  }
+  if (Array.isArray(remote?.hostApps)) return listedHostApps(remote.hostApps);
   return [];
 }
 
@@ -1569,10 +1583,9 @@ function proxyUrlForApp(ws, app) {
 }
 
 function jobsFromHostApps(ws, filter = {}) {
-  const apps = Array.isArray(ws.hostApps) ? ws.hostApps : [];
+  const apps = listedHostApps(ws.hostApps);
   const hostId = hostAppOf(ws)?.id;
   return apps
-    .filter((app) => app && app.role !== "ai-server")
     .filter((app) => (filter.appId ? app.id === filter.appId : true))
     .map((app) => {
       const port = Number(app.port) || 3000;
@@ -1622,7 +1635,7 @@ async function probeRunningApps(ws, timeoutMs = 2500) {
       appId: job.appId || job.role,
     });
   }
-  const listed = Array.isArray(ws.hostApps) ? ws.hostApps : [];
+  const listed = listedHostApps(ws.hostApps);
   const hostApps = await Promise.all(
     listed.map(async (app) => {
       const port = Number(app.port) || 0;
@@ -1645,7 +1658,7 @@ async function probeRunningApps(ws, timeoutMs = 2500) {
     chatPort: chat.port,
     hosts,
     hostApps,
-    running: chat.up || hosts.some((host) => host.up) || hostApps.some((app) => app.running),
+    running: hosts.some((host) => host.up) || hostApps.some((app) => app.running),
   };
 }
 
@@ -1662,9 +1675,7 @@ async function restoreHostsAfterReconnect(cfg) {
       .join(" ");
     if (status.appsRunning) {
       log(
-        `found running apps for ${label}: chat=${status.probe.chatPort}${
-          status.probe.chatUp ? "(up)" : "(down)"
-        }${hostSummary ? ` ${hostSummary}` : ""} share=${
+        `found running apps for ${label}: ${hostSummary || "(none)"} share=${
           status.host.appUrl || "(none)"
         } origins=${
           status.host.origins.join(",") || "none"
@@ -1703,10 +1714,7 @@ async function prepareWorkspaceLaunch(ws, cfg, reserved) {
     return { aiPort, jobs: [] };
   }
   log(`ports pick ${label} in ${folder}`);
-  const listedAi = Array.isArray(ws.hostApps)
-    ? ws.hostApps.find((app) => app.role === "ai-server" || app.id === "ai-server")
-    : null;
-  const preferredRaw = Number(listedAi?.port || ws.port) || 3100;
+  const preferredRaw = Number(ws.port) || 3100;
   const preferredAi = isAdminListenPort(preferredRaw) ? 3100 : preferredRaw;
   const aiUp = await isChatServerOnPort(preferredAi);
   const aiPort = aiUp
@@ -4679,12 +4687,11 @@ async function runActions(cfg, actions) {
               String(action.payload.folderPathRemaining || remaining[0] || ws.folderPath);
             ws.folderPath = primary;
             ws.extraFolders = remaining.filter((folder) => !sameFolder(folder, primary));
-            ws.hostApps = (Array.isArray(ws.hostApps) ? ws.hostApps : []).filter(
+            ws.hostApps = listedHostApps(
+              Array.isArray(ws.hostApps) ? ws.hostApps : []
+            ).filter(
               (app) =>
-                !app ||
-                app.role === "ai-server" ||
-                !app.folderPath ||
-                !sameFolder(app.folderPath, removed)
+                !app.folderPath || !sameFolder(app.folderPath, removed)
             );
             persistWorkspaceEntry(cfg, ws);
             result = {

package/src/share-rewrite.mjs

@@ -284,8 +284,8 @@ function isProbablyUtf8Text(buf) {
 }
 
 /**
- * Replace app-list origins (`localhost:8080`, LAN IPs, hostnames) with the
- * share URL for that port. Self-contained so the browser shim/SW can embed it.
+ * Replace loopback app origins only (`localhost:8080`, `127.0.0.1`, `::1`,
+ * `0.0.0.0`). Real hostnames and other base URLs are left unchanged.
  *
  * @param {string} text
  * @param {Record<string, string> | null | undefined} portUrls
@@ -297,14 +297,7 @@ export function rewriteMappedLocalUrls(text, portUrls) {
     .filter((port) => Number.isInteger(port) && port > 0 && port <= 65535)
     .sort((a, b) => b - a);
   if (!ports.length) return text;
-  const localHost =
-    "(?:localhost|127\\.0\\.0\\.1|\\[::1\\]|::1|0\\.0\\.0\\.0|" +
-    "10\\.\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}|" +
-    "192\\.168\\.\\d{1,3}\\.\\d{1,3}|" +
-    "172\\.(?:1[6-9]|2\\d|3[01])\\.\\d{1,3}\\.\\d{1,3}|" +
-    "169\\.254\\.\\d{1,3}\\.\\d{1,3}|" +
-    "[A-Za-z0-9](?:[A-Za-z0-9-]{0,61}[A-Za-z0-9])?(?:\\.(?:local|lan|internal|home))?)";
-  const anyHost = "(?:[^\\s'\"\\\\/<>@:]+|\\[[0-9a-fA-F:]+\\])";
+  const localHost = "(?:localhost|127\\.0\\.0\\.1|\\[::1\\]|::1|0\\.0\\.0\\.0)";
   let out = String(text);
   for (let i = 0; i < ports.length; i++) {
     const port = ports[i];
@@ -339,12 +332,6 @@ export function rewriteMappedLocalUrls(text, portUrls) {
     out = out.replace(new RegExp("//" + localHost + ":" + port + tail, "gi"), function (m) {
       return swap(m, dest.replace(/^https?:/i, ""));
     });
-    out = out.replace(new RegExp("http://" + anyHost + ":" + port + tail, "gi"), function (m) {
-      return swap(m, dest);
-    });
-    out = out.replace(new RegExp("ws://" + anyHost + ":" + port + tail, "gi"), function (m) {
-      return swap(m, destWs);
-    });
     out = out.replace(
       new RegExp("(?<![\\w./])" + localHost + ":" + port + tail, "gi"),
       function (m) {
@@ -360,7 +347,7 @@ export function rewriteMappedLocalUrls(text, portUrls) {
  * @param {Record<string, string>} headers
  * @param {Record<string, string> | null | undefined} portUrls
  */
-export function rewriteShareRequestBody(body, headers, portUrls, publicBase) {
+export function rewriteShareRequestBody(body, headers, portUrls, _publicBase) {
   if (!body) return body;
   const buf = Buffer.isBuffer(body) ? body : Buffer.from(body);
   if (!buf.length) return buf;
@@ -370,7 +357,6 @@ export function rewriteShareRequestBody(body, headers, portUrls, publicBase) {
   if (portUrls && Object.keys(portUrls).length) {
     next = rewriteMappedLocalUrls(next, portUrls);
   }
-  if (publicBase) next = rewriteShareOriginPaths(next, publicBase);
   if (next === text) return buf;
   return Buffer.from(next, "utf8");
 }
@@ -452,9 +438,10 @@ export function prefixShareOriginUrl(value, publicBase) {
     const basePort = base.port || (base.protocol === "https:" ? "443" : "80");
     if (reqPort !== basePort) return value;
     const path = u.pathname || "/";
+    if (path === "/" || path === "") return value;
     if (path === prefix || path.indexOf(prefix + "/") === 0) return u.toString();
     if (path.indexOf("/p/") === 0) return u.toString();
-    u.pathname = path === "/" ? prefix : prefix + path;
+    u.pathname = prefix + path;
     return u.toString();
   } catch {
     return value;
@@ -475,11 +462,11 @@ export function rewriteShareOriginPaths(text, publicBase) {
     .replace(/\//g, "\\/")
     .replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
   let out = String(text);
-  out = out.replace(new RegExp(originEsc + "(?:/[^\\s'\"<>\\\\]*)?", "gi"), function (matched) {
+  out = out.replace(new RegExp(originEsc + "/(?!p/)[^\\s'\"<>\\\\]+", "gi"), function (matched) {
     return prefixShareOriginUrl(matched, publicBase);
   });
   out = out.replace(
-    new RegExp(originSlashEsc + "(?:\\\\/[^\\s'\"<>]*)?", "gi"),
+    new RegExp(originSlashEsc + "\\\\/(?!p/)[^\\s'\"<>]+", "gi"),
     function (matched) {
       const unescaped = matched.replace(/\\\//g, "/");
       return prefixShareOriginUrl(unescaped, publicBase).replace(/\//g, "\\/");
@@ -821,12 +808,11 @@ function prefixRootPaths(body, publicBase, contentType = "") {
   let out = body;
   if (
     html &&
+    isViteDocument(out) &&
     /<head[\s>]/i.test(out) &&
-    !/<base\s/i.test(out) &&
-    !isNextDocument(out)
+    !/<base\s/i.test(out)
   ) {
-    const viteBase = isViteDocument(out) ? inferViteBase(out) : "/";
-    const href = joinProxyAndViteBase(pathPrefix, viteBase);
+    const href = joinProxyAndViteBase(pathPrefix, inferViteBase(out));
     out = out.replace(/<head([^>]*)>/i, `<head$1><base href="${href}">`);
   }
   if (html) {
@@ -883,6 +869,12 @@ function isScriptRequestPath(path) {
   return /\.(?:m?js|cjs)$/.test(p);
 }
 
+function isScriptOrJsonBody(headers, path) {
+  const mime = contentMime(headerGet(headers, "content-type"));
+  if (/javascript|ecmascript|json/.test(mime)) return true;
+  return isScriptRequestPath(path);
+}
+
 function rewriteLocalSidecarUrls(html, aiPublicBase, uiPublicBase) {
   const ai = String(aiPublicBase || "").replace(/\/$/, "");
   const ui = String(uiPublicBase || "").replace(/\/$/, "");
@@ -980,6 +972,14 @@ function shareProxyShim(p, portMap, rewriteMappedLocalUrls) {
       )
     );
   }
+  function loopback(h) {
+    h = String(h || "")
+      .replace(/^\[|\]$/g, "")
+      .toLowerCase();
+    return (
+      h === "localhost" || h === "127.0.0.1" || h === "::1" || h === "0.0.0.0"
+    );
+  }
   function prefixPath(path) {
     if (typeof path !== "string" || !path) return path;
     if (path.charAt(0) === "/" && path.charAt(1) !== "/") {
@@ -1019,17 +1019,29 @@ function shareProxyShim(p, portMap, rewriteMappedLocalUrls) {
   }
   function addNav(v) {
     if (typeof v !== "string" || !v) return v;
-    v = mapLocal(v);
+    var mapped = mapLocal(v);
+    if (mapped !== v) return mapped;
     if (v.charAt(0) === "/" && v.charAt(1) !== "/") return prefixPath(v);
     try {
       var nav = new URL(v, location.href);
+      if (!loopback(nav.hostname)) return v;
       if (nav.origin !== location.origin) return v;
+      if (nav.pathname === "/" || nav.pathname === "") return v;
       nav.pathname = prefixPath(nav.pathname);
       return nav.toString();
     } catch (e) {}
     return v;
   }
   function addNet(v) {
+    if (typeof v !== "string" || !v) return v;
+    var mapped = mapLocal(v);
+    if (mapped !== v) return mapped;
+    if (/^(https?:|wss?:)\/\//i.test(v)) {
+      try {
+        var u = new URL(v);
+        if (!loopback(u.hostname)) return v;
+      } catch (e) {}
+    }
     return addNav(v);
   }
   function mapSel(sel) {
@@ -1224,11 +1236,24 @@ function shareServiceWorkerMain(portMap, tokenRoot, rewriteMappedLocalUrls) {
     } catch (e) {}
     return "";
   }
+  function loopback(h) {
+    h = String(h || "")
+      .replace(/^\[|\]$/g, "")
+      .toLowerCase();
+    return (
+      h === "localhost" || h === "127.0.0.1" || h === "::1" || h === "0.0.0.0"
+    );
+  }
   function prefixWith(url, prefix) {
     if (!prefix) return url;
     try {
+      if (/^(https?:|wss?:)\/\//i.test(url)) {
+        var abs = new URL(url);
+        if (!loopback(abs.hostname)) return url;
+      }
       var u = new URL(url, self.location.href);
       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;
@@ -1402,7 +1427,7 @@ export function processShareHttpResponse(opts) {
       mutated = true;
     }
   }
-  if (publicBase && rewriteTextBody) {
+  if (publicBase && rewriteTextBody && !isScriptOrJsonBody(headers, path)) {
     const prefixed = rewriteShareOriginPaths(text, publicBase);
     if (prefixed !== text) {
       text = prefixed;