openmausbot 0.1.87 → 0.1.89

package/dist-server/connector-proxy.js

@@ -1,11 +1,113 @@
 // server/connector-proxy.ts
 import readline from "node:readline";
 import { randomUUID } from "node:crypto";
+
+// shared/wire.ts
+var CONNECTOR_SLUG_PATTERN = /^[a-z0-9][a-z0-9_-]{0,80}$/;
+var CONNECTOR_TOOL_NAME_PATTERN = /^[A-Z][A-Z0-9_]{0,127}$/;
+
+// server/connector-verdict.ts
+function serviceSlugFor(tool) {
+  const underscore = tool.indexOf("_");
+  if (underscore <= 0) return null;
+  return tool.slice(0, underscore).toLowerCase();
+}
+function serviceSlugForCandidates(tool, candidates) {
+  let match = null;
+  for (const candidate of candidates) {
+    if (tool.startsWith(candidate.toUpperCase() + "_") && (match === null || candidate.length > match.length)) {
+      match = candidate;
+    }
+  }
+  return match;
+}
+
+// server/connector-advertisement.ts
+var CONNECTOR_ALLOWED_TOOLS_ENV = "OMB_CONNECTOR_ALLOWED_TOOLS";
+var CONNECTOR_SERVICE_SLUGS_ENV = "OMB_CONNECTOR_SERVICE_SLUGS";
+var CONNECTOR_ALLOWED_TOOLS_MAX_BYTES = 32 * 1024;
+var CONNECTOR_SERVICE_SLUGS_MAX_BYTES = 32 * 1024;
+var CONNECTOR_META_TOOLS = [
+  "COMPOSIO_SEARCH_TOOLS",
+  "COMPOSIO_GET_TOOL_SCHEMAS",
+  "COMPOSIO_MULTI_EXECUTE_TOOL",
+  // Session-level connection meta-tools. COMPOSIO_MANAGE_CONNECTIONS ships
+  // in every Composio session; COMPOSIO_WAIT_FOR_CONNECTIONS is opt-in and
+  // off by default. They prefix as service "composio", which no grant
+  // names, so they ride this list instead of CONNECTION_TOOL_SUFFIXES —
+  // connector-proxy intercepts their calls to surface connection cards.
+  // The filter only keeps names upstream actually lists, so advertising an
+  // opted-out tool changes nothing.
+  "COMPOSIO_MANAGE_CONNECTIONS",
+  "COMPOSIO_WAIT_FOR_CONNECTIONS"
+];
+var CONNECTION_TOOL_SUFFIXES = ["_MANAGE_CONNECTIONS", "_WAIT_FOR_CONNECTIONS"];
+function parseConnectorAllowedToolsEnv(raw) {
+  if (!raw) return null;
+  let value;
+  try {
+    value = JSON.parse(raw);
+  } catch {
+    return null;
+  }
+  if (!value || typeof value !== "object" || Array.isArray(value)) return null;
+  const grants = {};
+  for (const [slug, grant] of Object.entries(value)) {
+    if (!CONNECTOR_SLUG_PATTERN.test(slug)) return null;
+    if (!grant || typeof grant !== "object" || Array.isArray(grant)) return null;
+    const tools = grant.tools;
+    if (tools === "*") {
+      grants[slug] = { tools: "*" };
+      continue;
+    }
+    if (!Array.isArray(tools) || tools.length === 0) return null;
+    if (!tools.every((tool) => typeof tool === "string" && CONNECTOR_TOOL_NAME_PATTERN.test(tool))) {
+      return null;
+    }
+    grants[slug] = { tools };
+  }
+  return grants;
+}
+function parseConnectorServiceSlugsEnv(raw) {
+  if (!raw) return [];
+  let value;
+  try {
+    value = JSON.parse(raw);
+  } catch {
+    return [];
+  }
+  if (!Array.isArray(value)) return [];
+  return value.every((slug) => typeof slug === "string" && CONNECTOR_SLUG_PATTERN.test(slug)) ? value : [];
+}
+function connectorToolAdvertised(name, grants, candidates = []) {
+  if (Object.keys(grants).length > 0 && CONNECTOR_META_TOOLS.includes(name)) return true;
+  const service = serviceSlugForCandidates(name, candidates) ?? serviceSlugFor(name);
+  const grant = service === null ? void 0 : grants[service];
+  if (!grant) return false;
+  if (grant.tools === "*") return true;
+  if (grant.tools.includes(name)) return true;
+  return CONNECTION_TOOL_SUFFIXES.some((suffix) => name.endsWith(suffix));
+}
+function filterToolsListFrame(frame, grants, candidates = []) {
+  const result = frame.result;
+  if (!result || typeof result !== "object" || Array.isArray(result)) return frame;
+  const tools = result.tools;
+  if (!Array.isArray(tools)) return frame;
+  const kept = tools.filter((tool) => {
+    const name = tool && typeof tool === "object" && !Array.isArray(tool) ? tool.name : void 0;
+    return typeof name === "string" ? connectorToolAdvertised(name, grants, candidates) : true;
+  });
+  return { ...frame, result: { ...result, tools: kept } };
+}
+
+// server/connector-proxy.ts
 var UPSTREAM = process.env.OMB_CONNECTOR_UPSTREAM_URL ?? "";
 var HARNESS = process.env.OMB_HARNESS_URL ?? "http://127.0.0.1:8799";
 var BOT_ID = process.env.OMB_BOT_ID ?? "";
 var THREAD_ID = process.env.OMB_THREAD_ID ?? "";
 var TOKEN = process.env.OMB_CONNECTOR_TOKEN ?? process.env.OMB_COMMS_TOKEN ?? "";
