fix(metamcp): recreate stale transport server records

Author: masterkain

charts/metamcp/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 name: metamcp
 description: MetaMCP aggregator Helm chart for Kubernetes
 type: application
-version: 0.3.6
+version: 0.3.7
 appVersion: "2.4.22"
 icon: https://icoretech.github.io/helm/charts/metamcp/logo.png
 keywords:

charts/metamcp/scripts/provision.py

@@ -5,6 +5,8 @@
 from urllib.parse import urlparse
 import base64
 
+from provision_lib import normalize_server_type, server_needs_recreate
+
 def log(msg):
     print(f"[provision] {msg}", flush=True)
 
@@ -370,11 +372,9 @@ def delete_server(name, servers_by_name):
 for s in servers:
     if not (s.get('enabled', True)):
         continue
-    name = s.get('name'); st = (s.get('type','SSE') or 'SSE').upper()
+    name = s.get('name'); st = normalize_server_type(s.get('type'))
     if not name:
         continue
-    if st in ('SSE','STREAMABLE'):
-        st = 'SSE' if st=='SSE' else 'STREAMABLE_HTTP'
     body = {'name': name, 'type': st}
     # Pre-compute desired fields for STDIO so we can also update existing servers
     desired_cmd = None
@@ -435,9 +435,14 @@ def delete_server(name, servers_by_name):
 
     # If server exists and updates are allowed, patch safe fields
     if name in srv_map:
-        if UPDATE_EXISTING and st in ('SSE','STREAMABLE_HTTP'):
+        current = srv_info.get(name, {})
+        if UPDATE_EXISTING and server_needs_recreate(current, st):
+            log(f"server transport cleanup: recreating {name}")
+            delete_server(name, srv_info)
+            srv_map.pop(name, None)
+            srv_info.pop(name, None)
+        if UPDATE_EXISTING and name in srv_map and st in ('SSE','STREAMABLE_HTTP'):
             try:
-                current = srv_info.get(name, {})
                 patch = {'uuid': current.get('uuid'), 'name': name, 'type': st}
                 # Always include required field for HTTP/SSE: url
                 if desired_url:
@@ -454,9 +459,8 @@ def delete_server(name, servers_by_name):
                     log(f"WARN server update {name} -> {r.status_code}: {r.text[:160]}")
             except Exception:
                 pass
-        elif UPDATE_EXISTING and st == 'STDIO':
+        elif UPDATE_EXISTING and name in srv_map and st == 'STDIO':
             try:
-                current = srv_info.get(name, {})
                 patch = {'uuid': current.get('uuid'), 'name': name, 'type': st}
                 # Always include required field for STDIO: command
                 if desired_cmd is not None:
@@ -473,7 +477,8 @@ def delete_server(name, servers_by_name):
                     log(f"WARN server update {name} -> {r.status_code}: {r.text[:160]}")
             except Exception:
                 pass
-        continue
+        if name in srv_map:
+            continue
     if st == 'STDIO':
         if desired_cmd is not None:
             body['command'] = desired_cmd

charts/metamcp/scripts/provision_lib.py

@@ -0,0 +1,29 @@
+def normalize_server_type(raw_type):
+    server_type = (raw_type or "SSE").upper()
+    if server_type in ("SSE", "STREAMABLE"):
+        return "SSE" if server_type == "SSE" else "STREAMABLE_HTTP"
+    return server_type
+
+
+def _has_value(value):
+    return value not in (None, "", [], {})
+
+
+def server_needs_recreate(current, desired_type):
+    current_type = normalize_server_type(current.get("type"))
+    if current_type != desired_type:
+        return True
+
+    if desired_type in ("SSE", "STREAMABLE_HTTP"):
+        return any(
+            _has_value(current.get(key))
+            for key in ("command", "args", "env")
+        )
+
+    if desired_type == "STDIO":
+        return any(
+            _has_value(current.get(key))
+            for key in ("url", "headers", "bearerToken")
+        )
+
+    return False

charts/metamcp/templates/provision-config.yaml

@@ -30,6 +30,8 @@ data:
   # No separate workloads.json; serviceBase is included per server above when deploy specs exist
   provision.py: |
 {{ (.Files.Get "scripts/provision.py") | indent 4 }}
+  provision_lib.py: |
+{{ (.Files.Get "scripts/provision_lib.py") | indent 4 }}
 {{- end }}
 
 ---

charts/metamcp/tests/test_provision_lib.py

@@ -0,0 +1,46 @@
+import importlib.util
+import pathlib
+import unittest
+
+
+MODULE_PATH = pathlib.Path(__file__).resolve().parent.parent / "scripts" / "provision_lib.py"
+SPEC = importlib.util.spec_from_file_location("provision_lib", MODULE_PATH)
+MODULE = importlib.util.module_from_spec(SPEC)
+assert SPEC.loader is not None
+SPEC.loader.exec_module(MODULE)
+
+
+class ProvisionLibTests(unittest.TestCase):
+    def test_recreates_when_transport_changes(self):
+        current = {
+            "type": "STDIO",
+            "command": "npx",
+            "args": ["-y", "@icoretech/warden-mcp@latest", "--stdio"],
+            "env": {"BW_HOST": "https://secret-manager.icorete.ch"},
+        }
+
+        self.assertTrue(MODULE.server_needs_recreate(current, "STREAMABLE_HTTP"))
+
+    def test_recreates_when_http_server_keeps_stale_stdio_fields(self):
+        current = {
+            "type": "STREAMABLE_HTTP",
+            "url": "http://example.svc.cluster.local:3005/sse?v=2",
+            "command": "npx",
+            "args": ["-y", "@icoretech/warden-mcp@latest", "--stdio"],
+            "env": {"BW_HOST": "https://secret-manager.icorete.ch"},
+        }
+
+        self.assertTrue(MODULE.server_needs_recreate(current, "STREAMABLE_HTTP"))
+
+    def test_keeps_clean_http_server_in_place(self):
+        current = {
+            "type": "STREAMABLE_HTTP",
+            "url": "http://example.svc.cluster.local:3005/sse?v=2",
+            "headers": {"X-Test": "1"},
+        }
+
+        self.assertFalse(MODULE.server_needs_recreate(current, "STREAMABLE_HTTP"))
+
+
+if __name__ == "__main__":
+    unittest.main()