@camstack/agent 1.1.17 → 1.1.19

package/dist/cli.js

@@ -37,15 +37,45 @@ var path6 = __toESM(require("path"));
 var fs = __toESM(require("fs"));
 var path = __toESM(require("path"));
 var import_fastify = __toESM(require("fastify"));
-function resolveUiDistDir(dataDir) {
-  const candidates = [
-    path.resolve(__dirname, "../../addon-agent-ui/dist"),
-    path.join(dataDir, "addons", "@camstack", "addon-agent-ui", "dist"),
-    path.join(dataDir, "agent-ui")
-  ];
-  for (const dir of candidates) {
-    if (fs.existsSync(path.join(dir, "index.html"))) return dir;
+function compareVersions(a, b) {
+  if (a === null && b === null) return 0;
+  if (a === null) return -1;
+  if (b === null) return 1;
+  const pa = a.split(".").map((s) => Number.parseInt(s, 10) || 0);
+  const pb = b.split(".").map((s) => Number.parseInt(s, 10) || 0);
+  const len = Math.max(pa.length, pb.length);
+  for (let i = 0; i < len; i++) {
+    const diff = (pa[i] ?? 0) - (pb[i] ?? 0);
+    if (diff !== 0) return diff;
+  }
+  return 0;
+}
+function readUiDistCandidate(baseDir) {
+  const dir = path.join(baseDir, "dist");
+  if (!fs.existsSync(path.join(dir, "index.html"))) return null;
+  let version = null;
+  try {
+    const parsed = JSON.parse(fs.readFileSync(path.join(baseDir, "package.json"), "utf-8"));
+    version = typeof parsed.version === "string" ? parsed.version : null;
+  } catch {
+    version = null;
   }
+  return { dir, version };
+}
+function pickUiDist(installed, bundled) {
+  if (installed && bundled) {
+    return compareVersions(bundled.version, installed.version) > 0 ? bundled.dir : installed.dir;
+  }
+  return installed?.dir ?? bundled?.dir ?? null;
+}
+function resolveUiDistDir(dataDir, bundledAddonsDir, siblingDistDir = path.resolve(__dirname, "../../addon-agent-ui/dist")) {
+  if (fs.existsSync(path.join(siblingDistDir, "index.html"))) return siblingDistDir;
+  const installed = readUiDistCandidate(path.join(dataDir, "addons", "@camstack", "addon-agent-ui"));
+  const bundled = bundledAddonsDir ? readUiDistCandidate(path.join(bundledAddonsDir, "addon-agent-ui")) : null;
+  const picked = pickUiDist(installed, bundled);
+  if (picked) return picked;
+  const legacy = path.join(dataDir, "agent-ui");
+  if (fs.existsSync(path.join(legacy, "index.html"))) return legacy;
   return null;
 }
 function readConfigFile(configPath) {
@@ -224,19 +254,26 @@ async function createAgentHttpServer(getBroker, config) {
     const nodes = getRegistryNodes(b);
     return mapDiscoveredNodes(nodes, b.nodeID);
   });
-  const uiDir = resolveUiDistDir(config.dataDir);
+  const uiDir = resolveUiDistDir(config.dataDir, process.env["CAMSTACK_BUNDLED_ADDONS_DIR"]);
   if (uiDir) {
     const fastifyStatic = await import("@fastify/static");
     await app.register(fastifyStatic.default, {
       root: uiDir,
       prefix: "/",
       wildcard: false,
-      decorateReply: false
+      // MUST stay true: the SPA-fallback below uses `reply.sendFile`, which
+      // only exists when the plugin decorates Reply. With `false` every
+      // fallback request 500'd with "reply.sendFile is not a function".
+      decorateReply: true
     });
     app.setNotFoundHandler(async (req, reply) => {
       if (req.url.startsWith("/api/") || req.url.startsWith("/health")) {
         return reply.status(404).send({ error: "Not found" });
       }
+      if (req.url.startsWith("/assets/")) {
+        console.warn(`[Agent] UI asset not found (stale index.html?): ${req.url}`);
+        return reply.status(404).send({ error: "Asset not found" });
+      }
       return reply.type("text/html").sendFile("index.html");
     });
     console.log(`[Agent] UI served from: ${uiDir}`);
@@ -1321,8 +1358,17 @@ async function startAgent(configPath) {
     udsEventBridgeDispose = (0, import_system3.createUdsEventBridge)({
       registry: agentUdsRegistry,
       parentBus: agentBrokerEventBus,
-      parentNodeId: broker.nodeID
+      parentNodeId: broker.nodeID,
+      // D2: relay to children via the pass-through subscription so the bridge's
+      // wildcard does NOT count toward this node's local interest (otherwise the
+      // gate could never filter anything).
+      subscribePassthrough: (handler) => (0, import_system3.subscribePassthrough)(broker, handler)
     });
+    const interestRegistry = agentUdsRegistry;
+    (0, import_system3.setNodeEventInterest)(
+      broker,
+      () => interestRegistry.aggregateEventInterest()
+    );
     const agentReadinessRegistry = (0, import_system3.getOrInitReadinessRegistry)(
       broker,
       agentBrokerEventBus,