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

{airbyte_internal_ops-0.5.2.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.2
+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.2.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
@@ -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
@@ -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.2.dist-info/METADATA,sha256=vKolAxrXmB-dgddkjeQxYNZZL0ID11L51nID5LeMkMk,5731
-airbyte_internal_ops-0.5.2.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-airbyte_internal_ops-0.5.2.dist-info/entry_points.txt,sha256=WxP0l7bRFss4Cr5uQqVj9mTEKwnRKouNuphXQF0lotA,171
-airbyte_internal_ops-0.5.2.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/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/_annotations.py

@@ -1,51 +0,0 @@
-# Copyright (c) 2025 Airbyte, Inc., all rights reserved.
-"""MCP tool annotation constants.
-
-These constants define the standard MCP annotations for tools, following the
-FastMCP 2.2.7+ specification.
-
-For more information, see:
-https://gofastmcp.com/concepts/tools#mcp-annotations
-"""
-
-from __future__ import annotations
-
-READ_ONLY_HINT = "readOnlyHint"
-"""Indicates if the tool only reads data without making any changes.
-
-When True, the tool performs read-only operations and does not modify any state.
-When False, the tool may write, create, update, or delete data.
-
-FastMCP default if not specified: False
-"""
-
-DESTRUCTIVE_HINT = "destructiveHint"
-"""Signals if the tool's changes are destructive (updates or deletes existing data).
-
-This hint is only relevant for non-read-only tools (readOnlyHint=False).
-When True, the tool modifies or deletes existing data in a way that may be
-difficult or impossible to reverse.
-When False, the tool creates new data or performs non-destructive operations.
-
-FastMCP default if not specified: True
-"""
-
-IDEMPOTENT_HINT = "idempotentHint"
-"""Indicates if repeated calls with the same parameters have the same effect.
-
-When True, calling the tool multiple times with identical parameters produces
-the same result and side effects as calling it once.
-When False, each call may produce different results or side effects.
-
-FastMCP default if not specified: False
-"""
-
-OPEN_WORLD_HINT = "openWorldHint"
-"""Specifies if the tool interacts with external systems.
-
-When True, the tool communicates with external services, APIs, or systems
-outside the local environment (e.g., cloud APIs, remote databases, internet).
-When False, the tool only operates on local state or resources.
-
-FastMCP default if not specified: True
-"""

airbyte_ops_mcp/mcp/_http_headers.py

@@ -1,254 +0,0 @@
-# Copyright (c) 2025 Airbyte, Inc., all rights reserved.
-"""HTTP header extraction for Airbyte Cloud credentials.
-
-This module provides internal helper functions for extracting Airbyte Cloud
-authentication credentials from HTTP headers when running as an MCP HTTP server.
-This enables per-request credential passing from upstream services like coral-agents.
-
-The resolution order for credentials is:
-1. HTTP headers (when running as MCP HTTP server)
-2. Environment variables (fallback)
-
-Note: This module is prefixed with "_" to indicate it is internal helper logic
-for the MCP module and should not be imported directly by external code.
-"""
-
-from __future__ import annotations
-
-import os
-
-from airbyte.cloud.auth import (
-    resolve_cloud_api_url,
-    resolve_cloud_client_id,
-    resolve_cloud_client_secret,
-    resolve_cloud_workspace_id,
-)
-from airbyte.secrets.base import SecretString
-from fastmcp.server.dependencies import get_http_headers
-
-from airbyte_ops_mcp.constants import (
-    HEADER_AIRBYTE_CLOUD_API_URL,
-    HEADER_AIRBYTE_CLOUD_CLIENT_ID,
-    HEADER_AIRBYTE_CLOUD_CLIENT_SECRET,
-    HEADER_AIRBYTE_CLOUD_WORKSPACE_ID,
-)
-
-
-def _get_header_value(headers: dict[str, str], header_name: str) -> str | None:
-    """Get a header value from a headers dict, case-insensitively.
-
-    Args:
-        headers: Dictionary of HTTP headers.
-        header_name: The header name to look for (case-insensitive).
-
-    Returns:
-        The header value if found, None otherwise.
-    """
-    header_name_lower = header_name.lower()
-    for key, value in headers.items():
-        if key.lower() == header_name_lower:
-            return value
-    return None
-
-
-def get_bearer_token_from_headers() -> SecretString | None:
-    """Extract bearer token from HTTP Authorization header.
-
-    This function extracts the bearer token from the standard HTTP
-    `Authorization: Bearer <token>` header when running as an MCP HTTP server.
-
-    Returns:
-        The bearer token as a SecretString, or None if not found or not in HTTP context.
-    """
-    headers = get_http_headers()
-    if not headers:
-        return None
-
-    auth_header = _get_header_value(headers, "Authorization")
-    if not auth_header:
-        return None
-
-    # Parse "Bearer <token>" format (case-insensitive prefix check)
-    bearer_prefix = "bearer "
-    if auth_header.lower().startswith(bearer_prefix):
-        token = auth_header[len(bearer_prefix) :].strip()
-        if token:
-            return SecretString(token)
-
-    return None
-
-
-def get_client_id_from_headers() -> SecretString | None:
-    """Extract client ID from HTTP headers.
-
-    Returns:
-        The client ID as a SecretString, or None if not found or not in HTTP context.
-    """
-    headers = get_http_headers()
-    if not headers:
-        return None
-
-    value = _get_header_value(headers, HEADER_AIRBYTE_CLOUD_CLIENT_ID)
-    if value:
-        return SecretString(value)
-    return None
-
-
-def get_client_secret_from_headers() -> SecretString | None:
-    """Extract client secret from HTTP headers.
-
-    Returns:
-        The client secret as a SecretString, or None if not found or not in HTTP context.
-    """
-    headers = get_http_headers()
-    if not headers:
-        return None
-
-    value = _get_header_value(headers, HEADER_AIRBYTE_CLOUD_CLIENT_SECRET)
-    if value:
-        return SecretString(value)
-    return None
-
-
-def get_workspace_id_from_headers() -> str | None:
-    """Extract workspace ID from HTTP headers.
-
-    Returns:
-        The workspace ID, or None if not found or not in HTTP context.
-    """
-    headers = get_http_headers()
-    if not headers:
-        return None
-
-    return _get_header_value(headers, HEADER_AIRBYTE_CLOUD_WORKSPACE_ID)
-
-
-def get_api_url_from_headers() -> str | None:
-    """Extract API URL from HTTP headers.
-
-    Returns:
-        The API URL, or None if not found or not in HTTP context.
-    """
-    headers = get_http_headers()
-    if not headers:
-        return None
-
-    return _get_header_value(headers, HEADER_AIRBYTE_CLOUD_API_URL)
-
-
-def resolve_client_id() -> SecretString:
-    """Resolve client ID from HTTP headers or environment variables.
-
-    Resolution order:
-    1. HTTP header X-Airbyte-Cloud-Client-Id
-    2. Environment variable AIRBYTE_CLOUD_CLIENT_ID (via PyAirbyte)
-
-    Returns:
-        The resolved client ID as a SecretString.
-
-    Raises:
-        PyAirbyteSecretNotFoundError: If no client ID can be resolved.
-    """
-    header_value = get_client_id_from_headers()
-    if header_value:
-        return header_value
-
-    return resolve_cloud_client_id()
-
-
-def resolve_client_secret() -> SecretString:
-    """Resolve client secret from HTTP headers or environment variables.
-
-    Resolution order:
-    1. HTTP header X-Airbyte-Cloud-Client-Secret
-    2. Environment variable AIRBYTE_CLOUD_CLIENT_SECRET (via PyAirbyte)
-
-    Returns:
-        The resolved client secret as a SecretString.
-
-    Raises:
-        PyAirbyteSecretNotFoundError: If no client secret can be resolved.
-    """
-    header_value = get_client_secret_from_headers()
-    if header_value:
-        return header_value
-
-    return resolve_cloud_client_secret()
-
-
-def resolve_workspace_id(workspace_id: str | None = None) -> str:
-    """Resolve workspace ID from multiple sources.
-
-    Resolution order:
-    1. Explicit workspace_id parameter (if provided)
-    2. HTTP header X-Airbyte-Cloud-Workspace-Id
-    3. Environment variable AIRBYTE_CLOUD_WORKSPACE_ID (via PyAirbyte)
-
-    Args:
-        workspace_id: Optional explicit workspace ID.
-
-    Returns:
-        The resolved workspace ID.
-
-    Raises:
-        PyAirbyteSecretNotFoundError: If no workspace ID can be resolved.
-    """
-    if workspace_id is not None:
-        return workspace_id
-
-    header_value = get_workspace_id_from_headers()
-    if header_value:
-        return header_value
-
-    return resolve_cloud_workspace_id()
-
-
-def resolve_api_url(api_url: str | None = None) -> str:
-    """Resolve API URL from multiple sources.
-
-    Resolution order:
-    1. Explicit api_url parameter (if provided)
-    2. HTTP header X-Airbyte-Cloud-Api-Url
-    3. Environment variable / default (via PyAirbyte)
-
-    Args:
-        api_url: Optional explicit API URL.
-
-    Returns:
-        The resolved API URL.
-    """
-    if api_url is not None:
-        return api_url
-
-    header_value = get_api_url_from_headers()
-    if header_value:
-        return header_value
-
-    return resolve_cloud_api_url()
-
-
-def resolve_bearer_token() -> SecretString | None:
-    """Resolve bearer token from HTTP headers or environment variables.
-
-    Resolution order:
-    1. HTTP Authorization header (Bearer <token>)
-    2. Environment variable AIRBYTE_CLOUD_BEARER_TOKEN
-
-    Returns:
-        The resolved bearer token as a SecretString, or None if not found.
-
-    Note:
-        Unlike resolve_client_id/resolve_client_secret, this function returns
-        None instead of raising an exception if no bearer token is found,
-        since bearer token auth is optional (can fall back to client credentials).
-    """
-    header_value = get_bearer_token_from_headers()
-    if header_value:
-        return header_value
-
-    # Try env var directly
-    env_value = os.environ.get("AIRBYTE_CLOUD_BEARER_TOKEN")
-    if env_value:
-        return SecretString(env_value)
-
-    return None

airbyte_ops_mcp/mcp/_mcp_utils.py

@@ -1,398 +0,0 @@
-# Copyright (c) 2025 Airbyte, Inc., all rights reserved.
-"""Deferred MCP capability registration for tools, prompts, and resources.
-
-This module provides a decorator to tag tool functions with MCP annotations
-for deferred registration. The domain for each tool is automatically derived
-from the file stem of the module where the tool is defined.
-"""
-
-from __future__ import annotations
-
-import inspect
-from collections.abc import Callable
-from dataclasses import dataclass
-from enum import Enum
-from pathlib import Path
-from typing import Any, TypeVar
-
-from fastmcp import FastMCP
-
-from airbyte_ops_mcp._annotations import (
-    DESTRUCTIVE_HINT,
-    IDEMPOTENT_HINT,
-    OPEN_WORLD_HINT,
-    READ_ONLY_HINT,
-)
-
-F = TypeVar("F", bound=Callable[..., Any])
-
-
-@dataclass
-class PromptDef:
-    """Definition of a deferred MCP prompt."""
-
-    name: str
-    description: str
-    func: Callable[..., list[dict[str, str]]]
-
-
-@dataclass
-class ResourceDef:
-    """Definition of a deferred MCP resource."""
-
-    uri: str
-    description: str
-    mime_type: str
-    func: Callable[..., Any]
-
-
-class ToolDomain(str, Enum):
-    """Tool domain categories for the Airbyte Admin MCP server.
-
-    These domains correspond to the main functional areas of the server.
-    """
-
-    REGISTRY = "registry"
-    """Registry tools for connector registry operations"""
-
-    METADATA = "metadata"
-    """Metadata tools for connector metadata operations"""
-
-    QA = "qa"
-    """QA tools for connector quality assurance"""
-
-    INSIGHTS = "insights"
-    """Insights tools for connector analysis and insights"""
-
-    REPO = "repo"
-    """Repository tools for GitHub repository operations"""
-
-    CLOUD_ADMIN = "cloud_admin"
-    """Cloud admin tools for Airbyte Cloud operations"""
-
-    SERVER_INFO = "server_info"
-    """Server information and version resources"""
-
-    PROMPTS = "prompts"
-    """Prompt templates for common workflows"""
-
-    REGRESSION_TESTS = "regression_tests"
-    """Regression tests for connector validation and comparison testing"""
-
-
-_REGISTERED_TOOLS: list[tuple[Callable[..., Any], dict[str, Any]]] = []
-_REGISTERED_RESOURCES: list[tuple[Callable[..., Any], dict[str, Any]]] = []
-_REGISTERED_PROMPTS: list[tuple[Callable[..., Any], dict[str, Any]]] = []
-
-
-def should_register_tool(annotations: dict[str, Any]) -> bool:
-    """Check if a tool should be registered.
-
-    Args:
-        annotations: Tool annotations dict
-
-    Returns:
-        Always returns True (no filtering applied)
-    """
-    return True
-
-
-def _get_caller_file_stem() -> str:
-    """Get the file stem of the caller's module.
-
-    Walks up the call stack to find the first frame outside this module,
-    then returns the stem of that file (e.g., "github" for "github.py").
-
-    Returns:
-        The file stem of the calling module.
-    """
-    for frame_info in inspect.stack():
-        # Skip frames from this module
-        if frame_info.filename != __file__:
-            return Path(frame_info.filename).stem
-    return "unknown"
-
-
-def _normalize_domain(domain: str) -> str:
-    """Normalize a domain string to its simple form.
-
-    Handles both file stems (e.g., "github") and module names
-    (e.g., "airbyte_ops_mcp.mcp.github") by extracting the last segment.
-
-    Args:
-        domain: A domain string, either a simple name or a dotted module path.
-
-    Returns:
-        The normalized domain (last segment of a dotted path, or the input if no dots).
-    """
-    return domain.rsplit(".", 1)[-1]
-
-
-def mcp_tool(
-    domain: ToolDomain | str | None = None,
-    *,
-    read_only: bool = False,
-    destructive: bool = False,
-    idempotent: bool = False,
-    open_world: bool = False,
-    extra_help_text: str | None = None,
-) -> Callable[[F], F]:
-    """Decorator to tag an MCP tool function with annotations for deferred registration.
-
-    This decorator stores the annotations on the function for later use during
-    deferred registration. It does not register the tool immediately.
-
-    The domain is automatically derived from the file stem of the module where
-    the tool is defined (e.g., tools in "github.py" get domain "github").
-
-    Args:
-        domain: Optional explicit domain override. If not provided, the domain
-            is automatically derived from the caller's file stem.
-        read_only: If True, tool only reads without making changes (default: False)
-        destructive: If True, tool modifies/deletes existing data (default: False)
-        idempotent: If True, repeated calls have same effect (default: False)
-        open_world: If True, tool interacts with external systems (default: False)
-        extra_help_text: Optional text to append to the function's docstring
-            with a newline delimiter
-
-    Returns:
-        Decorator function that tags the tool with annotations
-
-    Example:
-        @mcp_tool(read_only=True, idempotent=True)
-        def list_connectors_in_repo():
-            ...
-    """
-    # Auto-derive domain from caller's file stem if not provided
-    if domain is None:
-        domain_str = _get_caller_file_stem()
-    elif isinstance(domain, ToolDomain):
-        domain_str = domain.value
-    else:
-        domain_str = domain
-
-    annotations: dict[str, Any] = {
-        "domain": domain_str,
-        READ_ONLY_HINT: read_only,
-        DESTRUCTIVE_HINT: destructive,
-        IDEMPOTENT_HINT: idempotent,
-        OPEN_WORLD_HINT: open_world,
-    }
-
-    def decorator(func: F) -> F:
-        if extra_help_text:
-            func.__doc__ = (
-                (func.__doc__ or "") + "\n\n" + (extra_help_text or "")
-            ).rstrip()
-
-        _REGISTERED_TOOLS.append((func, annotations))
-        return func
-
-    return decorator
-
-
-def mcp_prompt(
-    name: str,
-    description: str,
-    domain: ToolDomain | str | None = None,
-):
-    """Decorator for deferred MCP prompt registration.
-
-    Args:
-        name: Unique name for the prompt
-        description: Human-readable description of the prompt
-        domain: Optional domain for filtering. If not provided, automatically
-            derived from the caller's file stem.
-
-    Returns:
-        Decorator function that registers the prompt
-
-    Raises:
-        ValueError: If a prompt with the same name is already registered
-    """
-    # Auto-derive domain from caller's file stem if not provided
-    if domain is None:
-        domain_str = _get_caller_file_stem()
-    elif isinstance(domain, ToolDomain):
-        domain_str = domain.value
-    else:
-        domain_str = domain
-
-    def decorator(func: Callable[..., list[dict[str, str]]]):
-        annotations = {
-            "name": name,
-            "description": description,
-            "domain": domain_str,
-        }
-        _REGISTERED_PROMPTS.append((func, annotations))
-        return func
-
-    return decorator
-
-
-def mcp_resource(
-    uri: str,
-    description: str,
-    mime_type: str,
-    domain: ToolDomain | str | None = None,
-):
-    """Decorator for deferred MCP resource registration.
-
-    Args:
-        uri: Unique URI for the resource
-        description: Human-readable description of the resource
-        mime_type: MIME type of the resource content
-        domain: Optional domain for filtering. If not provided, automatically
-            derived from the caller's file stem.
-
-    Returns:
-        Decorator function that registers the resource
-
-    Raises:
-        ValueError: If a resource with the same URI is already registered
-    """
-    # Auto-derive domain from caller's file stem if not provided
-    if domain is None:
-        domain_str = _get_caller_file_stem()
-    elif isinstance(domain, ToolDomain):
-        domain_str = domain.value
-    else:
-        domain_str = domain
-
-    def decorator(func: Callable[..., Any]):
-        annotations = {
-            "uri": uri,
-            "description": description,
-            "mime_type": mime_type,
-            "domain": domain_str,
-        }
-        _REGISTERED_RESOURCES.append((func, annotations))
-        return func
-
-    return decorator
-
-
-def _register_mcp_callables(
-    *,
-    app: FastMCP,
-    domain: ToolDomain | str,
-    resource_list: list[tuple[Callable, dict]],
-    register_fn: Callable,
-) -> None:
-    """Register resources and tools with the FastMCP app, filtered by domain.
-
-    Args:
-        app: The FastMCP app instance
-        domain: The domain to register tools for. Can be a simple name (e.g., "github")
-            or a full module path (e.g., "airbyte_ops_mcp.mcp.github" from __name__).
-        resource_list: List of (callable, annotations) tuples to register
-        register_fn: Function to call for each registration
-    """
-    domain_str = domain.value if isinstance(domain, ToolDomain) else domain
-    # Normalize to handle both file stems and __name__ module paths
-    domain_str = _normalize_domain(domain_str)
-
-    filtered_callables = [
-        (func, ann) for func, ann in resource_list if ann.get("domain") == domain_str
-    ]
-
-    for callable_fn, callable_annotations in filtered_callables:
-        register_fn(app, callable_fn, callable_annotations)
-
-
-def register_mcp_tools(
-    app: FastMCP,
-    domain: ToolDomain | str | None = None,
-) -> None:
-    """Register tools with the FastMCP app, filtered by domain.
-
-    Args:
-        app: The FastMCP app instance
-        domain: The domain to register for. If not provided, automatically
-            derived from the caller's file stem.
-    """
-    if domain is None:
-        domain = _get_caller_file_stem()
-
-    def _register_fn(
-        app: FastMCP,
-        callable_fn: Callable,
-        annotations: dict[str, Any],
-    ):
-        app.tool(
-            callable_fn,
-            annotations=annotations,
-        )
-
-    _register_mcp_callables(
-        app=app,
-        domain=domain,
-        resource_list=_REGISTERED_TOOLS,
-        register_fn=_register_fn,
-    )
-
-
-def register_mcp_prompts(
-    app: FastMCP,
-    domain: ToolDomain | str | None = None,
-) -> None:
-    """Register prompt callables with the FastMCP app, filtered by domain.
-
-    Args:
-        app: The FastMCP app instance
-        domain: The domain to register for. If not provided, automatically
-            derived from the caller's file stem.
-    """
-    if domain is None:
-        domain = _get_caller_file_stem()
-
-    def _register_fn(
-        app: FastMCP,
-        callable_fn: Callable,
-        annotations: dict[str, Any],
-    ):
-        app.prompt(
-            name=annotations["name"],
-            description=annotations["description"],
-        )(callable_fn)
-
-    _register_mcp_callables(
-        app=app,
-        domain=domain,
-        resource_list=_REGISTERED_PROMPTS,
-        register_fn=_register_fn,
-    )
-
-
-def register_mcp_resources(
-    app: FastMCP,
-    domain: ToolDomain | str | None = None,
-) -> None:
-    """Register resource callables with the FastMCP app, filtered by domain.
-
-    Args:
-        app: The FastMCP app instance
-        domain: The domain to register for. If not provided, automatically
-            derived from the caller's file stem.
-    """
-    if domain is None:
-        domain = _get_caller_file_stem()
-
-    def _register_fn(
-        app: FastMCP,
-        callable_fn: Callable,
-        annotations: dict[str, Any],
-    ):
-        _ = annotations
-        app.resource(
-            annotations["uri"],
-            description=annotations["description"],
-            mime_type=annotations["mime_type"],
-        )(callable_fn)
-
-    _register_mcp_callables(
-        app=app,
-        domain=domain,
-        resource_list=_REGISTERED_RESOURCES,
-        register_fn=_register_fn,
-    )

airbyte_ops_mcp/mcp/server_info.py

@@ -1,84 +0,0 @@
-# Copyright (c) 2025 Airbyte, Inc., all rights reserved.
-"""MCP resources for the Airbyte Admin MCP server.
-
-This module provides read-only resources that can be accessed by MCP clients.
-"""
-
-import importlib.metadata as md
-import subprocess
-from functools import lru_cache
-
-from fastmcp import FastMCP
-
-from airbyte_ops_mcp.constants import MCP_SERVER_NAME
-from airbyte_ops_mcp.mcp._mcp_utils import (
-    mcp_resource,
-    register_mcp_resources,
-)
-
-
-@lru_cache(maxsize=1)
-def _get_version_info() -> dict[str, str | list[str] | None]:
-    """Get version information for the MCP server.
-
-    Returns:
-        Dictionary with version information including package version,
-        git SHA, and FastMCP version
-    """
-    package_name = "airbyte-internal-ops"
-
-    try:
-        version = md.version(package_name)
-    except md.PackageNotFoundError:
-        version = "0.1.0+dev"
-
-    try:
-        fastmcp_version = md.version("fastmcp")
-    except md.PackageNotFoundError:
-        fastmcp_version = None
-
-    try:
-        git_sha = subprocess.run(
-            ["git", "rev-parse", "--short", "HEAD"],
-            capture_output=True,
-            text=True,
-            check=True,
-            timeout=5,
-        ).stdout.strip()
-    except Exception:
-        git_sha = None
-
-    return {
-        "name": package_name,
-        "docs_url": "https://github.com/airbytehq/airbyte-ops-mcp",
-        "release_history_url": "https://github.com/airbytehq/airbyte-ops-mcp/releases",
-        "version": version,
-        "git_sha": git_sha,
-        "fastmcp_version": fastmcp_version,
-        "domains": ["registry", "metadata", "qa", "insights", "repo"],
-    }
-
-
-@mcp_resource(
-    uri=f"{MCP_SERVER_NAME}://server/info",
-    description="Server information for the Airbyte Admin MCP server",
-    mime_type="application/json",
-)
-def mcp_server_info() -> dict[str, str | list[str] | None]:
-    """Resource that returns information for the MCP server.
-
-    This includes package version, release history, help URLs, as well as other information.
-
-    Returns:
-        Dictionary with version information
-    """
-    return _get_version_info()
-
-
-def register_server_info_resources(app: FastMCP) -> None:
-    """Register server info resources with the FastMCP app.
-
-    Args:
-        app: FastMCP application instance
-    """
-    register_mcp_resources(app, domain=__name__)