negotium 0.14.3 → 0.14.4

package/dist/agent-helpers.js

@@ -1008,6 +1008,19 @@ function refreshForumCatalogViews() {
   requiredForumMcpServers.splice(0, requiredForumMcpServers.length, ...required);
   optionalForumMcpServers.splice(0, optionalForumMcpServers.length, ...optional);
 }
+function isReservedRuntimeMcpServerName(name) {
+  return Object.hasOwn(MCP_CATALOG, name) || nodeMcpEntries.some((entry) => entry.key === name);
+}
+function mergeHostMcpServers(base, hostMcpServers) {
+  if (!hostMcpServers)
+    return base;
+  for (const name of Object.keys(hostMcpServers)) {
+    if (Object.hasOwn(base, name) || isReservedRuntimeMcpServerName(name)) {
+      throw new Error(`host MCP server name conflicts with node catalog: ${name}`);
+    }
+  }
+  return { ...base, ...hostMcpServers };
+}
 function buildNodeMcpSpecs(agent, filter) {
   const out = {};
   for (const entry of nodeMcpEntries) {
@@ -1184,7 +1197,7 @@ function getMcpServersForQuery(opts) {
     });
   }
   if (opts.sessionType === "manager") {
-    return getManagerMcpServers({
+    return mergeHostMcpServers(getManagerMcpServers({
       userId: opts.userId || "local",
       session: opts.session,
       topicId: opts.topicId,
@@ -1199,7 +1212,7 @@ function getMcpServersForQuery(opts) {
       autoContinue: opts.autoContinue,
       visualTools: opts.visualTools,
       fileDeliveryTools: opts.fileDeliveryTools
-    });
+    }), opts.hostMcpServers);
   }
   return getForumMcpServers({
     userId: opts.userId || "local",
@@ -3072,7 +3085,7 @@ var init_codex = __esm(async () => {
 });
 
 // ../../packages/core/src/version.ts
-var NEGOTIUM_VERSION = "0.14.3";
+var NEGOTIUM_VERSION = "0.14.4";
 
 // ../../packages/core/src/agents/codex-native-multi-agent.ts
 import { spawn as spawn2 } from "child_process";
@@ -5572,8 +5585,11 @@ function toCodexMcpServers(claudeShape) {
     if (typeof s.url === "string" && s.type !== "sse") {
       out[codexName] = withCodexMcpServerOverrides(name, {
         url: s.url,
-        ...s.http_headers && typeof s.http_headers === "object" ? { http_headers: s.http_headers } : {},
-        ...s.env_http_headers && typeof s.env_http_headers === "object" ? { env_http_headers: s.env_http_headers } : {}
+        ...s.http_headers && typeof s.http_headers === "object" || s.headers && typeof s.headers === "object" ? {
+          http_headers: s.http_headers ?? s.headers
+        } : {},
+        ...s.env_http_headers && typeof s.env_http_headers === "object" ? { env_http_headers: s.env_http_headers } : {},
+        ...typeof s.timeout === "number" ? { tool_timeout_sec: Math.max(1, Math.ceil(s.timeout / 1000)) } : {}
       });
     }
   }
@@ -15349,6 +15365,108 @@ body{font-family:system-ui,-apple-system,"Segoe UI",sans-serif;background:var(--
 </style>`;
 });
 
+// ../../packages/core/src/runtime-gateway.ts
+function parseHostMcpServers(value) {
+  if (value === undefined)
+    return;
+  if (!value || typeof value !== "object" || Array.isArray(value)) {
+    throw new TypeError("hostMcpServers must be an object");
+  }
+  const parsedEntries = [];
+  for (const [name, raw] of Object.entries(value)) {
+    if (!HOST_MCP_SERVER_NAME.test(name)) {
+      throw new TypeError(`invalid host MCP server name: ${name}`);
+    }
+    if (!raw || typeof raw !== "object" || Array.isArray(raw)) {
+      throw new TypeError(`hostMcpServers.${name} must be an object`);
+    }
+    const spec = raw;
+    const unsupported = Object.keys(spec).find((key) => !HOST_MCP_SERVER_KEYS.has(key));
+    if (unsupported) {
+      throw new TypeError(`hostMcpServers.${name}.${unsupported} is not allowed`);
+    }
+    if (spec.type !== "sse" && spec.type !== "http") {
+      throw new TypeError(`hostMcpServers.${name}.type must be sse or http`);
+    }
+    if (typeof spec.url !== "string") {
+      throw new TypeError(`hostMcpServers.${name}.url must be a string`);
+    }
+    let url;
+    try {
+      url = new URL(spec.url);
+    } catch {
+      throw new TypeError(`hostMcpServers.${name}.url must be a valid URL`);
+    }
+    if (url.protocol !== "http:" && url.protocol !== "https:") {
+      throw new TypeError(`hostMcpServers.${name}.url must use http or https`);
+    }
+    let headers;
+    if (spec.headers !== undefined) {
+      if (!spec.headers || typeof spec.headers !== "object" || Array.isArray(spec.headers)) {
+        throw new TypeError(`hostMcpServers.${name}.headers must be an object`);
+      }
+      const headerEntries = [];
+      for (const [key, headerValue] of Object.entries(spec.headers)) {
+        if (!HTTP_HEADER_NAME.test(key) || typeof headerValue !== "string") {
+          throw new TypeError(`hostMcpServers.${name}.headers must contain string values`);
+        }
+        try {
+          new Headers([[key, headerValue]]);
+        } catch {
+          throw new TypeError(`hostMcpServers.${name}.headers contains an invalid header`);
+        }
+        headerEntries.push([key, headerValue]);
+      }
+      headers = Object.fromEntries(headerEntries);
+    }
+    if (spec.timeout !== undefined && (typeof spec.timeout !== "number" || !Number.isFinite(spec.timeout) || spec.timeout <= 0)) {
+      throw new TypeError(`hostMcpServers.${name}.timeout must be a positive number`);
+    }
+    parsedEntries.push([
+      name,
+      {
+        type: spec.type,
+        url: url.toString(),
+        ...headers ? { headers } : {},
+        ...spec.timeout !== undefined ? { timeout: spec.timeout } : {}
+      }
+    ]);
+  }
+  return Object.fromEntries(parsedEntries);
+}
+var HOST_MCP_SERVER_NAME, HOST_MCP_SERVER_KEYS, HTTP_HEADER_NAME;
+var init_runtime_gateway = __esm(() => {
+  HOST_MCP_SERVER_NAME = /^[A-Za-z0-9][A-Za-z0-9._-]*$/;
+  HOST_MCP_SERVER_KEYS = new Set(["type", "url", "headers", "timeout"]);
+  HTTP_HEADER_NAME = /^[!#$%&'*+.^_`|~0-9A-Za-z-]+$/;
+});
+
+// ../../packages/core/src/storage/topic-host-mcp-grants.ts
+function getTopicHostMcpGrant(topicId) {
+  const row = db.query("SELECT servers_json FROM api_topic_host_mcp_grants WHERE topic_id = ?").get(topicId);
+  if (!row)
+    return null;
+  try {
+    return parseHostMcpServers(JSON.parse(row.servers_json)) ?? null;
+  } catch {
+    return null;
+  }
+}
+function deleteTopicHostMcpGrant(topicId) {
+  db.query("DELETE FROM api_topic_host_mcp_grants WHERE topic_id = ?").run(topicId);
+}
+var init_topic_host_mcp_grants = __esm(async () => {
+  init_runtime_gateway();
+  await init_forum_db();
+  db.exec(`
+  CREATE TABLE IF NOT EXISTS api_topic_host_mcp_grants (
+    topic_id     TEXT PRIMARY KEY,
+    servers_json TEXT NOT NULL,
+    updated_at   TEXT NOT NULL
+  )
+`);
+});
+
 // ../../packages/core/src/storage/topic-tool-capabilities.ts
 function getTopicToolCapabilities(topicId) {
   const row = db.query(`SELECT visual_tools, file_delivery_tools
@@ -15527,6 +15645,7 @@ async function deleteTopicCascadeImpl(topic, userId, options, deletingAncestorId
       logger.warn({ err: err2, topicId, cwd }, "deleteTopicCascade: workspace cleanup failed");
     }
     deleteTopicVisuals(topicId);
+    deleteTopicHostMcpGrant(topicId);
     deleteTopicToolCapabilities(topicId);
     deleteTopicArchiveState(topicId);
     deleteMessagesForTopic(topicId);
@@ -15589,6 +15708,7 @@ var init_lifecycle = __esm(async () => {
   await init_token_stats();
   await init_topic_archive();
   await init_topic_archive_state();
+  await init_topic_host_mcp_grants();
   await init_topic_tool_capabilities();
   TopicArchiveRequiredError = class TopicArchiveRequiredError extends Error {
     code = "TOPIC_ARCHIVE_FAILED";
@@ -17059,6 +17179,7 @@ __export(exports_turn_runner, {
   resolveWikiMemoryMirror: () => resolveWikiMemoryMirror,
   resolveVisualMediaInput: () => resolveVisualMediaInput,
   resolveTurnToolCapabilities: () => resolveTurnToolCapabilities,
+  resolveTurnHostMcpServers: () => resolveTurnHostMcpServers,
   resolveTopicTurnSession: () => resolveTopicTurnSession,
   resolveTopicTurnExecution: () => resolveTopicTurnExecution,
   resolveSessionRetry: () => resolveSessionRetry,
@@ -17415,6 +17536,12 @@ function resolveTurnToolCapabilities(topicId, params) {
     fileDeliveryTools: params.fileDeliveryTools ?? granted?.fileDeliveryTools ?? false
   };
 }
+function resolveTurnHostMcpServers(topic, sessionType) {
+  const effectiveSessionType = sessionType ?? (topic.kind === "manager" ? "manager" : "forum");
+  if (topic.kind !== "manager" || effectiveSessionType !== "manager")
+    return;
+  return getTopicHostMcpGrant(topic.id) ?? undefined;
+}
 function mergeSupersedingUserTurn(running, incoming) {
   const userMessages = [
     ...running.userMessages ?? [legacyUserTurnEnvelope(running.prompt, running.attachments)],
@@ -17634,6 +17761,7 @@ function startAiTurn(params) {
   const sessionName = params.sessionName ?? topic.title;
   const sessionType = params.sessionType;
   const { visualTools, fileDeliveryTools } = resolveTurnToolCapabilities(topicId, params);
+  const hostMcpServers = resolveTurnHostMcpServers(topic, sessionType);
   const onSessionId = params.onSessionId;
   const onSessionReset = params.onSessionReset;
   const bridgeSessionFromHistory = params.bridgeSessionFromHistory === true;
@@ -18133,6 +18261,7 @@ function startAiTurn(params) {
         autoContinue: allowAutoContinue && !silent,
         visualTools,
         fileDeliveryTools,
+        hostMcpServers,
         ...threadRootId ? { threadRootId } : {},
         peerBridge
       });
@@ -18476,6 +18605,7 @@ var init_turn_runner = __esm(async () => {
   await init_runtime_leases();
   await init_runtime_topic_state();
   await init_runtime_turn_requests();
+  await init_topic_host_mcp_grants();
   await init_topic_tool_capabilities();
   await init_wiki();
   init_wiki_summary_names();
@@ -20538,4 +20668,4 @@ export {
   DEFAULT_SELF_CONFIG_PRODUCT
 };
 
-//# debugId=4F08424E019BC37B64756E2164756E21
+//# debugId=631A95CB99797D8064756E2164756E21