fix: tools_include/exclude filter not applied immediately on gateway edit

Bug 1 — Timing: update_gateway() applied the OLD tools_include filter
(from DB) instead of the NEW one (from the edit form) because
_apply_tool_filters was called at L2381 but gateway.tools_include was
only updated at L2515. New tools matching the updated filter were never
imported, and tools deselected by the old filter were deleted as stale.

Fix: read effective_include/exclude from gateway_update (falling back
to gateway's existing value) BEFORE calling _apply_tool_filters.

Bug 2 — Clearing: setting tools_include to None when the form field
was empty made the service skip the update (is not None check), so
a filter could never be removed once set.

Fix: admin handler defaults to [] (empty list) instead of None for
cleared fields; service converts [] to None (clear) while preserving
None as 'not provided' (keep existing).

Author: Olivier Gintrand

mcpgateway/admin.py

@@ -12370,8 +12370,9 @@ async def admin_edit_gateway(
             passthrough_headers = None
 
         # Handle tools_include filter
+        # Use [] (empty list) to signal "user cleared the filter" vs None (not provided)
         tools_include_str = str(form.get("tools_include", ""))
-        tools_include: Optional[List[str]] = None
+        tools_include: Optional[List[str]] = []
         if tools_include_str and tools_include_str.strip():
             try:
                 tools_include = orjson.loads(tools_include_str)
@@ -12380,7 +12381,7 @@ async def admin_edit_gateway(
 
         # Handle tools_exclude filter
         tools_exclude_str = str(form.get("tools_exclude", ""))
-        tools_exclude: Optional[List[str]] = None
+        tools_exclude: Optional[List[str]] = []
         if tools_exclude_str and tools_exclude_str.strip():
             try:
                 tools_exclude = orjson.loads(tools_exclude_str)

mcpgateway/services/gateway_service.py

@@ -2377,8 +2377,11 @@ async def update_gateway(
                         client_key=update_client_key,
                     )
 
-                    # Apply tool include/exclude filters (fnmatch glob patterns)
-                    tools = _apply_tool_filters(tools, gateway.tools_include, gateway.tools_exclude)
+                    # Apply NEW tool filters so this edit takes effect immediately
+                    # (must read from gateway_update BEFORE persisting to gateway)
+                    effective_include = gateway_update.tools_include if gateway_update.tools_include is not None else gateway.tools_include
+                    effective_exclude = gateway_update.tools_exclude if gateway_update.tools_exclude is not None else gateway.tools_exclude
+                    tools = _apply_tool_filters(tools, effective_include, effective_exclude)
 
                     new_tool_names = [tool.name for tool in tools]
                     new_resource_uris = [resource.uri for resource in resources]
@@ -2512,10 +2515,12 @@ async def update_gateway(
                     gateway.gateway_mode = gateway_update.gateway_mode
 
                 # Update tool filters if provided
+                # An empty list [] means "user cleared the filter" → store None
+                # None means "not provided in this update" → keep existing value
                 if hasattr(gateway_update, "tools_include") and gateway_update.tools_include is not None:
-                    gateway.tools_include = gateway_update.tools_include
+                    gateway.tools_include = gateway_update.tools_include if gateway_update.tools_include else None
                 if hasattr(gateway_update, "tools_exclude") and gateway_update.tools_exclude is not None:
-                    gateway.tools_exclude = gateway_update.tools_exclude
+                    gateway.tools_exclude = gateway_update.tools_exclude if gateway_update.tools_exclude else None
 
                 # Update metadata fields
                 gateway.updated_at = datetime.now(timezone.utc)