@openscout/scout 0.2.65 → 0.2.68

package/dist/runtime/base-daemon.mjs

@@ -63,6 +63,9 @@ function shouldFallbackFromUnixSocket(error) {
   const code = error && typeof error === "object" && "code" in error ? error.code : undefined;
   return code === "ENOENT" || code === "ECONNREFUSED" || code === "ENOTSOCK" || code === "EACCES" || code === "FailedToOpenSocket";
 }
+function errorMessage(error) {
+  return error instanceof Error ? error.message : String(error);
+}
 function requestBrokerOverUnixSocket(socketPath, baseUrl, path, options) {
   return new Promise((resolve, reject) => {
     const normalizedBaseUrl = normalizeBaseUrl(baseUrl);
@@ -116,17 +119,36 @@ async function requestBrokerWire(baseUrl, path, options) {
   const socketPath = options.socketPath?.trim();
   if (socketPath) {
     try {
-      return await requestBrokerOverUnixSocket(socketPath, baseUrl, path, options);
+      return {
+        response: await requestBrokerOverUnixSocket(socketPath, baseUrl, path, options),
+        trace: {
+          transport: "unix_socket",
+          socketPath
+        }
+      };
     } catch (error) {
       if (!shouldFallbackFromUnixSocket(error)) {
         throw error;
       }
+      return {
+        response: await requestBrokerOverHttp(baseUrl, path, options),
+        trace: {
+          transport: "http",
+          socketPath,
+          socketFallbackError: `${socketPath}: ${errorMessage(error)}`
+        }
+      };
     }
   }
-  return requestBrokerOverHttp(baseUrl, path, options);
+  return {
+    response: await requestBrokerOverHttp(baseUrl, path, options),
+    trace: {
+      transport: "http"
+    }
+  };
 }
-async function requestScoutBrokerJson(baseUrl, path, options = {}) {
-  const response = await requestBrokerWire(baseUrl, path, options);
+async function requestScoutBrokerJsonWithTrace(baseUrl, path, options = {}) {
+  const { response, trace } = await requestBrokerWire(baseUrl, path, options);
   let parsed;
   let parsedJson = false;
   if (response.text.length > 0) {
@@ -139,14 +161,14 @@ async function requestScoutBrokerJson(baseUrl, path, options = {}) {
   }
   if (!response.ok) {
     if (parsedJson && options.acceptErrorJson?.(parsed)) {
-      return parsed;
+      return { value: parsed, trace };
     }
     throw new Error(`${path} returned ${response.status}: ${response.text}`);
   }
   if (parsedJson) {
-    return parsed;
+    return { value: parsed, trace };
   }
-  return;
+  return { value: undefined, trace };
 }
 
 // packages/runtime/src/support-paths.ts
@@ -476,11 +498,13 @@ function resolveBrokerServiceConfig() {
     brokerPort,
     brokerUrl,
     brokerSocketPath,
-    advertiseScope
+    advertiseScope,
+    coreAgents: readCoreAgentsSync()
   };
 }
 function renderLaunchAgentPlist(config) {
   const launchPath = resolveLaunchAgentPATH();
+  const coreAgentsValue = (config.coreAgents ?? []).join(",");
   const envEntries = {
     OPENSCOUT_BROKER_HOST: config.brokerHost,
     OPENSCOUT_BROKER_PORT: String(config.brokerPort),
@@ -505,6 +529,9 @@ function renderLaunchAgentPlist(config) {
       "OPENSCOUT_SSE_KEEPALIVE_MS"
     ])
   };
+  if (coreAgentsValue) {
+    envEntries["OPENSCOUT_CORE_AGENTS"] = coreAgentsValue;
+  }
   const envBlock = Object.entries(envEntries).map(([key, value]) => `
     <key>${xmlEscape(key)}</key>
     <string>${xmlEscape(value)}</string>`).join("");
@@ -540,6 +567,18 @@ function renderLaunchAgentPlist(config) {
 </plist>
 `;
 }
+function readCoreAgentsSync() {
+  try {
+    const settingsPath = resolveOpenScoutSupportPaths().settingsPath;
+    const raw = readFileSync(settingsPath, "utf8");
+    const settings = JSON.parse(raw);
+    const raw_agents = settings?.agents?.coreAgents;
+    if (Array.isArray(raw_agents)) {
+      return raw_agents.filter((v) => typeof v === "string" && v.trim().length > 0);
+    }
+  } catch {}
+  return [];
+}
 function collectOptionalEnvVars(keys) {
   const entries = {};
   for (const key of keys) {
@@ -684,22 +723,37 @@ function inspectLaunchctl(config) {
 async function fetchHealthSnapshot(config) {
   const controller = new AbortController;
   const timeout = setTimeout(() => controller.abort(), 1000);
+  const checkedAt = Date.now();
   try {
-    const payload = await requestScoutBrokerJson(config.brokerUrl, "/health", {
+    const { value: payload, trace } = await requestScoutBrokerJsonWithTrace(config.brokerUrl, "/health", {
       signal: controller.signal,
       socketPath: config.brokerSocketPath
     });
     return {
       reachable: true,
       ok: Boolean(payload.ok),
+      checkedAt,
+      transport: trace.transport,
+      socketPath: trace.socketPath,
+      socketFallbackError: trace.socketFallbackError,
       nodeId: payload.nodeId,
       meshId: payload.meshId,
-      counts: payload.counts
+      counts: payload.counts ? {
+        nodes: payload.counts.nodes ?? 0,
+        actors: payload.counts.actors ?? 0,
+        agents: payload.counts.agents ?? 0,
+        conversations: payload.counts.conversations ?? 0,
+        messages: payload.counts.messages ?? 0,
+        flights: payload.counts.flights ?? 0,
+        collaborationRecords: payload.counts.collaborationRecords ?? 0
+      } : undefined
     };
   } catch (error) {
     return {
       reachable: false,
       ok: false,
+      checkedAt,
+      socketPath: config.brokerSocketPath,
       error: error instanceof Error ? error.message : String(error)
     };
   } finally {
@@ -834,8 +888,12 @@ function formatBrokerServiceStatus(status) {
     `broker socket: ${status.brokerSocketPath}`,
     `reachable: ${status.reachable ? "yes" : "no"}`,
     `health: ${status.health.ok ? "ok" : status.health.error ?? "unreachable"}`,
+    `health transport: ${status.health.transport ?? "unknown"}`,
     `logs: ${status.stdoutLogPath}`
   ];
+  if (status.health.socketFallbackError) {
+    lines.push(`socket fallback: ${status.health.socketFallbackError}`);
+  }
   if (status.lastLogLine) {
     lines.push(`last log: ${status.lastLogLine}`);
   }
@@ -960,7 +1018,7 @@ function resolveOpenScoutLocalEdgeConfig(input = {}) {
   const portalHost = resolveScoutWebNamedHostname(input.portalHost ?? DEFAULT_SCOUT_WEB_PORTAL_HOST);
   const nodeHost = resolveScoutWebNamedHostname(input.nodeHost ?? resolveConfiguredScoutWebHostname());
   const wildcardHost = `*.${portalHost}`;
-  const scheme = input.scheme ?? "both";
+  const scheme = input.scheme ?? "http";
   const upstream = `127.0.0.1:${input.webPort ?? resolveWebPort()}`;
   const brokerUpstream = `127.0.0.1:${input.brokerPort ?? resolveBrokerPort()}`;
   return {
@@ -1222,6 +1280,7 @@ var mdnsProcesses = [];
 var brokerRestartDelayMs = RESTART_MIN_DELAY_MS;
 var edgeRestartDelayMs = RESTART_MIN_DELAY_MS;
 var supervisedWebPid = null;
+var supervisorKeepAlive = null;
 var config = resolveBrokerServiceConfig();
 function log(message, details) {
   if (details === undefined) {
@@ -1317,7 +1376,7 @@ function resolveEdgeScheme() {
   if (value === "http" || value === "https" || value === "both") {
     return value;
   }
-  return "both";
+  return "http";
 }
 function resolveEdgeConfig() {
   const portalHost = process.env.OPENSCOUT_WEB_PORTAL_HOST?.trim() || DEFAULT_SCOUT_WEB_PORTAL_HOST;
@@ -1523,6 +1582,10 @@ async function shutdown(exitCode = 0) {
     return;
   }
   shuttingDown = true;
+  if (supervisorKeepAlive) {
+    clearInterval(supervisorKeepAlive);
+    supervisorKeepAlive = null;
+  }
   stopSupervisedWeb();
   stopMenuBarApp();
   stopEdgeProcesses();
@@ -1535,6 +1598,14 @@ async function shutdown(exitCode = 0) {
 function sleep2(ms) {
   return new Promise((resolveSleep) => setTimeout(resolveSleep, ms));
 }
+function keepSupervisorAlive() {
+  if (supervisorKeepAlive) {
+    return;
+  }
+  supervisorKeepAlive = setInterval(() => {
+    return;
+  }, 60000);
+}
 for (const signal of ["SIGINT", "SIGTERM"]) {
   process.on(signal, () => {
     shutdown(0).catch((error) => {
@@ -1548,6 +1619,7 @@ log("starting Scout base service", {
   brokerUrl: config.brokerUrl,
   bootout: `launchctl bootout ${config.serviceTarget}`
 });
+keepSupervisorAlive();
 spawnBroker();
 startLocalEdge();
 startMenuBarApp();