negotium 0.22.4 → 0.22.5

package/dist/main.js

@@ -2019,7 +2019,7 @@ function loadClaudeAttachments() {
 }
 function encodeClaudeCwd(cwd) {
   const realCwd = cwd.startsWith("/tmp/") ? cwd.replace(/^\/tmp\//, "/private/tmp/") : cwd;
-  return `-${realCwd.replaceAll(/[^a-zA-Z0-9]/g, "-").replace(/^-/, "")}`;
+  return realCwd.replaceAll(/[^a-zA-Z0-9]/g, "-");
 }
 function writeClaudeRollout(opts) {
   const sessionId = opts.sessionId ?? randomUUID();
@@ -5370,6 +5370,19 @@ function getNodeMcpServers() {
 function isReservedRuntimeMcpServerName(name) {
   return Object.hasOwn(MCP_CATALOG, name) || nodeMcpEntries.some((entry) => entry.key === name);
 }
+function hostMcpGrantRefusal(topic, names) {
+  if (topic.kind === "manager")
+    return null;
+  if (topic.isSubagent)
+    return "hostMcpServers is not allowed for subagent topics";
+  const managerOnly = names.find((name) => MANAGER_ONLY_HOST_MCP_NAMES.has(name));
+  return managerOnly ? `${managerOnly} is only allowed for manager topics` : null;
+}
+function withoutManagerOnlyHostMcpServers(hostMcpServers) {
+  if (!hostMcpServers)
+    return;
+  return Object.fromEntries(Object.entries(hostMcpServers).filter(([name]) => !MANAGER_ONLY_HOST_MCP_NAMES.has(name)));
+}
 function mergeHostMcpServers(base, hostMcpServers) {
   if (!hostMcpServers)
     return base;
@@ -5630,7 +5643,7 @@ function getMcpServersForQuery(opts) {
       fileDeliveryTools: opts.fileDeliveryTools
     }), opts.hostMcpServers), opts.topicId);
   }
