@openscout/scout 0.2.69 → 0.2.72

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

@@ -8,6 +8,7 @@ import { fileURLToPath } from "url";
 
 // packages/runtime/src/broker-api.ts
 import { request as httpRequest } from "http";
+var DEFAULT_BROKER_JSON_REQUEST_TIMEOUT_MS = 30000;
 function normalizeBaseUrl(baseUrl) {
   const trimmed = baseUrl.trim();
   if (!trimmed) {
@@ -108,12 +109,19 @@ function requestBrokerOverUnixSocket(socketPath, baseUrl, path, options) {
     request.end();
   });
 }
+function defaultBrokerRequestSignal(options) {
+  return options.signal ?? AbortSignal.timeout(DEFAULT_BROKER_JSON_REQUEST_TIMEOUT_MS);
+}
 async function requestBrokerWire(baseUrl, path, options) {
+  const requestOptions = {
+    ...options,
+    signal: defaultBrokerRequestSignal(options)
+  };
   const socketPath = options.socketPath?.trim();
   if (socketPath) {
     try {
       return {
-        response: await requestBrokerOverUnixSocket(socketPath, baseUrl, path, options),
+        response: await requestBrokerOverUnixSocket(socketPath, baseUrl, path, requestOptions),
         trace: {
           transport: "unix_socket",
           socketPath
@@ -124,7 +132,7 @@ async function requestBrokerWire(baseUrl, path, options) {
         throw error;
       }
       return {
-        response: await requestBrokerOverHttp(baseUrl, path, options),
+        response: await requestBrokerOverHttp(baseUrl, path, requestOptions),
         trace: {
           transport: "http",
           socketPath,
@@ -134,7 +142,7 @@ async function requestBrokerWire(baseUrl, path, options) {
     }
   }
   return {
-    response: await requestBrokerOverHttp(baseUrl, path, options),
+    response: await requestBrokerOverHttp(baseUrl, path, requestOptions),
     trace: {
       transport: "http"
     }
@@ -175,6 +183,8 @@ function resolveOpenScoutSupportPaths() {
   const logsDirectory = join(supportDirectory, "logs");
   const runtimeDirectory = join(supportDirectory, "runtime");
   const catalogDirectory = join(supportDirectory, "catalog");
+  const controlHome = process.env.OPENSCOUT_CONTROL_HOME ?? join(home, ".openscout", "control-plane");
+  const knowledgeDirectory = join(controlHome, "knowledge");
   return {
     supportDirectory,
     logsDirectory,
@@ -186,8 +196,12 @@ function resolveOpenScoutSupportPaths() {
     settingsPath: join(supportDirectory, "settings.json"),
     harnessCatalogPath: join(catalogDirectory, "harness-catalog.json"),
     relayAgentsRegistryPath: join(supportDirectory, "relay-agents.json"),
+    managedInstallsPath: join(supportDirectory, "managed-installs.json"),
     relayHubDirectory: process.env.OPENSCOUT_RELAY_HUB ?? join(home, ".openscout", "relay"),
-    controlHome: process.env.OPENSCOUT_CONTROL_HOME ?? join(home, ".openscout", "control-plane"),
+    controlHome,
+    knowledgeDirectory,
+    knowledgeQmdDirectory: join(knowledgeDirectory, "qmd"),
+    knowledgeSqlitePath: join(knowledgeDirectory, "knowledge.sqlite"),
     desktopStatusPath: join(supportDirectory, "agent-status.json"),
     workspaceStatePath: join(supportDirectory, "workspace-state.json"),
     cutoverMarkerPath: join(supportDirectory, OPENSCOUT_RPC_CUTOVER_MARKER)
@@ -339,6 +353,7 @@ function isLoopbackHost(host) {
 }
 var BROKER_SERVICE_POLL_INTERVAL_MS = 100;
 var DEFAULT_BROKER_START_TIMEOUT_MS = 15000;
+var DEFAULT_BROKER_STOP_TIMEOUT_MS = 20000;
 function buildDefaultBrokerUrl(host = DEFAULT_BROKER_HOST, port = DEFAULT_BROKER_PORT) {
   return `http://${host}:${port}`;
 }
@@ -444,6 +459,13 @@ function resolveBrokerStartTimeoutMs() {
   }
   return DEFAULT_BROKER_START_TIMEOUT_MS;
 }
+function resolveBrokerStopTimeoutMs() {
+  const explicit = Number.parseInt(process.env.OPENSCOUT_BROKER_STOP_TIMEOUT_MS ?? "", 10);
+  if (Number.isFinite(explicit) && explicit > 0) {
+    return Math.max(explicit, BROKER_SERVICE_POLL_INTERVAL_MS);
+  }
+  return DEFAULT_BROKER_STOP_TIMEOUT_MS;
+}
 function resolveBrokerServiceLabel(mode) {
   const explicit = process.env.OPENSCOUT_SERVICE_LABEL?.trim() || process.env.OPENSCOUT_BROKER_SERVICE_LABEL?.trim();
   if (explicit) {
@@ -533,7 +555,18 @@ function renderLaunchAgentPlist(config) {
       "OPENSCOUT_NODE_QUALIFIER",
       "OPENSCOUT_TAILSCALE_BIN",
       "OPENSCOUT_TAILSCALE_STATUS_JSON",
-      "OPENSCOUT_SSE_KEEPALIVE_MS"
+      "OPENSCOUT_SSE_KEEPALIVE_MS",
+      "OPENSCOUT_WEB_EDGE_SCHEME",
+      "OPENSCOUT_WEB_PUBLIC_ORIGIN",
+      "OPENSCOUT_WEB_PORTAL_HOST",
+      "OPENSCOUT_WEB_LOCAL_NAME",
+      "OPENSCOUT_WEB_ADVERTISED_HOST",
+      "OPENSCOUT_WEB_TRUSTED_HOSTS",
+      "OPENSCOUT_WEB_TRUSTED_ORIGINS",
+      "OPENSCOUT_WEB_PORT",
+      "OPENSCOUT_WEB_FLAG_BUNDLE",
+      "OPENSCOUT_WEB_EXPERIENCE",
+      "OPENSCOUT_WEB_AB_VARIANT"
     ])
   };
   if (coreAgentsValue) {
@@ -816,6 +849,7 @@ async function startBrokerService(config = resolveBrokerServiceConfig()) {
   bootoutLegacyBrokerService(config);
   writeLaunchAgentPlist(config);
   runCommand(launchctlPath(), ["bootout", config.serviceTarget], { allowFailure: true });
+  await waitForBrokerServiceStopped(config);
   runCommand(launchctlPath(), ["bootstrap", config.domainTarget, config.launchAgentPath], { allowFailure: true });
   runCommand(launchctlPath(), ["kickstart", "-k", config.serviceTarget], { allowFailure: true });
   const attempts = Math.ceil(resolveBrokerStartTimeoutMs() / BROKER_SERVICE_POLL_INTERVAL_MS);
@@ -832,16 +866,21 @@ async function startBrokerService(config = resolveBrokerServiceConfig()) {
 function sleep(ms) {
   return new Promise((resolve3) => setTimeout(resolve3, ms));
 }
-async function stopBrokerService(config = resolveBrokerServiceConfig()) {
-  runCommand(launchctlPath(), ["bootout", config.serviceTarget], { allowFailure: true });
-  for (let attempt = 0;attempt < 30; attempt += 1) {
-    const status = await brokerServiceStatus(config);
-    if (!status.health.reachable) {
+async function waitForBrokerServiceStopped(config) {
+  let status = await brokerServiceStatus(config);
+  const attempts = Math.ceil(resolveBrokerStopTimeoutMs() / BROKER_SERVICE_POLL_INTERVAL_MS);
+  for (let attempt = 0;attempt < attempts; attempt += 1) {
+    status = await brokerServiceStatus(config);
+    if (!status.loaded && !status.health.reachable) {
       return status;
     }
     await sleep(BROKER_SERVICE_POLL_INTERVAL_MS);
   }
-  return brokerServiceStatus(config);
+  return status;
+}
+async function stopBrokerService(config = resolveBrokerServiceConfig()) {
+  runCommand(launchctlPath(), ["bootout", config.serviceTarget], { allowFailure: true });
+  return waitForBrokerServiceStopped(config);
 }
 async function restartBrokerService(config = resolveBrokerServiceConfig()) {
   await stopBrokerService(config);

package/dist/runtime/mesh-discover.mjs

@@ -8,6 +8,7 @@ import { fileURLToPath } from "url";
 
 // packages/runtime/src/broker-api.ts
 import { request as httpRequest } from "http";
+var DEFAULT_BROKER_JSON_REQUEST_TIMEOUT_MS = 30000;
 function normalizeBaseUrl(baseUrl) {
   const trimmed = baseUrl.trim();
   if (!trimmed) {
@@ -108,12 +109,19 @@ function requestBrokerOverUnixSocket(socketPath, baseUrl, path, options) {
     request.end();
   });
 }
+function defaultBrokerRequestSignal(options) {
+  return options.signal ?? AbortSignal.timeout(DEFAULT_BROKER_JSON_REQUEST_TIMEOUT_MS);
+}
 async function requestBrokerWire(baseUrl, path, options) {
+  const requestOptions = {
+    ...options,
+    signal: defaultBrokerRequestSignal(options)
+  };
   const socketPath = options.socketPath?.trim();
   if (socketPath) {
     try {
       return {
-        response: await requestBrokerOverUnixSocket(socketPath, baseUrl, path, options),
+        response: await requestBrokerOverUnixSocket(socketPath, baseUrl, path, requestOptions),
         trace: {
           transport: "unix_socket",
           socketPath
@@ -124,7 +132,7 @@ async function requestBrokerWire(baseUrl, path, options) {
         throw error;
       }
       return {
-        response: await requestBrokerOverHttp(baseUrl, path, options),
+        response: await requestBrokerOverHttp(baseUrl, path, requestOptions),
         trace: {
           transport: "http",
           socketPath,
@@ -134,7 +142,7 @@ async function requestBrokerWire(baseUrl, path, options) {
     }
   }
   return {
-    response: await requestBrokerOverHttp(baseUrl, path, options),
+    response: await requestBrokerOverHttp(baseUrl, path, requestOptions),
     trace: {
       transport: "http"
     }
@@ -175,6 +183,8 @@ function resolveOpenScoutSupportPaths() {
   const logsDirectory = join(supportDirectory, "logs");
   const runtimeDirectory = join(supportDirectory, "runtime");
   const catalogDirectory = join(supportDirectory, "catalog");
+  const controlHome = process.env.OPENSCOUT_CONTROL_HOME ?? join(home, ".openscout", "control-plane");
+  const knowledgeDirectory = join(controlHome, "knowledge");
   return {
     supportDirectory,
     logsDirectory,
@@ -186,8 +196,12 @@ function resolveOpenScoutSupportPaths() {
     settingsPath: join(supportDirectory, "settings.json"),
     harnessCatalogPath: join(catalogDirectory, "harness-catalog.json"),
     relayAgentsRegistryPath: join(supportDirectory, "relay-agents.json"),
+    managedInstallsPath: join(supportDirectory, "managed-installs.json"),
     relayHubDirectory: process.env.OPENSCOUT_RELAY_HUB ?? join(home, ".openscout", "relay"),
-    controlHome: process.env.OPENSCOUT_CONTROL_HOME ?? join(home, ".openscout", "control-plane"),
+    controlHome,
+    knowledgeDirectory,
+    knowledgeQmdDirectory: join(knowledgeDirectory, "qmd"),
+    knowledgeSqlitePath: join(knowledgeDirectory, "knowledge.sqlite"),
     desktopStatusPath: join(supportDirectory, "agent-status.json"),
     workspaceStatePath: join(supportDirectory, "workspace-state.json"),
     cutoverMarkerPath: join(supportDirectory, OPENSCOUT_RPC_CUTOVER_MARKER)
@@ -335,6 +349,7 @@ function resolveBrokerHost(scope = resolveAdvertiseScope()) {
 }
 var BROKER_SERVICE_POLL_INTERVAL_MS = 100;
 var DEFAULT_BROKER_START_TIMEOUT_MS = 15000;
+var DEFAULT_BROKER_STOP_TIMEOUT_MS = 20000;
 function buildDefaultBrokerUrl(host = DEFAULT_BROKER_HOST, port = DEFAULT_BROKER_PORT) {
   return `http://${host}:${port}`;
 }
@@ -430,6 +445,13 @@ function resolveBrokerStartTimeoutMs() {
   }
   return DEFAULT_BROKER_START_TIMEOUT_MS;
 }
+function resolveBrokerStopTimeoutMs() {
+  const explicit = Number.parseInt(process.env.OPENSCOUT_BROKER_STOP_TIMEOUT_MS ?? "", 10);
+  if (Number.isFinite(explicit) && explicit > 0) {
+    return Math.max(explicit, BROKER_SERVICE_POLL_INTERVAL_MS);
+  }
+  return DEFAULT_BROKER_STOP_TIMEOUT_MS;
+}
 function resolveBrokerServiceLabel(mode) {
   const explicit = process.env.OPENSCOUT_SERVICE_LABEL?.trim() || process.env.OPENSCOUT_BROKER_SERVICE_LABEL?.trim();
   if (explicit) {
@@ -519,7 +541,18 @@ function renderLaunchAgentPlist(config) {
       "OPENSCOUT_NODE_QUALIFIER",
       "OPENSCOUT_TAILSCALE_BIN",
       "OPENSCOUT_TAILSCALE_STATUS_JSON",
-      "OPENSCOUT_SSE_KEEPALIVE_MS"
+      "OPENSCOUT_SSE_KEEPALIVE_MS",
+      "OPENSCOUT_WEB_EDGE_SCHEME",
+      "OPENSCOUT_WEB_PUBLIC_ORIGIN",
+      "OPENSCOUT_WEB_PORTAL_HOST",
+      "OPENSCOUT_WEB_LOCAL_NAME",
+      "OPENSCOUT_WEB_ADVERTISED_HOST",
+      "OPENSCOUT_WEB_TRUSTED_HOSTS",
+      "OPENSCOUT_WEB_TRUSTED_ORIGINS",
+      "OPENSCOUT_WEB_PORT",
+      "OPENSCOUT_WEB_FLAG_BUNDLE",
+      "OPENSCOUT_WEB_EXPERIENCE",
+      "OPENSCOUT_WEB_AB_VARIANT"
     ])
   };
   if (coreAgentsValue) {
@@ -802,6 +835,7 @@ async function startBrokerService(config = resolveBrokerServiceConfig()) {
   bootoutLegacyBrokerService(config);
   writeLaunchAgentPlist(config);
   runCommand(launchctlPath(), ["bootout", config.serviceTarget], { allowFailure: true });
+  await waitForBrokerServiceStopped(config);
   runCommand(launchctlPath(), ["bootstrap", config.domainTarget, config.launchAgentPath], { allowFailure: true });
   runCommand(launchctlPath(), ["kickstart", "-k", config.serviceTarget], { allowFailure: true });
   const attempts = Math.ceil(resolveBrokerStartTimeoutMs() / BROKER_SERVICE_POLL_INTERVAL_MS);
@@ -818,16 +852,21 @@ async function startBrokerService(config = resolveBrokerServiceConfig()) {
 function sleep(ms) {
   return new Promise((resolve3) => setTimeout(resolve3, ms));
 }
-async function stopBrokerService(config = resolveBrokerServiceConfig()) {
-  runCommand(launchctlPath(), ["bootout", config.serviceTarget], { allowFailure: true });
-  for (let attempt = 0;attempt < 30; attempt += 1) {
-    const status = await brokerServiceStatus(config);
-    if (!status.health.reachable) {
+async function waitForBrokerServiceStopped(config) {
+  let status = await brokerServiceStatus(config);
+  const attempts = Math.ceil(resolveBrokerStopTimeoutMs() / BROKER_SERVICE_POLL_INTERVAL_MS);
+  for (let attempt = 0;attempt < attempts; attempt += 1) {
+    status = await brokerServiceStatus(config);
+    if (!status.loaded && !status.health.reachable) {
       return status;
     }
     await sleep(BROKER_SERVICE_POLL_INTERVAL_MS);
   }
-  return brokerServiceStatus(config);
+  return status;
+}
+async function stopBrokerService(config = resolveBrokerServiceConfig()) {
+  runCommand(launchctlPath(), ["bootout", config.serviceTarget], { allowFailure: true });
+  return waitForBrokerServiceStopped(config);
 }
 async function restartBrokerService(config = resolveBrokerServiceConfig()) {
   await stopBrokerService(config);