feat(mcp): Add optional workspace_id parameter to cloud tools with conditional schema hiding (#876)

Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>

Author: aaronsteers

airbyte/mcp/_tool_utils.py

@@ -7,6 +7,7 @@
 
 from __future__ import annotations
 
+import inspect
 import os
 from collections.abc import Callable
 from typing import Any, Literal, TypeVar
@@ -25,6 +26,7 @@
     os.environ.get("AIRBYTE_CLOUD_MCP_READONLY_MODE", "").strip() == "1"
 )
 AIRBYTE_CLOUD_MCP_SAFE_MODE = os.environ.get("AIRBYTE_CLOUD_MCP_SAFE_MODE", "1").strip() != "0"
+AIRBYTE_CLOUD_WORKSPACE_ID_IS_SET = bool(os.environ.get("AIRBYTE_CLOUD_WORKSPACE_ID", "").strip())
 
 _REGISTERED_TOOLS: list[tuple[Callable[..., Any], dict[str, Any]]] = []
 _GUIDS_CREATED_IN_SESSION: set[str] = set()
@@ -158,8 +160,20 @@ def register_tools(app: Any, domain: Literal["cloud", "local", "registry"]) -> N
     for func, tool_annotations in get_registered_tools(domain):
         if should_register_tool(tool_annotations):
             extra_help_text = getattr(func, "_mcp_extra_help_text", None)
+            description: str | None = None
             if extra_help_text:
                 description = (func.__doc__ or "").rstrip() + "\n" + extra_help_text
-                app.tool(func, annotations=tool_annotations, description=description)
-            else:
-                app.tool(func, annotations=tool_annotations)
+
+            # For cloud tools, conditionally hide workspace_id parameter when env var is set
+            exclude_args: list[str] | None = None
+            if domain == "cloud" and AIRBYTE_CLOUD_WORKSPACE_ID_IS_SET:
+                params = set(inspect.signature(func).parameters.keys())
+                excluded = [name for name in ["workspace_id"] if name in params]
+                exclude_args = excluded or None
+
+            app.tool(
+                func,
+                annotations=tool_annotations,
+                description=description,
+                exclude_args=exclude_args,
+            )