airbyte-internal-ops 0.1.7__py3-none-any.whl → 0.1.9__py3-none-any.whl

{airbyte_internal_ops-0.1.7.dist-info → airbyte_internal_ops-0.1.9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: airbyte-internal-ops
-Version: 0.1.7
+Version: 0.1.9
 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

{airbyte_internal_ops-0.1.7.dist-info → airbyte_internal_ops-0.1.9.dist-info}/RECORD

@@ -1,6 +1,7 @@
 airbyte_ops_mcp/__init__.py,sha256=HhzURuYr29_UIdMrnWYaZB8ENr_kFkBdm4uqeiIW3Vw,760
 airbyte_ops_mcp/_annotations.py,sha256=MO-SBDnbykxxHDESG7d8rviZZ4WlZgJKv0a8eBqcEzQ,1757
-airbyte_ops_mcp/constants.py,sha256=eDO262DXtlPbWENwpk9GTllmkz9S_xT7G4qX2-BcfkE,1743
+airbyte_ops_mcp/constants.py,sha256=419-AlRfwbbxeEEV9lhmXhpTUjsSdzJpfcuL_MZZtXM,1982
+airbyte_ops_mcp/gcp_auth.py,sha256=5k-k145ZoYhHLjyDES8nrA8f8BBihRI0ykrdD1IcfOs,3599
 airbyte_ops_mcp/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 airbyte_ops_mcp/_legacy/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 airbyte_ops_mcp/_legacy/airbyte_ci/README.md,sha256=qEYx4geDR8AEDjrcA303h7Nol-CMDLojxUyiGzQprM8,236
@@ -206,7 +207,7 @@ airbyte_ops_mcp/_legacy/airbyte_ci/connector_qa/checks/documentation/templates/s
 airbyte_ops_mcp/_legacy/airbyte_ci/connector_qa/checks/documentation/templates/template.md.j2,sha256=bYxLfOP3GDwQC9Q3PiVbxsL5GS0p5b10k1dwzfOrm1M,1962
 airbyte_ops_mcp/_legacy/airbyte_ci/connector_qa/templates/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 airbyte_ops_mcp/_legacy/airbyte_ci/connector_qa/templates/qa_checks.md.j2,sha256=v3NyYUAYkqRiYAFDQ2NgpgYK6PIDhDKrqfRgpX8454s,1946
-airbyte_ops_mcp/_legacy/airbyte_ci/metadata_models/README.md,sha256=9uGj0cTaGawoD-uMOT8ImT19XXozWz6-r_aFRjZhN8Y,3567
+airbyte_ops_mcp/_legacy/airbyte_ci/metadata_models/README.md,sha256=CQtTgVzHH3UdgRCohA9GyNhxIiYxVZmSwhMKWnfbocE,3569
 airbyte_ops_mcp/_legacy/airbyte_ci/metadata_models/package-lock.json,sha256=uazyPocrveknTDfwu4DlcaDQ5HwkPNf1Q_vDNpGMp0s,2233
 airbyte_ops_mcp/_legacy/airbyte_ci/metadata_models/package.json,sha256=_JMByXIhM9iYRKlLqheCVWXWswfwDzuXc5-A1VRUdUM,307
 airbyte_ops_mcp/_legacy/airbyte_ci/metadata_models/transform.py,sha256=cx-u9y0aYKs0M7rL47I62WQfcx6uIyzbL2wWv5GERNM,1939
@@ -281,7 +282,7 @@ airbyte_ops_mcp/_legacy/airbyte_ci/metadata_service/constants.py,sha256=bSXsx-RQ
 airbyte_ops_mcp/_legacy/airbyte_ci/metadata_service/docker_hub.py,sha256=K-6-QjTiSEPeJUnVJIMyYfTtu6uFoh0vLX579b04LSs,5528
 airbyte_ops_mcp/_legacy/airbyte_ci/metadata_service/gcs_upload.py,sha256=_r1nh54U6QFglFiPWBpxrSylE6Guu0Gjk7Bq5NKK4EE,26506
 airbyte_ops_mcp/_legacy/airbyte_ci/metadata_service/registry.py,sha256=3okT639PCZGL0p6tlWJoTYy-xI2igeAj6DerxkMC1_Q,15130
-airbyte_ops_mcp/_legacy/airbyte_ci/metadata_service/registry_entry.py,sha256=sVq0fgAnTIihROn9Iy5OHMswT-fF2JDTPsRo-bNF0yA,26417
+airbyte_ops_mcp/_legacy/airbyte_ci/metadata_service/registry_entry.py,sha256=QT-UopRiFGJpabvoya-B3F32qrlB2qluOiNKj56Pv4g,26489
 airbyte_ops_mcp/_legacy/airbyte_ci/metadata_service/registry_report.py,sha256=dp13BxBiXG7DgxhzfupMm-sTFdjUVn9TyYrvo6KShU0,12600
 airbyte_ops_mcp/_legacy/airbyte_ci/metadata_service/sentry.py,sha256=e1O6_FHrHvqNNQdb5TkXs5Bhv7_hZ8fMiOWJr8H5tkI,1806
 airbyte_ops_mcp/_legacy/airbyte_ci/metadata_service/spec_cache.py,sha256=rcsJtu6B8_bmfXFv9U-IVjsVpPDJWLJYdH8e_XbT7yk,4482
@@ -350,24 +351,24 @@ 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=BMFYs5bTEgdOhxwzBrtSyYMKaHhXnMM_SGzK2hFDPBY,32076
+airbyte_ops_mcp/cli/cloud.py,sha256=OTc8o_MIw5DGGPnQ2kiUT98GCXS2I95vvsSN9_d7LVo,32077
 airbyte_ops_mcp/cli/gh.py,sha256=91b1AxFXvHQCFyXhrrym-756ZjnMCqvxFdmwCtma1zI,2046
-airbyte_ops_mcp/cli/registry.py,sha256=OpON1p4_A-G-FSfIpr6UlKYTjcj_zyiprKOu7qxwuhc,5787
+airbyte_ops_mcp/cli/registry.py,sha256=-yiLJWSslV_qGi6ImXZYfXOJSE4oJBO7yICkyA_RiUo,5792
 airbyte_ops_mcp/cli/repo.py,sha256=G1hoQpH0XYhUH3FFOsia9xabGB0LP9o3XcwBuqvFVo0,16331
 airbyte_ops_mcp/cloud_admin/__init__.py,sha256=cqE96Q10Kp6elhH9DAi6TVsIwSUy3sooDLLrxTaktGk,816
-airbyte_ops_mcp/cloud_admin/api_client.py,sha256=4vZv1J4S2Q8ETl6gIB20X1X6KHTVV-bx__b2Ax8oqyc,17358
+airbyte_ops_mcp/cloud_admin/api_client.py,sha256=6PovHDwOzo4fxSyk6viwvnXjCRIiC4uPZo0pGMx0Bdk,17359
 airbyte_ops_mcp/cloud_admin/auth.py,sha256=j45pRR8fg6CLwVdn7Uu5KW_kTz_CjRP6ZJGUzqHj_Dk,2558
 airbyte_ops_mcp/cloud_admin/connection_config.py,sha256=UtbIwuB7CA3WJr9oYRwlKDsjciqd_9ewWdml2f8DuXw,4887
 airbyte_ops_mcp/cloud_admin/models.py,sha256=YZ3FbEW-tZa50khKTTl4Bzvy_LsGyyQd6qcpXo62jls,2670
 airbyte_ops_mcp/connection_config_retriever/__init__.py,sha256=Xoi-YvARrNPhECdpwEDDkdwEpnvj8zuUlwULpf4iRrU,800
 airbyte_ops_mcp/connection_config_retriever/audit_logging.py,sha256=GjT4dVa0TtvGDmiBz9qwzcYCnSf9hTo7UM6l7ubUNE8,2846
-airbyte_ops_mcp/connection_config_retriever/retrieval.py,sha256=Bpbl1qoR0z1F8dgQOj-dB95UxqzGTXbkW4nHMPBIO-g,12112
+airbyte_ops_mcp/connection_config_retriever/retrieval.py,sha256=s6yeCyrboWkUd6KdaheEo87x-rLtQNTL8XeR8O9z2HI,12160
 airbyte_ops_mcp/connection_config_retriever/secrets_resolution.py,sha256=12g0lZzhCzAPl4Iv4eMW6d76mvXjIBGspOnNhywzks4,3644
 airbyte_ops_mcp/live_tests/__init__.py,sha256=qJac67dt6DQCqif39HqeiG3Tr9xrxfP-ala8HsLZKis,1020
 airbyte_ops_mcp/live_tests/ci_output.py,sha256=NQATOGid0OCbLEl2NOtGK4cHLL5OxXhjmtanBjIlCyE,11369
 airbyte_ops_mcp/live_tests/config.py,sha256=dwWeY0tatdbwl9BqbhZ7EljoZDCtKmGO5fvOAIxeXmA,5873
 airbyte_ops_mcp/live_tests/connection_fetcher.py,sha256=5wIiA0VvCFNEc-fr6Po18gZMX3E5fyPOGf2SuVOqv5U,12799
-airbyte_ops_mcp/live_tests/connection_secret_retriever.py,sha256=C3yGoE8JSlkypKlpGYoI-5oczFexHyl5Z3avkDKyqQc,6445
+airbyte_ops_mcp/live_tests/connection_secret_retriever.py,sha256=DtZYB4Y8CXfUXTFhmzrqzjuEFoICzz5Md3Ol_y9HCq0,4861
 airbyte_ops_mcp/live_tests/connector_runner.py,sha256=fGE_TCii9zhC3pbyBupJ3JVkuxOWB59Q1DgigcF3q04,9707
 airbyte_ops_mcp/live_tests/evaluation_modes.py,sha256=lAL6pEDmy_XCC7_m4_NXjt_f6Z8CXeAhMkc0FU8bm_M,1364
 airbyte_ops_mcp/live_tests/http_metrics.py,sha256=oTD7f2MnQOvx4plOxHop2bInQ0-whvuToSsrC7TIM-M,12469
@@ -384,29 +385,29 @@ airbyte_ops_mcp/live_tests/validation/catalog_validators.py,sha256=jqqVAMOk0mtdP
 airbyte_ops_mcp/live_tests/validation/record_validators.py,sha256=-7Ir2LWGCrtadK2JLuBgppSyk0RFJX6Nsy0lrabtwrs,7411
 airbyte_ops_mcp/mcp/__init__.py,sha256=QqkNkxzdXlg-W03urBAQ3zmtOKFPf35rXgO9ceUjpng,334
 airbyte_ops_mcp/mcp/_guidance.py,sha256=48tQSnDnxqXtyGJxxgjz0ZiI814o_7Fj7f6R8jpQ7so,2375
-airbyte_ops_mcp/mcp/_mcp_utils.py,sha256=Im3J3yCtXPbW_Kp-oh5b11Z2187V3-Zsos5LBgdvQrc,9111
-airbyte_ops_mcp/mcp/cloud_connector_versions.py,sha256=G8mVzhvSCmrTEqDseV57-wwL0s3oWdydgyvgMr027tU,10443
+airbyte_ops_mcp/mcp/_mcp_utils.py,sha256=nhztHcoc-_ASPpJfoDBjxjjqEvQM6_QIrhp7F2UCrQk,11494
+airbyte_ops_mcp/mcp/cloud_connector_versions.py,sha256=XxaS6WBP0sJPRwT7TTPhVH2PzhPqVWMNU5fVdWdxLLk,10361
 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/github.py,sha256=5ZPsSTy4-gummS96xGoG-n2RwCgyg3-UWAvmEmxd5x4,7686
-airbyte_ops_mcp/mcp/github_repo_ops.py,sha256=pE6RyATBfUKBOffQ6iyNJhHfCLjwq0pzVmmFYUg39UQ,5375
-airbyte_ops_mcp/mcp/live_tests.py,sha256=KnxZLuUNmm_3Clt0DU8H9rJ01zOKefnL_wqdSCMDjkE,17992
+airbyte_ops_mcp/mcp/github.py,sha256=opmVWRwjNs_jeWejv8wHOtb-3J09hOlqxg98GCzmFLo,7627
+airbyte_ops_mcp/mcp/github_repo_ops.py,sha256=PiERpt8abo20Gz4CfXhrDNlVM4o4FOt5sweZJND2a0s,5314
+airbyte_ops_mcp/mcp/live_tests.py,sha256=eHfgNkEcY1OKzYiJmkxwOluLPiFHIdP4nm_H1H0MXDg,17940
 airbyte_ops_mcp/mcp/metadata.py,sha256=fwGW97WknR5lfKcQnFtK6dU87aA6TmLj1NkKyqDAV9g,270
-airbyte_ops_mcp/mcp/prerelease.py,sha256=2Mr0LdCLhEc9Q7CEtmganJXHGHCLCXODKlkSapLsSsY,9484
-airbyte_ops_mcp/mcp/prod_db_queries.py,sha256=L0p7LlF7GV5mXoH_2GwgQp04sXL2QA5v-RiuLsTb-yA,12614
-airbyte_ops_mcp/mcp/prompts.py,sha256=6opN4ZweQxfSdtoK0gL6wTrlxkRvxTQvH1VTmAuhoBE,1645
+airbyte_ops_mcp/mcp/prerelease.py,sha256=08G6ogRqEauQyDxFLirUVaYeU3exAJd-DJn_8fXCNXg,9450
+airbyte_ops_mcp/mcp/prod_db_queries.py,sha256=RkBVISfkbwML3grWONxYsULRnFEYdqDZVBZIyo6W8xE,14311
+airbyte_ops_mcp/mcp/prompts.py,sha256=mJld9mdPECXYZffWXGSvNs4Xevx3rxqUGNlzGKVC2_s,1599
 airbyte_ops_mcp/mcp/registry.py,sha256=PW-VYUj42qx2pQ_apUkVaoUFq7VgB9zEU7-aGrkSCCw,290
 airbyte_ops_mcp/mcp/server.py,sha256=7zi91xioVTx1q-bEleekZH2c2JnbzDQt_6zxdEwnLbg,2958
-airbyte_ops_mcp/mcp/server_info.py,sha256=4yNBA_N_vUyLwVJqp7abyFuzZkcnv6-ck_Beb2SXqTE,2426
+airbyte_ops_mcp/mcp/server_info.py,sha256=Yi4B1auW64QZGBDas5mro_vwTjvrP785TFNSBP7GhRg,2361
 airbyte_ops_mcp/prod_db_access/__init__.py,sha256=5pxouMPY1beyWlB0UwPnbaLTKTHqU6X82rbbgKY2vYU,1069
 airbyte_ops_mcp/prod_db_access/db_engine.py,sha256=ia1KcuQOXi3Qhy_MnxYmccCBJ4rAt_d4nVDjcyzje6o,4289
 airbyte_ops_mcp/prod_db_access/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-airbyte_ops_mcp/prod_db_access/queries.py,sha256=bZZntlTXzvI2uSAFMkOfb_LcfCOlxyTuOddRVw4yU2M,8676
-airbyte_ops_mcp/prod_db_access/sql.py,sha256=zHPucNuMlfxz3aU8vYo1ziiGk0lIncG9XmblEoRDd4c,12725
+airbyte_ops_mcp/prod_db_access/queries.py,sha256=q7PcI15EGh6jFS9MVB_gZt1a56YvrZV5hnwa5lgU2q0,10844
+airbyte_ops_mcp/prod_db_access/sql.py,sha256=tWQAwMk8DzG8HpLIYglljlReI2oeYulQPsV31ocUJSw,16251
 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_internal_ops-0.1.7.dist-info/METADATA,sha256=lIb2MpFriSDAUAYqwerfgA6a3zz3YOrwzDY17cyIZno,5282
-airbyte_internal_ops-0.1.7.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-airbyte_internal_ops-0.1.7.dist-info/entry_points.txt,sha256=eUgJ9xIy9PlR-CgRbqRMsh1NVp6jz08v9bul9vCYlU4,111
-airbyte_internal_ops-0.1.7.dist-info/RECORD,,
+airbyte_internal_ops-0.1.9.dist-info/METADATA,sha256=1tBlf96RtcJNsKARaZt4711QiVISWcAkex4OLBlUmjk,5282
+airbyte_internal_ops-0.1.9.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+airbyte_internal_ops-0.1.9.dist-info/entry_points.txt,sha256=eUgJ9xIy9PlR-CgRbqRMsh1NVp6jz08v9bul9vCYlU4,111
+airbyte_internal_ops-0.1.9.dist-info/RECORD,,

airbyte_ops_mcp/_legacy/airbyte_ci/metadata_models/README.md

@@ -75,7 +75,7 @@ This will copy the specified connector version to your development bucket. This
 _💡 Note: A prerequisite is you have [gsutil](https://cloud.google.com/storage/docs/gsutil) installed and have run `gsutil auth login`_
 
 ```bash
-TARGET_BUCKET=<YOUR-DEV_BUCKET> CONNECTOR="airbyte/source-stripe" VERSION="3.17.0-dev.ea013c8741" poetry run poe copy-connector-from-prod
+TARGET_BUCKET=<YOUR-DEV_BUCKET> CONNECTOR="airbyte/source-stripe" VERSION="3.17.0-preview.ea013c8" poetry run poe copy-connector-from-prod
 ```
 
 ### Promote Connector Version to Latest
@@ -87,5 +87,5 @@ _💡 Note: A prerequisite is you have [gsutil](https://cloud.google.com/storage
 _⚠️ Warning: Its important to know that this will remove ANY existing files in the latest folder that are not in the versioned folder as it calls `gsutil rsync` with `-d` enabled._
 
 ```bash
-TARGET_BUCKET=<YOUR-DEV_BUCKET> CONNECTOR="airbyte/source-stripe" VERSION="3.17.0-dev.ea013c8741" poetry run poe promote-connector-to-latest
+TARGET_BUCKET=<YOUR-DEV_BUCKET> CONNECTOR="airbyte/source-stripe" VERSION="3.17.0-preview.ea013c8" poetry run poe promote-connector-to-latest
 ```

airbyte_ops_mcp/_legacy/airbyte_ci/metadata_service/registry_entry.py

@@ -526,7 +526,7 @@ def generate_and_persist_registry_entry(
         bucket_name (str): The name of the GCS bucket.
         repo_metadata_file_path (pathlib.Path): The path to the spec file.
         registry_type (str): The registry type.
-        docker_image_tag (str): The docker image tag associated with this release. Typically a semver string (e.g. '1.2.3'), possibly with a suffix (e.g. '1.2.3-dev.abcde12345')
+        docker_image_tag (str): The docker image tag associated with this release. Typically a semver string (e.g. '1.2.3'), possibly with a suffix (e.g. '1.2.3-preview.abcde12')
         is_prerelease (bool): Whether this is a prerelease, or a main release.
     """
     # Read the repo metadata dict to bootstrap ourselves. We need the docker repository,
@@ -536,7 +536,7 @@ def generate_and_persist_registry_entry(
 
     try:
         # Now that we have the docker repo, read the appropriate versioned metadata from GCS.
-        # This metadata will differ in a few fields (e.g. in prerelease mode, dockerImageTag will contain the actual prerelease tag `1.2.3-dev.abcde12345`),
+        # This metadata will differ in a few fields (e.g. in prerelease mode, dockerImageTag will contain the actual prerelease tag `1.2.3-preview.abcde12`),
         # so we'll treat this as the source of truth (ish. See below for how we handle the registryOverrides field.)
         gcs_client = get_gcs_storage_client(gcs_creds=os.environ.get("GCS_CREDENTIALS"))
         bucket = gcs_client.bucket(bucket_name)
@@ -645,6 +645,7 @@ def generate_and_persist_registry_entry(
     if (
         "-rc" not in metadata_dict["data"]["dockerImageTag"]
         and "-dev" not in metadata_dict["data"]["dockerImageTag"]
+        and "-preview" not in metadata_dict["data"]["dockerImageTag"]
     ) and not metadata_dict["data"]["registryOverrides"][registry_type]["enabled"]:
         logger.info(
             f"{registry_type} is not enabled: deleting existing {registry_type} registry entry for {metadata_dict['data']['dockerRepository']} at latest path."

airbyte_ops_mcp/cli/cloud.py

@@ -117,7 +117,7 @@ def set_version_override(
     version: Annotated[
         str,
         Parameter(
-            help="The semver version string to pin to (e.g., '2.1.5-dev.abc1234567')."
+            help="The semver version string to pin to (e.g., '2.1.5-preview.abc1234')."
         ),
     ],
     reason: Annotated[

airbyte_ops_mcp/cli/registry.py

@@ -63,7 +63,7 @@ def publish_prerelease(
     """Publish a connector prerelease to the Airbyte registry.
 
     Triggers the publish-connectors-prerelease workflow in the airbytehq/airbyte
-    repository. Pre-release versions are tagged with format: {version}-dev.{git-sha}
+    repository. Pre-release versions are tagged with format: {version}-preview.{git-sha}
 
     Requires GITHUB_CONNECTOR_PUBLISHING_PAT or GITHUB_TOKEN environment variable
     with 'actions:write' permission.
@@ -162,7 +162,7 @@ def inspect_image(
     ],
     tag: Annotated[
         str,
-        Parameter(help="Image tag (e.g., '2.1.5-dev.abc1234567')."),
+        Parameter(help="Image tag (e.g., '2.1.5-preview.abc1234')."),
     ],
 ) -> None:
     """Check if a Docker image exists on DockerHub.

airbyte_ops_mcp/cloud_admin/api_client.py

@@ -160,7 +160,7 @@ def resolve_connector_version_id(
     Args:
         actor_definition_id: The actor definition ID
         connector_type: Either "source" or "destination"
-        version: The version string (e.g., "0.1.47-dev.abe7cb4ddb")
+        version: The version string (e.g., "0.1.47-preview.abe7cb4")
         api_root: The API root URL
         client_id: The Airbyte Cloud client ID
         client_secret: The Airbyte Cloud client secret

airbyte_ops_mcp/connection_config_retriever/retrieval.py

@@ -24,6 +24,7 @@ from airbyte_ops_mcp.connection_config_retriever.secrets_resolution import (
     get_resolved_config,
 )
 from airbyte_ops_mcp.constants import CLOUD_REGISTRY_URL, ConnectionObject
+from airbyte_ops_mcp.gcp_auth import get_secret_manager_client
 from airbyte_ops_mcp.prod_db_access.db_engine import get_pool
 
 LOGGER = logging.getLogger(__name__)
@@ -306,7 +307,7 @@ def retrieve_objects(
     """
     connection_candidates = [TestingCandidate(connection_id=connection_id)]
 
-    secret_manager_client = secretmanager.SecretManagerServiceClient()
+    secret_manager_client = get_secret_manager_client()
     connection_pool = get_pool(secret_manager_client)
 
     with connection_pool.connect() as db_conn:

airbyte_ops_mcp/constants.py

@@ -12,6 +12,10 @@ MCP_SERVER_NAME = "airbyte-internal-ops"
 ENV_AIRBYTE_INTERNAL_ADMIN_FLAG = "AIRBYTE_INTERNAL_ADMIN_FLAG"
 ENV_AIRBYTE_INTERNAL_ADMIN_USER = "AIRBYTE_INTERNAL_ADMIN_USER"
 
+# Environment variable for GCP credentials (JSON content, not file path)
+ENV_GCP_PROD_DB_ACCESS_CREDENTIALS = "GCP_PROD_DB_ACCESS_CREDENTIALS"
+"""Environment variable containing GCP service account JSON credentials for prod DB access."""
+
 # Expected values for internal admin authentication
 EXPECTED_ADMIN_FLAG_VALUE = "airbyte.io"
 EXPECTED_ADMIN_EMAIL_DOMAIN = "@airbyte.io"

airbyte_ops_mcp/gcp_auth.py

@@ -0,0 +1,99 @@
+# Copyright (c) 2025 Airbyte, Inc., all rights reserved.
+"""Centralized GCP authentication utilities.
+
+This module provides a single code path for GCP credential handling across
+the airbyte-ops-mcp codebase. It supports both standard Application Default
+Credentials (ADC) and the GCP_PROD_DB_ACCESS_CREDENTIALS environment variable
+used internally at Airbyte.
+
+Usage:
+    from airbyte_ops_mcp.gcp_auth import get_secret_manager_client
+
+    # Get a properly authenticated Secret Manager client
+    client = get_secret_manager_client()
+"""
+
+from __future__ import annotations
+
+import logging
+import os
+import tempfile
+from pathlib import Path
+
+from google.cloud import secretmanager
+
+from airbyte_ops_mcp.constants import ENV_GCP_PROD_DB_ACCESS_CREDENTIALS
+
+logger = logging.getLogger(__name__)
+
+# Environment variable name (internal to GCP libraries)
+ENV_GOOGLE_APPLICATION_CREDENTIALS = "GOOGLE_APPLICATION_CREDENTIALS"
+
+# Module-level cache for the credentials file path
+_credentials_file_path: str | None = None
+
+
+def ensure_adc_credentials() -> str | None:
+    """Ensure GCP Application Default Credentials are available.
+
+    If GOOGLE_APPLICATION_CREDENTIALS is not set but GCP_PROD_DB_ACCESS_CREDENTIALS is,
+    write the JSON credentials to a temp file and set GOOGLE_APPLICATION_CREDENTIALS
+    to point to that file. This provides a fallback for internal employees who use
+    GCP_PROD_DB_ACCESS_CREDENTIALS as their standard credential source.
+
+    Note: GOOGLE_APPLICATION_CREDENTIALS must be a file path, not JSON content.
+    The GCP_PROD_DB_ACCESS_CREDENTIALS env var contains the JSON content directly,
+    so we write it to a temp file first.
+
+    This function is idempotent and safe to call multiple times.
+
+    Returns:
+        The path to the credentials file if one was created, or None if
+        GOOGLE_APPLICATION_CREDENTIALS was already set.
+    """
+    global _credentials_file_path
+
+    # If GOOGLE_APPLICATION_CREDENTIALS is already set, nothing to do
+    if ENV_GOOGLE_APPLICATION_CREDENTIALS in os.environ:
+        return None
+
+    # Check if we have the fallback credentials
+    gsm_creds = os.getenv(ENV_GCP_PROD_DB_ACCESS_CREDENTIALS)
+    if not gsm_creds:
+        return None
+
+    # Reuse the same file path if we've already written credentials and file still exists
+    if _credentials_file_path is not None and Path(_credentials_file_path).exists():
+        os.environ[ENV_GOOGLE_APPLICATION_CREDENTIALS] = _credentials_file_path
+        return _credentials_file_path
+
+    # Write credentials to a temp file
+    # Use a unique filename based on PID to avoid collisions between processes
+    creds_file = Path(tempfile.gettempdir()) / f"gcp_prod_db_creds_{os.getpid()}.json"
+    creds_file.write_text(gsm_creds)
+
+    # Set restrictive permissions (owner read/write only)
+    creds_file.chmod(0o600)
+
+    _credentials_file_path = str(creds_file)
+    os.environ[ENV_GOOGLE_APPLICATION_CREDENTIALS] = _credentials_file_path
+
+    logger.debug(
+        f"Wrote {ENV_GCP_PROD_DB_ACCESS_CREDENTIALS} to {creds_file} and set "
+        f"{ENV_GOOGLE_APPLICATION_CREDENTIALS}"
+    )
+
+    return _credentials_file_path
+
+
+def get_secret_manager_client() -> secretmanager.SecretManagerServiceClient:
+    """Get a Secret Manager client with proper credential handling.
+
+    This function ensures GCP credentials are available (supporting the
+    GCP_PROD_DB_ACCESS_CREDENTIALS fallback) before creating the client.
+
+    Returns:
+        A configured SecretManagerServiceClient instance.
+    """
+    ensure_adc_credentials()
+    return secretmanager.SecretManagerServiceClient()

airbyte_ops_mcp/live_tests/connection_secret_retriever.py

@@ -32,15 +32,14 @@ from __future__ import annotations
 
 import logging
 import os
-import tempfile
 from dataclasses import replace
-from pathlib import Path
 from typing import TYPE_CHECKING
 
 from airbyte_ops_mcp.connection_config_retriever import (
     ConnectionObject,
     retrieve_objects,
 )
+from airbyte_ops_mcp.gcp_auth import ensure_adc_credentials
 
 if TYPE_CHECKING:
     from airbyte_ops_mcp.live_tests.connection_fetcher import ConnectionData
@@ -50,39 +49,6 @@ logger = logging.getLogger(__name__)
 # Environment variable to enable secret retrieval
 ENV_USE_SECRET_RETRIEVER = "USE_CONNECTION_SECRET_RETRIEVER"
 
-# GCP credential environment variables
-ENV_GOOGLE_APPLICATION_CREDENTIALS = "GOOGLE_APPLICATION_CREDENTIALS"
-ENV_GCP_PROD_DB_ACCESS_CREDENTIALS = "GCP_PROD_DB_ACCESS_CREDENTIALS"
-
-
-def _ensure_gcp_credentials_env() -> None:
-    """Ensure GCP credentials are available via standard env var.
-
-    If GOOGLE_APPLICATION_CREDENTIALS is not set but GCP_PROD_DB_ACCESS_CREDENTIALS is,
-    write the JSON credentials to a temp file and set GOOGLE_APPLICATION_CREDENTIALS
-    to point to that file. This provides a fallback for internal employees who use
-    GCP_PROD_DB_ACCESS_CREDENTIALS as their standard credential source for prod
-    database access.
-
-    Note: GOOGLE_APPLICATION_CREDENTIALS must be a file path, not JSON content.
-    The GCP_PROD_DB_ACCESS_CREDENTIALS env var contains the JSON content directly,
-    so we write it to a temp file first.
-
-    This function is idempotent and safe to call multiple times.
-    """
-    if ENV_GOOGLE_APPLICATION_CREDENTIALS not in os.environ:
-        gsm_creds = os.getenv(ENV_GCP_PROD_DB_ACCESS_CREDENTIALS)
-        if gsm_creds:
-            # Write credentials to a temp file since GOOGLE_APPLICATION_CREDENTIALS
-            # expects a file path, not JSON content
-            creds_file = Path(tempfile.gettempdir()) / "gcp_prod_db_creds.json"
-            creds_file.write_text(gsm_creds)
-            os.environ[ENV_GOOGLE_APPLICATION_CREDENTIALS] = str(creds_file)
-            logger.debug(
-                f"Wrote {ENV_GCP_PROD_DB_ACCESS_CREDENTIALS} to {creds_file} and set "
-                f"{ENV_GOOGLE_APPLICATION_CREDENTIALS}"
-            )
-
 
 def is_secret_retriever_enabled() -> bool:
     """Check if secret retrieval is enabled via environment variable.
@@ -120,7 +86,7 @@ def retrieve_unmasked_config(
         The unmasked source config dict, or None if retrieval fails.
     """
     # Ensure GCP credentials are available (supports GCP_PROD_DB_ACCESS_CREDENTIALS fallback)
-    _ensure_gcp_credentials_env()
+    ensure_adc_credentials()
 
     # Only request the source config - that's all we need for secrets
     requested_objects = [ConnectionObject.SOURCE_CONFIG]

airbyte_ops_mcp/mcp/_mcp_utils.py

@@ -2,14 +2,17 @@
 """Deferred MCP capability registration for tools, prompts, and resources.
 
 This module provides a decorator to tag tool functions with MCP annotations
-for deferred registration.
+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
@@ -94,8 +97,39 @@ def should_register_tool(annotations: dict[str, Any]) -> bool:
     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,
+    domain: ToolDomain | str | None = None,
     *,
     read_only: bool = False,
     destructive: bool = False,
@@ -108,8 +142,12 @@ def mcp_tool(
     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: The domain this tool belongs to (e.g., ToolDomain.REGISTRY, "registry")
+        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)
@@ -121,11 +159,18 @@ def mcp_tool(
         Decorator function that tags the tool with annotations
 
     Example:
-        @mcp_tool(ToolDomain.REGISTRY, read_only=True, idempotent=True)
+        @mcp_tool(read_only=True, idempotent=True)
         def list_connectors_in_repo():
             ...
     """
-    domain_str = domain.value if isinstance(domain, ToolDomain) else domain
+    # 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,
@@ -156,7 +201,8 @@ def mcp_prompt(
     Args:
         name: Unique name for the prompt
         description: Human-readable description of the prompt
-        domain: Optional domain for filtering (e.g., ToolDomain.PROMPTS)
+        domain: Optional domain for filtering. If not provided, automatically
+            derived from the caller's file stem.
 
     Returns:
         Decorator function that registers the prompt
@@ -164,15 +210,20 @@ def mcp_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]]]):
-        domain_str = domain.value if isinstance(domain, ToolDomain) else domain
         annotations = {
             "name": name,
             "description": description,
+            "domain": domain_str,
         }
