airbyte-internal-ops 0.5.1__py3-none-any.whl → 0.6.0__py3-none-any.whl

{airbyte_internal_ops-0.5.1.dist-info → airbyte_internal_ops-0.6.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: airbyte-internal-ops
-Version: 0.5.1
+Version: 0.6.0
 Summary: MCP and API interfaces that let the agents do the admin work
 Author-email: Aaron Steers <aj@airbyte.io>
 Keywords: admin,airbyte,api,mcp
@@ -21,6 +21,7 @@ Requires-Dist: cloud-sql-python-connector[pg8000]<2.0,>=1.7.0
 Requires-Dist: cyclopts<5.0,>=4.0.0
 Requires-Dist: docker<7.0,>=6.0
 Requires-Dist: dpath<3.0,>=2.1.5
+Requires-Dist: fastmcp-extensions<1.0,>=0.2.0
 Requires-Dist: fastmcp<3.0,>=2.12.1
 Requires-Dist: gitpython<4.0,>=3.1.29
 Requires-Dist: google-cloud-logging<4.0,>=3.9.0

{airbyte_internal_ops-0.5.1.dist-info → airbyte_internal_ops-0.6.0.dist-info}/RECORD

@@ -1,6 +1,5 @@
 airbyte_ops_mcp/__init__.py,sha256=tuzdlMkfnWBnsri5KGHM2M_xuNnzFk2u_aR79mmN7Yg,772
-airbyte_ops_mcp/_annotations.py,sha256=MO-SBDnbykxxHDESG7d8rviZZ4WlZgJKv0a8eBqcEzQ,1757
-airbyte_ops_mcp/constants.py,sha256=lhifXJggCKYOjJAprTQ8N-kXrScTBVWuo05CJTQdVnM,7355
+airbyte_ops_mcp/constants.py,sha256=xU8ARMs7jG0-1hseKn3K1dmhyMOMM3JTetRZugLSKEo,7695
 airbyte_ops_mcp/docker_hub.py,sha256=qdOYpj2KOFOsEGsl2b2rcVPzyYDharOVM_lJxNTytds,5833
 airbyte_ops_mcp/gcp_auth.py,sha256=i0cm1_xX4fj_31iKlfARpNvTaSr85iGTSw9KMf4f4MU,7206
 airbyte_ops_mcp/github_actions.py,sha256=FSi_tjS9TbwRVp8dwlDZhFOi7lJXEZQLhPm2KpcjNlY,7022
@@ -245,7 +244,7 @@ airbyte_ops_mcp/cli/__init__.py,sha256=XpL7FyVfgabfBF2JR7u7NwJ2krlYqjd_OwLcWf-Xc
 airbyte_ops_mcp/cli/_base.py,sha256=I8tWnyQf0ks4r3J8N8h-5GZxyn37T-55KsbuHnxYlcg,415
 airbyte_ops_mcp/cli/_shared.py,sha256=jg-xMyGzTCGPqKd8VTfE_3kGPIyO_3Kx5sQbG4rPc0Y,1311
 airbyte_ops_mcp/cli/app.py,sha256=SEdBpqFUG2O8zGV5ifwptxrLGFph_dLr66-MX9d69gQ,789
-airbyte_ops_mcp/cli/cloud.py,sha256=18SiVVMAibzPpGiEgKiga1BZ5x4QlLREOLd_VmNZwSo,45831
+airbyte_ops_mcp/cli/cloud.py,sha256=jac0FcG3UvNNeNNhqZR04uY9BCyVvins1kjO0LRZ86Y,45861
 airbyte_ops_mcp/cli/gh.py,sha256=koJPu0MDB6AW7mJq2z4dZV65ofvsZTkqoeitGF8KJR8,5364
 airbyte_ops_mcp/cli/registry.py,sha256=L4nDKhlegr31gSE-GUvDFSq10KgDz5kJuZXgLIxYIyg,9785
 airbyte_ops_mcp/cli/repo.py,sha256=G1hoQpH0XYhUH3FFOsia9xabGB0LP9o3XcwBuqvFVo0,16331
@@ -260,24 +259,21 @@ airbyte_ops_mcp/connection_config_retriever/retrieval.py,sha256=s6yeCyrboWkUd6Kd
 airbyte_ops_mcp/connection_config_retriever/secrets_resolution.py,sha256=12g0lZzhCzAPl4Iv4eMW6d76mvXjIBGspOnNhywzks4,3644
 airbyte_ops_mcp/gcp_logs/__init__.py,sha256=IqkxclXJnD1U4L2at7aC9GYqPXnuLdYLgmkm3ZiIu6s,409
 airbyte_ops_mcp/gcp_logs/error_lookup.py,sha256=Ufl1FtNQJKP_yWndVT1Xku1mT-gxW_0atmNMCYMXvOo,12757
-airbyte_ops_mcp/mcp/__init__.py,sha256=QqkNkxzdXlg-W03urBAQ3zmtOKFPf35rXgO9ceUjpng,334
+airbyte_ops_mcp/mcp/__init__.py,sha256=Y5K-iKUxSY5KM_2XWrYRJqGpjjTHE_ezriED98ZzalU,538
 airbyte_ops_mcp/mcp/_guidance.py,sha256=48tQSnDnxqXtyGJxxgjz0ZiI814o_7Fj7f6R8jpQ7so,2375
-airbyte_ops_mcp/mcp/_http_headers.py,sha256=9TAH2RYhFR3z2JugW4Q3WrrqJIdaCzAbyA1GhtQ_EMM,7278
-airbyte_ops_mcp/mcp/_mcp_utils.py,sha256=WNwcGzF7XGKZNAYRt0Uhj5BkRfmwqnFABCrk77OZjRw,11512
-airbyte_ops_mcp/mcp/cloud_connector_versions.py,sha256=XXsXtBrNN9lbwzZQvKkIjmMnzBSZPSaupQSnd99pXhA,34272
+airbyte_ops_mcp/mcp/cloud_connector_versions.py,sha256=boafO4ipwdnHZCuN8jxNw5xNmwgH19iBHWQv2NxCujk,34470
 airbyte_ops_mcp/mcp/connector_analysis.py,sha256=OC4KrOSkMkKPkOisWnSv96BDDE5TQYHq-Jxa2vtjJpo,298
 airbyte_ops_mcp/mcp/connector_qa.py,sha256=aImpqdnqBPDrz10BS0owsV4kuIU2XdalzgbaGZsbOL0,258
-airbyte_ops_mcp/mcp/gcp_logs.py,sha256=IPtq4098_LN1Cgeba4jATO1iYFFFpL2-aRO0pGcOdzs,2689
-airbyte_ops_mcp/mcp/github_actions.py,sha256=_mAVTl6UX3F7S_HeV1-M5R4jMNzNQGI3ADs3sBzden8,11760
-airbyte_ops_mcp/mcp/github_repo_ops.py,sha256=PiERpt8abo20Gz4CfXhrDNlVM4o4FOt5sweZJND2a0s,5314
+airbyte_ops_mcp/mcp/gcp_logs.py,sha256=QCDQHmsxQHJ26BB0sxkBgKXr7Ja9wVFkdpY6423H-xo,2677
+airbyte_ops_mcp/mcp/github_actions.py,sha256=G0NmjNVWpVtLXdQnhX7qJwPFkfEX5gBXf55xt0FpJJ0,11752
+airbyte_ops_mcp/mcp/github_repo_ops.py,sha256=YHeuN7Xc_L3xkJ-F3l1t1TIPW2j2CjecBDbb0DUvZO8,5306
 airbyte_ops_mcp/mcp/metadata.py,sha256=fwGW97WknR5lfKcQnFtK6dU87aA6TmLj1NkKyqDAV9g,270
-airbyte_ops_mcp/mcp/prerelease.py,sha256=KxBNRxwkIzfD981xphi07cvlgR-QEDmSe88aBfqNAyQ,9561
-airbyte_ops_mcp/mcp/prod_db_queries.py,sha256=ZSo5E0UcHNmu9R5pZeDZDbWQXsPVHhSk4DUvRUbBGAg,47553
-airbyte_ops_mcp/mcp/prompts.py,sha256=mJld9mdPECXYZffWXGSvNs4Xevx3rxqUGNlzGKVC2_s,1599
+airbyte_ops_mcp/mcp/prerelease.py,sha256=jSrAwk95vZLfwYFn5Menb-ziAMTUZnzAMHIJAitd9x8,9553
+airbyte_ops_mcp/mcp/prod_db_queries.py,sha256=EdZyrccrM5tHKEtjks4598hzbZ62FuDCCHTjjFT4Wt0,47545
+airbyte_ops_mcp/mcp/prompts.py,sha256=v4bguskw7hSsISkseACzKQm5QwrIXmiwbs27oclXTE8,1591
 airbyte_ops_mcp/mcp/registry.py,sha256=PW-VYUj42qx2pQ_apUkVaoUFq7VgB9zEU7-aGrkSCCw,290
-airbyte_ops_mcp/mcp/regression_tests.py,sha256=RM11mP7QIC7jEgUCuhv9zUShz_DDsrnySa8cEXlUZGk,17054
-airbyte_ops_mcp/mcp/server.py,sha256=dMOFXPFeHBIqicOWs8UsPfzgsWnzsWDsZJ79E_OYjT0,5341
-airbyte_ops_mcp/mcp/server_info.py,sha256=Yi4B1auW64QZGBDas5mro_vwTjvrP785TFNSBP7GhRg,2361
+airbyte_ops_mcp/mcp/regression_tests.py,sha256=zwdQ-ymUhWtVcIjwiNIZAC151GKhuxi55HDi4S91RnI,17046
+airbyte_ops_mcp/mcp/server.py,sha256=u9P-cJkAe9KkSj6Kcvkly68toOn1Wt8KCOxLrmav2u0,7061
 airbyte_ops_mcp/prod_db_access/__init__.py,sha256=5pxouMPY1beyWlB0UwPnbaLTKTHqU6X82rbbgKY2vYU,1069
 airbyte_ops_mcp/prod_db_access/db_engine.py,sha256=VUqEWZtharJUR-Cri_pMwtGh1C4Neu4s195mbEXlm-w,9190
 airbyte_ops_mcp/prod_db_access/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -286,12 +282,12 @@ airbyte_ops_mcp/prod_db_access/sql.py,sha256=E7HQratZC5LbCXdvpQzZRd09SmCVnY_4Ru-
 airbyte_ops_mcp/registry/__init__.py,sha256=iEaPlt9GrnlaLbc__98TguNeZG8wuQu7S-_2QkhHcbA,858
 airbyte_ops_mcp/registry/models.py,sha256=B4L4TKr52wo0xs0CqvCBrpowqjShzVnZ5eTr2-EyhNs,2346
 airbyte_ops_mcp/registry/publish.py,sha256=VoPxsM2_0zJ829orzCRN-kjgcJtuBNyXgW4I9J680ro,12717
-airbyte_ops_mcp/regression_tests/__init__.py,sha256=8pwJIdz1Lb9oFV6UQ3DSjYKd8HCSqU8RpH5SDgEcEBA,1038
+airbyte_ops_mcp/regression_tests/__init__.py,sha256=qdveN866w50VmiDmTD0IW8Buo4UUn_1m9mKNS6hgj5U,1092
 airbyte_ops_mcp/regression_tests/cdk_secrets.py,sha256=iRjqqBS96KZoswfgT7ju-pE_pfbYoDy4PfrK-K8uyYs,3204
 airbyte_ops_mcp/regression_tests/ci_output.py,sha256=os69gcEhbomrGRAfnwPYAXhsAiJSWOuyW1gWZPx9-hw,15498
 airbyte_ops_mcp/regression_tests/config.py,sha256=dwWeY0tatdbwl9BqbhZ7EljoZDCtKmGO5fvOAIxeXmA,5873
 airbyte_ops_mcp/regression_tests/connection_fetcher.py,sha256=laGkxVfDl8_S-Azst28wijvPnOB-bmuuk2B_2e-0yjY,13170
-airbyte_ops_mcp/regression_tests/connection_secret_retriever.py,sha256=FhWNVWq7sON4nwUmVJv8BgXBOqg1YV4b5WuWyCzZ0LU,4695
+airbyte_ops_mcp/regression_tests/connection_secret_retriever.py,sha256=e2RvLEtAcpSHnYobP3wGNYGk8VNVI6MallX3cS0UPgA,5561
 airbyte_ops_mcp/regression_tests/connector_runner.py,sha256=OZzUa2aLh0sHaEARsDePOA-e3qEX4cvh3Jhnvi8S1rY,10130
 airbyte_ops_mcp/regression_tests/evaluation_modes.py,sha256=lAL6pEDmy_XCC7_m4_NXjt_f6Z8CXeAhMkc0FU8bm_M,1364
 airbyte_ops_mcp/regression_tests/http_metrics.py,sha256=busCYLb7qID0vv7yAtzARf__-HukpE3mAoc-pYI_gCQ,13256
@@ -306,7 +302,7 @@ airbyte_ops_mcp/regression_tests/regression/comparators.py,sha256=MJkLZEKHivgrG0
 airbyte_ops_mcp/regression_tests/validation/__init__.py,sha256=MBEwGOoNuqT4_oCahtoK62OKWIjUCfWa7vZTxNj_0Ek,1532
 airbyte_ops_mcp/regression_tests/validation/catalog_validators.py,sha256=jqqVAMOk0mtdPgwu4d0hA0ZEjtsNh5gapvGydRv3_qk,12553
 airbyte_ops_mcp/regression_tests/validation/record_validators.py,sha256=RjauAhKWNwxMBTu0eNS2hMFNQVs5CLbQU51kp6FOVDk,7432
-airbyte_internal_ops-0.5.1.dist-info/METADATA,sha256=6FSpbOvu29YiilQjtOkOgmjW66Pxx-AlPciUPTmM8G0,5731
-airbyte_internal_ops-0.5.1.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-airbyte_internal_ops-0.5.1.dist-info/entry_points.txt,sha256=WxP0l7bRFss4Cr5uQqVj9mTEKwnRKouNuphXQF0lotA,171
-airbyte_internal_ops-0.5.1.dist-info/RECORD,,
+airbyte_internal_ops-0.6.0.dist-info/METADATA,sha256=dalsaOUv8ws3bbG5Y8AdwrwarYviB2C33gFQMwZ3pyA,5777
+airbyte_internal_ops-0.6.0.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+airbyte_internal_ops-0.6.0.dist-info/entry_points.txt,sha256=WxP0l7bRFss4Cr5uQqVj9mTEKwnRKouNuphXQF0lotA,171
+airbyte_internal_ops-0.6.0.dist-info/RECORD,,

airbyte_ops_mcp/cli/cloud.py

@@ -65,6 +65,7 @@ from airbyte_ops_mcp.regression_tests.connection_fetcher import (
     save_connection_data_to_files,
 )
 from airbyte_ops_mcp.regression_tests.connection_secret_retriever import (
+    SecretRetrievalError,
     enrich_config_with_secrets,
     should_use_secret_retriever,
 )
@@ -847,13 +848,14 @@ def regression_test(
                     retrieval_reason="Regression test with USE_CONNECTION_SECRET_RETRIEVER=true",
                 )
                 print_success("Successfully retrieved unmasked secrets from database")
-            except Exception as e:
-                print_error(f"Failed to retrieve unmasked secrets: {e}")
+            except SecretRetrievalError as e:
+                write_github_output("success", False)
+                write_github_output("error", str(e))
                 exit_with_error(
-                    f"Failed to retrieve unmasked secrets: {e}\n"
-                    f"Unset USE_CONNECTION_SECRET_RETRIEVER or verify that the "
-                    f"{ENV_GCP_PROD_DB_ACCESS_CREDENTIALS} environment variable is set "
-                    f"with valid database credentials and that the Cloud SQL Proxy is running."
+                    f"{e}\n\n"
+                    f"This connection cannot be used for regression testing. "
+                    f"Please use a connection from a non-EU workspace, or use GSM-based "
+                    f"integration test credentials instead (by omitting --connection-id)."
                 )
 
         config_file, catalog_file = save_connection_data_to_files(

airbyte_ops_mcp/constants.py

@@ -10,6 +10,19 @@ from airbyte.exceptions import PyAirbyteInputError
 MCP_SERVER_NAME = "airbyte-internal-ops"
 """The name of the MCP server."""
 
+
+class ServerConfigKey(StrEnum):
+    """Config keys for MCP server configuration arguments.
+
+    These keys are used both when defining server_config_args in mcp_server()
+    and when retrieving config values via get_mcp_config().
+    """
+
+    BEARER_TOKEN = "bearer_token"
+    CLIENT_ID = "client_id"
+    CLIENT_SECRET = "client_secret"
+
+
 USER_AGENT = "Airbyte-Internal-Ops Python client"
 """User-Agent string for HTTP requests to Airbyte Cloud APIs."""
 

airbyte_ops_mcp/mcp/__init__.py

@@ -1,9 +1,12 @@
 """MCP tools organized by functional domain.
 
-This package contains all MCP tool implementations organized by the ToolDomain enum:
-- registry: Connector registry operations
-- metadata: Connector metadata operations
-- qa: Connector quality assurance
-- insights: Connector analysis and insights
-- repo: GitHub repository operations
+This package contains all MCP tool implementations organized by module name.
+Domain is automatically inferred from the file stem where tools are defined:
+- github_repo_ops: GitHub repository operations
+- cloud_connector_versions: Cloud connector version management
+- prod_db_queries: Production database queries
+- github_actions: GitHub Actions workflow operations
+- regression_tests: Connector regression testing
+- prerelease: Connector prerelease operations
+- gcp_logs: GCP log queries
 """

airbyte_ops_mcp/mcp/cloud_connector_versions.py

@@ -15,7 +15,8 @@ from typing import Annotated, Literal
 
 from airbyte import constants
 from airbyte.exceptions import PyAirbyteInputError
-from fastmcp import FastMCP
+from fastmcp import Context, FastMCP
+from fastmcp_extensions import get_mcp_config, mcp_tool, register_mcp_tools
 from pydantic import Field
 
 from airbyte_ops_mcp.cloud_admin import api_client
@@ -29,19 +30,13 @@ from airbyte_ops_mcp.cloud_admin.models import (
     VersionOverrideOperationResult,
     WorkspaceVersionOverrideResult,
 )
-from airbyte_ops_mcp.constants import WorkspaceAliasEnum
+from airbyte_ops_mcp.constants import ServerConfigKey, WorkspaceAliasEnum
 from airbyte_ops_mcp.github_api import (
     GitHubAPIError,
     GitHubCommentParseError,
     GitHubUserEmailNotFoundError,
     get_admin_email_from_approval_comment,
 )
-from airbyte_ops_mcp.mcp._http_headers import (
-    resolve_bearer_token,
-    resolve_client_id,
-    resolve_client_secret,
-)
-from airbyte_ops_mcp.mcp._mcp_utils import mcp_tool, register_mcp_tools
 
 
 @dataclass(frozen=True)
@@ -56,33 +51,36 @@ class _ResolvedCloudAuth:
     client_secret: str | None = None
 
 
-def _resolve_cloud_auth() -> _ResolvedCloudAuth:
+def _resolve_cloud_auth(ctx: Context) -> _ResolvedCloudAuth:
     """Resolve authentication credentials for Airbyte Cloud API.
 
     Credentials are resolved in priority order:
     1. Bearer token (Authorization header or AIRBYTE_CLOUD_BEARER_TOKEN env var)
     2. Client credentials (X-Airbyte-Cloud-Client-Id/Secret headers or env vars)
 
+    Args:
+        ctx: FastMCP Context object from the current tool invocation.
+
     Returns:
         _ResolvedCloudAuth with either bearer_token or client credentials set.
 
     Raises:
         CloudAuthError: If credentials cannot be resolved from headers or env vars.
     """
-    # Try bearer token first (preferred)
-    bearer_token = resolve_bearer_token()
+    # Try bearer token first (preferred, but not required)
+    bearer_token = get_mcp_config(ctx, ServerConfigKey.BEARER_TOKEN)
     if bearer_token:
-        return _ResolvedCloudAuth(bearer_token=str(bearer_token))
+        return _ResolvedCloudAuth(bearer_token=bearer_token)
 
     # Fall back to client credentials
     try:
-        client_id = resolve_client_id()
-        client_secret = resolve_client_secret()
+        client_id = get_mcp_config(ctx, ServerConfigKey.CLIENT_ID)
+        client_secret = get_mcp_config(ctx, ServerConfigKey.CLIENT_SECRET)
         return _ResolvedCloudAuth(
-            client_id=str(client_id),
-            client_secret=str(client_secret),
+            client_id=client_id,
+            client_secret=client_secret,
         )
-    except Exception as e:
+    except ValueError as e:
         raise CloudAuthError(
             f"Failed to resolve credentials. Ensure credentials are provided "
             f"via Authorization header (Bearer token), "
@@ -111,6 +109,8 @@ def get_cloud_connector_version(
         Literal["source", "destination"],
         "The type of connector (source or destination)",
     ],
+    *,
+    ctx: Context,
 ) -> ConnectorVersionInfo:
     """Get the current version information for a deployed connector.
 
@@ -126,7 +126,7 @@ def get_cloud_connector_version(
     resolved_workspace_id = WorkspaceAliasEnum.resolve(workspace_id)
 
     try:
-        auth = _resolve_cloud_auth()
+        auth = _resolve_cloud_auth(ctx)
 
         # Use vendored API client instead of connector.get_connector_version()
         # Use Config API root for version management operations
@@ -248,6 +248,8 @@ def set_cloud_connector_version_override(
             default=None,
         ),
     ],
+    *,
+    ctx: Context,
 ) -> VersionOverrideOperationResult:
     """Set or clear a version override for a deployed connector.
 
@@ -359,7 +361,7 @@ def set_cloud_connector_version_override(
 
     # Resolve auth and get current version info
     try:
-        auth = _resolve_cloud_auth()
+        auth = _resolve_cloud_auth(ctx)
 
         # Get current version info before the operation
         current_version_data = api_client.get_connector_version(
@@ -529,6 +531,8 @@ def set_workspace_connector_version_override(
             default=None,
         ),
     ],
+    *,
+    ctx: Context,
 ) -> WorkspaceVersionOverrideResult:
     """Set or clear a workspace-level version override for a connector type.
 
@@ -634,7 +638,7 @@ def set_workspace_connector_version_override(
 
     # Resolve auth and call API client
     try:
-        auth = _resolve_cloud_auth()
+        auth = _resolve_cloud_auth(ctx)
 
         result = api_client.set_workspace_connector_version_override(
             workspace_id=resolved_workspace_id,
@@ -762,6 +766,8 @@ def set_organization_connector_version_override(
             default=None,
         ),
     ],
+    *,
+    ctx: Context,
 ) -> OrganizationVersionOverrideResult:
     """Set or clear an organization-level version override for a connector type.
 
@@ -863,7 +869,7 @@ def set_organization_connector_version_override(
 
     # Resolve auth and call API client
     try:
-        auth = _resolve_cloud_auth()
+        auth = _resolve_cloud_auth(ctx)
 
         result = api_client.set_organization_connector_version_override(
             organization_id=organization_id,
@@ -921,4 +927,4 @@ def register_cloud_connector_version_tools(app: FastMCP) -> None:
     Args:
         app: FastMCP application instance
     """
-    register_mcp_tools(app, domain=__name__)
+    register_mcp_tools(app, mcp_module=__name__)

airbyte_ops_mcp/mcp/gcp_logs.py

@@ -10,6 +10,7 @@ from __future__ import annotations
 from typing import Annotated
 
 from fastmcp import FastMCP
+from fastmcp_extensions import mcp_tool, register_mcp_tools
 from pydantic import Field
 
 from airbyte_ops_mcp.gcp_logs import (
@@ -18,7 +19,6 @@ from airbyte_ops_mcp.gcp_logs import (
     fetch_error_logs,
 )
 from airbyte_ops_mcp.gcp_logs.error_lookup import DEFAULT_GCP_PROJECT
-from airbyte_ops_mcp.mcp._mcp_utils import mcp_tool, register_mcp_tools
 
 
 @mcp_tool(

airbyte_ops_mcp/mcp/github_actions.py

@@ -12,6 +12,7 @@ from typing import Annotated
 
 import requests
 from fastmcp import FastMCP
+from fastmcp_extensions import mcp_tool, register_mcp_tools
 from pydantic import BaseModel, Field
 
 from airbyte_ops_mcp.github_actions import (
@@ -23,7 +24,6 @@ from airbyte_ops_mcp.github_api import (
     get_pr_head_ref,
     resolve_github_token,
 )
-from airbyte_ops_mcp.mcp._mcp_utils import mcp_tool, register_mcp_tools
 
 # Token env vars for workflow triggering (in order of preference)
 WORKFLOW_TRIGGER_TOKEN_ENV_VARS = [
@@ -400,4 +400,4 @@ def register_github_actions_tools(app: FastMCP) -> None:
     Args:
         app: FastMCP application instance
     """
-    register_mcp_tools(app, domain=__name__)
+    register_mcp_tools(app, mcp_module=__name__)

airbyte_ops_mcp/mcp/github_repo_ops.py

@@ -10,12 +10,12 @@ from __future__ import annotations
 from typing import Annotated, Literal
 
 from fastmcp import FastMCP
+from fastmcp_extensions import mcp_tool, register_mcp_tools
 from pydantic import BaseModel
 
 from airbyte_ops_mcp.airbyte_repo.bump_version import bump_connector_version
 from airbyte_ops_mcp.airbyte_repo.list_connectors import list_connectors
 from airbyte_ops_mcp.airbyte_repo.utils import resolve_diff_range
-from airbyte_ops_mcp.mcp._mcp_utils import mcp_tool, register_mcp_tools
 
 
 class ConnectorListResponse(BaseModel):
@@ -162,4 +162,4 @@ def register_github_repo_ops_tools(app: FastMCP) -> None:
     Args:
         app: FastMCP application instance
     """
-    register_mcp_tools(app, domain=__name__)
+    register_mcp_tools(app, mcp_module=__name__)

airbyte_ops_mcp/mcp/prerelease.py

@@ -16,6 +16,7 @@ from typing import Annotated, Literal
 import requests
 import yaml
 from fastmcp import FastMCP
+from fastmcp_extensions import mcp_tool, register_mcp_tools
 from pydantic import BaseModel, Field
 
 from airbyte_ops_mcp.github_actions import trigger_workflow_dispatch
@@ -24,7 +25,6 @@ from airbyte_ops_mcp.github_api import (
     get_pr_head_ref,
     resolve_github_token,
 )
-from airbyte_ops_mcp.mcp._mcp_utils import mcp_tool, register_mcp_tools
 
 
 class ConnectorRepo(StrEnum):
@@ -278,4 +278,4 @@ def register_prerelease_tools(app: FastMCP) -> None:
     Args:
         app: FastMCP application instance
     """
-    register_mcp_tools(app, domain=__name__)
+    register_mcp_tools(app, mcp_module=__name__)

airbyte_ops_mcp/mcp/prod_db_queries.py

@@ -14,10 +14,10 @@ from typing import Annotated, Any
 import requests
 from airbyte.exceptions import PyAirbyteInputError
 from fastmcp import FastMCP
+from fastmcp_extensions import mcp_tool, register_mcp_tools
 from pydantic import BaseModel, Field
 
 from airbyte_ops_mcp.constants import OrganizationAliasEnum, WorkspaceAliasEnum
-from airbyte_ops_mcp.mcp._mcp_utils import mcp_tool, register_mcp_tools
 from airbyte_ops_mcp.prod_db_access.queries import (
     query_actors_pinned_to_version,
     query_connections_by_connector,
@@ -1274,4 +1274,4 @@ def query_prod_connector_connection_stats(
 
 def register_prod_db_query_tools(app: FastMCP) -> None:
     """Register prod DB query tools with the FastMCP app."""
-    register_mcp_tools(app, domain=__name__)
+    register_mcp_tools(app, mcp_module=__name__)

airbyte_ops_mcp/mcp/prompts.py

@@ -10,10 +10,10 @@ from __future__ import annotations
 from typing import Annotated
 
 from fastmcp import FastMCP
+from fastmcp_extensions import mcp_prompt, register_mcp_prompts
 from pydantic import Field
 
 from airbyte_ops_mcp.mcp._guidance import TEST_MY_TOOLS_GUIDANCE
-from airbyte_ops_mcp.mcp._mcp_utils import mcp_prompt, register_mcp_prompts
 
 
 @mcp_prompt(
@@ -56,4 +56,4 @@ def register_prompts(app: FastMCP) -> None:
     Args:
         app: FastMCP application instance
     """
-    register_mcp_prompts(app, domain=__name__)
+    register_mcp_prompts(app, mcp_module=__name__)

airbyte_ops_mcp/mcp/regression_tests.py

@@ -29,12 +29,12 @@ from airbyte.exceptions import (
     AirbyteWorkspaceMismatchError,
 )
 from fastmcp import FastMCP
+from fastmcp_extensions import mcp_tool, register_mcp_tools
 from pydantic import BaseModel, Field
 
 from airbyte_ops_mcp.constants import WorkspaceAliasEnum
 from airbyte_ops_mcp.github_actions import trigger_workflow_dispatch
 from airbyte_ops_mcp.github_api import GITHUB_API_BASE, resolve_github_token
-from airbyte_ops_mcp.mcp._mcp_utils import mcp_tool, register_mcp_tools
 from airbyte_ops_mcp.mcp.prerelease import ConnectorRepo
 
 logger = logging.getLogger(__name__)
@@ -471,4 +471,4 @@ def register_regression_tests_tools(app: FastMCP) -> None:
     Args:
         app: FastMCP application instance
     """
-    register_mcp_tools(app, domain=__name__)
+    register_mcp_tools(app, mcp_module=__name__)

airbyte_ops_mcp/mcp/server.py

@@ -17,10 +17,17 @@ import os
 import sys
 from pathlib import Path
 
+from airbyte.cloud.auth import resolve_cloud_client_id, resolve_cloud_client_secret
 from dotenv import load_dotenv
 from fastmcp import FastMCP
+from fastmcp_extensions import MCPServerConfigArg, mcp_server
 
-from airbyte_ops_mcp.constants import MCP_SERVER_NAME
+from airbyte_ops_mcp.constants import (
+    HEADER_AIRBYTE_CLOUD_CLIENT_ID,
+    HEADER_AIRBYTE_CLOUD_CLIENT_SECRET,
+    MCP_SERVER_NAME,
+    ServerConfigKey,
+)
 from airbyte_ops_mcp.mcp.cloud_connector_versions import (
     register_cloud_connector_version_tools,
 )
@@ -31,20 +38,64 @@ from airbyte_ops_mcp.mcp.prerelease import register_prerelease_tools
 from airbyte_ops_mcp.mcp.prod_db_queries import register_prod_db_query_tools
 from airbyte_ops_mcp.mcp.prompts import register_prompts
 from airbyte_ops_mcp.mcp.regression_tests import register_regression_tests_tools
-from airbyte_ops_mcp.mcp.server_info import register_server_info_resources
 
 # Default HTTP server configuration
 DEFAULT_HTTP_HOST = "127.0.0.1"
 DEFAULT_HTTP_PORT = 8082
 
-app: FastMCP = FastMCP(MCP_SERVER_NAME)
+
+def _normalize_bearer_token(value: str) -> str | None:
+    """Extract bearer token from Authorization header value.
+
+    Parses "Bearer <token>" format (case-insensitive prefix).
+    Returns None if the value doesn't have the Bearer prefix.
+    """
+    if value.lower().startswith("bearer "):
+        token = value[7:].strip()
+        return token if token else None
+    return None
+
+
+# Create the MCP server with built-in server info resource
+app = mcp_server(
+    name=MCP_SERVER_NAME,
+    package_name="airbyte-internal-ops",
+    advertised_properties={
+        "docs_url": "https://github.com/airbytehq/airbyte-ops-mcp",
+        "release_history_url": "https://github.com/airbytehq/airbyte-ops-mcp/releases",
+    },
+    server_config_args=[
+        MCPServerConfigArg(
+            name=ServerConfigKey.BEARER_TOKEN,
+            http_header_key="Authorization",
+            env_var="AIRBYTE_CLOUD_BEARER_TOKEN",
+            normalize_fn=_normalize_bearer_token,
+            required=False,
+            sensitive=True,
+        ),
+        MCPServerConfigArg(
+            name=ServerConfigKey.CLIENT_ID,
+            http_header_key=HEADER_AIRBYTE_CLOUD_CLIENT_ID,
+            default=lambda: str(resolve_cloud_client_id()),
+            required=True,
+            sensitive=True,
+        ),
+        MCPServerConfigArg(
+            name=ServerConfigKey.CLIENT_SECRET,
+            http_header_key=HEADER_AIRBYTE_CLOUD_CLIENT_SECRET,
+            default=lambda: str(resolve_cloud_client_secret()),
+            required=True,
+            sensitive=True,
+        ),
+    ],
+    include_standard_tool_filters=True,
+)
 
 
 def register_server_assets(app: FastMCP) -> None:
     """Register all server assets (tools, prompts, resources) with the FastMCP app.
 
     This function registers assets for all domains:
-    - SERVER_INFO: Server version and information resources
     - REPO: GitHub repository operations
     - CLOUD: Cloud connector version management
     - PROMPTS: Prompt templates for common workflows
@@ -54,10 +105,11 @@ def register_server_assets(app: FastMCP) -> None:
     - QA: Connector quality assurance (future)
     - INSIGHTS: Connector analysis and insights (future)
 
+    Note: Server info resource is now built-in via mcp_server() helper.
+
     Args:
         app: FastMCP application instance
     """
-    register_server_info_resources(app)
     register_github_repo_ops_tools(app)
     register_github_actions_tools(app)
     register_prerelease_tools(app)

airbyte_ops_mcp/regression_tests/__init__.py

@@ -10,6 +10,7 @@ from airbyte_ops_mcp.regression_tests.connection_fetcher import (
     fetch_connection_data,
 )
 from airbyte_ops_mcp.regression_tests.connection_secret_retriever import (
+    SecretRetrievalError,
     enrich_config_with_secrets,
     is_secret_retriever_enabled,
     retrieve_unmasked_config,
@@ -27,6 +28,7 @@ __all__ = [
     "ConnectionData",
     "ConnectorUnderTest",
     "ExecutionResult",
+    "SecretRetrievalError",
     "TargetOrControl",
     "enrich_config_with_secrets",
     "fetch_connection_data",

airbyte_ops_mcp/regression_tests/connection_secret_retriever.py

@@ -107,9 +107,18 @@ def retrieve_unmasked_config(
     return None
 
 
+class SecretRetrievalError(Exception):
+    """Raised when secret retrieval fails.
+
+    This exception is raised when USE_CONNECTION_SECRET_RETRIEVER is enabled
+    but secrets cannot be retrieved (e.g., EU data residency restrictions).
+    """
+
+
 def enrich_config_with_secrets(
     connection_data: ConnectionData,
     retrieval_reason: str = "MCP live tests",
+    raise_on_failure: bool = True,
 ) -> ConnectionData:
     """Enrich connection data with unmasked secrets from internal retriever.
 
@@ -120,10 +129,16 @@ def enrich_config_with_secrets(
     Args:
         connection_data: The connection data to enrich.
         retrieval_reason: Reason for retrieval (for audit logging).
+        raise_on_failure: If True (default), raise SecretRetrievalError when
+            secrets cannot be retrieved. If False, return the original
+            connection_data with masked secrets (legacy behavior).
 
     Returns:
-        A new ConnectionData with unmasked config, or the original if
-        retrieval fails or is not available.
+        A new ConnectionData with unmasked config.
+
+    Raises:
+        SecretRetrievalError: If raise_on_failure is True and secrets cannot
+            be retrieved (e.g., due to EU data residency restrictions).
     """
     unmasked_config = retrieve_unmasked_config(
         connection_id=connection_data.connection_id,
@@ -131,10 +146,15 @@ def enrich_config_with_secrets(
     )
 
     if unmasked_config is None:
-        logger.info(
-            f"Could not retrieve unmasked config for {connection_data.connection_id}, "
-            "using masked config from Cloud API"
+        error_msg = (
+            "Could not retrieve unmasked secrets for connection "
+            f"{connection_data.connection_id}. This may be due to EU data "
+            "residency restrictions or database connectivity issues. "
+            "The connection's credentials cannot be used for regression testing."
         )
+        logger.warning(error_msg)
+        if raise_on_failure:
+            raise SecretRetrievalError(error_msg)
         return connection_data
 
     logger.info(