Revert "refactor(mcp): connect upstream MCP servers directly to pi"

This reverts commit ef43567fbf98e1317f12063c6cd9925e0005fd9f.

Author: ChipWolf

home/.chezmoidata/mcps/00-base.yaml

@@ -13,20 +13,15 @@
 mcp:
   serversById:
 
-    # --- Upstream servers --------------------------------------------
-    # These render into mcpproxy (for cursor/opencode, which benefit
-    # from retrieve_tools-style discovery) and directly into pi (which
-    # already has pi-mcp-adapter providing its own lazy mcp() proxy;
-    # stacking another tool-discovery layer on top adds friction
-    # without saving context).
+    # --- Servers proxied by mcpproxy ---------------------------------
+    # These render only into mcpproxy's upstream list. Clients reach
+    # them via the mcpproxy entry below.
 
     obsidian:
       enabled: true
       targets:
         mcpproxy:
           enabled: true
-        pi:
-          enabled: true
       local:
         command: "mise"
         args:
@@ -44,8 +39,6 @@ mcp:
       targets:
         mcpproxy:
           enabled: true
-        pi:
-          enabled: true
       local:
         command: "mise"
         args:
@@ -62,8 +55,6 @@ mcp:
       targets:
         mcpproxy:
           enabled: true
-        pi:
-          enabled: true
       remote:
         url: "https://mcp.context7.com/mcp"
 
@@ -72,8 +63,6 @@ mcp:
       targets:
         mcpproxy:
           enabled: true
-        pi:
-          enabled: true
       remote:
         url: "https://mcp.grep.app"
 
@@ -100,11 +89,10 @@ mcp:
 
     # --- Aggregator entry --------------------------------------------
     # Smart MCP proxy aggregates the upstream MCP servers above and
-    # exposes them via retrieve_tools-style discovery. Used by cursor
-    # (40-tool limit) and opencode (token cost per registered tool).
-    # Pi connects to upstream servers directly (see above) since
-    # pi-mcp-adapter already provides lazy/discovery semantics.
-    # mcpproxy.app or the brew-installed mcpproxy CLI must be running.
+    # exposes them via a single endpoint with retrieve_tools-based
+    # discovery. Clients connect to the proxy instead of registering
+    # each upstream directly. mcpproxy.app or the brew-installed
+    # mcpproxy CLI must be running.
 
     mcpproxy:
       enabled: true
@@ -113,6 +101,8 @@ mcp:
           enabled: true
         opencode:
           enabled: true
+        pi:
+          enabled: true
       remote:
         url: "http://127.0.0.1:8080/mcp"
         transport: "streamableHttp"

home/.chezmoidata/mcps/10-chipwolf.yaml

@@ -14,8 +14,6 @@ mcp:
       targets:
         mcpproxy:
           enabled: true
-        pi:
-          enabled: true
       remote:
         url: "https://mcp.atlassian.com/v1/mcp"
 
@@ -26,8 +24,6 @@ mcp:
       targets:
         mcpproxy:
           enabled: true
-        pi:
-          enabled: true
       local:
         command: "bash"
         args: