openmausbot 0.1.86 → 0.1.87

package/dist-server/local-computer-proxy.js

@@ -260,11 +260,11 @@ function createToolListNormalizer() {
 // server/mcp-bridge.ts
 var BRIDGE_INACTIVITY_MS = 45e3;
 var PROBE_TIMEOUT_MS = 1e4;
-function runLivenessProbe(probe, timeoutMs = PROBE_TIMEOUT_MS) {
+function runLivenessProbe(probe, timeoutMs = PROBE_TIMEOUT_MS, env) {
   return new Promise((resolve) => {
     const child = spawn(probe.command, probe.args, {
       shell: false,
-      env: { ...process.env, PATH: augmentedPath() },
+      env: env ?? { ...process.env, PATH: augmentedPath() },
       stdio: ["ignore", "ignore", "ignore"]
     });
     const timer = setTimeout(() => {
@@ -451,7 +451,7 @@ function runMcpBridge(options) {
     const liveness = options.liveness;
     watchdog = createInactivityWatchdog({
       inactivityMs: BRIDGE_INACTIVITY_MS,
-      probe: () => runLivenessProbe(liveness),
+      probe: () => runLivenessProbe(liveness, PROBE_TIMEOUT_MS, options.env),
       onDead: () => {
         process.stderr.write(
           `${options.label} transport went silent and stopped answering liveness probes; ending the bridge

package/dist-server/local-computer.js

@@ -91,16 +91,14 @@ function sameDriverFileIdentity(expected, actual) {
 }
 function decodeLegacyDescriptor(value, platform) {
   const supportedPlatform = legacyPlatform(platform);
-  if (!supportedPlatform || !value || value.mode === "unavailable" || typeof value.mcpCommand !== "string") {
+  if (!supportedPlatform || !value || !(value.mode === "embedded" || supportedPlatform === "darwin" && value.mode === "standalone") || Object.hasOwn(value, "status") && value.status !== "ready" || typeof value.socketPath !== "string" || !value.socketPath || typeof value.mcpCommand !== "string" || !value.mcpCommand.trim()) {
     return null;
   }
-  if (value.mcpArgs !== void 0 && !Array.isArray(value.mcpArgs)) return null;
-  if (value.mcpEnv !== void 0 && (!value.mcpEnv || typeof value.mcpEnv !== "object" || Array.isArray(value.mcpEnv))) {
-    return null;
-  }
-  const args = value.mcpArgs ?? ["mcp"];
+  if (!Array.isArray(value.mcpArgs) || value.mcpArgs[0] !== "mcp") return null;
+  if (!value.mcpEnv || typeof value.mcpEnv !== "object" || Array.isArray(value.mcpEnv)) return null;
+  const args = value.mcpArgs;
   if (!args.every((arg) => typeof arg === "string")) return null;
-  const env = value.mcpEnv ?? {};
+  const env = value.mcpEnv;
   if (!Object.values(env).every((entry) => typeof entry === "string")) return null;
   return {
     command: value.mcpCommand,
@@ -219,6 +217,17 @@ function validateLegacyDescriptorRuntime(descriptorFile, platform, { uid = proce
     return false;
   }
 }
+function firstPresentCuaDescriptor(candidates) {
+  for (const file of new Set(candidates)) {
+    try {
+      lstatSync(file);
+      return file;
+    } catch (error) {
+      if (error.code !== "ENOENT") return file;
+    }
+  }
+  return null;
+}
 function readCuaConnection({
   platform = process.platform,
   userData = process.env.OMB_USER_DATA,
@@ -227,23 +236,49 @@ function readCuaConnection({
   validateLegacyRuntime = validateLegacyDescriptorRuntime
 } = {}) {
   const candidates = userData ? [join2(userData, "cua-connection.json")] : [];
-  if (platform === "darwin") {
+  if (platform === "darwin" && !userData) {
     for (const directory of ["OpenMausBot", "openmausbot", "OpenGrokBot", "opengrokbot"]) {
       candidates.push(join2(home, "Library", "Application Support", directory, "cua-connection.json"));
     }
   }
-  for (const file of new Set(candidates)) {
-    try {
+  const file = firstPresentCuaDescriptor(candidates);
+  if (!file) return null;
+  try {
+    const raw = JSON.parse(readFileSync(file, "utf8"));
+    if (platform === "linux") {
+      const decoded = decodeLinuxDescriptor(raw);
+      if (decoded && validateLinuxRuntime(file, raw)) return decoded;
+    } else {
+      const decoded = decodeLegacyDescriptor(raw, platform);
+      if (decoded && validateLegacyRuntime(file, platform)) return decoded;
+    }
+  } catch {
+  }
+  return null;
+}
+function readCuaUnavailableReason({
+  platform = process.platform,
+  userData = process.env.OMB_USER_DATA,
+  home = homedir()
+} = {}) {
+  if (!legacyPlatform(platform)) return null;
+  const candidates = userData ? [join2(userData, "cua-connection.json")] : [];
+  if (platform === "darwin" && !userData) {
+    for (const directory of ["OpenMausBot", "openmausbot", "OpenGrokBot", "opengrokbot"]) {
+      candidates.push(join2(home, "Library", "Application Support", directory, "cua-connection.json"));
+    }
+  }
+  const file = firstPresentCuaDescriptor(candidates);
+  if (!file) return null;
+  try {
+    if (validateLegacyDescriptorRuntime(file, platform)) {
       const raw = JSON.parse(readFileSync(file, "utf8"));
-      if (platform === "linux") {
-        const decoded = decodeLinuxDescriptor(raw);
-        if (decoded && validateLinuxRuntime(file, raw)) return decoded;
-      } else {
-        const decoded = decodeLegacyDescriptor(raw, platform);
-        if (decoded && validateLegacyRuntime(file, platform)) return decoded;
+      if (raw && typeof raw === "object" && !Array.isArray(raw) && Object.keys(raw).length === 2 && raw.mode === "unavailable") {
+        const reason = raw.reason;
+        if (typeof reason === "string" && reason.trim() && reason.length <= 2e3) return reason.trim();
       }
-    } catch {
     }
+  } catch {
   }
   return null;
 }
@@ -253,5 +288,6 @@ export {
   decodeLinuxDescriptor,
   gatedLocalComputer,
   readCuaConnection,
+  readCuaUnavailableReason,
   validateLinuxDescriptorRuntime
 };