@lensmcp/cluster 1.16.15 → 1.16.17

package/executors/gateway/runtime/lens-children.d.ts

@@ -11,6 +11,10 @@ export interface LensChildren {
      *  distinct port, append its `lensmcp.local/<key>` route to its fragment. Returns a reaper (kills the
      *  child WITHOUT auto-heal respawn) for the daemon to call on unregister — or undefined if no bundle. */
     hostWorkspaceDashboard(fragment: WorkspaceFragment): (() => void) | undefined;
+    /** Host a REGISTERED workspace's `lens:true` FRONTEND apps (completes model-A "the daemon hosts
+     *  everything"): spawn each app's vite (+ capture) in the workspace's OWN root + event bus, on a
+     *  collision-safe port, and point its route target at that port. Returns a reaper for unregister. */
+    hostWorkspaceApps(fragment: WorkspaceFragment): () => void;
     /** Reap all managed children (called from `stop()`). */
     reapAll(): void;
 }

package/executors/gateway/runtime/lens-children.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"lens-children.d.ts","sourceRoot":"","sources":["../../../../../../libs/cluster/src/executors/gateway/runtime/lens-children.ts"],"names":[],"mappings":"AAQA,OAAO,EAIL,KAAK,UAAU,EAChB,MAAM,kCAAkC,CAAC;AAG1C,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAE1D,OAAO,KAAK,EAAE,cAAc,EAAE,qBAAqB,EAAgB,MAAM,SAAS,CAAC;AAQnF,OAAO,EAA0B,KAAK,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAM7E,MAAM,WAAW,YAAY;IAC3B,iBAAiB,EAAE,UAAU,CAAC;IAC9B;iFAC6E;IAC7E,qBAAqB,IAAI,IAAI,CAAC;IAC9B;;6GAEyG;IACzG,sBAAsB,CAAC,QAAQ,EAAE,iBAAiB,GAAG,CAAC,MAAM,IAAI,CAAC,GAAG,SAAS,CAAC;IAC9E,wDAAwD;IACxD,OAAO,IAAI,IAAI,CAAC;CACjB;AAED,wBAAgB,kBAAkB,CAAC,EAAE,EAAE,cAAc,EAAE,GAAG,EAAE,aAAa,EAAE,OAAO,EAAE,qBAAqB,GAAG,YAAY,CAkNvH"}
+{"version":3,"file":"lens-children.d.ts","sourceRoot":"","sources":["../../../../../../libs/cluster/src/executors/gateway/runtime/lens-children.ts"],"names":[],"mappings":"AAQA,OAAO,EAIL,KAAK,UAAU,EAChB,MAAM,kCAAkC,CAAC;AAG1C,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAE1D,OAAO,KAAK,EAAE,cAAc,EAAE,qBAAqB,EAAuB,MAAM,SAAS,CAAC;AAQ1F,OAAO,EAA0B,KAAK,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAM7E,MAAM,WAAW,YAAY;IAC3B,iBAAiB,EAAE,UAAU,CAAC;IAC9B;iFAC6E;IAC7E,qBAAqB,IAAI,IAAI,CAAC;IAC9B;;6GAEyG;IACzG,sBAAsB,CAAC,QAAQ,EAAE,iBAAiB,GAAG,CAAC,MAAM,IAAI,CAAC,GAAG,SAAS,CAAC;IAC9E;;yGAEqG;IACrG,iBAAiB,CAAC,QAAQ,EAAE,iBAAiB,GAAG,MAAM,IAAI,CAAC;IAC3D,wDAAwD;IACxD,OAAO,IAAI,IAAI,CAAC;CACjB;AAED,wBAAgB,kBAAkB,CAAC,EAAE,EAAE,cAAc,EAAE,GAAG,EAAE,aAAa,EAAE,OAAO,EAAE,qBAAqB,GAAG,YAAY,CAySvH"}

package/executors/gateway/runtime/lens-children.js

