openmausbot 0.1.83 → 0.1.85

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

@@ -177,6 +177,86 @@ function probeLoginShellPath() {
   );
 }
 
+// server/mcp-tool-schema.ts
+var ROOT_COMBINATORS = ["anyOf", "oneOf", "allOf", "not"];
+function isObject(value) {
+  return Boolean(value) && typeof value === "object" && !Array.isArray(value);
+}
+function branches(value) {
+  return Array.isArray(value) ? value.filter(isObject) : [];
+}
+function objectShape(schema) {
+  const properties = isObject(schema.properties) ? { ...schema.properties } : {};
+  const required = new Set(Array.isArray(schema.required) ? schema.required.filter((key) => typeof key === "string") : []);
+  const adopt = (shape) => {
+    for (const [key, value] of Object.entries(shape.properties)) if (!(key in properties)) properties[key] = value;
+  };
+  for (const branch of branches(schema.allOf)) {
+    const shape = objectShape(branch);
+    adopt(shape);
+    for (const key of shape.required) required.add(key);
+  }
+  for (const keyword of ["anyOf", "oneOf"]) {
+    const choices = branches(schema[keyword]).map(objectShape);
+    if (choices.length === 0) continue;
+    for (const choice of choices) adopt(choice);
+    for (const key of choices[0].required) {
+      if (choices.every((choice) => choice.required.includes(key))) required.add(key);
+    }
+  }
+  return { properties, required: [...required] };
+}
+function describesObject(type) {
+  return type === void 0 || type === "object" || Array.isArray(type) && type.includes("object");
+}
+function providerSafeInputSchema(schema) {
+  if (!isObject(schema) || !describesObject(schema.type)) return { type: "object", properties: {} };
+  if (schema.type === "object" && ROOT_COMBINATORS.every((keyword) => !(keyword in schema))) return schema;
+  const { properties, required } = objectShape(schema);
+  const safe = { ...schema, type: "object", properties };
+  for (const keyword of ROOT_COMBINATORS) delete safe[keyword];
+  if (required.length > 0) safe.required = required;
+  else delete safe.required;
+  return safe;
+}
+function createToolListNormalizer() {
+  const pending = /* @__PURE__ */ new Set();
+  const idKey = (id) => `${typeof id}:${String(id)}`;
+  return {
+    observeRequest(line) {
+      let frame;
+      try {
+        frame = JSON.parse(line);
+      } catch {
+        return;
+      }
+      if (isObject(frame) && frame.method === "tools/list" && (typeof frame.id === "number" || typeof frame.id === "string")) {
+        pending.add(idKey(frame.id));
+      }
+    },
+    rewriteResponse(line) {
+      if (pending.size === 0) return line;
+      let frame;
+      try {
+        frame = JSON.parse(line);
+      } catch {
+        return line;
+      }
+      if (!isObject(frame) || "method" in frame || !pending.delete(idKey(frame.id))) return line;
+      if (!isObject(frame.result) || !Array.isArray(frame.result.tools)) return line;
+      let changed = false;
+      const tools = frame.result.tools.map((tool) => {
+        if (!isObject(tool)) return tool;
+        const inputSchema = providerSafeInputSchema(tool.inputSchema);
+        if (inputSchema === tool.inputSchema) return tool;
+        changed = true;
+        return { ...tool, inputSchema };
+      });
+      return changed ? JSON.stringify({ ...frame, result: { ...frame.result, tools } }) : line;
+    }
+  };
+}
+
 // server/mcp-bridge.ts
 var BRIDGE_INACTIVITY_MS = 45e3;
 var PROBE_TIMEOUT_MS = 1e4;
@@ -346,8 +426,10 @@ function runMcpBridge(options) {
       }
     } : {}
   });
+  const toolLists = createToolListNormalizer();
   let pendingInput = Promise.resolve();
   const inbound = createLineSplitter((line) => {
+    toolLists.observeRequest(line);
     const completion = intercept(line);
     if (completion) pendingInput = completion;
   });
@@ -357,7 +439,7 @@ function runMcpBridge(options) {
     inbound.flush();
     void pendingInput.finally(() => child.stdin.end());
   });
-  const outbound = createLineSplitter((line) => process.stdout.write(line + "\n"));
+  const outbound = createLineSplitter((line) => process.stdout.write(toolLists.rewriteResponse(line) + "\n"));
   child.stdout.on("data", (chunk) => outbound.push(chunk));
   child.stdout.on("end", () => outbound.flush());
   const detach = () => {

package/dist-server/local-computer.js

@@ -23,6 +23,7 @@ var SPAWNED_PROXIES = {
   connectors: resolveProxy("connector-proxy"),
   mcpGate: resolveProxy("mcp-gate"),
   phone: resolveProxy("drivers/phone-proxy"),
+  hook: resolveProxy("hooks/omb-hook"),
   // Loaded by the external `pi` process via `-e`, not by this server — but
   // resolved through the same single source of truth so the packaged layout
   // check can assert it ships.
@@ -208,11 +209,22 @@ function validateLinuxDescriptorRuntime(descriptorFile, raw, {
     return false;
   }
 }
+function validateLegacyDescriptorRuntime(descriptorFile, platform, { uid = process.getuid?.() ?? -1 } = {}) {
+  try {
+    const stat = lstatSync(descriptorFile);
+    if (!stat.isFile() || stat.isSymbolicLink()) return false;
+    if (platform !== "win32" && (stat.uid !== uid || (stat.mode & 18) !== 0)) return false;
+    return true;
+  } catch {
+    return false;
+  }
+}
 function readCuaConnection({
   platform = process.platform,
   userData = process.env.OMB_USER_DATA,
   home = homedir(),
-  validateLinuxRuntime = validateLinuxDescriptorRuntime
+  validateLinuxRuntime = validateLinuxDescriptorRuntime,
+  validateLegacyRuntime = validateLegacyDescriptorRuntime
 } = {}) {
   const candidates = userData ? [join2(userData, "cua-connection.json")] : [];
   if (platform === "darwin") {
@@ -228,7 +240,7 @@ function readCuaConnection({
         if (decoded && validateLinuxRuntime(file, raw)) return decoded;
       } else {
         const decoded = decodeLegacyDescriptor(raw, platform);
-        if (decoded) return decoded;
+        if (decoded && validateLegacyRuntime(file, platform)) return decoded;
       }
     } catch {
     }