From 286da8980eeddfea73749c8aab6dafa528c4ff98 Mon Sep 17 00:00:00 2001
From: damocles <damocles@hyperhive>
Date: Sat, 16 May 2026 02:31:26 +0200
Subject: [PATCH] Revert "mcp: wire extra server allowedTools into
 --allowedTools arg"

This reverts commit e0b18ff3c2ec5a7f771ab9a1a247ff4a24a8c475.
---
 hive-ag3nt/src/mcp.rs | 18 +-----------------
 1 file changed, 1 insertion(+), 17 deletions(-)

diff --git a/hive-ag3nt/src/mcp.rs b/hive-ag3nt/src/mcp.rs
index 3220f37..14c2311 100644
--- a/hive-ag3nt/src/mcp.rs
+++ b/hive-ag3nt/src/mcp.rs
@@ -544,8 +544,6 @@ impl ManagerServer {
 )]
 impl ServerHandler for ManagerServer {}
 
-
-
 /// Name of the hyperhive MCP server inside claude's view. Claude prefixes
 /// tools as `mcp__<this>__<tool>` (e.g. `mcp__hyperhive__send`).
 pub const SERVER_NAME: &str = "hyperhive";
@@ -608,9 +606,7 @@ pub fn allowed_mcp_tools(flavor: Flavor) -> Vec<String> {
 }
 
 /// Combined allow-list passed to `--allowedTools` (auto-approve) — covers
-/// the built-ins, the hyperhive MCP surface, and any extra MCP servers.
-/// Extra server tools are read from the same `/etc/hyperhive/extra-mcp.json`
-/// file that `render_claude_config` uses, so the two are always in sync.
+/// both the built-ins and the MCP surface.
 #[must_use]
 pub fn allowed_tools_arg(flavor: Flavor) -> String {
     let mut all: Vec<String> = ALLOWED_BUILTIN_TOOLS
@@ -618,18 +614,6 @@ pub fn allowed_tools_arg(flavor: Flavor) -> String {
         .map(|s| (*s).to_owned())
         .collect();
     all.extend(allowed_mcp_tools(flavor));
-    for (name, spec) in load_extra_mcp() {
-        if name == SERVER_NAME {
-            continue; // already covered above
-        }
-        for tool in &spec.allowed_tools {
-            if tool == "*" {
-                all.push(format!("mcp__{name}__*"));
-            } else {
-                all.push(format!("mcp__{name}__{tool}"));
-            }
-        }
-    }
     all.join(",")
 }