@@ -38,6 +38,10 @@ function createLensChildren(rt, obs, options) {
     const labeledChildren = new Map();
     const removedLabels = new Set();
     const usedDashboardPorts = new Set();
+    // Lens-app vite ports already claimed (the daemon's own apps + every registered workspace's), so a
+    // registered workspace whose app declares a port already in use gets offset (vite's --strictPort would
+    // otherwise exit-loop). Keyed by the actual bound port.
+    const usedAppPorts = new Set();
     // A `SpawnChild` over the gateway's managed-children array — the SAME shape `agent-dev` passes to
     // `spawnLensFrontend`. EVERY gateway-managed child AUTO-HEALS: the dashboard + MCP singletons AND each
     // `lens:true` vite app are restarted when they exit while the gateway is up, with exponential backoff.
@@ -45,16 +49,19 @@ function createLensChildren(rt, obs, options) {
     // and a child that crashes-on-boot backs off to HEAL_MAX_MS rather than spinning. A child that ran
     // healthily (≥ HEAL_HEALTHY_MS) gets a fresh budget, so one that dies after an hour comes back fast. A
     // dead child still NEVER kills the cluster — it simply respawns in the background.
-    const spawnManagedChild = (label, bin, args, env, optional = false, respawn) => {
+    const spawnManagedChild = (label, bin, args, env, optional = false, respawn, 
+    // Per-child working dir. The daemon's OWN children run in `rt.root`; a REGISTERED workspace's vite must
+    // run in ITS root (so vite loads the right .env / resolves its own context). Threaded through auto-heal.
+    cwd) => {
         void optional;
         void respawn; // legacy knobs — auto-heal is now universal (signature kept for compat)
         const spawnedAt = Date.now();
-        const child = (0, node_child_process_1.spawn)(bin, args, { cwd: rt.root, env: { ...process.env, ...(env ?? {}) }, stdio: 'inherit' });
+        const child = (0, node_child_process_1.spawn)(bin, args, { cwd: cwd ?? rt.root, env: { ...process.env, ...(env ?? {}) }, stdio: 'inherit' });
         lensChildren.push(child);
         labeledChildren.set(label, child); // the CURRENT handle for this label (a per-workspace dashboard reap targets it)
-        // Track a `lens:true` app's vite dev server (label 'vite') for the zombie recycle. Its `LENSMCP_PROJECT`
-        // (set by lens-children when it spawns the frontend) names the app; a fresh respawn re-adds via this path.
-        if (label === 'vite')
+        // Track a `lens:true` app's vite dev server (label 'vite', or `<ws>:<proj>:vite` for a registered
+        // workspace) for the zombie recycle. Its `LENSMCP_PROJECT` names the app; a fresh respawn re-adds here.
+        if (label === 'vite' || label.endsWith(':vite'))
             viteChildren.set(child, { project: env?.['LENSMCP_PROJECT'] ?? 'app', spawnedAt });
         child.on('exit', (code, sig) => {
             const idx = lensChildren.indexOf(child);
@@ -71,7 +78,7 @@ function createLensChildren(rt, obs, options) {
             lensHeal.set(label, heal);
             console.warn(`[gateway] lens child ${label} exited (code=${code} sig=${sig}); auto-healing in ${Math.round(delay / 1000)}s (attempt ${heal.attempts}).`);
             const t = setTimeout(() => { if (!rt.stopped())
-                spawnManagedChild(label, bin, args, env, optional, respawn); }, delay);
+                spawnManagedChild(label, bin, args, env, optional, respawn, cwd); }, delay);
             t.unref?.();
         });
         return child;
@@ -165,6 +172,7 @@ function createLensChildren(rt, obs, options) {
             if (app.started)
                 continue;
             app.started = true;
+            usedAppPorts.add(app.port); // claim the daemon's own lens-app ports so a registered workspace offsets off them
             try {
                 (0, lens_frontend_1.spawnLensFrontend)({
                     projectRoot: app.projectRoot,
@@ -227,6 +235,86 @@ function createLensChildren(rt, obs, options) {
             labeledChildren.delete(label);
         };
     };
+    // P3d — host a REGISTERED workspace's `lens:true` FRONTEND apps (the model-A completeness gap: the daemon
+    // spawned a registered workspace's pods on-demand + its dashboard, but NOT its lens frontends, so a route
+    // like app.<key>.local pointed at a port nothing bound → 502). For each lens app: spawn its vite (+ browser
+    // capture) in the registered workspace's OWN root + event bus, on a COLLISION-SAFE port (offset off the
+    // daemon's own + other workspaces', since vite's --strictPort exits on a clash), and update the route
+    // TARGET to that port so the merged table (rebuilt right after this in the control handler) upstreams
+    // correctly. Unique labels (`<ws>:<proj>:vite`) keep auto-heal + the reaper from touching the daemon's own
+    // identically-named vites. Returns a reaper the control endpoint calls on unregister.
+    const hostWorkspaceApps = (fragment) => {
+        // Group a project's (possibly several host) routes so one spawned vite serves them all.
+        const byProject = new Map();
+        for (const r of fragment.routes) {
+            if (!r.lens)
+                continue;
+            const list = byProject.get(r.lens.project) ?? [];
+            list.push(r);
+            byProject.set(r.lens.project, list);
+        }
+        if (byProject.size === 0)
+            return () => { };
+        const eventFile = path.join(fragment.root, '.lensmcp', 'events.jsonl'); // the registered workspace's OWN bus
+        const labels = [];
+        const ports = [];
+        for (const [project, routes] of byProject) {
+            const lens0 = routes[0].lens;
+            if (lens0.started)
+                continue;
+            // Collision-safe port: keep the declared port unless already claimed, else step up.
+            let port = lens0.port;
+            while (usedAppPorts.has(port))
+                port += 1;
+            usedAppPorts.add(port);
+            ports.push(port);
+            // Point every route of this project at the actual bound port (all share the one vite).
+            for (const r of routes) {
+                r.lens.started = true;
+                r.lens.port = port;
+                r.target = `http://localhost:${port}`;
+            }
+            const labelPrefix = `${fragment.wsKey}:${project}:`;
+            const viteLabel = `${labelPrefix}vite`;
+            const captureLabel = `${labelPrefix}browser-capture`;
+            labels.push(viteLabel, captureLabel);
+            removedLabels.delete(viteLabel); // a fresh registration after a prior unregister → allow auto-heal again
+            removedLabels.delete(captureLabel);
+            // A cwd-injecting spawn view: the registered workspace's children run in ITS root (not the daemon's).
+            const spawnInRoot = (label, bin, args, env, optional, respawn) => spawnManagedChild(label, bin, args, env, optional, respawn, fragment.root);
+            console.log(`[gateway] hosting lens app '${project}' of '${fragment.wsKey}' → vite :${port}`);
+            try {
+                (0, lens_frontend_1.spawnLensFrontend)({
+                    projectRoot: lens0.projectRoot,
+                    workspaceRoot: fragment.root,
+                    project,
+                    eventFile,
+                    port,
+                    chrome: true,
+                    headless: true,
+                    viteEnv: { LENSMCP_PROJECT: project },
+                    labelPrefix,
+                    log: (l) => console.log(l),
+                }, spawnInRoot);
+                emit('info', `lens app started: ${fragment.wsKey}/${project} (vite :${port})`, `cluster-lens-app:${fragment.wsKey}:${project}`, { kind: 'lens-app-up', project, port });
+            }
+            catch (e) {
+                console.error(`[gateway] lens app ${fragment.wsKey}/${project}: ${e.message}`);
+            }
+        }
+        return () => {
+            for (const label of labels) {
+                removedLabels.add(label); // stop auto-heal resurrecting it
+                try {
+                    labeledChildren.get(label)?.kill('SIGTERM');
+                }
+                catch { /* already gone */ }
+                labeledChildren.delete(label);
+            }
+            for (const p of ports)
+                usedAppPorts.delete(p);
+        };
+    };
     const reapAll = () => {
         if (lensSweeper) {
             clearInterval(lensSweeper);
@@ -239,5 +327,5 @@ function createLensChildren(rt, obs, options) {
             catch { /* already gone */ }
         }
     };
-    return { spawnManagedChild, bootSingletonsAndApps, hostWorkspaceDashboard, reapAll };
+    return { spawnManagedChild, bootSingletonsAndApps, hostWorkspaceDashboard, hostWorkspaceApps, reapAll };
 }

package/executors/gateway/runtime/server.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../../../../../libs/cluster/src/executors/gateway/runtime/server.ts"],"names":[],"mappings":"AA2BA,OAAO,KAAK,EAAE,cAAc,EAAE,aAAa,EAAkB,qBAAqB,EAAsB,MAAM,SAAS,CAAC;AAkDxH,wBAAsB,YAAY,CAChC,OAAO,EAAE,qBAAqB,EAC9B,OAAO,EAAE,cAAc,GACtB,OAAO,CAAC,aAAa,CAAC,CA0OxB"}
+{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../../../../../libs/cluster/src/executors/gateway/runtime/server.ts"],"names":[],"mappings":"AA2BA,OAAO,KAAK,EAAE,cAAc,EAAE,aAAa,EAAkB,qBAAqB,EAAsB,MAAM,SAAS,CAAC;AAkDxH,wBAAsB,YAAY,CAChC,OAAO,EAAE,qBAAqB,EAC9B,OAAO,EAAE,cAAc,GACtB,OAAO,CAAC,aAAa,CAAC,CAkPxB"}

package/executors/gateway/runtime/server.js

@@ -110,7 +110,18 @@ async function startGateway(options, context) {
     const registry = new route_registry_1.RouteRegistry();
     registry.register({ wsKey, root: context.root, routes: discovered, services });
     const routes = []; // the LIVE table the request pipeline reads (a stable ref, mutated in place)
-    const rebuildRoutes = () => (0, route_registry_1.rebuildRoutesInPlace)(routes, registry);
+    // Assigned after the TLS servers are built (below) — re-mints the gateway cert with the CURRENT route
+    // hosts and hot-swaps it. Declared HERE (above rebuildRoutes) so rebuildRoutes can trigger it AFTER every
+    // live route change; a no-op until the TLS servers exist (the boot mint happens separately, below).
+    let refreshCert = () => { };
+    const rebuildRoutes = () => {
+        (0, route_registry_1.rebuildRoutesInPlace)(routes, registry);
+        // The cert tracks the live route hosts BY CONSTRUCTION: any register/unregister rebuilds the table then
+        // re-mints, so a dynamically-registered workspace's hostnames always join the SANs (no ERR_CERT_COMMON_
+        // NAME_INVALID). Wiring it here (not in the control onRegister) avoids the ordering trap where the cert
+        // was minted from the STALE table because onRegister ran before the control handler's rebuild.
+        refreshCert();
+    };
     rebuildRoutes();
     // --- per-service api keys (the gateway is the trust boundary) ---------------
     const { serviceKeys, keyToProject } = (0, service_keys_1.loadServiceKeys)(context.root, services);
@@ -139,28 +150,24 @@ async function startGateway(options, context) {
     // The daemon CONTROL PLANE (loopback ~/.lensmcp/control.sock): a second workspace's `gateway start`
     // REGISTERS its fragment here instead of fighting for :443, and the daemon HOSTS its services (spawns
     // them, model A) + its dashboard (planning/multi-workspace-gateway.md P3). Harmless for a lone gateway.
-    const dashboardReapers = new Map();
-    // Assigned after the TLS servers are built (below) — re-mints the gateway cert with the CURRENT route
-    // hosts and hot-swaps it, so a workspace that registers AFTER boot gets its hostnames into the cert SANs
-    // (otherwise the browser sees ERR_CERT_COMMON_NAME_INVALID for the new workspace's hosts).
-    let refreshCert = () => { };
+    const workspaceReapers = new Map();
     let controlServer;
     try {
         controlServer = (0, control_1.startControlServer)({
             rt,
             killService: (svc, reason) => svcLayer.killSpawned(svc, reason),
             onRegister: (fragment) => {
-                // Host the registered workspace's dashboard (appends its lensmcp.local/<key> route to the fragment
-                // BEFORE the control handler's rebuild) and remember its reaper.
-                const reap = lens.hostWorkspaceDashboard(fragment);
-                if (reap)
-                    dashboardReapers.set(fragment.wsKey, reap);
-                refreshCert(); // the new workspace's hosts must join the gateway cert SANs
+                // Host the registered workspace's dashboard AND its lens FRONTEND apps (both spawned in ITS root/bus;
+                // the dashboard appends its lensmcp.local/<key> route + the apps rewrite their route targets to the
+                // actual bound port — all BEFORE the control handler's rebuild). The cert re-mint happens in
+                // rebuildRoutes (called by the control handler right after this), once the full table is live.
+                const reapDash = lens.hostWorkspaceDashboard(fragment);
+                const reapApps = lens.hostWorkspaceApps(fragment);
+                workspaceReapers.set(fragment.wsKey, () => { reapDash?.(); reapApps(); });
             },
             onUnregister: (fragment) => {
-                dashboardReapers.get(fragment.wsKey)?.();
-                dashboardReapers.delete(fragment.wsKey);
-                refreshCert();
+                workspaceReapers.get(fragment.wsKey)?.();
+                workspaceReapers.delete(fragment.wsKey);
             },
         });
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lensmcp/cluster",
-  "version": "1.16.15",
+  "version": "1.16.17",
   "description": "Run your Nx workspace as a local production cluster: pods on unix sockets with true HMR, one https gateway with per-project domains, scale-from-zero, autoscale, idle-kill, local-CA TLS — observed by the LensMCP lens.",
   "main": "./index.js",
   "types": "./index.d.ts",
@@ -65,8 +65,8 @@
     }
   },
   "dependencies": {
-    "@lensmcp/node-instrumentation": "1.16.15",
-    "@lensmcp/nx-plugin": "1.16.15",
+    "@lensmcp/node-instrumentation": "1.16.17",
+    "@lensmcp/nx-plugin": "1.16.17",
     "fork-ts-checker-webpack-plugin": "^9.0.0",
     "glob": "^11.0.0",
     "http-proxy": "^1.18.0",