+var ALLOWED_TOOLS = parseConnectorAllowedToolsEnv(process.env[CONNECTOR_ALLOWED_TOOLS_ENV]);
+var SERVICE_SLUGS = parseConnectorServiceSlugsEnv(process.env[CONNECTOR_SERVICE_SLUGS_ENV]);
 var MAX_RESPONSE_BYTES = 20 * 1024 * 1024;
 var INITIALIZE_RELAY_TIMEOUT_MS = 1e3;
 var RELAY_TIMEOUT_MS = 10 * 6e4;
@@ -176,7 +278,9 @@ async function handle(message) {
   }
   try {
     const response = await relay(message);
-    if (response && id !== void 0) send(response);
+    if (response && id !== void 0) {
+      send(method === "tools/list" && ALLOWED_TOOLS ? filterToolsListFrame(response, ALLOWED_TOOLS, SERVICE_SLUGS) : response);
+    }
   } catch (error) {
     if (id === void 0) return;
     const messageText = error instanceof Error ? error.message : String(error);

package/dist-server/container-mcp.js

@@ -44,6 +44,8 @@ function knownDirs() {
     join(home, ".volta", "bin"),
     join(home, ".bun", "bin"),
     join(home, ".asdf", "shims"),
+    join(home, ".local", "share", "mise", "shims"),
+    // mise installer
     join(home, ".deno", "bin"),
     join(home, "bin"),
     ...nvmBinDirs()
@@ -15642,7 +15644,7 @@ var MAX_CONCURRENT_BOT_THREADS = 10;
 var MIN_THREAD_EVENT_LOG_BYTES = 256 * 1024;
 var MAX_THREAD_EVENT_LOG_BYTES = 4 * 1024 * 1024 * 1024;
 var MIN_LOCAL_VM_MAX_INSTANCES = 1;
-var MAX_LOCAL_VM_MAX_INSTANCES = 4;
+var MAX_LOCAL_VM_MAX_INSTANCES = 8;
 function isValidSshAlias(value) {
   return typeof value === "string" && SSH_ALIAS.test(value);
 }
@@ -15843,6 +15845,13 @@ var defaultModelSelectionSchema = external_exports.object({
   (selection) => selection.variant === void 0 || selection.effort === void 0,
   "choose either a model variant or an effort level"
 );
+var automaticRecoverySchema = external_exports.object({
+  enabled: external_exports.boolean(),
+  backup: defaultModelSelectionSchema.optional()
+}).strict().refine(
+  (recovery) => !recovery.enabled || recovery.backup !== void 0,
+  { message: "Choose a backup model before enabling automatic recovery", path: ["backup"] }
+);
 var threadsConfigSchema = external_exports.object({
   maxConcurrentPerBot: external_exports.number().int().min(1).max(MAX_CONCURRENT_BOT_THREADS),
   /** Cap each per-thread events/ and native/ NDJSON log at this many
@@ -15871,6 +15880,7 @@ var appConfigSchema = external_exports.object({
    * addresses or `@domain` entries; admins get every scope, members chat only. */
   signIn: external_exports.object({ admins: external_exports.array(external_exports.string().max(320)).max(500).optional(), members: external_exports.array(external_exports.string().max(320)).max(5e3).optional() }).optional(),
   defaultModelSelection: defaultModelSelectionSchema.optional(),
+  automaticRecovery: automaticRecoverySchema.optional(),
   newBotDefaults: newBotDefaultsSchema.optional(),
   newBots: newBotsConfigSchema.optional(),
   /** CLI-only launch preferences. Never enable remote access implicitly. */