@openscout/scout 0.2.65 → 0.2.68

package/dist/runtime/broker-process-manager.mjs

@@ -56,6 +56,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);
@@ -109,17 +112,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) {
@@ -132,14 +154,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
@@ -483,11 +505,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),
@@ -512,6 +536,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("");
@@ -547,6 +574,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) {
@@ -691,22 +730,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 {
@@ -841,8 +895,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}`);
   }

package/dist/runtime/mesh-discover.mjs

@@ -56,6 +56,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);
@@ -109,17 +112,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) {
@@ -132,14 +154,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
@@ -469,11 +491,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),
@@ -498,6 +522,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("");
@@ -533,6 +560,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) {
@@ -677,22 +716,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 {
@@ -827,8 +881,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}`);
   }