-        if domain_str is not None:
-            annotations["domain"] = domain_str
         _REGISTERED_PROMPTS.append((func, annotations))
         return func
 
@@ -191,7 +242,8 @@ def mcp_resource(
         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 (e.g., ToolDomain.SERVER_INFO)
+        domain: Optional domain for filtering. If not provided, automatically
+            derived from the caller's file stem.
 
     Returns:
         Decorator function that registers the resource
@@ -199,16 +251,21 @@ def mcp_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]):
-        domain_str = domain.value if isinstance(domain, ToolDomain) else domain
         annotations = {
             "uri": uri,
             "description": description,
             "mime_type": mime_type,
+            "domain": domain_str,
         }
-        if domain_str is not None:
-            annotations["domain"] = domain_str
         _REGISTERED_RESOURCES.append((func, annotations))
         return func
 
@@ -226,11 +283,14 @@ def _register_mcp_callables(
 
     Args:
         app: The FastMCP app instance
-        domain: The domain to register tools for (e.g., ToolDomain.REGISTRY, "registry")
+        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
@@ -242,14 +302,17 @@ def _register_mcp_callables(
 
 def register_mcp_tools(
     app: FastMCP,
-    domain: ToolDomain | str,
+    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 (e.g., ToolDomain.REGISTRY, "registry")
+        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,
@@ -271,14 +334,17 @@ def register_mcp_tools(
 
 def register_mcp_prompts(
     app: FastMCP,
-    domain: ToolDomain | str,
+    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 (e.g., ToolDomain.PROMPTS, "prompts")
+        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,
@@ -300,14 +366,17 @@ def register_mcp_prompts(
 
 def register_mcp_resources(
     app: FastMCP,
-    domain: ToolDomain | str,
+    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 (e.g., ToolDomain.SERVER_INFO, "server_info")
+        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,

airbyte_ops_mcp/mcp/cloud_connector_versions.py

@@ -33,7 +33,7 @@ from airbyte_ops_mcp.cloud_admin.models import (
     ConnectorVersionInfo,
     VersionOverrideOperationResult,
 )
-from airbyte_ops_mcp.mcp._mcp_utils import ToolDomain, mcp_tool, register_mcp_tools
+from airbyte_ops_mcp.mcp._mcp_utils import mcp_tool, register_mcp_tools
 
 
 def _get_workspace(workspace_id: str) -> CloudWorkspace:
@@ -63,7 +63,6 @@ def _get_workspace(workspace_id: str) -> CloudWorkspace:
 
 
 @mcp_tool(
-    ToolDomain.CLOUD_ADMIN,
     read_only=True,
     idempotent=True,
     open_world=True,
@@ -117,7 +116,6 @@ def get_cloud_connector_version(
 
 
 @mcp_tool(
-    ToolDomain.CLOUD_ADMIN,
     destructive=True,
     idempotent=False,
     open_world=True,
@@ -297,4 +295,4 @@ def register_cloud_connector_version_tools(app: FastMCP) -> None:
     Args:
         app: FastMCP application instance
     """
-    register_mcp_tools(app, domain=ToolDomain.CLOUD_ADMIN)
+    register_mcp_tools(app, domain=__name__)

airbyte_ops_mcp/mcp/github.py

@@ -15,7 +15,7 @@ import requests
 from fastmcp import FastMCP
 from pydantic import BaseModel, Field
 
-from airbyte_ops_mcp.mcp._mcp_utils import ToolDomain, mcp_tool, register_mcp_tools
+from airbyte_ops_mcp.mcp._mcp_utils import mcp_tool, register_mcp_tools
 
 GITHUB_API_BASE = "https://api.github.com"
 DOCKERHUB_API_BASE = "https://hub.docker.com/v2"
@@ -115,7 +115,6 @@ def _get_workflow_run(
 
 
 @mcp_tool(
-    ToolDomain.REPO,
     read_only=True,
     idempotent=True,
     open_world=True,
@@ -205,7 +204,7 @@ def _check_dockerhub_image(
 
     Args:
         image: Docker image name (e.g., "airbyte/source-github")
-        tag: Image tag (e.g., "2.1.5-dev.abc1234567")
+        tag: Image tag (e.g., "2.1.5-preview.abc1234")
 
     Returns:
         Tag data dictionary if found, None if not found.
@@ -222,7 +221,6 @@ def _check_dockerhub_image(
 
 
 @mcp_tool(
-    ToolDomain.REPO,
     read_only=True,
     idempotent=True,
     open_world=True,
@@ -234,7 +232,7 @@ def get_docker_image_info(
     ],
     tag: Annotated[
         str,
-        Field(description="Image tag (e.g., '2.1.5-dev.abc1234567')"),
+        Field(description="Image tag (e.g., '2.1.5-preview.abc1234')"),
     ],
 ) -> DockerImageInfo:
     """Check if a Docker image exists on DockerHub.
@@ -276,4 +274,4 @@ def register_github_tools(app: FastMCP) -> None:
     Args:
         app: FastMCP application instance
     """
-    register_mcp_tools(app, domain=ToolDomain.REPO)
+    register_mcp_tools(app, domain=__name__)

airbyte_ops_mcp/mcp/github_repo_ops.py

@@ -15,7 +15,7 @@ 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 ToolDomain, mcp_tool, register_mcp_tools
+from airbyte_ops_mcp.mcp._mcp_utils import mcp_tool, register_mcp_tools
 
 
 class ConnectorListResponse(BaseModel):
@@ -36,7 +36,6 @@ class BumpVersionResponse(BaseModel):
 
 
 @mcp_tool(
-    ToolDomain.REPO,
     read_only=True,
     idempotent=True,
     open_world=False,
@@ -102,7 +101,6 @@ def list_connectors_in_repo(
 
 
 @mcp_tool(
-    ToolDomain.REPO,
     read_only=False,
     idempotent=False,
     open_world=False,
@@ -164,4 +162,4 @@ def register_github_repo_ops_tools(app: FastMCP) -> None:
     Args:
         app: FastMCP application instance
     """
-    register_mcp_tools(app, domain=ToolDomain.REPO)
+    register_mcp_tools(app, domain=__name__)

airbyte_ops_mcp/mcp/live_tests.py

@@ -21,7 +21,7 @@ from airbyte.cloud.auth import resolve_cloud_client_id, resolve_cloud_client_sec
 from fastmcp import FastMCP
 from pydantic import BaseModel, Field
 
-from airbyte_ops_mcp.mcp._mcp_utils import ToolDomain, mcp_tool, register_mcp_tools
+from airbyte_ops_mcp.mcp._mcp_utils import mcp_tool, register_mcp_tools
 
 logger = logging.getLogger(__name__)
 
@@ -308,7 +308,6 @@ class RunLiveConnectionTestsResponse(BaseModel):
 
 
 @mcp_tool(
-    ToolDomain.LIVE_TESTS,
     read_only=False,
     idempotent=False,
     open_world=True,
@@ -512,4 +511,4 @@ def register_live_tests_tools(app: FastMCP) -> None:
     Args:
         app: FastMCP application instance
     """
-    register_mcp_tools(app, domain=ToolDomain.LIVE_TESTS)
+    register_mcp_tools(app, domain=__name__)

airbyte_ops_mcp/mcp/prerelease.py

@@ -16,7 +16,7 @@ import yaml
 from fastmcp import FastMCP
 from pydantic import BaseModel, Field
 
-from airbyte_ops_mcp.mcp._mcp_utils import ToolDomain, mcp_tool, register_mcp_tools
+from airbyte_ops_mcp.mcp._mcp_utils import mcp_tool, register_mcp_tools
 
 GITHUB_API_BASE = "https://api.github.com"
 DEFAULT_REPO_OWNER = "airbytehq"
@@ -111,7 +111,7 @@ def _get_pr_head_info(
     return PRHeadInfo(
         ref=pr_data["head"]["ref"],
         sha=sha,
-        short_sha=sha[:10],
+        short_sha=sha[:7],
     )
 
 
@@ -205,7 +205,6 @@ def _trigger_workflow_dispatch(
 
 
 @mcp_tool(
-    ToolDomain.REPO,
     read_only=False,
     destructive=False,
     idempotent=False,
@@ -236,7 +235,7 @@ def publish_connector_to_airbyte_registry(
     publish-connectors-prerelease workflow in the airbytehq/airbyte repository,
     which publishes a pre-release version of the specified connector from the PR branch.
 
-    Pre-release versions are tagged with the format: {version}-dev.{10-char-git-sha}
+    Pre-release versions are tagged with the format: {version}-preview.{7-char-git-sha}
     These versions are available for version pinning via the scoped_configuration API.
 
     Requires GITHUB_CONNECTOR_PUBLISHING_PAT or GITHUB_TOKEN environment variable
@@ -291,7 +290,7 @@ def publish_connector_to_airbyte_registry(
         docker_image = data.get("dockerRepository")
         base_version = data.get("dockerImageTag")
         if base_version:
-            docker_image_tag = f"{base_version}-dev.{head_info.short_sha}"
+            docker_image_tag = f"{base_version}-preview.{head_info.short_sha}"
 
     return PrereleaseWorkflowResult(
         success=True,
@@ -310,4 +309,4 @@ def register_prerelease_tools(app: FastMCP) -> None:
     Args:
         app: FastMCP application instance
     """
-    register_mcp_tools(app, domain=ToolDomain.REPO)
+    register_mcp_tools(app, domain=__name__)

airbyte_ops_mcp/mcp/prod_db_queries.py

@@ -14,12 +14,13 @@ from airbyte.exceptions import PyAirbyteInputError
 from fastmcp import FastMCP
 from pydantic import Field
 
-from airbyte_ops_mcp.mcp._mcp_utils import ToolDomain, mcp_tool, register_mcp_tools
+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,
     query_connector_versions,
     query_dataplanes_list,
+    query_failed_sync_attempts_for_version,
     query_new_connector_releases,
     query_sync_results_for_version,
     query_workspace_info,
@@ -86,7 +87,6 @@ def _resolve_canonical_name_to_definition_id(canonical_name: str) -> str:
 
 
 @mcp_tool(
-    ToolDomain.CLOUD_ADMIN,
     read_only=True,
     idempotent=True,
 )
@@ -104,7 +104,6 @@ def query_prod_dataplanes() -> list[dict[str, Any]]:
 
 
 @mcp_tool(
-    ToolDomain.CLOUD_ADMIN,
     read_only=True,
     idempotent=True,
 )
@@ -128,7 +127,6 @@ def query_prod_workspace_info(
 
 
 @mcp_tool(
-    ToolDomain.CLOUD_ADMIN,
     read_only=True,
     idempotent=True,
 )
@@ -151,7 +149,6 @@ def query_prod_connector_versions(
 
 
 @mcp_tool(
-    ToolDomain.CLOUD_ADMIN,
     read_only=True,
     idempotent=True,
 )
@@ -179,7 +176,6 @@ def query_prod_new_connector_releases(
 
 
 @mcp_tool(
-    ToolDomain.CLOUD_ADMIN,
     read_only=True,
     idempotent=True,
 )
@@ -205,7 +201,6 @@ def query_prod_actors_by_connector_version(
 
 
 @mcp_tool(
-    ToolDomain.CLOUD_ADMIN,
     read_only=True,
     idempotent=True,
 )
@@ -252,7 +247,52 @@ def query_prod_connector_version_sync_results(
 
 
 @mcp_tool(
-    ToolDomain.CLOUD_ADMIN,
+    read_only=True,
+    idempotent=True,
+)
+def query_prod_failed_sync_attempts_for_version(
+    connector_version_id: Annotated[
+        str,
+        Field(description="Connector version UUID to find failed sync attempts for"),
+    ],
+    days: Annotated[
+        int,
+        Field(description="Number of days to look back (default: 7)", default=7),
+    ] = 7,
+    limit: Annotated[
+        int,
+        Field(description="Maximum number of results (default: 100)", default=100),
+    ] = 100,
+) -> list[dict[str, Any]]:
+    """List failed sync attempts with failure details for actors pinned to a connector version.
+
+    Returns failed attempt records for connections using actors pinned to the specified
+    version. Includes failure_summary from the attempts table for debugging.
+
+    Key fields:
+    - latest_job_attempt_status: Final job status after all retries ('succeeded' means
+      the job eventually succeeded despite this failed attempt)
+    - failed_attempt_number: Which attempt this was (0-indexed)
+    - failure_summary: JSON containing failure details including failureType and messages
+
+    Note: May return multiple rows per job (one per failed attempt). Results ordered by
+    job_updated_at DESC, then failed_attempt_number DESC.
+
+    Returns list of dicts with keys: job_id, connection_id, latest_job_attempt_status,
+    job_started_at, job_updated_at, connection_name, actor_id, actor_name,
+    actor_definition_id, pin_origin_type, pin_origin, workspace_id, workspace_name,
+    organization_id, dataplane_group_id, dataplane_name, failed_attempt_id,
+    failed_attempt_number, failed_attempt_status, failed_attempt_created_at,
+    failed_attempt_ended_at, failure_summary, processing_task_queue
+    """
+    return query_failed_sync_attempts_for_version(
+        connector_version_id,
+        days=days,
+        limit=limit,
+    )
+
+
+@mcp_tool(
     read_only=True,
     idempotent=True,
     open_world=True,
@@ -354,4 +394,4 @@ def query_prod_connections_by_connector(
 
 def register_prod_db_query_tools(app: FastMCP) -> None:
     """Register prod DB query tools with the FastMCP app."""
-    register_mcp_tools(app, ToolDomain.CLOUD_ADMIN)
+    register_mcp_tools(app, domain=__name__)

airbyte_ops_mcp/mcp/prompts.py

@@ -13,13 +13,12 @@ from fastmcp import FastMCP
 from pydantic import Field
 
 from airbyte_ops_mcp.mcp._guidance import TEST_MY_TOOLS_GUIDANCE
-from airbyte_ops_mcp.mcp._mcp_utils import ToolDomain, mcp_prompt, register_mcp_prompts
+from airbyte_ops_mcp.mcp._mcp_utils import mcp_prompt, register_mcp_prompts
 
 
 @mcp_prompt(
     name="test-my-tools",
     description="Test all available MCP tools to confirm they are working properly",
-    domain=ToolDomain.PROMPTS,
 )
 def test_my_tools_prompt(
     scope: Annotated[
@@ -57,4 +56,4 @@ def register_prompts(app: FastMCP) -> None:
     Args:
         app: FastMCP application instance
     """
-    register_mcp_prompts(app, ToolDomain.PROMPTS)
+    register_mcp_prompts(app, domain=__name__)

airbyte_ops_mcp/mcp/server_info.py

@@ -12,7 +12,6 @@ from fastmcp import FastMCP
 
 from airbyte_ops_mcp.constants import MCP_SERVER_NAME
 from airbyte_ops_mcp.mcp._mcp_utils import (
-    ToolDomain,
     mcp_resource,
     register_mcp_resources,
 )
@@ -64,7 +63,6 @@ def _get_version_info() -> dict[str, str | list[str] | None]:
     uri=f"{MCP_SERVER_NAME}://server/info",
     description="Server information for the Airbyte Admin MCP server",
     mime_type="application/json",
-    domain=ToolDomain.SERVER_INFO,
 )
 def mcp_server_info() -> dict[str, str | list[str] | None]:
     """Resource that returns information for the MCP server.
@@ -83,4 +81,4 @@ def register_server_info_resources(app: FastMCP) -> None:
     Args:
         app: FastMCP application instance
     """
-    register_mcp_resources(app, domain=ToolDomain.SERVER_INFO)
+    register_mcp_resources(app, domain=__name__)

airbyte_ops_mcp/prod_db_access/queries.py

@@ -16,12 +16,15 @@ from typing import Any
 import sqlalchemy
 from google.cloud import secretmanager
 
+from airbyte_ops_mcp.gcp_auth import get_secret_manager_client
 from airbyte_ops_mcp.prod_db_access.db_engine import get_pool
 from airbyte_ops_mcp.prod_db_access.sql import (
     SELECT_ACTORS_PINNED_TO_VERSION,
     SELECT_CONNECTIONS_BY_CONNECTOR,
+    SELECT_CONNECTIONS_BY_CONNECTOR_AND_ORG,
     SELECT_CONNECTOR_VERSIONS,
     SELECT_DATAPLANES_LIST,
+    SELECT_FAILED_SYNC_ATTEMPTS_FOR_VERSION,
     SELECT_NEW_CONNECTOR_RELEASES,
     SELECT_ORG_WORKSPACES,
     SELECT_SUCCESSFUL_SYNCS_FOR_VERSION,
@@ -52,7 +55,7 @@ def _run_sql_query(
         List of row dicts from the query result
     """
     if gsm_client is None:
-        gsm_client = secretmanager.SecretManagerServiceClient()
+        gsm_client = get_secret_manager_client()
     pool = get_pool(gsm_client)
     start = perf_counter()
     with pool.connect() as conn:
@@ -84,14 +87,28 @@ def query_connections_by_connector(
     Returns:
         List of connection records with workspace and dataplane info
     """
+    # Use separate queries to avoid pg8000 NULL parameter type issues
+    # pg8000 cannot determine the type of NULL parameters in patterns like
+    # "(:param IS NULL OR column = :param)"
+    if organization_id is None:
+        return _run_sql_query(
+            SELECT_CONNECTIONS_BY_CONNECTOR,
+            parameters={
+                "connector_definition_id": connector_definition_id,
+                "limit": limit,
+            },
+            query_name="SELECT_CONNECTIONS_BY_CONNECTOR",
+            gsm_client=gsm_client,
+        )
+
     return _run_sql_query(
-        SELECT_CONNECTIONS_BY_CONNECTOR,
+        SELECT_CONNECTIONS_BY_CONNECTOR_AND_ORG,
         parameters={
             "connector_definition_id": connector_definition_id,
             "organization_id": organization_id,
             "limit": limit,
         },
-        query_name="SELECT_CONNECTIONS_BY_CONNECTOR",
+        query_name="SELECT_CONNECTIONS_BY_CONNECTOR_AND_ORG",
         gsm_client=gsm_client,
     )
 
@@ -208,6 +225,44 @@ def query_sync_results_for_version(
     )
 
 
+def query_failed_sync_attempts_for_version(
+    connector_version_id: str,
+    days: int = 7,
+    limit: int = 100,
+    *,
+    gsm_client: secretmanager.SecretManagerServiceClient | None = None,
+) -> list[dict[str, Any]]:
+    """Query failed sync job results with attempt details for actors pinned to a version.
+
+    This query joins to the attempts table to include failure_summary and other
+    attempt-level details useful for debugging. Date filters are applied to both
+    jobs and attempts tables to optimize join performance.
+
+    Note: This may return multiple rows per job (one per attempt). Results are
+    ordered by job_updated_at DESC, then attempt_number DESC.
+
+    Args:
+        connector_version_id: Connector version UUID to filter by
+        days: Number of days to look back (default: 7)
+        limit: Maximum number of results (default: 100)
+        gsm_client: GCP Secret Manager client. If None, a new client will be instantiated.
+
+    Returns:
+        List of failed sync job results with attempt details including failure_summary
+    """
+    cutoff_date = datetime.now(timezone.utc) - timedelta(days=days)
+    return _run_sql_query(
+        SELECT_FAILED_SYNC_ATTEMPTS_FOR_VERSION,
+        parameters={
+            "actor_definition_version_id": connector_version_id,
+            "cutoff_date": cutoff_date,
+            "limit": limit,
+        },
+        query_name="SELECT_FAILED_SYNC_ATTEMPTS_FOR_VERSION",
+        gsm_client=gsm_client,
+    )
+
+
 def query_dataplanes_list(
     *,
     gsm_client: secretmanager.SecretManagerServiceClient | None = None,

airbyte_ops_mcp/prod_db_access/sql.py

@@ -74,7 +74,9 @@ import sqlalchemy
 # Connection Queries
 # =============================================================================
 
-# Query connections by connector type, optionally filtered by organization
+# Query connections by connector type (no organization filter)
+# Note: pg8000 cannot determine the type of NULL parameters in patterns like
+# "(:param IS NULL OR column = :param)", so we use separate queries instead
 SELECT_CONNECTIONS_BY_CONNECTOR = sqlalchemy.text(
     """
     SELECT
@@ -97,7 +99,34 @@ SELECT_CONNECTIONS_BY_CONNECTOR = sqlalchemy.text(
       ON workspace.dataplane_group_id = dataplane_group.id
     WHERE
          source_actor.actor_definition_id = :connector_definition_id
-     AND (:organization_id IS NULL OR workspace.organization_id = :organization_id)
+    LIMIT :limit
+    """
+)
+
+# Query connections by connector type, filtered by organization
+SELECT_CONNECTIONS_BY_CONNECTOR_AND_ORG = sqlalchemy.text(
+    """
+    SELECT
+         connection.id AS connection_id,
+         connection.name AS connection_name,
+         connection.source_id,
+         workspace.id AS workspace_id,
+         workspace.name AS workspace_name,
+         workspace.organization_id,
+         workspace.dataplane_group_id,
+         dataplane_group.name AS dataplane_name,
+         source_actor.actor_definition_id AS source_definition_id,
+         source_actor.name AS source_name
+    FROM connection
+    JOIN actor AS source_actor
+      ON connection.source_id = source_actor.id
+    JOIN workspace
+      ON source_actor.workspace_id = workspace.id
+    LEFT JOIN dataplane_group
+      ON workspace.dataplane_group_id = dataplane_group.id
+    WHERE
+         source_actor.actor_definition_id = :connector_definition_id
+     AND workspace.organization_id = :organization_id
     LIMIT :limit
     """
 )
@@ -276,6 +305,66 @@ SELECT_SUCCESSFUL_SYNCS_FOR_VERSION = sqlalchemy.text(
     """
 )
 
+# Get failed attempt results for actors pinned to a specific connector definition VERSION ID
+# Includes attempt details (failure_summary, etc.) for research/debugging
+# Filters on attempts.status = 'failed' to capture all failed attempts, including those
+# from jobs that eventually succeeded via retry. The latest_job_attempt_status field
+# indicates whether the job eventually succeeded or remained failed.
+# Query starts from attempts table to leverage indexed columns (ended_at, status)
+# Note: attempts.ended_at and attempts.status are indexed (btree)
+SELECT_FAILED_SYNC_ATTEMPTS_FOR_VERSION = sqlalchemy.text(
+    """
+    SELECT
+         jobs.id AS job_id,
+         jobs.scope AS connection_id,
+         jobs.status AS latest_job_attempt_status,
+         jobs.started_at AS job_started_at,
+         jobs.updated_at AS job_updated_at,
+         connection.name AS connection_name,
+         actor.id AS actor_id,
+         actor.name AS actor_name,
+         actor.actor_definition_id,
+         scoped_configuration.origin_type AS pin_origin_type,
+         scoped_configuration.origin AS pin_origin,
+         workspace.id AS workspace_id,
+         workspace.name AS workspace_name,
+         workspace.organization_id,
+         workspace.dataplane_group_id,
+         dataplane_group.name AS dataplane_name,
+         attempts.id AS failed_attempt_id,
+         attempts.attempt_number AS failed_attempt_number,
+         attempts.status AS failed_attempt_status,
+         attempts.created_at AS failed_attempt_created_at,
+         attempts.ended_at AS failed_attempt_ended_at,
+         attempts.failure_summary,
+         attempts.processing_task_queue
+    FROM attempts
+    JOIN jobs
+      ON jobs.id = attempts.job_id
+     AND jobs.config_type = 'sync'
+     AND jobs.updated_at >= :cutoff_date
+    JOIN connection
+      ON jobs.scope = connection.id::text
+    JOIN actor
+      ON connection.source_id = actor.id
+    JOIN scoped_configuration
+      ON scoped_configuration.scope_id = actor.id
+     AND scoped_configuration.key = 'connector_version'
+     AND scoped_configuration.scope_type = 'actor'
+     AND scoped_configuration.value = :actor_definition_version_id
+    JOIN workspace
+      ON actor.workspace_id = workspace.id
+    LEFT JOIN dataplane_group
+      ON workspace.dataplane_group_id = dataplane_group.id
+    WHERE
+         attempts.ended_at >= :cutoff_date
+     AND attempts.status = 'failed'
+    ORDER BY
+         attempts.ended_at DESC
+    LIMIT :limit
+    """
+)
+
 # =============================================================================
 # Dataplane and Workspace Queries
 # =============================================================================