@camstack/agent 1.1.12 → 1.1.13

package/dist/cli.js

@@ -34,9 +34,9 @@ var fs6 = __toESM(require("fs"));
 var path6 = __toESM(require("path"));
 
 // src/agent-http.ts
-var import_fastify = __toESM(require("fastify"));
 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"),
@@ -68,6 +68,23 @@ function getRegistryNodes(broker) {
     return [];
   }
 }
+function pickIpv4(ipList) {
+  if (!ipList) return null;
+  for (const ip of ipList) {
+    if (ip.includes(":")) continue;
+    if (ip.startsWith("127.")) continue;
+    return ip;
+  }
+  return null;
+}
+function resolveHubEndpoint(nodes) {
+  const hub = nodes.find((n) => n.id === "hub");
+  if (!hub) return null;
+  return pickIpv4(hub.ipList) ?? hub.hostname ?? null;
+}
+function mapDiscoveredNodes(nodes, selfId) {
+  return nodes.filter((n) => n.id !== selfId).map((n) => ({ id: n.id, hostname: n.hostname ?? n.id, isHub: n.id === "hub" }));
+}
 function deriveHubConnectionState(nodes, discoveryMode) {
   const hubInRegistry = nodes.some((n) => n.id === "hub");
   if (hubInRegistry) return "connected";
@@ -106,28 +123,35 @@ async function createAgentHttpServer(getBroker, config) {
     const hubConnected = nodes.some((n) => n.id === "hub");
     const discoveryMode = !eff.hubAddress;
     const hubConnectionState = config.getHubConnectionState ? config.getHubConnectionState() : deriveHubConnectionState(nodes, discoveryMode);
+    const resolvedHubAddress = resolveHubEndpoint(nodes);
+    const appVersion = process.env["CAMSTACK_AGENT_APP_VERSION"] ?? null;
+    const discoveredNodes = mapDiscoveredNodes(nodes, broker.nodeID);
     try {
       const status = await broker.call("$agent.status");
       return {
         ...status,
         name: eff.name,
         hubAddress: eff.hubAddress,
+        resolvedHubAddress,
+        appVersion,
         hubConnected,
         hubConnectionState,
         discoveryMode,
         hasSecret: eff.hasSecret,
-        discoveredNodes: nodes.filter((n) => n.id !== broker.nodeID).map((n) => n.id)
+        discoveredNodes
       };
     } catch {
       return {
         nodeId: config.nodeId,
         name: eff.name,
         hubAddress: eff.hubAddress,
+        resolvedHubAddress,
+        appVersion,
         hubConnected,
         hubConnectionState,
         discoveryMode,
         hasSecret: eff.hasSecret,
-        discoveredNodes: [],
+        discoveredNodes,
         addons: [],
         localIps: []
       };
@@ -198,7 +222,7 @@ async function createAgentHttpServer(getBroker, config) {
   app.get("/api/agent/discovered-nodes", async () => {
     const b = getBroker();
     const nodes = getRegistryNodes(b);
-    return nodes.filter((n) => n.id !== b.nodeID).map((n) => ({ id: n.id, isHub: n.id === "hub" }));
+    return mapDiscoveredNodes(nodes, b.nodeID);
   });
   const uiDir = resolveUiDistDir(config.dataDir);
   if (uiDir) {
@@ -299,11 +323,11 @@ function loadAgentConfig(configPath, dataDirOverride) {
 }
 
 // src/agent-service.ts
-var os2 = __toESM(require("os"));
 var fs4 = __toESM(require("fs"));
+var os2 = __toESM(require("os"));
 var path4 = __toESM(require("path"));
-var import_moleculer = require("moleculer");
 var import_system = require("@camstack/system");
+var import_moleculer = require("moleculer");
 
 // src/agent-deploy-swap.ts
 var fs3 = __toESM(require("fs"));
@@ -372,6 +396,14 @@ async function applyDeployedBundle(input) {
   return { addonDir: liveDir };
 }
 
+// src/apply-model-distribution.ts
+async function applyModelDistribution(seam, params) {
+  seam.mkdirp(seam.modelsDir);
+  const buffer = await seam.fetchBundle(params.source);
+  await seam.extract(buffer, seam.modelsDir);
+  return { success: true, modelId: params.modelId, format: params.format, path: seam.modelsDir };
+}
+
 // src/fetch-bundle-from-hub.ts
 var import_node_crypto2 = require("crypto");
 var import_undici = require("undici");
@@ -395,14 +427,6 @@ async function fetchBundleFromHub(opts) {
   return buffer;
 }
 
-// src/apply-model-distribution.ts
-async function applyModelDistribution(seam, params) {
-  seam.mkdirp(seam.modelsDir);
-  const buffer = await seam.fetchBundle(params.source);
-  await seam.extract(buffer, seam.modelsDir);
-  return { success: true, modelId: params.modelId, format: params.format, path: seam.modelsDir };
-}
-
 // src/agent-service.ts
 var deploySwapLogger = {
   info: (msg) => console.log(`[Agent] ${msg}`),
@@ -514,6 +538,7 @@ function createAgentService(deps) {
               memoryPercent = snapshot.memory.percent;
             }
           }
+          const mem = process.memoryUsage();
           return {
             nodeId: broker.nodeID,
             name: deps.agentName,
@@ -527,6 +552,16 @@ function createAgentService(deps) {
             cpuPercent,
             memoryPercent,
             uptime: os2.uptime(),
+            // The agent *process* itself (distinct from the host `uptime` /
+            // memory above) — surfaced so the UI can show how long THIS agent
+            // has been running and how much RAM its own runtime holds.
+            agentProcess: {
+              pid: process.pid,
+              uptimeSeconds: Math.round(process.uptime()),
+              rssMB: Math.round(mem.rss / 1024 / 1024),
+              heapUsedMB: Math.round(mem.heapUsed / 1024 / 1024),
+              heapTotalMB: Math.round(mem.heapTotal / 1024 / 1024)
+            },
             localIps: getLocalIps(),
             addons: [...deps.loadedAddons.values()].map((a) => ({
               id: a.id,