-  return hideProviderIntrospectionForOtium(getForumMcpServers({
+  return hideProviderIntrospectionForOtium(mergeHostMcpServers(getForumMcpServers({
     userId: opts.userId || "local",
     actorUserId: opts.actorUserId,
     actorTopicScope: opts.actorTopicScope,
@@ -5657,7 +5670,7 @@ function getMcpServersForQuery(opts) {
     extra: opts.mcpExtra,
     silent: opts.silent,
     peerBridge: opts.peerBridge
-  }), opts.topicId);
+  }), withoutManagerOnlyHostMcpServers(opts.hostMcpServers)), opts.topicId);
 }
 function hideProviderIntrospectionForOtium(servers, topicId) {
   if (!topicId || getTopic(topicId)?.surface !== "otium")
@@ -5667,7 +5680,7 @@ function hideProviderIntrospectionForOtium(servers, topicId) {
   delete filtered["token-stats"];
   return filtered;
 }
-var _playwrightUnavailableNotifier, _playwrightUnavailableLastNotifiedAt, _PLAYWRIGHT_UNAVAILABLE_COOLDOWN_MS, _playwrightUnavailableThisTurn, cuaRsMcpPort, cuaRsMcpToken, MCP_CATALOG, nodeMcpEntries, resolvedNodeMcpPorts, allForumMcpServerNames, requiredForumMcpServers, REQUIRED_FORUM_MCP_SERVERS, optionalForumMcpServers, OPTIONAL_FORUM_MCP_SERVERS;
+var _playwrightUnavailableNotifier, _playwrightUnavailableLastNotifiedAt, _PLAYWRIGHT_UNAVAILABLE_COOLDOWN_MS, _playwrightUnavailableThisTurn, cuaRsMcpPort, cuaRsMcpToken, MCP_CATALOG, nodeMcpEntries, resolvedNodeMcpPorts, allForumMcpServerNames, requiredForumMcpServers, REQUIRED_FORUM_MCP_SERVERS, optionalForumMcpServers, OPTIONAL_FORUM_MCP_SERVERS, MANAGER_ONLY_HOST_MCP_NAMES;
 var init_mcp_config = __esm(async () => {
   init_explicit_agent_switch();
   init_canonical_bridge_config();
@@ -5924,6 +5937,7 @@ var init_mcp_config = __esm(async () => {
   optionalForumMcpServers = [];
   OPTIONAL_FORUM_MCP_SERVERS = optionalForumMcpServers;
   refreshForumCatalogViews();
+  MANAGER_ONLY_HOST_MCP_NAMES = new Set(["topic-admin"]);
 });
 
 // ../../packages/core/src/agents/execution-host.ts
@@ -6540,7 +6554,7 @@ var exports_version = {};
 __export(exports_version, {
   NEGOTIUM_VERSION: () => NEGOTIUM_VERSION
 });
-var NEGOTIUM_VERSION = "0.22.4";
+var NEGOTIUM_VERSION = "0.22.5";
 
 // ../../packages/core/src/agents/codex-native-multi-agent.ts
 import { spawn as spawn2 } from "child_process";
@@ -23128,8 +23142,10 @@ function resolveTurnToolCapabilities(topicId, params) {
   };
 }
 function resolveTurnHostMcpServers(topic, sessionType) {
-  const effectiveSessionType = sessionType ?? (topic.kind === "manager" ? "manager" : "forum");
-  if (topic.kind !== "manager" || effectiveSessionType !== "manager")
+  if (topic.isSubagent)
+    return;
+  const ownScope = topic.kind === "manager" ? "manager" : "forum";
+  if ((sessionType ?? ownScope) !== ownScope)
     return;
   return getTopicHostMcpGrant(topic.id) ?? undefined;
 }
@@ -26445,9 +26461,9 @@ function gatewayPayloadHash(params, requestId, actorUserId) {
 }
 function submitRuntimeGatewayTurn(params) {
   const hostMcpServers = parseHostMcpServers(params.hostMcpServers);
-  if (hostMcpServers !== undefined && params.topic.kind !== "manager") {
-    throw new TypeError("hostMcpServers is only allowed for manager topics");
-  }
+  const grantRefusal = hostMcpServers === undefined ? null : hostMcpGrantRefusal(params.topic, Object.keys(hostMcpServers));
+  if (grantRefusal)
+    throw new TypeError(grantRefusal);
   const conflictingHostMcpName = Object.keys(hostMcpServers ?? {}).find(isReservedRuntimeMcpServerName);
   if (conflictingHostMcpName) {
     throw new TypeError(`host MCP server name conflicts with node catalog: ${conflictingHostMcpName}`);
@@ -29952,6 +29968,7 @@ __export(exports_node_host, {
   isReservedRuntimeMcpServerName: () => isReservedRuntimeMcpServerName,
   isParticipant: () => isParticipant,
   insertCommittedTopicCreateClaim: () => insertCommittedTopicCreateClaim,
+  hostMcpGrantRefusal: () => hostMcpGrantRefusal,
   getVisibleTopics: () => getVisibleTopics,
   getTopicTombstone: () => getTopicTombstone,
   getTopicStats: () => getTopicStats,
@@ -39369,6 +39386,7 @@ function createNodeControlHandler(options) {
             capabilities: [
               "turn-submit-idempotent",
               "host-mcp-turn-injection",
+              "host-mcp-forum-turn-injection",
               "turn-events-sse-resume",
               "canonical-topic-read",
               "canonical-message-read",
@@ -39636,9 +39654,9 @@ function createNodeControlHandler(options) {
           if (!topic.participants.some((participant) => participant.userId === userId)) {
             return jsonError(404, "Topic not found");
           }
-          if (hostMcpServers !== undefined && topic.kind !== "manager") {
-            return jsonError(400, "hostMcpServers is only allowed for manager topics");
-          }
+          const grantRefusal = hostMcpServers === undefined ? null : hostMcpGrantRefusal(topic, Object.keys(hostMcpServers));
+          if (grantRefusal)
+            return jsonError(400, grantRefusal);
           if (attachments2.some((fileId) => !nodeFileStore.allows(fileId, { topicId, ownerUserId: userId }))) {
             return jsonError(404, "Attachment not found");
           }
@@ -59068,4 +59086,4 @@ switch (command) {
   }
 }
 
-//# debugId=80556303BA5A6CCA64756E2164756E21
+//# debugId=B68892935362F4E964756E2164756E21