chore: refactor common code into helper function

feat: serve /.well-known/... oauth metadata files
2026-01-15 02:18:10 -05:00 · 2025-12-15 12:21:40 -05:00 · 2025-12-15 12:21:40 -05:00
654 changed files with 14595 additions and 19774 deletions
--- a/.ci/continuous.release.cloudbuild.yaml
+++ b/.ci/continuous.release.cloudbuild.yaml
@@ -305,4 +305,4 @@ substitutions:
  _AR_HOSTNAME: ${_REGION}-docker.pkg.dev
  _AR_REPO_NAME: toolbox-dev
  _BUCKET_NAME: genai-toolbox-dev
-  _DOCKER_URI: ${_AR_HOSTNAME}/${PROJECT_ID}/${_AR_REPO_NAME}/toolbox
+  _DOCKER_URI: ${_AR_HOSTNAME}/${PROJECT_ID}/${_AR_REPO_NAME}/toolbox
--- a/.ci/integration.cloudbuild.yaml
+++ b/.ci/integration.cloudbuild.yaml
@@ -212,26 +212,6 @@ steps:
          bigquery \
          bigquery

-  - id: "cloud-gda"
-    name: golang:1
-    waitFor: ["compile-test-binary"]
-    entrypoint: /bin/bash
-    env:
-      - "GOPATH=/gopath"
-      - "CLOUD_GDA_PROJECT=$PROJECT_ID"
-      - "SERVICE_ACCOUNT_EMAIL=$SERVICE_ACCOUNT_EMAIL"
-    secretEnv: ["CLIENT_ID"]
-    volumes:
-      - name: "go"
-        path: "/gopath"
-    args:
-      - -c
-      - |
-        .ci/test_with_coverage.sh \
-          "Cloud Gemini Data Analytics" \
-          cloudgda \
-          cloudgda
-
  - id: "dataplex"
    name: golang:1
    waitFor: ["compile-test-binary"]
@@ -338,7 +318,7 @@ steps:
        .ci/test_with_coverage.sh \
          "Spanner" \
          spanner \
-          spanner || echo "Integration tests failed." # ignore test failures
+          spanner

  - id: "neo4j"
    name: golang:1
@@ -825,27 +805,7 @@ steps:
          elasticsearch \
          elasticsearch

-  - id: "snowflake"
-    name: golang:1
-    waitFor: ["compile-test-binary"]
-    entrypoint: /bin/bash
-    env:
-      - "GOPATH=/gopath"
-      - "SERVICE_ACCOUNT_EMAIL=$SERVICE_ACCOUNT_EMAIL"
-      - "SNOWFLAKE_DATABASE=$_SNOWFLAKE_DATABASE"
-      - "SNOWFLAKE_SCHEMA=$_SNOWFLAKE_SCHEMA"
-    secretEnv: ["CLIENT_ID", "SNOWFLAKE_USER", "SNOWFLAKE_PASS", "SNOWFLAKE_ACCOUNT"]
-    volumes:
-      - name: "go"
-        path: "/gopath"
-    args:
-      - -c
-      - |
-        .ci/test_with_coverage.sh \
-          "Snowflake" \
-          snowflake \
-          snowflake
- 
+
  - id: "cassandra"
    name: golang:1
    waitFor: ["compile-test-binary"]
@@ -866,8 +826,8 @@ steps:
          cassandra

  - id: "oracle"
-    name: ghcr.io/oracle/oraclelinux9-instantclient:23
-    waitFor: ["install-dependencies"]
+    name: golang:1
+    waitFor: ["compile-test-binary"]
    entrypoint: /bin/bash
    env:
      - "GOPATH=/gopath"
@@ -880,25 +840,10 @@ steps:
    args:
      - -c
      - |
-        # Install the C compiler and Oracle SDK headers needed for cgo
-        dnf install -y gcc oracle-instantclient-devel
-        # Install Go
-        curl -L -o go.tar.gz "https://go.dev/dl/go1.25.1.linux-amd64.tar.gz"
-        tar -C /usr/local -xzf go.tar.gz
-        export PATH="/usr/local/go/bin:$$PATH"
-
-        go test -v ./internal/sources/oracle/... \
-          -coverprofile=oracle_coverage.out \
-          -coverpkg=./internal/sources/oracle/...,./internal/tools/oracle/...
-        
-        # Coverage check
-        total_coverage=$(go tool cover -func=oracle_coverage.out | grep "total:" | awk '{print $3}')
-        echo "Oracle total coverage: $total_coverage"
-        coverage_numeric=$(echo "$total_coverage" | sed 's/%//')
-        if awk -v cov="$coverage_numeric" 'BEGIN {exit !(cov < 20)}'; then
-            echo "Coverage failure: $total_coverage is below 20%."
-            exit 1
-        fi
+        .ci/test_with_coverage.sh \
+          "Oracle" \
+          oracle \
+          oracle

  - id: "serverless-spark"
    name: golang:1
@@ -1058,12 +1003,6 @@ availableSecrets:
      env: ELASTICSEARCH_USER
    - versionName: projects/$PROJECT_ID/secrets/elastic_search_pass/versions/latest
      env: ELASTICSEARCH_PASS
-    - versionName: projects/$PROJECT_ID/secrets/snowflake_account/versions/latest
-      env: SNOWFLAKE_ACCOUNT
-    - versionName: projects/$PROJECT_ID/secrets/snowflake_user/versions/latest
-      env: SNOWFLAKE_USER
-    - versionName: projects/$PROJECT_ID/secrets/snowflake_pass/versions/latest
-      env: SNOWFLAKE_PASS
    - versionName: projects/$PROJECT_ID/secrets/cassandra_user/versions/latest
      env: CASSANDRA_USER
    - versionName: projects/$PROJECT_ID/secrets/cassandra_pass/versions/latest
@@ -1150,5 +1089,4 @@ substitutions:
  _SINGLESTORE_USER: "root"
  _MARIADB_PORT: "3307"
  _MARIADB_DATABASE: test_database
-  _SNOWFLAKE_DATABASE: "test"
-  _SNOWFLAKE_SCHEMA: "PUBLIC"
+
--- a/.github/renovate.json5
+++ b/.github/renovate.json5
@@ -24,23 +24,5 @@
      ],
      pinDigests: true,
    },
-    {
-      groupName: 'Go',
-      matchManagers: [
-        'gomod',
-      ],
-    },
-    {
-      groupName: 'Node',
-      matchManagers: [
-        'npm',
-      ],
-    },
-    {
-      groupName: 'Pip',
-      matchManagers: [
-        'pip_requirements',
-      ],
-    },
  ],
 }
--- a/.github/workflows/deploy_dev_docs.yaml
+++ b/.github/workflows/deploy_dev_docs.yaml
@@ -40,7 +40,7 @@ jobs:
      group: docs-deployment
      cancel-in-progress: false
    steps:
-      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6
+      - uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5
        with:
          fetch-depth: 0 # Fetch all history for .GitInfo and .Lastmod

@@ -51,12 +51,12 @@ jobs:
          extended: true

      - name: Setup Node
-        uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6
+        uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6
        with:
          node-version: "22"

      - name: Cache dependencies
-        uses: actions/cache@9255dc7a253b0ccc959486e2bca901246202afeb # v5
+        uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4
        with:
          path: ~/.npm
          key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
--- a/.github/workflows/deploy_previous_version_docs.yaml
+++ b/.github/workflows/deploy_previous_version_docs.yaml
@@ -30,14 +30,14 @@ jobs:

    steps:
      - name: Checkout main branch (for latest templates and theme)
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6
+        uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5
        with:
          ref: 'main'
          submodules: 'recursive'
          fetch-depth: 0

      - name: Checkout old content from tag into a temporary directory
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6
+        uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5
        with:
          ref: ${{ github.event.inputs.version_tag }}
          path: 'old_version_source' # Checkout into a temp subdir
@@ -57,7 +57,7 @@ jobs:
        with:
          hugo-version: "0.145.0"
          extended: true
-      - uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6
+      - uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6
        with:
          node-version: "22"

--- a/.github/workflows/deploy_versioned_docs.yaml
+++ b/.github/workflows/deploy_versioned_docs.yaml
@@ -30,7 +30,7 @@ jobs:
      cancel-in-progress: false
    steps:
      - name: Checkout Code at Tag
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6
+        uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5
        with:
          ref: ${{ github.event.release.tag_name }}

@@ -44,7 +44,7 @@ jobs:
          extended: true

      - name: Setup Node
-        uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6
+        uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6
        with:
          node-version: "22"

--- a/.github/workflows/docs_preview_clean.yaml
+++ b/.github/workflows/docs_preview_clean.yaml
@@ -34,7 +34,7 @@ jobs:
      group: "preview-${{ github.event.number }}"
      cancel-in-progress: true
    steps:
-      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6
+      - uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5
        with:
          ref: versioned-gh-pages

--- a/.github/workflows/docs_preview_deploy.yaml
+++ b/.github/workflows/docs_preview_deploy.yaml
@@ -49,7 +49,7 @@ jobs:
      group: "preview-${{ github.event.number }}"
      cancel-in-progress: true
    steps:
-      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6
+      - uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5
        with:
          # Checkout the PR's HEAD commit (supports forks).
          ref: ${{ github.event.pull_request.head.sha }}
@@ -62,12 +62,12 @@ jobs:
          extended: true

      - name: Setup Node
-        uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6
+        uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6
        with:
          node-version: "22"

      - name: Cache dependencies
-        uses: actions/cache@9255dc7a253b0ccc959486e2bca901246202afeb # v5
+        uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4
        with:
          path: ~/.npm
          key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
--- a/.github/workflows/link_checker_workflow.yaml
+++ b/.github/workflows/link_checker_workflow.yaml
@@ -1,59 +0,0 @@
-# Copyright 2025 Google LLC
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-name: Link Checker
-
-on:
-  pull_request:
-
-
-jobs:
-  link-check:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout Repository
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6
-
-      - name: Restore lychee cache
-        uses: actions/cache@9255dc7a253b0ccc959486e2bca901246202afeb # v5
-        with:
-          path: .lycheecache
-          key: cache-lychee-${{ github.sha }}
-          restore-keys: cache-lychee-
-
-      - name: Link Checker
-        uses: lycheeverse/lychee-action@a8c4c7cb88f0c7386610c35eb25108e448569cb0 # v2
-        with:
-          args: >
-            --verbose
-            --no-progress
-            --cache
-            --max-cache-age 1d
-            README.md
-            docs/
-          output: /tmp/foo.txt
-          fail: true
-          jobSummary: true
-          debug: true
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      # This step only runs if the 'lychee_check' step fails, ensuring the 
-      # context note only appears when the developer needs to troubleshoot.
-      - name: Display Link Context Note on Failure
-        if: ${{ failure() }}
-        run: |
-          echo "## Link Resolution Note" >> $GITHUB_STEP_SUMMARY
-          echo "Local links and directory changes work differently on GitHub than on the docsite." >> $GITHUB_STEP_SUMMARY
-          echo "You must ensure fixes pass the **GitHub check** and also work with **\`hugo server\`**." >> $GITHUB_STEP_SUMMARY
-          echo "---" >> $GITHUB_STEP_SUMMARY
-
--- a/.github/workflows/lint.yaml
+++ b/.github/workflows/lint.yaml
@@ -55,7 +55,7 @@ jobs:
        with:
          go-version: "1.25"
      - name: Checkout code
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
        with:
          ref: ${{ github.event.pull_request.head.sha }}
          repository: ${{ github.event.pull_request.head.repo.full_name }}
@@ -66,7 +66,7 @@ jobs:
        run: |
          go mod tidy && git diff --exit-code
      - name: golangci-lint
-        uses: golangci/golangci-lint-action@1e7e51e771db61008b38414a730f564565cf7c20 # v9.2.0
+        uses: golangci/golangci-lint-action@4afd733a84b1f43292c63897423277bb7f4313a9 # v8.0.0
        with:
          version: latest
          args: --timeout 10m
--- a/.github/workflows/publish-mcp.yml
+++ b/.github/workflows/publish-mcp.yml
@@ -29,7 +29,7 @@ jobs:

    steps:
      - name: Checkout code
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6
+        uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5

      - name: Wait for image in Artifact Registry
        shell: bash
--- a/.github/workflows/sync-labels.yaml
+++ b/.github/workflows/sync-labels.yaml
@@ -29,7 +29,7 @@ jobs:
      issues: 'write'
      pull-requests: 'write'
    steps:
-      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+      - uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
      - uses: micnncim/action-label-syncer@3abd5ab72fda571e69fffd97bd4e0033dd5f495c # v1.3.0
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
--- a/.github/workflows/tests.yaml
+++ b/.github/workflows/tests.yaml
@@ -62,7 +62,7 @@ jobs:
          go-version: "1.24"

      - name: Checkout code
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
        with:
          ref: ${{ github.event.pull_request.head.sha }}
          repository: ${{ github.event.pull_request.head.repo.full_name }}
--- a/.gitignore
+++ b/.gitignore
@@ -20,4 +20,4 @@ node_modules

 # executable
 genai-toolbox
-toolbox
+toolbox
--- a/.hugo/hugo.toml
+++ b/.hugo/hugo.toml
@@ -51,14 +51,6 @@ ignoreFiles = ["quickstart/shared", "quickstart/python", "quickstart/js", "quick
 # Add a new version block here before every release
 # The order of versions in this file is mirrored into the dropdown

-[[params.versions]]
-  version = "v0.25.0"
-  url = "https://googleapis.github.io/genai-toolbox/v0.25.0/"
-
-[[params.versions]]
-  version = "v0.24.0"
-  url = "https://googleapis.github.io/genai-toolbox/v0.24.0/"
-
 [[params.versions]]
  version = "v0.23.0"
  url = "https://googleapis.github.io/genai-toolbox/v0.23.0/"
--- a/.lycheeignore
+++ b/.lycheeignore
@@ -1,45 +0,0 @@
-# Ignore documentation placeholders and generic example domains
-^https?://([a-zA-Z0-9-]+\.)?example\.com(:\d+)?(/.*)?$
-^http://example\.net
-
-# Shields.io badges often trigger rate limits or intermittent 503s
-^https://img\.shields\.io/.*
-
-# PDF files are ignored as lychee cannot reliably parse internal PDF links
-\.pdf$
-
-# Standard mailto: protocol is not a web URL
-^mailto:
-
-# Ignore local development endpoints that won't resolve in CI/CD environments
-^https?://(127\.0\.0\.1|localhost)(:\d+)?(/.*)?$
-
-# Placeholder for Google Cloud Run service discovery
-https://cloud-run-url.app/
-
-# DGraph Cloud and private instance endpoints
-https://xxx.cloud.dgraph.io/
-https://cloud.dgraph.io/login
-https://dgraph.io/docs
-
-# MySQL Community downloads and main site (often protected by bot mitigation)
-https://dev.mysql.com/downloads/installer/
-https://www.mysql.com/
-
-# Claude desktop download link
-https://claude.ai/download
-
-# Google Cloud Run product page
-https://cloud.google.com/run
-
-# These specific deep links are known to cause redirect loops or 403s in automated scrapers
-https://dev.mysql.com/doc/refman/8.4/en/sql-prepared-statements.html
-https://dev.mysql.com/doc/refman/8.4/en/user-names.html
-
-# npmjs links can occasionally trigger rate limiting during high-frequency CI builds
-https://www.npmjs.com/package/@toolbox-sdk/core
-https://www.npmjs.com/package/@toolbox-sdk/adk
-
-
-# Ignore social media and blog profiles to reduce external request overhead
-https://medium.com/@mcp_toolbox
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,47 +1,5 @@
 # Changelog

-## [0.25.0](https://github.com/googleapis/genai-toolbox/compare/v0.24.0...v0.25.0) (2026-01-08)
-
-
-### Features
-
-* Add `embeddingModel` support ([#2121](https://github.com/googleapis/genai-toolbox/issues/2121)) ([9c62f31](https://github.com/googleapis/genai-toolbox/commit/9c62f313ff5edf0a3b5b8a3e996eba078fba4095))
-* Add `allowed-hosts` flag ([#2254](https://github.com/googleapis/genai-toolbox/issues/2254)) ([17b41f6](https://github.com/googleapis/genai-toolbox/commit/17b41f64531b8fe417c28ada45d1992ba430dc1b))
-* Add parameter default value to manifest ([#2264](https://github.com/googleapis/genai-toolbox/issues/2264)) ([9d1feca](https://github.com/googleapis/genai-toolbox/commit/9d1feca10810fa42cb4c94a409252f1bd373ee36))
-* **snowflake:** Add Snowflake Source and Tools ([#858](https://github.com/googleapis/genai-toolbox/issues/858)) ([b706b5b](https://github.com/googleapis/genai-toolbox/commit/b706b5bc685aeda277f277868bae77d38d5fd7b6))
-* **prebuilt/cloud-sql-mysql:** Update CSQL MySQL prebuilt tools to use IAM ([#2202](https://github.com/googleapis/genai-toolbox/issues/2202)) ([731a32e](https://github.com/googleapis/genai-toolbox/commit/731a32e5360b4d6862d81fcb27d7127c655679a8))
-* **sources/bigquery:** Make credentials scope configurable ([#2210](https://github.com/googleapis/genai-toolbox/issues/2210)) ([a450600](https://github.com/googleapis/genai-toolbox/commit/a4506009b93771b77fb05ae97044f914967e67ed))
-* **sources/trino:** Add ssl verification options and fix docs example ([#2155](https://github.com/googleapis/genai-toolbox/issues/2155)) ([4a4cf1e](https://github.com/googleapis/genai-toolbox/commit/4a4cf1e712b671853678dba99c4dc49dd4fc16a2))
-* **tools/looker:** Add ability to set destination folder with `make_look` and `make_dashboard`. ([#2245](https://github.com/googleapis/genai-toolbox/issues/2245)) ([eb79339](https://github.com/googleapis/genai-toolbox/commit/eb793398cd1cc4006d9808ccda5dc7aea5e92bd5))
-* **tools/postgressql:** Add tool to list store procedure ([#2156](https://github.com/googleapis/genai-toolbox/issues/2156)) ([cf0fc51](https://github.com/googleapis/genai-toolbox/commit/cf0fc515b57d9b84770076f3c0c5597c4597ef62))
-* **tools/postgressql:** Add Parameter `embeddedBy` config support ([#2151](https://github.com/googleapis/genai-toolbox/issues/2151)) ([17b70cc](https://github.com/googleapis/genai-toolbox/commit/17b70ccaa754d15bcc33a1a3ecb7e652520fa600))
-
-
-### Bug Fixes
-
-* **server:** Add `embeddingModel` config initialization ([#2281](https://github.com/googleapis/genai-toolbox/issues/2281)) ([a779975](https://github.com/googleapis/genai-toolbox/commit/a7799757c9345f99b6d2717841fbf792d364e1a2))
-* **sources/cloudgda:** Add import for cloudgda source ([#2217](https://github.com/googleapis/genai-toolbox/issues/2217)) ([7daa411](https://github.com/googleapis/genai-toolbox/commit/7daa4111f4ebfb0a35319fd67a8f7b9f0f99efcf))
-* **tools/alloydb-wait-for-operation:** Fix connection message generation ([#2228](https://github.com/googleapis/genai-toolbox/issues/2228)) ([7053fbb](https://github.com/googleapis/genai-toolbox/commit/7053fbb1953653143d39a8510916ea97a91022a6))
-* **tools/alloydbainl:** Only add psv when NL Config Param is defined ([#2265](https://github.com/googleapis/genai-toolbox/issues/2265)) ([ef8f3b0](https://github.com/googleapis/genai-toolbox/commit/ef8f3b02f2f38ce94a6ba9acf35d08b9469bef4e))
-* **tools/looker:** Looker client OAuth nil pointer error ([#2231](https://github.com/googleapis/genai-toolbox/issues/2231)) ([268700b](https://github.com/googleapis/genai-toolbox/commit/268700bdbf8281de0318d60ca613ed3672990b20))
-
-## [0.24.0](https://github.com/googleapis/genai-toolbox/compare/v0.23.0...v0.24.0) (2025-12-19)
-
-
-### Features
-
-* **sources/cloud-gemini-data-analytics:** Add the Gemini Data Analytics (GDA) integration for DB NL2SQL conversion to Toolbox ([#2181](https://github.com/googleapis/genai-toolbox/issues/2181)) ([aa270b2](https://github.com/googleapis/genai-toolbox/commit/aa270b2630da2e3d618db804ca95550445367dbc))
-* **source/cloudsqlmysql:** Add support for IAM authentication in Cloud SQL MySQL source ([#2050](https://github.com/googleapis/genai-toolbox/issues/2050)) ([af3d3c5](https://github.com/googleapis/genai-toolbox/commit/af3d3c52044bea17781b89ce4ab71ff0f874ac20))
-* **sources/oracle:** Add Oracle OCI and Wallet support ([#1945](https://github.com/googleapis/genai-toolbox/issues/1945)) ([8ea39ec](https://github.com/googleapis/genai-toolbox/commit/8ea39ec32fbbaa97939c626fec8c5d86040ed464))
-* Support combining prebuilt and custom tool configurations ([#2188](https://github.com/googleapis/genai-toolbox/issues/2188)) ([5788605](https://github.com/googleapis/genai-toolbox/commit/57886058188aa5d2a51d5846a98bc6d8a650edd1))
-* **tools/mysql-get-query-plan:** Add new `mysql-get-query-plan` tool for MySQL source ([#2123](https://github.com/googleapis/genai-toolbox/issues/2123)) ([0641da0](https://github.com/googleapis/genai-toolbox/commit/0641da0353857317113b2169e547ca69603ddfde))
-
-
-### Bug Fixes
-
-* **spanner:** Move list graphs validation to runtime ([#2154](https://github.com/googleapis/genai-toolbox/issues/2154)) ([914b3ee](https://github.com/googleapis/genai-toolbox/commit/914b3eefda40a650efe552d245369e007277dab5))
-
-
 ## [0.23.0](https://github.com/googleapis/genai-toolbox/compare/v0.22.0...v0.23.0) (2025-12-11)


--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -59,13 +59,6 @@ You can manually trigger the bot by commenting on your Pull Request:
 *   `/gemini summary`: Posts a summary of the changes in the pull request.
 *   `/gemini help`: Overview of the available commands

-## Guidelines for Pull Requests
-
-1. Please keep your PR small for more thorough review and easier updates. In case of regression, it also allows us to roll back a single feature instead of multiple ones.
-1. For non-trivial changes, consider opening an issue and discussing it with the code owners first.
-1. Provide a good PR description as a record of what change is being made and why it was made. Link to a GitHub issue if it exists.
-1. Make sure your code is thoroughly tested with unit tests and integration tests. Remember to clean up the test instances properly in your code to avoid memory leaks.
-
 ## Adding a New Database Source or Tool

 Please create an
@@ -92,11 +85,11 @@ implementation](https://github.com/googleapis/genai-toolbox/blob/main/internal/s
  `newdb.go`. Create a `Config` struct to include all the necessary parameters
  for connecting to the database (e.g., host, port, username, password, database
  name) and a `Source` struct to store necessary parameters for tools (e.g.,
-  Name, Type, connection object, additional config).
+  Name, Kind, connection object, additional config).
 * **Implement the
  [`SourceConfig`](https://github.com/googleapis/genai-toolbox/blob/fd300dc606d88bf9f7bba689e2cee4e3565537dd/internal/sources/sources.go#L57)
  interface**. This interface requires two methods:
-  * `SourceConfigType() string`: Returns a unique string identifier for your
+  * `SourceConfigKind() string`: Returns a unique string identifier for your
    data source (e.g., `"newdb"`).
  * `Initialize(ctx context.Context, tracer trace.Tracer) (Source, error)`:
    Creates a new instance of your data source and establishes a connection to
@@ -104,7 +97,7 @@ implementation](https://github.com/googleapis/genai-toolbox/blob/main/internal/s
 * **Implement the
  [`Source`](https://github.com/googleapis/genai-toolbox/blob/fd300dc606d88bf9f7bba689e2cee4e3565537dd/internal/sources/sources.go#L63)
  interface**. This interface requires one method:
-  * `SourceType() string`: Returns the same string identifier as `SourceConfigType()`.
+  * `SourceKind() string`: Returns the same string identifier as `SourceConfigKind()`.
 * **Implement `init()`** to register the new Source.
 * **Implement Unit Tests** in a file named `newdb_test.go`.

@@ -117,8 +110,6 @@ implementation](https://github.com/googleapis/genai-toolbox/blob/main/internal/s
 We recommend looking at an [example tool
 implementation](https://github.com/googleapis/genai-toolbox/tree/main/internal/tools/postgres/postgressql).

-Remember to keep your PRs small. For example, if you are contributing a new Source, only include one or two core Tools within the same PR, the rest of the Tools can come in subsequent PRs. 
-
 * **Create a new directory** under `internal/tools` for your tool type (e.g., `internal/tools/newdb/newdbtool`).
 * **Define a configuration struct** for your tool in a file named `newdbtool.go`.
 Create a `Config` struct and a `Tool` struct to store necessary parameters for
@@ -126,7 +117,7 @@ tools.
 * **Implement the
  [`ToolConfig`](https://github.com/googleapis/genai-toolbox/blob/fd300dc606d88bf9f7bba689e2cee4e3565537dd/internal/tools/tools.go#L61)
  interface**. This interface requires one method:
-  * `ToolConfigType() string`: Returns a unique string identifier for your tool
+  * `ToolConfigKind() string`: Returns a unique string identifier for your tool
    (e.g., `"newdb-tool"`).
  * `Initialize(sources map[string]Source) (Tool, error)`: Creates a new
    instance of your tool and validates that it can connect to the specified
@@ -172,21 +163,19 @@ tools.
            parameters][temp-param-doc]. Only run this test if template
            parameters apply to your tool.

-* **Add additional tests** for the tools that are not covered by the predefined tests. Every tool must be tested!
-
 * **Add the new database to the integration test workflow** in
  [integration.cloudbuild.yaml](.ci/integration.cloudbuild.yaml).

 [tool-get]:
-    https://github.com/googleapis/genai-toolbox/blob/v0.23.0/tests/tool.go#L41
+    https://github.com/googleapis/genai-toolbox/blob/fd300dc606d88bf9f7bba689e2cee4e3565537dd/tests/tool.go#L31
 [tool-call]:
-    https://github.com/googleapis/genai-toolbox/blob/v0.23.0/tests/tool.go#L229
+    <https://github.com/googleapis/genai-toolbox/blob/fd300dc606d88bf9f7bba689e2cee4e3565537dd/tests/tool.go#L79>
 [mcp-call]:
-    https://github.com/googleapis/genai-toolbox/blob/v0.23.0/tests/tool.go#L789
+    https://github.com/googleapis/genai-toolbox/blob/fd300dc606d88bf9f7bba689e2cee4e3565537dd/tests/tool.go#L554
 [execute-sql]:
-    https://github.com/googleapis/genai-toolbox/blob/v0.23.0/tests/tool.go#L609
+    <https://github.com/googleapis/genai-toolbox/blob/fd300dc606d88bf9f7bba689e2cee4e3565537dd/tests/tool.go#L431>
 [temp-param]:
-    https://github.com/googleapis/genai-toolbox/blob/v0.23.0/tests/tool.go#L454
+    <https://github.com/googleapis/genai-toolbox/blob/fd300dc606d88bf9f7bba689e2cee4e3565537dd/tests/tool.go#L297>
 [temp-param-doc]:
    https://googleapis.github.io/genai-toolbox/resources/tools/#template-parameters

@@ -243,7 +232,7 @@ resources.
  | style           | Update src code, with only formatting and whitespace updates (e.g. code formatter or linter changes). |

  Pull requests should always add scope whenever possible. The scope is
-  formatted as `<scope-resource>/<scope-type>` (e.g., `sources/postgres`, or
+  formatted as `<scope-type>/<scope-kind>` (e.g., `sources/postgres`, or
  `tools/mssql-sql`).
  
  Ideally, **each PR covers only one scope**, if this is
@@ -255,4 +244,4 @@ resources.
 * **PR Description:** PR description should **always** be included. It should
  include a concise description of the changes, it's impact, along with a
  summary of the solution. If the PR is related to a specific issue, the issue
-  number should be mentioned in the PR description (e.g. `Fixes #1`).
+  number should be mentioned in the PR description (e.g. `Fixes #1`).
--- a/DEVELOPER.md
+++ b/DEVELOPER.md
@@ -207,30 +207,6 @@ variables for each source.
 * SQLite -  setup in the integration test, where we create a temporary database
  file

-### Link Checking and Fixing with Lychee
-
-We use **[lychee](https://github.com/lycheeverse/lychee-action)** for repository link checks.
-
-* To run the checker **locally**, see the [command-line usage guide](https://github.com/lycheeverse/lychee?tab=readme-ov-file#commandline-usage).
-
-####  Fixing Broken Links
-
-1.  **Update the Link:** Correct the broken URL or update the content where it is used.
-2.  **Ignore the Link:** If you can't fix the link (e.g., due to **external rate-limits** or if it's a **local-only URL**), tell Lychee to **ignore** it.
-
-    * List **regular expressions** or **direct links** in the **[.lycheeignore](https://github.com/googleapis/genai-toolbox/blob/main/.lycheeignore)** file, one entry per line.
-    * **Always add a comment** explaining **why** the link is being skipped to prevent link rot. **Example `.lycheeignore`:**
-       ```text
-       # These are email addresses, not standard web URLs, and usually cause check failures.
-       ^mailto:.*
-       ```
-> [!NOTE]
-> To avoid build failures in GitHub Actions, follow the linking pattern demonstrated here: <br>
-> **Avoid:** (Works in Hugo, breaks Link Checker): `[Read more](docs/setup)` or `[Read more](docs/setup/)` <br>
-> **Reason:** The link checker cannot find a file named "setup" or a directory with that name containing an index. <br>
-> **Preferred:** `[Read more](docs/setup.md)` <br>
-> **Reason:** The GitHub Action finds the physical file. Hugo then uses its internal logic (or render hooks) to resolve this to the correct `/docs/setup/` web URL. <br>
-
 ### Other GitHub Checks

 * License header check (`.github/header-checker-lint.yml`) - Ensures files have
@@ -304,7 +280,6 @@ There are 3 GHA workflows we use to achieve document versioning:
 Request a repo owner to run the preview deployment workflow on your PR. A
 preview link will be automatically added as a comment to your PR.

-
 #### Maintainers

 1. **Inspect Changes:** Review the proposed changes in the PR to ensure they are
@@ -379,23 +354,6 @@ to approve PRs for main. TeamSync is used to create this team from the MDB
 Group `toolbox-contributors`. Googlers who are developing for MCP-Toolbox
 but aren't part of the core team should join this group.

-### Issue/PR Triage and SLO
-After an issue is created, maintainers will assign the following labels:
-* `Priority` (defaulted to P0)
-* `Type` (if applicable)
-* `Product` (if applicable)
-
-All incoming issues and PRs will follow the following SLO:
-| Type            | Priority | Objective                                                              |
-|-----------------|----------|------------------------------------------------------------------------|
-| Feature Request | P0       | Must respond within **5 days**                                         |
-| Process         | P0       | Must respond within **5 days**                                         |
-| Bugs            | P0       | Must respond within **5 days**, and resolve/closure within **14 days** |
-| Bugs            | P1       | Must respond within **7 days**, and resolve/closure within **90 days** |
-| Bugs            | P2       | Must respond within **30 days**
-
-_Types that are not listed in the table do not adhere to any SLO._
-
 ### Releasing

 Toolbox has two types of releases: versioned and continuous. It uses Google
--- a/README.md
+++ b/README.md
@@ -140,7 +140,7 @@ To install Toolbox as a binary:
 >
 > ```sh
 > # see releases page for other versions
-> export VERSION=0.25.0
+> export VERSION=0.23.0
 > curl -L -o toolbox https://storage.googleapis.com/genai-toolbox/v$VERSION/linux/amd64/toolbox
 > chmod +x toolbox
 > ```
@@ -153,7 +153,7 @@ To install Toolbox as a binary:
 >
 > ```sh
 > # see releases page for other versions
-> export VERSION=0.25.0
+> export VERSION=0.23.0
 > curl -L -o toolbox https://storage.googleapis.com/genai-toolbox/v$VERSION/darwin/arm64/toolbox
 > chmod +x toolbox
 > ```
@@ -166,7 +166,7 @@ To install Toolbox as a binary:
 >
 > ```sh
 > # see releases page for other versions
-> export VERSION=0.25.0
+> export VERSION=0.23.0
 > curl -L -o toolbox https://storage.googleapis.com/genai-toolbox/v$VERSION/darwin/amd64/toolbox
 > chmod +x toolbox
 > ```
@@ -179,7 +179,7 @@ To install Toolbox as a binary:
 >
 > ```cmd
 > :: see releases page for other versions
-> set VERSION=0.25.0
+> set VERSION=0.23.0
 > curl -o toolbox.exe "https://storage.googleapis.com/genai-toolbox/v%VERSION%/windows/amd64/toolbox.exe"
 > ```
 >
@@ -191,7 +191,7 @@ To install Toolbox as a binary:
 >
 > ```powershell
 > # see releases page for other versions
-> $VERSION = "0.25.0"
+> $VERSION = "0.23.0"
 > curl.exe -o toolbox.exe "https://storage.googleapis.com/genai-toolbox/v$VERSION/windows/amd64/toolbox.exe"
 > ```
 >
@@ -204,7 +204,7 @@ You can also install Toolbox as a container:

 ```sh
 # see releases page for other versions
-export VERSION=0.25.0
+export VERSION=0.23.0
 docker pull us-central1-docker.pkg.dev/database-toolbox/toolbox/toolbox:$VERSION
 ```

@@ -228,7 +228,7 @@ To install from source, ensure you have the latest version of
 [Go installed](https://go.dev/doc/install), and then run the following command:

 ```sh
-go install github.com/googleapis/genai-toolbox@v0.25.0
+go install github.com/googleapis/genai-toolbox@v0.23.0
 ```
 <!-- {x-release-please-end} -->

@@ -272,7 +272,7 @@ To run Toolbox from binary:
 To run the server after pulling the [container image](#installing-the-server):

 ```sh
-export VERSION=0.24.0 # Use the version you pulled
+export VERSION=0.11.0 # Use the version you pulled
 docker run -p 5000:5000 \
 -v $(pwd)/tools.yaml:/app/tools.yaml \
 us-central1-docker.pkg.dev/database-toolbox/toolbox/toolbox:$VERSION \
@@ -954,7 +954,7 @@ For more details on configuring different types of sources, see the
 ### Tools

 The `tools` section of a `tools.yaml` define the actions an agent can take: what
-type of tool it is, which source(s) it affects, what parameters it uses, etc.
+kind of tool it is, which source(s) it affects, what parameters it uses, etc.

 ```yaml
 tools:
@@ -1035,12 +1035,12 @@ The version will be incremented  as follows:

 ### Post-1.0.0 Versioning

-Once the project reaches a stable `1.0.0` release, the version number
-**`MAJOR.MINOR.PATCH`** will follow the more common convention:
+Once the project reaches a stable `1.0.0` release, the versioning will follow
+the more common convention:

- **`MAJOR`**: Incremented for incompatible API changes.
- **`MINOR`**: Incremented for new, backward-compatible functionality.
- **`PATCH`**: Incremented for backward-compatible bug fixes.
+- **`MAJOR.MINOR.PATCH`**: Incremented for incompatible API changes.
+- **`MAJOR.MINOR.PATCH`**: Incremented for new, backward-compatible functionality.
+- **`MAJOR.MINOR.PATCH`**: Incremented for backward-compatible bug fixes.

 The public API that this applies to is the CLI associated with Toolbox, the
 interactions with official SDKs, and the definitions in the `tools.yaml` file.
--- a/cmd/root.go
+++ b/cmd/root.go
@@ -15,7 +15,6 @@
 package cmd

 import (
-	"bytes"
 	"context"
 	_ "embed"
 	"fmt"
@@ -34,7 +33,6 @@ import (
 	"github.com/fsnotify/fsnotify"
 	yaml "github.com/goccy/go-yaml"
 	"github.com/googleapis/genai-toolbox/internal/auth"
-	"github.com/googleapis/genai-toolbox/internal/embeddingmodels"
 	"github.com/googleapis/genai-toolbox/internal/log"
 	"github.com/googleapis/genai-toolbox/internal/prebuiltconfigs"
 	"github.com/googleapis/genai-toolbox/internal/prompts"
@@ -75,7 +73,6 @@ import (
 	_ "github.com/googleapis/genai-toolbox/internal/tools/clickhouse/clickhouselistdatabases"
 	_ "github.com/googleapis/genai-toolbox/internal/tools/clickhouse/clickhouselisttables"
 	_ "github.com/googleapis/genai-toolbox/internal/tools/clickhouse/clickhousesql"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/cloudgda"
 	_ "github.com/googleapis/genai-toolbox/internal/tools/cloudhealthcare/cloudhealthcarefhirfetchpage"
 	_ "github.com/googleapis/genai-toolbox/internal/tools/cloudhealthcare/cloudhealthcarefhirpatienteverything"
 	_ "github.com/googleapis/genai-toolbox/internal/tools/cloudhealthcare/cloudhealthcarefhirpatientsearch"
@@ -93,7 +90,6 @@ import (
 	_ "github.com/googleapis/genai-toolbox/internal/tools/cloudhealthcare/cloudhealthcaresearchdicomstudies"
 	_ "github.com/googleapis/genai-toolbox/internal/tools/cloudmonitoring"
 	_ "github.com/googleapis/genai-toolbox/internal/tools/cloudsql/cloudsqlcloneinstance"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/cloudsql/cloudsqlcreatebackup"
 	_ "github.com/googleapis/genai-toolbox/internal/tools/cloudsql/cloudsqlcreatedatabase"
 	_ "github.com/googleapis/genai-toolbox/internal/tools/cloudsql/cloudsqlcreateusers"
 	_ "github.com/googleapis/genai-toolbox/internal/tools/cloudsql/cloudsqlgetinstances"
@@ -172,7 +168,6 @@ import (
 	_ "github.com/googleapis/genai-toolbox/internal/tools/mssql/mssqllisttables"
 	_ "github.com/googleapis/genai-toolbox/internal/tools/mssql/mssqlsql"
 	_ "github.com/googleapis/genai-toolbox/internal/tools/mysql/mysqlexecutesql"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/mysql/mysqlgetqueryplan"
 	_ "github.com/googleapis/genai-toolbox/internal/tools/mysql/mysqllistactivequeries"
 	_ "github.com/googleapis/genai-toolbox/internal/tools/mysql/mysqllisttablefragmentation"
 	_ "github.com/googleapis/genai-toolbox/internal/tools/mysql/mysqllisttables"
@@ -200,7 +195,6 @@ import (
 	_ "github.com/googleapis/genai-toolbox/internal/tools/postgres/postgreslistroles"
 	_ "github.com/googleapis/genai-toolbox/internal/tools/postgres/postgreslistschemas"
 	_ "github.com/googleapis/genai-toolbox/internal/tools/postgres/postgreslistsequences"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/postgres/postgresliststoredprocedure"
 	_ "github.com/googleapis/genai-toolbox/internal/tools/postgres/postgreslisttables"
 	_ "github.com/googleapis/genai-toolbox/internal/tools/postgres/postgreslisttablespaces"
 	_ "github.com/googleapis/genai-toolbox/internal/tools/postgres/postgreslisttablestats"
@@ -217,8 +211,6 @@ import (
 	_ "github.com/googleapis/genai-toolbox/internal/tools/serverlessspark/serverlesssparklistbatches"
 	_ "github.com/googleapis/genai-toolbox/internal/tools/singlestore/singlestoreexecutesql"
 	_ "github.com/googleapis/genai-toolbox/internal/tools/singlestore/singlestoresql"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/snowflake/snowflakeexecutesql"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/snowflake/snowflakesql"
 	_ "github.com/googleapis/genai-toolbox/internal/tools/spanner/spannerexecutesql"
 	_ "github.com/googleapis/genai-toolbox/internal/tools/spanner/spannerlistgraphs"
 	_ "github.com/googleapis/genai-toolbox/internal/tools/spanner/spannerlisttables"
@@ -241,7 +233,6 @@ import (
 	_ "github.com/googleapis/genai-toolbox/internal/sources/bigtable"
 	_ "github.com/googleapis/genai-toolbox/internal/sources/cassandra"
 	_ "github.com/googleapis/genai-toolbox/internal/sources/clickhouse"
-	_ "github.com/googleapis/genai-toolbox/internal/sources/cloudgda"
 	_ "github.com/googleapis/genai-toolbox/internal/sources/cloudhealthcare"
 	_ "github.com/googleapis/genai-toolbox/internal/sources/cloudmonitoring"
 	_ "github.com/googleapis/genai-toolbox/internal/sources/cloudsqladmin"
@@ -267,7 +258,6 @@ import (
 	_ "github.com/googleapis/genai-toolbox/internal/sources/redis"
 	_ "github.com/googleapis/genai-toolbox/internal/sources/serverlessspark"
 	_ "github.com/googleapis/genai-toolbox/internal/sources/singlestore"
-	_ "github.com/googleapis/genai-toolbox/internal/sources/snowflake"
 	_ "github.com/googleapis/genai-toolbox/internal/sources/spanner"
 	_ "github.com/googleapis/genai-toolbox/internal/sources/sqlite"
 	_ "github.com/googleapis/genai-toolbox/internal/sources/tidb"
@@ -363,12 +353,12 @@ func NewCommand(opts ...Option) *Command {
 	flags.StringVarP(&cmd.cfg.Address, "address", "a", "127.0.0.1", "Address of the interface the server will listen on.")
 	flags.IntVarP(&cmd.cfg.Port, "port", "p", 5000, "Port the server will listen on.")

-	flags.StringVar(&cmd.tools_file, "tools_file", "", "File path specifying the tool configuration. Cannot be used with --tools-files, or --tools-folder.")
+	flags.StringVar(&cmd.tools_file, "tools_file", "", "File path specifying the tool configuration. Cannot be used with --prebuilt.")
 	// deprecate tools_file
 	_ = flags.MarkDeprecated("tools_file", "please use --tools-file instead")
-	flags.StringVar(&cmd.tools_file, "tools-file", "", "File path specifying the tool configuration. Cannot be used with --tools-files, or --tools-folder.")
-	flags.StringSliceVar(&cmd.tools_files, "tools-files", []string{}, "Multiple file paths specifying tool configurations. Files will be merged. Cannot be used with --tools-file, or --tools-folder.")
-	flags.StringVar(&cmd.tools_folder, "tools-folder", "", "Directory path containing YAML tool configuration files. All .yaml and .yml files in the directory will be loaded and merged. Cannot be used with --tools-file, or --tools-files.")
+	flags.StringVar(&cmd.tools_file, "tools-file", "", "File path specifying the tool configuration. Cannot be used with --prebuilt, --tools-files, or --tools-folder.")
+	flags.StringSliceVar(&cmd.tools_files, "tools-files", []string{}, "Multiple file paths specifying tool configurations. Files will be merged. Cannot be used with --prebuilt, --tools-file, or --tools-folder.")
+	flags.StringVar(&cmd.tools_folder, "tools-folder", "", "Directory path containing YAML tool configuration files. All .yaml and .yml files in the directory will be loaded and merged. Cannot be used with --prebuilt, --tools-file, or --tools-files.")
 	flags.Var(&cmd.cfg.LogLevel, "log-level", "Specify the minimum level logged. Allowed: 'DEBUG', 'INFO', 'WARN', 'ERROR'.")
 	flags.Var(&cmd.cfg.LoggingFormat, "logging-format", "Specify logging format to use. Allowed: 'standard' or 'JSON'.")
 	flags.BoolVar(&cmd.cfg.TelemetryGCP, "telemetry-gcp", false, "Enable exporting directly to Google Cloud Monitoring.")
@@ -376,16 +366,16 @@ func NewCommand(opts ...Option) *Command {
 	flags.StringVar(&cmd.cfg.TelemetryServiceName, "telemetry-service-name", "toolbox", "Sets the value of the service.name resource attribute for telemetry data.")
 	// Fetch prebuilt tools sources to customize the help description
 	prebuiltHelp := fmt.Sprintf(
-		"Use a prebuilt tool configuration by source type. Allowed: '%s'.",
+		"Use a prebuilt tool configuration by source type. Cannot be used with --tools-file. Allowed: '%s'.",
 		strings.Join(prebuiltconfigs.GetPrebuiltSources(), "', '"),
 	)
 	flags.StringVar(&cmd.prebuiltConfig, "prebuilt", "", prebuiltHelp)
 	flags.BoolVar(&cmd.cfg.Stdio, "stdio", false, "Listens via MCP STDIO instead of acting as a remote HTTP server.")
 	flags.BoolVar(&cmd.cfg.DisableReload, "disable-reload", false, "Disables dynamic reloading of tools file.")
 	flags.BoolVar(&cmd.cfg.UI, "ui", false, "Launches the Toolbox UI web server.")
-	// TODO: Insecure by default. Might consider updating this for v1.0.0
 	flags.StringSliceVar(&cmd.cfg.AllowedOrigins, "allowed-origins", []string{"*"}, "Specifies a list of origins permitted to access this server. Defaults to '*'.")
-	flags.StringSliceVar(&cmd.cfg.AllowedHosts, "allowed-hosts", []string{"*"}, "Specifies a list of hosts permitted to access this server. Defaults to '*'.")
+	flags.StringVar(&cmd.cfg.OAuthProtectedResource, "oauth-protected-resource", "", "Specifies a yaml file that contains what should be returned from /.well-known/oauth-protected-resource")
+	flags.StringVar(&cmd.cfg.OAuthAuthorizationServer, "oauth-authorization-server", "", "Specifies a yaml file that contains what should be returned from /.well-known/oauth-authorization-server")

 	// wrap RunE command so that we have access to original Command object
 	cmd.RunE = func(*cobra.Command, []string) error { return run(cmd) }
@@ -394,13 +384,12 @@ func NewCommand(opts ...Option) *Command {
 }

 type ToolsFile struct {
-	Sources         server.SourceConfigs         `yaml:"sources"`
-	AuthSources     server.AuthServiceConfigs    `yaml:"authSources"` // Deprecated: Kept for compatibility.
-	AuthServices    server.AuthServiceConfigs    `yaml:"authServices"`
-	EmbeddingModels server.EmbeddingModelConfigs `yaml:"embeddingModels"`
-	Tools           server.ToolConfigs           `yaml:"tools"`
-	Toolsets        server.ToolsetConfigs        `yaml:"toolsets"`
-	Prompts         server.PromptConfigs         `yaml:"prompts"`
+	Sources      server.SourceConfigs      `yaml:"sources"`
+	AuthSources  server.AuthServiceConfigs `yaml:"authSources"` // Deprecated: Kept for compatibility.
+	AuthServices server.AuthServiceConfigs `yaml:"authServices"`
+	Tools        server.ToolConfigs        `yaml:"tools"`
+	Toolsets     server.ToolsetConfigs     `yaml:"toolsets"`
+	Prompts      server.PromptConfigs      `yaml:"prompts"`
 }

 // parseEnv replaces environment variables ${ENV_NAME} with their values.
@@ -426,103 +415,6 @@ func parseEnv(input string) (string, error) {
 	return output, err
 }

-func convertToolsFile(ctx context.Context, raw []byte) ([]byte, error) {
-	logger, err := util.LoggerFromContext(ctx)
-	if err != nil {
-		return nil, err
-	}
-
-	// TODO: add embeddingmodels when available
-	keysToCheck := []string{"sources", "authServices", "authSources", "tools", "prompts", "toolsets"}
-	var input yaml.MapSlice
-	decoder := yaml.NewDecoder(bytes.NewReader(raw), yaml.UseOrderedMap())
-	if err := decoder.Decode(&input); err != nil {
-		return nil, err
-	}
-
-	// Convert raw MapSlice to a helper map for quick lookup
-	// while keeping the values as MapSlices to preserve internal order
-	lookup := make(map[string]yaml.MapSlice)
-	for _, item := range input {
-		key := item.Key.(string)
-		if slice, ok := item.Value.(yaml.MapSlice); ok {
-			// convert authSources to authServices
-			if key == "authSources" {
-				logger.WarnContext(ctx, "`authSources` is deprecated, use `authServices` instead")
-				key = "authServices"
-			}
-			// works even if lookup[key] is nil
-			lookup[key] = append(lookup[key], slice...)
-		} else {
-			// toolsfile is already v2
-			if key == "kind" {
-				return raw, nil
-			}
-			return nil, fmt.Errorf("'%s' is not a map", key)
-		}
-	}
-	// convert to tools file v2
-	var buf bytes.Buffer
-	encoder := yaml.NewEncoder(&buf)
-	for _, kind := range keysToCheck {
-		data, exists := lookup[kind]
-		if !exists {
-			// if this is skipped for all keys, the tools file is in v2
-			continue
-		}
-		// Transform each entry
-		for _, entry := range data {
-			entryName := entry.Key.(string)
-			entryBody := ProcessValue(entry.Value, kind == "toolsets")
-
-			transformed := yaml.MapSlice{
-				{Key: "kind", Value: kind},
-				{Key: "name", Value: entryName},
-			}
-
-			// Merge the transformed body into our result
-			if bodySlice, ok := entryBody.(yaml.MapSlice); ok {
-				transformed = append(transformed, bodySlice...)
-			} else {
-				return nil, fmt.Errorf("unable to convert entryBody to MapSlice")
-			}
-
-			if err := encoder.Encode(transformed); err != nil {
-				return nil, err
-			}
-		}
-	}
-	return buf.Bytes(), nil
-}
-
-// ProcessValue recursively looks for MapSlices to rename 'kind' -> 'type'
-func ProcessValue(v any, isToolset bool) any {
-	switch val := v.(type) {
-	case yaml.MapSlice:
-		for i := range val {
-			// Perform renaming
-			if val[i].Key == "kind" {
-				val[i].Key = "type"
-			}
-			// Recursive call for nested values (e.g., nested objects or lists)
-			val[i].Value = ProcessValue(val[i].Value, false)
-		}
-		return val
-	case []any:
-		// Process lists: If it's a toolset top-level list, wrap it.
-		if isToolset {
-			return yaml.MapSlice{{Key: "tools", Value: val}}
-		}
-		// Otherwise, recurse into list items (to catch nested objects)
-		for i := range val {
-			val[i] = ProcessValue(val[i], false)
-		}
-		return val
-	default:
-		return val
-	}
-}
-
 // parseToolsFile parses the provided yaml into appropriate configs.
 func parseToolsFile(ctx context.Context, raw []byte) (ToolsFile, error) {
 	var toolsFile ToolsFile
@@ -546,12 +438,11 @@ func parseToolsFile(ctx context.Context, raw []byte) (ToolsFile, error) {
 // All resource names (sources, authServices, tools, toolsets) must be unique across all files.
 func mergeToolsFiles(files ...ToolsFile) (ToolsFile, error) {
 	merged := ToolsFile{
-		Sources:         make(server.SourceConfigs),
-		AuthServices:    make(server.AuthServiceConfigs),
-		EmbeddingModels: make(server.EmbeddingModelConfigs),
-		Tools:           make(server.ToolConfigs),
-		Toolsets:        make(server.ToolsetConfigs),
-		Prompts:         make(server.PromptConfigs),
+		Sources:      make(server.SourceConfigs),
+		AuthServices: make(server.AuthServiceConfigs),
+		Tools:        make(server.ToolConfigs),
+		Toolsets:     make(server.ToolsetConfigs),
+		Prompts:      make(server.PromptConfigs),
 	}

 	var conflicts []string
@@ -571,9 +462,6 @@ func mergeToolsFiles(files ...ToolsFile) (ToolsFile, error) {
 			if _, exists := merged.AuthSources[name]; exists {
 				conflicts = append(conflicts, fmt.Sprintf("authSource '%s' (file #%d)", name, fileIndex+1))
 			} else {
-				if merged.AuthSources == nil {
-					merged.AuthSources = make(server.AuthServiceConfigs)
-				}
 				merged.AuthSources[name] = authSource
 			}
 		}
@@ -587,15 +475,6 @@ func mergeToolsFiles(files ...ToolsFile) (ToolsFile, error) {
 			}
 		}

-		// Check for conflicts and merge embeddingModels
-		for name, em := range file.EmbeddingModels {
-			if _, exists := merged.EmbeddingModels[name]; exists {
-				conflicts = append(conflicts, fmt.Sprintf("embedding model '%s' (file #%d)", name, fileIndex+1))
-			} else {
-				merged.EmbeddingModels[name] = em
-			}
-		}
-
 		// Check for conflicts and merge tools
 		for name, tool := range file.Tools {
 			if _, exists := merged.Tools[name]; exists {
@@ -700,14 +579,14 @@ func handleDynamicReload(ctx context.Context, toolsFile ToolsFile, s *server.Ser
 		panic(err)
 	}

-	sourcesMap, authServicesMap, embeddingModelsMap, toolsMap, toolsetsMap, promptsMap, promptsetsMap, err := validateReloadEdits(ctx, toolsFile)
+	sourcesMap, authServicesMap, toolsMap, toolsetsMap, promptsMap, promptsetsMap, err := validateReloadEdits(ctx, toolsFile)
 	if err != nil {
 		errMsg := fmt.Errorf("unable to validate reloaded edits: %w", err)
 		logger.WarnContext(ctx, errMsg.Error())
 		return err
 	}

-	s.ResourceMgr.SetResources(sourcesMap, authServicesMap, embeddingModelsMap, toolsMap, toolsetsMap, promptsMap, promptsetsMap)
+	s.ResourceMgr.SetResources(sourcesMap, authServicesMap, toolsMap, toolsetsMap, promptsMap, promptsetsMap)

 	return nil
 }
@@ -715,7 +594,7 @@ func handleDynamicReload(ctx context.Context, toolsFile ToolsFile, s *server.Ser
 // validateReloadEdits checks that the reloaded tools file configs can initialized without failing
 func validateReloadEdits(
 	ctx context.Context, toolsFile ToolsFile,
-) (map[string]sources.Source, map[string]auth.AuthService, map[string]embeddingmodels.EmbeddingModel, map[string]tools.Tool, map[string]tools.Toolset, map[string]prompts.Prompt, map[string]prompts.Promptset, error,
+) (map[string]sources.Source, map[string]auth.AuthService, map[string]tools.Tool, map[string]tools.Toolset, map[string]prompts.Prompt, map[string]prompts.Promptset, error,
 ) {
 	logger, err := util.LoggerFromContext(ctx)
 	if err != nil {
@@ -733,23 +612,22 @@ func validateReloadEdits(
 	defer span.End()

 	reloadedConfig := server.ServerConfig{
-		Version:               versionString,
-		SourceConfigs:         toolsFile.Sources,
-		AuthServiceConfigs:    toolsFile.AuthServices,
-		EmbeddingModelConfigs: toolsFile.EmbeddingModels,
-		ToolConfigs:           toolsFile.Tools,
-		ToolsetConfigs:        toolsFile.Toolsets,
-		PromptConfigs:         toolsFile.Prompts,
+		Version:            versionString,
+		SourceConfigs:      toolsFile.Sources,
+		AuthServiceConfigs: toolsFile.AuthServices,
+		ToolConfigs:        toolsFile.Tools,
+		ToolsetConfigs:     toolsFile.Toolsets,
+		PromptConfigs:      toolsFile.Prompts,
 	}

-	sourcesMap, authServicesMap, embeddingModelsMap, toolsMap, toolsetsMap, promptsMap, promptsetsMap, err := server.InitializeConfigs(ctx, reloadedConfig)
+	sourcesMap, authServicesMap, toolsMap, toolsetsMap, promptsMap, promptsetsMap, err := server.InitializeConfigs(ctx, reloadedConfig)
 	if err != nil {
 		errMsg := fmt.Errorf("unable to initialize reloaded configs: %w", err)
 		logger.WarnContext(ctx, errMsg.Error())
-		return nil, nil, nil, nil, nil, nil, nil, err
+		return nil, nil, nil, nil, nil, nil, err
 	}

-	return sourcesMap, authServicesMap, embeddingModelsMap, toolsMap, toolsetsMap, promptsMap, promptsetsMap, nil
+	return sourcesMap, authServicesMap, toolsMap, toolsetsMap, promptsMap, promptsetsMap, nil
 }

 // watchChanges checks for changes in the provided yaml tools file(s) or folder.
@@ -960,10 +838,16 @@ func run(cmd *Command) error {
 		}
 	}()

-	var allToolsFiles []ToolsFile
+	var toolsFile ToolsFile

-	// Load Prebuilt Configuration
 	if cmd.prebuiltConfig != "" {
+		// Make sure --prebuilt and --tools-file/--tools-files/--tools-folder flags are mutually exclusive
+		if cmd.tools_file != "" || len(cmd.tools_files) > 0 || cmd.tools_folder != "" {
+			errMsg := fmt.Errorf("--prebuilt and --tools-file/--tools-files/--tools-folder flags cannot be used simultaneously")
+			cmd.logger.ErrorContext(ctx, errMsg.Error())
+			return errMsg
+		}
+		// Use prebuilt tools
 		buf, err := prebuiltconfigs.Get(cmd.prebuiltConfig)
 		if err != nil {
 			cmd.logger.ErrorContext(ctx, err.Error())
@@ -974,97 +858,72 @@ func run(cmd *Command) error {
 		// Append prebuilt.source to Version string for the User Agent
 		cmd.cfg.Version += "+prebuilt." + cmd.prebuiltConfig

-		parsed, err := parseToolsFile(ctx, buf)
+		toolsFile, err = parseToolsFile(ctx, buf)
 		if err != nil {
 			errMsg := fmt.Errorf("unable to parse prebuilt tool configuration: %w", err)
 			cmd.logger.ErrorContext(ctx, errMsg.Error())
 			return errMsg
 		}
-		allToolsFiles = append(allToolsFiles, parsed)
-	}
-
-	// Determine if Custom Files should be loaded
-	// Check for explicit custom flags
-	isCustomConfigured := cmd.tools_file != "" || len(cmd.tools_files) > 0 || cmd.tools_folder != ""
-
-	// Determine if default 'tools.yaml' should be used (No prebuilt AND No custom flags)
-	useDefaultToolsFile := cmd.prebuiltConfig == "" && !isCustomConfigured
-
-	if useDefaultToolsFile {
-		cmd.tools_file = "tools.yaml"
-		isCustomConfigured = true
-	}
-
-	// Load Custom Configurations
-	if isCustomConfigured {
-		// Enforce exclusivity among custom flags (tools-file vs tools-files vs tools-folder)
-		if (cmd.tools_file != "" && len(cmd.tools_files) > 0) ||
-			(cmd.tools_file != "" && cmd.tools_folder != "") ||
-			(len(cmd.tools_files) > 0 && cmd.tools_folder != "") {
+	} else if len(cmd.tools_files) > 0 {
+		// Make sure --tools-file, --tools-files, and --tools-folder flags are mutually exclusive
+		if cmd.tools_file != "" || cmd.tools_folder != "" {
 			errMsg := fmt.Errorf("--tools-file, --tools-files, and --tools-folder flags cannot be used simultaneously")
 			cmd.logger.ErrorContext(ctx, errMsg.Error())
 			return errMsg
 		}

-		var customTools ToolsFile
+		// Use multiple tools files
+		cmd.logger.InfoContext(ctx, fmt.Sprintf("Loading and merging %d tool configuration files", len(cmd.tools_files)))
 		var err error
-
-		if len(cmd.tools_files) > 0 {
-			// Use tools-files
-			cmd.logger.InfoContext(ctx, fmt.Sprintf("Loading and merging %d tool configuration files", len(cmd.tools_files)))
-			customTools, err = loadAndMergeToolsFiles(ctx, cmd.tools_files)
-		} else if cmd.tools_folder != "" {
-			// Use tools-folder
-			cmd.logger.InfoContext(ctx, fmt.Sprintf("Loading and merging all YAML files from directory: %s", cmd.tools_folder))
-			customTools, err = loadAndMergeToolsFolder(ctx, cmd.tools_folder)
-		} else {
-			// Use single file (tools-file or default `tools.yaml`)
-			buf, readFileErr := os.ReadFile(cmd.tools_file)
-			if readFileErr != nil {
-				errMsg := fmt.Errorf("unable to read tool file at %q: %w", cmd.tools_file, readFileErr)
-				cmd.logger.ErrorContext(ctx, errMsg.Error())
-				return errMsg
-			}
-			customTools, err = parseToolsFile(ctx, buf)
-			if err != nil {
-				err = fmt.Errorf("unable to parse tool file at %q: %w", cmd.tools_file, err)
-			}
-		}
-
+		toolsFile, err = loadAndMergeToolsFiles(ctx, cmd.tools_files)
 		if err != nil {
 			cmd.logger.ErrorContext(ctx, err.Error())
 			return err
 		}
-		allToolsFiles = append(allToolsFiles, customTools)
+	} else if cmd.tools_folder != "" {
+		// Make sure --tools-folder and other flags are mutually exclusive
+		if cmd.tools_file != "" || len(cmd.tools_files) > 0 {
+			errMsg := fmt.Errorf("--tools-file, --tools-files, and --tools-folder flags cannot be used simultaneously")
+			cmd.logger.ErrorContext(ctx, errMsg.Error())
+			return errMsg
+		}
+
+		// Use tools folder
+		cmd.logger.InfoContext(ctx, fmt.Sprintf("Loading and merging all YAML files from directory: %s", cmd.tools_folder))
+		var err error
+		toolsFile, err = loadAndMergeToolsFolder(ctx, cmd.tools_folder)
+		if err != nil {
+			cmd.logger.ErrorContext(ctx, err.Error())
+			return err
+		}
+	} else {
+		// Set default value of tools-file flag to tools.yaml
+		if cmd.tools_file == "" {
+			cmd.tools_file = "tools.yaml"
+		}
+
+		// Read single tool file contents
+		buf, err := os.ReadFile(cmd.tools_file)
+		if err != nil {
+			errMsg := fmt.Errorf("unable to read tool file at %q: %w", cmd.tools_file, err)
+			cmd.logger.ErrorContext(ctx, errMsg.Error())
+			return errMsg
+		}
+
+		toolsFile, err = parseToolsFile(ctx, buf)
+		if err != nil {
+			errMsg := fmt.Errorf("unable to parse tool file at %q: %w", cmd.tools_file, err)
+			cmd.logger.ErrorContext(ctx, errMsg.Error())
+			return errMsg
+		}
 	}

-	// Merge Everything
-	// This will error if custom tools collide with prebuilt tools
-	finalToolsFile, err := mergeToolsFiles(allToolsFiles...)
-	if err != nil {
-		cmd.logger.ErrorContext(ctx, err.Error())
-		return err
-	}
+	cmd.cfg.SourceConfigs, cmd.cfg.AuthServiceConfigs, cmd.cfg.ToolConfigs, cmd.cfg.ToolsetConfigs, cmd.cfg.PromptConfigs = toolsFile.Sources, toolsFile.AuthServices, toolsFile.Tools, toolsFile.Toolsets, toolsFile.Prompts

-	cmd.cfg.SourceConfigs = finalToolsFile.Sources
-	cmd.cfg.AuthServiceConfigs = finalToolsFile.AuthServices
-	cmd.cfg.EmbeddingModelConfigs = finalToolsFile.EmbeddingModels
-	cmd.cfg.ToolConfigs = finalToolsFile.Tools
-	cmd.cfg.ToolsetConfigs = finalToolsFile.Toolsets
-	cmd.cfg.PromptConfigs = finalToolsFile.Prompts
-
-	authSourceConfigs := finalToolsFile.AuthSources
+	authSourceConfigs := toolsFile.AuthSources
 	if authSourceConfigs != nil {
 		cmd.logger.WarnContext(ctx, "`authSources` is deprecated, use `authServices` instead")
-
-		for k, v := range authSourceConfigs {
-			if _, exists := cmd.cfg.AuthServiceConfigs[k]; exists {
-				errMsg := fmt.Errorf("resource conflict detected: authSource '%s' has the same name as an existing authService. Please rename your authSource", k)
-				cmd.logger.ErrorContext(ctx, errMsg.Error())
-				return errMsg
-			}
-			cmd.cfg.AuthServiceConfigs[k] = v
-		}
+		cmd.cfg.AuthServiceConfigs = authSourceConfigs
 	}

 	instrumentation, err := telemetry.CreateTelemetryInstrumentation(versionString)
@@ -1115,8 +974,9 @@ func run(cmd *Command) error {
 		}()
 	}

-	if isCustomConfigured && !cmd.cfg.DisableReload {
-		watchDirs, watchedFiles := resolveWatcherInputs(cmd.tools_file, cmd.tools_files, cmd.tools_folder)
+	watchDirs, watchedFiles := resolveWatcherInputs(cmd.tools_file, cmd.tools_files, cmd.tools_folder)
+
+	if !cmd.cfg.DisableReload {
 		// start watching the file(s) or folder for changes to trigger dynamic reloading
 		go watchChanges(ctx, watchDirs, watchedFiles, s)
 	}
--- a/cmd/root_test.go
+++ b/cmd/root_test.go
@@ -23,18 +23,15 @@ import (
 	"os"
 	"path"
 	"path/filepath"
-	"reflect"
 	"regexp"
 	"runtime"
 	"strings"
 	"testing"
 	"time"

-	yaml "github.com/goccy/go-yaml"
 	"github.com/google/go-cmp/cmp"

 	"github.com/googleapis/genai-toolbox/internal/auth/google"
-	"github.com/googleapis/genai-toolbox/internal/embeddingmodels/gemini"
 	"github.com/googleapis/genai-toolbox/internal/log"
 	"github.com/googleapis/genai-toolbox/internal/prebuiltconfigs"
 	"github.com/googleapis/genai-toolbox/internal/prompts"
@@ -69,9 +66,6 @@ func withDefaults(c server.ServerConfig) server.ServerConfig {
 	if c.AllowedOrigins == nil {
 		c.AllowedOrigins = []string{"*"}
 	}
-	if c.AllowedHosts == nil {
-		c.AllowedHosts = []string{"*"}
-	}
 	return c
 }

@@ -98,21 +92,6 @@ func invokeCommand(args []string) (*Command, string, error) {
 	return c, buf.String(), err
 }

-// invokeCommandWithContext executes the command with a context and returns the captured output.
-func invokeCommandWithContext(ctx context.Context, args []string) (*Command, string, error) {
-	// Capture output using a buffer
-	buf := new(bytes.Buffer)
-	c := NewCommand(WithStreams(buf, buf))
-
-	c.SetArgs(args)
-	c.SilenceUsage = true
-	c.SilenceErrors = true
-	c.SetContext(ctx)
-
-	err := c.Execute()
-	return c, buf.String(), err
-}
-
 func TestVersion(t *testing.T) {
 	data, err := os.ReadFile("version.txt")
 	if err != nil {
@@ -225,13 +204,6 @@ func TestServerConfigFlags(t *testing.T) {
 				AllowedOrigins: []string{"http://foo.com", "http://bar.com"},
 			}),
 		},
-		{
-			desc: "allowed hosts",
-			args: []string{"--allowed-hosts", "http://foo.com,http://bar.com"},
-			want: withDefaults(server.ServerConfig{
-				AllowedHosts: []string{"http://foo.com", "http://bar.com"},
-			}),
-		},
 	}
 	for _, tc := range tcs {
 		t.Run(tc.desc, func(t *testing.T) {
@@ -496,235 +468,6 @@ func TestDefaultLogLevel(t *testing.T) {
 	}
 }

-func TestConvertToolsFile(t *testing.T) {
-	ctx, cancelCtx := context.WithTimeout(context.Background(), time.Minute)
-	defer cancelCtx()
-	pr, pw := io.Pipe()
-	defer pw.Close()
-	defer pr.Close()
-
-	logger, err := log.NewStdLogger(pw, pw, "DEBUG")
-	if err != nil {
-		t.Fatalf("failed to setup logger %s", err)
-	}
-	ctx = util.WithLogger(ctx, logger)
-
-	tcs := []struct {
-		desc   string
-		in     string
-		want   string
-		isErr  bool
-		errStr string
-	}{
-		{
-			desc: "basic convert",
-			in: `
-            sources:
-                my-pg-instance:
-                    kind: cloud-sql-postgres
-                    project: my-project
-                    region: my-region
-                    instance: my-instance
-                    database: my_db
-                    user: my_user
-                    password: my_pass
-            tools:
-                example_tool:
-                    kind: postgres-sql
-                    source: my-pg-instance
-                    description: some description
-                    statement: |
-                      SELECT * FROM SQL_STATEMENT;
-                    parameters:
-                        - name: country
-                          type: string
-                          description: some description
-            toolsets:
-                example_toolset:
-                    - example_tool`,
-			want: `
-kind: sources
-name: my-pg-instance
-type: cloud-sql-postgres
-project: my-project
-region: my-region
-instance: my-instance
-database: my_db
-user: my_user
-password: my_pass
---
-kind: tools
-name: example_tool
-type: postgres-sql
-source: my-pg-instance
-description: some description
-statement: |
-    SELECT * FROM SQL_STATEMENT;
-parameters:
- name: country
-  type: string
-  description: some description
---
-kind: toolsets
-name: example_toolset
-tools:
- example_tool`,
-		},
-		{
-			desc: "rearrange resource order",
-			in: `
-            tools:
-                example_tool:
-                    kind: postgres-sql
-                    source: my-pg-instance
-                    description: some description
-                    statement: |
-                        SELECT * FROM SQL_STATEMENT;
-                    parameters:
-                        - name: country
-                          type: string
-                          description: some description
-            sources:
-                my-pg-instance:
-                    kind: cloud-sql-postgres
-                    project: my-project
-                    region: my-region
-                    instance: my-instance
-                    database: my_db
-                    user: my_user
-                    password: my_pass
-            toolsets:
-                example_toolset:
-                    - example_tool`,
-			want: `
-kind: sources
-name: my-pg-instance
-type: cloud-sql-postgres
-project: my-project
-region: my-region
-instance: my-instance
-database: my_db
-user: my_user
-password: my_pass
---
-kind: tools
-name: example_tool
-type: postgres-sql
-source: my-pg-instance
-description: some description
-statement: |
-    SELECT * FROM SQL_STATEMENT;
-parameters:
- name: country
-  type: string
-  description: some description
---
-kind: toolsets
-name: example_toolset
-tools:
- example_tool`,
-		},
-		{
-			desc: "no convertion needed",
-			in: `
-kind: sources
-name: my-pg-instance
-type: cloud-sql-postgres
-project: my-project
-region: my-region
-instance: my-instance
-database: my_db
-user: my_user
-password: my_pass
---
-kind: tools
-name: example_tool
-type: postgres-sql
-source: my-pg-instance
-description: some description
-statement: |
-    SELECT * FROM SQL_STATEMENT;
-parameters:
- name: country
-  type: string
-  description: some description
---
-kind: toolsets
-name: example_toolset
-tools:
- example_tool`,
-			want: `
-kind: sources
-name: my-pg-instance
-type: cloud-sql-postgres
-project: my-project
-region: my-region
-instance: my-instance
-database: my_db
-user: my_user
-password: my_pass
---
-kind: tools
-name: example_tool
-type: postgres-sql
-source: my-pg-instance
-description: some description
-statement: |
-    SELECT * FROM SQL_STATEMENT;
-parameters:
- name: country
-  type: string
-  description: some description
---
-kind: toolsets
-name: example_toolset
-tools:
- example_tool`,
-		},
-		{
-			desc:   "invalid source",
-			in:     `sources: invalid`,
-			isErr:  true,
-			errStr: "'sources' is not a map",
-		},
-		{
-			desc:   "invalid toolset",
-			in:     `toolsets: invalid`,
-			isErr:  true,
-			errStr: "'toolsets' is not a map",
-		},
-	}
-	for _, tc := range tcs {
-		t.Run(tc.desc, func(t *testing.T) {
-			output, err := convertToolsFile(ctx, []byte(tc.in))
-			if tc.isErr {
-				if err == nil {
-					t.Fatalf("missing error: %s", tc.errStr)
-				}
-				if err.Error() != tc.errStr {
-					t.Fatalf("invalid error string: got %s, want %s", err, tc.errStr)
-				}
-				return
-			}
-			if err != nil {
-				t.Fatalf("unexpected error: %s", err)
-			}
-
-			// ensures that the order is correct
-			var doc1, doc2 yaml.MapSlice
-			if err := yaml.Unmarshal(output, &doc1); err != nil {
-				t.Fatalf("unable to unmarshal output: %s", string(output))
-			}
-			if err := yaml.Unmarshal([]byte(tc.want), &doc2); err != nil {
-				t.Fatalf("unable to unmarshal output: %s", tc.want)
-			}
-			if !reflect.DeepEqual(doc1, doc2) {
-				t.Fatalf("incorrect output: got %s, want %s", doc1, doc2)
-			}
-		})
-	}
-}
-
 func TestParseToolFile(t *testing.T) {
 	ctx, err := testutils.ContextWithNewLogger()
 	if err != nil {
@@ -766,7 +509,7 @@ func TestParseToolFile(t *testing.T) {
 				Sources: server.SourceConfigs{
 					"my-pg-instance": cloudsqlpgsrc.Config{
 						Name:     "my-pg-instance",
-						Type:     cloudsqlpgsrc.SourceType,
+						Kind:     cloudsqlpgsrc.SourceKind,
 						Project:  "my-project",
 						Region:   "my-region",
 						Instance: "my-instance",
@@ -779,7 +522,7 @@ func TestParseToolFile(t *testing.T) {
 				Tools: server.ToolConfigs{
 					"example_tool": postgressql.Config{
 						Name:        "example_tool",
-						Type:        "postgres-sql",
+						Kind:        "postgres-sql",
 						Source:      "my-pg-instance",
 						Description: "some description",
 						Statement:   "SELECT * FROM SQL_STATEMENT;\n",
@@ -920,7 +663,7 @@ func TestParseToolFileWithAuth(t *testing.T) {
 				Sources: server.SourceConfigs{
 					"my-pg-instance": cloudsqlpgsrc.Config{
 						Name:     "my-pg-instance",
-						Type:     cloudsqlpgsrc.SourceType,
+						Kind:     cloudsqlpgsrc.SourceKind,
 						Project:  "my-project",
 						Region:   "my-region",
 						Instance: "my-instance",
@@ -933,19 +676,19 @@ func TestParseToolFileWithAuth(t *testing.T) {
 				AuthServices: server.AuthServiceConfigs{
 					"my-google-service": google.Config{
 						Name:     "my-google-service",
-						Type:     google.AuthServiceType,
+						Kind:     google.AuthServiceKind,
 						ClientID: "my-client-id",
 					},
 					"other-google-service": google.Config{
 						Name:     "other-google-service",
-						Type:     google.AuthServiceType,
+						Kind:     google.AuthServiceKind,
 						ClientID: "other-client-id",
 					},
 				},
 				Tools: server.ToolConfigs{
 					"example_tool": postgressql.Config{
 						Name:         "example_tool",
-						Type:         "postgres-sql",
+						Kind:         "postgres-sql",
 						Source:       "my-pg-instance",
 						Description:  "some description",
 						Statement:    "SELECT * FROM SQL_STATEMENT;\n",
@@ -1020,7 +763,7 @@ func TestParseToolFileWithAuth(t *testing.T) {
 				Sources: server.SourceConfigs{
 					"my-pg-instance": cloudsqlpgsrc.Config{
 						Name:     "my-pg-instance",
-						Type:     cloudsqlpgsrc.SourceType,
+						Kind:     cloudsqlpgsrc.SourceKind,
 						Project:  "my-project",
 						Region:   "my-region",
 						Instance: "my-instance",
@@ -1033,19 +776,19 @@ func TestParseToolFileWithAuth(t *testing.T) {
 				AuthSources: server.AuthServiceConfigs{
 					"my-google-service": google.Config{
 						Name:     "my-google-service",
-						Type:     google.AuthServiceType,
+						Kind:     google.AuthServiceKind,
 						ClientID: "my-client-id",
 					},
 					"other-google-service": google.Config{
 						Name:     "other-google-service",
-						Type:     google.AuthServiceType,
+						Kind:     google.AuthServiceKind,
 						ClientID: "other-client-id",
 					},
 				},
 				Tools: server.ToolConfigs{
 					"example_tool": postgressql.Config{
 						Name:         "example_tool",
-						Type:         "postgres-sql",
+						Kind:         "postgres-sql",
 						Source:       "my-pg-instance",
 						Description:  "some description",
 						Statement:    "SELECT * FROM SQL_STATEMENT;\n",
@@ -1122,7 +865,7 @@ func TestParseToolFileWithAuth(t *testing.T) {
 				Sources: server.SourceConfigs{
 					"my-pg-instance": cloudsqlpgsrc.Config{
 						Name:     "my-pg-instance",
-						Type:     cloudsqlpgsrc.SourceType,
+						Kind:     cloudsqlpgsrc.SourceKind,
 						Project:  "my-project",
 						Region:   "my-region",
 						Instance: "my-instance",
@@ -1135,19 +878,19 @@ func TestParseToolFileWithAuth(t *testing.T) {
 				AuthServices: server.AuthServiceConfigs{
 					"my-google-service": google.Config{
 						Name:     "my-google-service",
-						Type:     google.AuthServiceType,
+						Kind:     google.AuthServiceKind,
 						ClientID: "my-client-id",
 					},
 					"other-google-service": google.Config{
 						Name:     "other-google-service",
-						Type:     google.AuthServiceType,
+						Kind:     google.AuthServiceKind,
 						ClientID: "other-client-id",
 					},
 				},
 				Tools: server.ToolConfigs{
 					"example_tool": postgressql.Config{
 						Name:         "example_tool",
-						Type:         "postgres-sql",
+						Kind:         "postgres-sql",
 						Source:       "my-pg-instance",
 						Description:  "some description",
 						Statement:    "SELECT * FROM SQL_STATEMENT;\n",
@@ -1293,7 +1036,7 @@ func TestEnvVarReplacement(t *testing.T) {
 				Sources: server.SourceConfigs{
 					"my-http-instance": httpsrc.Config{
 						Name:           "my-http-instance",
-						Type:           httpsrc.SourceType,
+						Kind:           httpsrc.SourceKind,
 						BaseURL:        "http://test_server/",
 						Timeout:        "10s",
 						DefaultHeaders: map[string]string{"Authorization": "ACTUAL_HEADER"},
@@ -1303,19 +1046,19 @@ func TestEnvVarReplacement(t *testing.T) {
 				AuthServices: server.AuthServiceConfigs{
 					"my-google-service": google.Config{
 						Name:     "my-google-service",
-						Type:     google.AuthServiceType,
+						Kind:     google.AuthServiceKind,
 						ClientID: "ACTUAL_CLIENT_ID",
 					},
 					"other-google-service": google.Config{
 						Name:     "other-google-service",
-						Type:     google.AuthServiceType,
+						Kind:     google.AuthServiceKind,
 						ClientID: "ACTUAL_CLIENT_ID_2",
 					},
 				},
 				Tools: server.ToolConfigs{
 					"example_tool": http.Config{
 						Name:         "example_tool",
-						Type:         "http",
+						Kind:         "http",
 						Source:       "my-instance",
 						Method:       "GET",
 						Path:         "search?name=alice&pet=cat",
@@ -1593,7 +1336,6 @@ func TestPrebuiltTools(t *testing.T) {
 	cloudsqlmssqlobsvconfig, _ := prebuiltconfigs.Get("cloud-sql-mssql-observability")
 	serverless_spark_config, _ := prebuiltconfigs.Get("serverless-spark")
 	cloudhealthcare_config, _ := prebuiltconfigs.Get("cloud-healthcare")
-	snowflake_config, _ := prebuiltconfigs.Get("snowflake")

 	// Set environment variables
 	t.Setenv("API_KEY", "your_api_key")
@@ -1691,14 +1433,6 @@ func TestPrebuiltTools(t *testing.T) {
 	t.Setenv("CLOUD_HEALTHCARE_REGION", "your_gcp_region")
 	t.Setenv("CLOUD_HEALTHCARE_DATASET", "your_healthcare_dataset")

-	t.Setenv("SNOWFLAKE_ACCOUNT", "your_account")
-	t.Setenv("SNOWFLAKE_USER", "your_username")
-	t.Setenv("SNOWFLAKE_PASSWORD", "your_pass")
-	t.Setenv("SNOWFLAKE_DATABASE", "your_db")
-	t.Setenv("SNOWFLAKE_SCHEMA", "your_schema")
-	t.Setenv("SNOWFLAKE_WAREHOUSE", "your_wh")
-	t.Setenv("SNOWFLAKE_ROLE", "your_role")
-
 	ctx, err := testutils.ContextWithNewLogger()
 	if err != nil {
 		t.Fatalf("unexpected error: %s", err)
@@ -1724,7 +1458,7 @@ func TestPrebuiltTools(t *testing.T) {
 			wantToolset: server.ToolsetConfigs{
 				"cloud_sql_postgres_admin_tools": tools.ToolsetConfig{
 					Name:      "cloud_sql_postgres_admin_tools",
-					ToolNames: []string{"create_instance", "get_instance", "list_instances", "create_database", "list_databases", "create_user", "wait_for_operation", "postgres_upgrade_precheck", "clone_instance", "create_backup"},
+					ToolNames: []string{"create_instance", "get_instance", "list_instances", "create_database", "list_databases", "create_user", "wait_for_operation", "postgres_upgrade_precheck", "clone_instance"},
 				},
 			},
 		},
@@ -1734,7 +1468,7 @@ func TestPrebuiltTools(t *testing.T) {
 			wantToolset: server.ToolsetConfigs{
 				"cloud_sql_mysql_admin_tools": tools.ToolsetConfig{
 					Name:      "cloud_sql_mysql_admin_tools",
-					ToolNames: []string{"create_instance", "get_instance", "list_instances", "create_database", "list_databases", "create_user", "wait_for_operation", "clone_instance", "create_backup"},
+					ToolNames: []string{"create_instance", "get_instance", "list_instances", "create_database", "list_databases", "create_user", "wait_for_operation", "clone_instance"},
 				},
 			},
 		},
@@ -1744,7 +1478,7 @@ func TestPrebuiltTools(t *testing.T) {
 			wantToolset: server.ToolsetConfigs{
 				"cloud_sql_mssql_admin_tools": tools.ToolsetConfig{
 					Name:      "cloud_sql_mssql_admin_tools",
-					ToolNames: []string{"create_instance", "get_instance", "list_instances", "create_database", "list_databases", "create_user", "wait_for_operation", "clone_instance", "create_backup"},
+					ToolNames: []string{"create_instance", "get_instance", "list_instances", "create_database", "list_databases", "create_user", "wait_for_operation", "clone_instance"},
 				},
 			},
 		},
@@ -1754,7 +1488,7 @@ func TestPrebuiltTools(t *testing.T) {
 			wantToolset: server.ToolsetConfigs{
 				"alloydb_postgres_database_tools": tools.ToolsetConfig{
 					Name:      "alloydb_postgres_database_tools",
-					ToolNames: []string{"execute_sql", "list_tables", "list_active_queries", "list_available_extensions", "list_installed_extensions", "list_autovacuum_configurations", "list_memory_configurations", "list_top_bloated_tables", "list_replication_slots", "list_invalid_indexes", "get_query_plan", "list_views", "list_schemas", "database_overview", "list_triggers", "list_indexes", "list_sequences", "long_running_transactions", "list_locks", "replication_stats", "list_query_stats", "get_column_cardinality", "list_publication_tables", "list_tablespaces", "list_pg_settings", "list_database_stats", "list_roles", "list_table_stats", "list_stored_procedure"},
+					ToolNames: []string{"execute_sql", "list_tables", "list_active_queries", "list_available_extensions", "list_installed_extensions", "list_autovacuum_configurations", "list_memory_configurations", "list_top_bloated_tables", "list_replication_slots", "list_invalid_indexes", "get_query_plan", "list_views", "list_schemas", "database_overview", "list_triggers", "list_indexes", "list_sequences", "long_running_transactions", "list_locks", "replication_stats", "list_query_stats", "get_column_cardinality", "list_publication_tables", "list_tablespaces", "list_pg_settings", "list_database_stats", "list_roles", "list_table_stats"},
 				},
 			},
 		},
@@ -1784,7 +1518,7 @@ func TestPrebuiltTools(t *testing.T) {
 			wantToolset: server.ToolsetConfigs{
 				"cloud_sql_postgres_database_tools": tools.ToolsetConfig{
 					Name:      "cloud_sql_postgres_database_tools",
-					ToolNames: []string{"execute_sql", "list_tables", "list_active_queries", "list_available_extensions", "list_installed_extensions", "list_autovacuum_configurations", "list_memory_configurations", "list_top_bloated_tables", "list_replication_slots", "list_invalid_indexes", "get_query_plan", "list_views", "list_schemas", "database_overview", "list_triggers", "list_indexes", "list_sequences", "long_running_transactions", "list_locks", "replication_stats", "list_query_stats", "get_column_cardinality", "list_publication_tables", "list_tablespaces", "list_pg_settings", "list_database_stats", "list_roles", "list_table_stats", "list_stored_procedure"},
+					ToolNames: []string{"execute_sql", "list_tables", "list_active_queries", "list_available_extensions", "list_installed_extensions", "list_autovacuum_configurations", "list_memory_configurations", "list_top_bloated_tables", "list_replication_slots", "list_invalid_indexes", "get_query_plan", "list_views", "list_schemas", "database_overview", "list_triggers", "list_indexes", "list_sequences", "long_running_transactions", "list_locks", "replication_stats", "list_query_stats", "get_column_cardinality", "list_publication_tables", "list_tablespaces", "list_pg_settings", "list_database_stats", "list_roles", "list_table_stats"},
 				},
 			},
 		},
@@ -1884,7 +1618,7 @@ func TestPrebuiltTools(t *testing.T) {
 			wantToolset: server.ToolsetConfigs{
 				"postgres_database_tools": tools.ToolsetConfig{
 					Name:      "postgres_database_tools",
-					ToolNames: []string{"execute_sql", "list_tables", "list_active_queries", "list_available_extensions", "list_installed_extensions", "list_autovacuum_configurations", "list_memory_configurations", "list_top_bloated_tables", "list_replication_slots", "list_invalid_indexes", "get_query_plan", "list_views", "list_schemas", "database_overview", "list_triggers", "list_indexes", "list_sequences", "long_running_transactions", "list_locks", "replication_stats", "list_query_stats", "get_column_cardinality", "list_publication_tables", "list_tablespaces", "list_pg_settings", "list_database_stats", "list_roles", "list_table_stats", "list_stored_procedure"},
+					ToolNames: []string{"execute_sql", "list_tables", "list_active_queries", "list_available_extensions", "list_installed_extensions", "list_autovacuum_configurations", "list_memory_configurations", "list_top_bloated_tables", "list_replication_slots", "list_invalid_indexes", "get_query_plan", "list_views", "list_schemas", "database_overview", "list_triggers", "list_indexes", "list_sequences", "long_running_transactions", "list_locks", "replication_stats", "list_query_stats", "get_column_cardinality", "list_publication_tables", "list_tablespaces", "list_pg_settings", "list_database_stats", "list_roles", "list_table_stats"},
 				},
 			},
 		},
@@ -1996,16 +1730,6 @@ func TestPrebuiltTools(t *testing.T) {
 				},
 			},
 		},
-		{
-			name: "Snowflake prebuilt tool",
-			in:   snowflake_config,
-			wantToolset: server.ToolsetConfigs{
-				"snowflake_tools": tools.ToolsetConfig{
-					Name:      "snowflake_tools",
-					ToolNames: []string{"execute_sql", "list_tables"},
-				},
-			},
-		},
 	}

 	for _, tc := range tcs {
@@ -2031,6 +1755,11 @@ func TestMutuallyExclusiveFlags(t *testing.T) {
 		args      []string
 		errString string
 	}{
+		{
+			desc:      "--prebuilt and --tools-file",
+			args:      []string{"--prebuilt", "alloydb", "--tools-file", "my.yaml"},
+			errString: "--prebuilt and --tools-file/--tools-files/--tools-folder flags cannot be used simultaneously",
+		},
 		{
 			desc:      "--tools-file and --tools-files",
 			args:      []string{"--tools-file", "my.yaml", "--tools-files", "a.yaml,b.yaml"},
@@ -2091,10 +1820,9 @@ func TestFileLoadingErrors(t *testing.T) {

 func TestMergeToolsFiles(t *testing.T) {
 	file1 := ToolsFile{
-		Sources:         server.SourceConfigs{"source1": httpsrc.Config{Name: "source1"}},
-		Tools:           server.ToolConfigs{"tool1": http.Config{Name: "tool1"}},
-		Toolsets:        server.ToolsetConfigs{"set1": tools.ToolsetConfig{Name: "set1"}},
-		EmbeddingModels: server.EmbeddingModelConfigs{"model1": gemini.Config{Name: "gemini-text"}},
+		Sources:  server.SourceConfigs{"source1": httpsrc.Config{Name: "source1"}},
+		Tools:    server.ToolConfigs{"tool1": http.Config{Name: "tool1"}},
+		Toolsets: server.ToolsetConfigs{"set1": tools.ToolsetConfig{Name: "set1"}},
 	}
 	file2 := ToolsFile{
 		AuthServices: server.AuthServiceConfigs{"auth1": google.Config{Name: "auth1"}},
@@ -2116,12 +1844,11 @@ func TestMergeToolsFiles(t *testing.T) {
 			name:  "merge two distinct files",
 			files: []ToolsFile{file1, file2},
 			want: ToolsFile{
-				Sources:         server.SourceConfigs{"source1": httpsrc.Config{Name: "source1"}},
-				AuthServices:    server.AuthServiceConfigs{"auth1": google.Config{Name: "auth1"}},
-				Tools:           server.ToolConfigs{"tool1": http.Config{Name: "tool1"}, "tool2": http.Config{Name: "tool2"}},
-				Toolsets:        server.ToolsetConfigs{"set1": tools.ToolsetConfig{Name: "set1"}, "set2": tools.ToolsetConfig{Name: "set2"}},
-				Prompts:         server.PromptConfigs{},
-				EmbeddingModels: server.EmbeddingModelConfigs{"model1": gemini.Config{Name: "gemini-text"}},
+				Sources:      server.SourceConfigs{"source1": httpsrc.Config{Name: "source1"}},
+				AuthServices: server.AuthServiceConfigs{"auth1": google.Config{Name: "auth1"}},
+				Tools:        server.ToolConfigs{"tool1": http.Config{Name: "tool1"}, "tool2": http.Config{Name: "tool2"}},
+				Toolsets:     server.ToolsetConfigs{"set1": tools.ToolsetConfig{Name: "set1"}, "set2": tools.ToolsetConfig{Name: "set2"}},
+				Prompts:      server.PromptConfigs{},
 			},
 			wantErr: false,
 		},
@@ -2134,24 +1861,22 @@ func TestMergeToolsFiles(t *testing.T) {
 			name:  "merge single file",
 			files: []ToolsFile{file1},
 			want: ToolsFile{
-				Sources:         file1.Sources,
-				AuthServices:    make(server.AuthServiceConfigs),
-				EmbeddingModels: server.EmbeddingModelConfigs{"model1": gemini.Config{Name: "gemini-text"}},
-				Tools:           file1.Tools,
-				Toolsets:        file1.Toolsets,
-				Prompts:         server.PromptConfigs{},
+				Sources:      file1.Sources,
+				AuthServices: make(server.AuthServiceConfigs),
+				Tools:        file1.Tools,
+				Toolsets:     file1.Toolsets,
+				Prompts:      server.PromptConfigs{},
 			},
 		},
 		{
 			name:  "merge empty list",
 			files: []ToolsFile{},
 			want: ToolsFile{
-				Sources:         make(server.SourceConfigs),
-				AuthServices:    make(server.AuthServiceConfigs),
-				EmbeddingModels: make(server.EmbeddingModelConfigs),
-				Tools:           make(server.ToolConfigs),
-				Toolsets:        make(server.ToolsetConfigs),
-				Prompts:         server.PromptConfigs{},
+				Sources:      make(server.SourceConfigs),
+				AuthServices: make(server.AuthServiceConfigs),
+				Tools:        make(server.ToolConfigs),
+				Toolsets:     make(server.ToolsetConfigs),
+				Prompts:      server.PromptConfigs{},
 			},
 		},
 	}
@@ -2177,228 +1902,3 @@ func TestMergeToolsFiles(t *testing.T) {
 		})
 	}
 }
-func TestPrebuiltAndCustomTools(t *testing.T) {
-	t.Setenv("SQLITE_DATABASE", "test.db")
-	// Setup custom tools file
-	customContent := `
-tools:
-  custom_tool:
-    kind: http
-    source: my-http
-    method: GET
-    path: /
-    description: "A custom tool for testing"
-sources:
-  my-http:
-    kind: http
-    baseUrl: http://example.com
-`
-	customFile := filepath.Join(t.TempDir(), "custom.yaml")
-	if err := os.WriteFile(customFile, []byte(customContent), 0644); err != nil {
-		t.Fatal(err)
-	}
-
-	// Tool Conflict File
-	// SQLite prebuilt has a tool named 'list_tables'
-	toolConflictContent := `
-tools:
-  list_tables:
-    kind: http
-    source: my-http
-    method: GET
-    path: /
-    description: "Conflicting tool"
-sources:
-  my-http:
-    kind: http
-    baseUrl: http://example.com
-`
-	toolConflictFile := filepath.Join(t.TempDir(), "tool_conflict.yaml")
-	if err := os.WriteFile(toolConflictFile, []byte(toolConflictContent), 0644); err != nil {
-		t.Fatal(err)
-	}
-
-	// Source Conflict File
-	// SQLite prebuilt has a source named 'sqlite-source'
-	sourceConflictContent := `
-sources:
-  sqlite-source:
-    kind: http
-    baseUrl: http://example.com
-tools:
-  dummy_tool:
-    kind: http
-    source: sqlite-source
-    method: GET
-    path: /
-    description: "Dummy"
-`
-	sourceConflictFile := filepath.Join(t.TempDir(), "source_conflict.yaml")
-	if err := os.WriteFile(sourceConflictFile, []byte(sourceConflictContent), 0644); err != nil {
-		t.Fatal(err)
-	}
-
-	// Toolset Conflict File
-	// SQLite prebuilt has a toolset named 'sqlite_database_tools'
-	toolsetConflictContent := `
-sources:
-  dummy-src:
-    kind: http
-    baseUrl: http://example.com
-tools:
-  dummy_tool:
-    kind: http
-    source: dummy-src
-    method: GET
-    path: /
-    description: "Dummy"
-toolsets:
-  sqlite_database_tools:
-    - dummy_tool
-`
-	toolsetConflictFile := filepath.Join(t.TempDir(), "toolset_conflict.yaml")
-	if err := os.WriteFile(toolsetConflictFile, []byte(toolsetConflictContent), 0644); err != nil {
-		t.Fatal(err)
-	}
-
-	//Legacy Auth File
-	authContent := `
-authSources:
-  legacy-auth:
-    kind: google
-    clientId: "test-client-id"
-`
-	authFile := filepath.Join(t.TempDir(), "auth.yaml")
-	if err := os.WriteFile(authFile, []byte(authContent), 0644); err != nil {
-		t.Fatal(err)
-	}
-
-	testCases := []struct {
-		desc      string
-		args      []string
-		wantErr   bool
-		errString string
-		cfgCheck  func(server.ServerConfig) error
-	}{
-		{
-			desc:    "success mixed",
-			args:    []string{"--prebuilt", "sqlite", "--tools-file", customFile},
-			wantErr: false,
-			cfgCheck: func(cfg server.ServerConfig) error {
-				if _, ok := cfg.ToolConfigs["custom_tool"]; !ok {
-					return fmt.Errorf("custom tool not found")
-				}
-				if _, ok := cfg.ToolConfigs["list_tables"]; !ok {
-					return fmt.Errorf("prebuilt tool 'list_tables' not found")
-				}
-				return nil
-			},
-		},
-		{
-			desc:      "tool conflict error",
-			args:      []string{"--prebuilt", "sqlite", "--tools-file", toolConflictFile},
-			wantErr:   true,
-			errString: "resource conflicts detected",
-		},
-		{
-			desc:      "source conflict error",
-			args:      []string{"--prebuilt", "sqlite", "--tools-file", sourceConflictFile},
-			wantErr:   true,
-			errString: "resource conflicts detected",
-		},
-		{
-			desc:      "toolset conflict error",
-			args:      []string{"--prebuilt", "sqlite", "--tools-file", toolsetConflictFile},
-			wantErr:   true,
-			errString: "resource conflicts detected",
-		},
-		{
-			desc:    "legacy auth additive",
-			args:    []string{"--prebuilt", "sqlite", "--tools-file", authFile},
-			wantErr: false,
-			cfgCheck: func(cfg server.ServerConfig) error {
-				if _, ok := cfg.AuthServiceConfigs["legacy-auth"]; !ok {
-					return fmt.Errorf("legacy auth source not merged into auth services")
-				}
-				return nil
-			},
-		},
-	}
-
-	for _, tc := range testCases {
-		t.Run(tc.desc, func(t *testing.T) {
-			ctx, cancel := context.WithTimeout(context.Background(), 500*time.Millisecond)
-			defer cancel()
-
-			cmd, output, err := invokeCommandWithContext(ctx, tc.args)
-
-			if tc.wantErr {
-				if err == nil {
-					t.Fatalf("expected an error but got none")
-				}
-				if !strings.Contains(err.Error(), tc.errString) {
-					t.Errorf("expected error message to contain %q, but got %q", tc.errString, err.Error())
-				}
-			} else {
-				if err != nil && err != context.DeadlineExceeded && err != context.Canceled {
-					t.Fatalf("unexpected error: %v", err)
-				}
-				if !strings.Contains(output, "Server ready to serve!") {
-					t.Errorf("server did not start successfully (no ready message found). Output:\n%s", output)
-				}
-				if tc.cfgCheck != nil {
-					if err := tc.cfgCheck(cmd.cfg); err != nil {
-						t.Errorf("config check failed: %v", err)
-					}
-				}
-			}
-		})
-	}
-}
-
-func TestDefaultToolsFileBehavior(t *testing.T) {
-	t.Setenv("SQLITE_DATABASE", "test.db")
-	testCases := []struct {
-		desc      string
-		args      []string
-		expectRun bool
-		errString string
-	}{
-		{
-			desc:      "no flags (defaults to tools.yaml)",
-			args:      []string{},
-			expectRun: false,
-			errString: "tools.yaml", // Expect error because tools.yaml doesn't exist in test env
-		},
-		{
-			desc:      "prebuilt only (skips tools.yaml)",
-			args:      []string{"--prebuilt", "sqlite"},
-			expectRun: true,
-		},
-	}
-
-	for _, tc := range testCases {
-		t.Run(tc.desc, func(t *testing.T) {
-			ctx, cancel := context.WithTimeout(context.Background(), 500*time.Millisecond)
-			defer cancel()
-			_, output, err := invokeCommandWithContext(ctx, tc.args)
-
-			if tc.expectRun {
-				if err != nil && err != context.DeadlineExceeded && err != context.Canceled {
-					t.Fatalf("expected server start, got error: %v", err)
-				}
-				// Verify it actually started
-				if !strings.Contains(output, "Server ready to serve!") {
-					t.Errorf("server did not start successfully (no ready message found). Output:\n%s", output)
-				}
-			} else {
-				if err == nil {
-					t.Fatalf("expected error reading default file, got nil")
-				}
-				if !strings.Contains(err.Error(), tc.errString) {
-					t.Errorf("expected error message to contain %q, but got %q", tc.errString, err.Error())
-				}
-			}
-		})
-	}
-}
--- a/cmd/test.db
+++ b/cmd/test.db
--- a/cmd/version.txt
+++ b/cmd/version.txt
@@ -1 +1 @@
-0.25.0
+0.23.0
--- a/docs/BIGQUERY_README.md
+++ b/docs/BIGQUERY_README.md
@@ -68,7 +68,6 @@ The BigQuery MCP server is configured using environment variables.
 export BIGQUERY_PROJECT="<your-gcp-project-id>"
 export BIGQUERY_LOCATION="<your-dataset-location>"  # Optional
 export BIGQUERY_USE_CLIENT_OAUTH="true"  # Optional
-export BIGQUERY_SCOPES="<comma-separated-scopes>"  # Optional
 ```

 Add the following configuration to your MCP client (e.g., `settings.json` for Gemini CLI, `mcp_config.json` for Antigravity):
--- a/docs/en/blogs/_index.md
+++ b/docs/en/blogs/_index.md
@@ -1,18 +0,0 @@
---
-title: "Featured Articles"
-weight: 3
-description: Toolbox Medium Blogs
-manualLink: "https://medium.com/@mcp_toolbox"
-manualLinkTarget: _blank
---
-
-<html>
-  <head>
-    <title>Redirecting to Featured Articles</title>
-    <link rel="canonical" href="https://medium.com/@mcp_toolbox"/>
-    <meta http-equiv="refresh" content="0;url=https://medium.com/@mcp_toolbox"/>
-  </head>
-  <body>
-    <p>If you are not automatically redirected, please <a href="https://medium.com/@mcp_toolbox">follow this link to our articles</a>.</p>
-  </body>
-</html>
--- a/docs/en/concepts/telemetry/index.md
+++ b/docs/en/concepts/telemetry/index.md
@@ -183,11 +183,11 @@ Protocol (OTLP). If you would like to use a collector, please refer to this

 The following flags are used to determine Toolbox's telemetry configuration:

-| **flag**                   | **type** | **description**                                                                                                                                                                                           |
-|----------------------------|----------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| `--telemetry-gcp`          | bool     | Enable exporting directly to Google Cloud Monitoring. Default is `false`.                                                                                                                                 |
-| `--telemetry-otlp`         | string   | Enable exporting using OpenTelemetry Protocol (OTLP) to the specified endpoint (e.g. "127.0.0.1:4318"). To pass an insecure endpoint here, set environment variable `OTEL_EXPORTER_OTLP_INSECURE=true`. |
-| `--telemetry-service-name` | string   | Sets the value of the `service.name` resource attribute. Default is `toolbox`.                                                                                                                            |
+| **flag**                   | **type** | **description**                                                                                                  |
+|----------------------------|----------|------------------------------------------------------------------------------------------------------------------|
+| `--telemetry-gcp`          | bool     | Enable exporting directly to Google Cloud Monitoring. Default is `false`.                                        |
+| `--telemetry-otlp`         | string   | Enable exporting using OpenTelemetry Protocol (OTLP) to the specified endpoint (e.g. "<http://127.0.0.1:4318>"). |
+| `--telemetry-service-name` | string   | Sets the value of the `service.name` resource attribute. Default is `toolbox`.                                   |

 In addition to the flags noted above, you can also make additional configuration
 for OpenTelemetry via the [General SDK Configuration][sdk-configuration] through
@@ -207,5 +207,5 @@ To enable Google Cloud Exporter:
 To enable OTLP Exporter, provide Collector endpoint:

 ```bash
-./toolbox --telemetry-otlp="127.0.0.1:4553"
+./toolbox --telemetry-otlp="http://127.0.0.1:4553"
 ```
--- a/docs/en/getting-started/colab_quickstart.ipynb
+++ b/docs/en/getting-started/colab_quickstart.ipynb
@@ -234,7 +234,7 @@
      },
      "outputs": [],
      "source": [
-        "version = \"0.25.0\" # x-release-please-version\n",
+        "version = \"0.23.0\" # x-release-please-version\n",
        "! curl -O https://storage.googleapis.com/genai-toolbox/v{version}/linux/amd64/toolbox\n",
        "\n",
        "# Make the binary executable\n",
--- a/docs/en/getting-started/introduction/_index.md
+++ b/docs/en/getting-started/introduction/_index.md
@@ -103,7 +103,7 @@ To install Toolbox as a binary on Linux (AMD64):

 ```sh
 # see releases page for other versions
-export VERSION=0.25.0
+export VERSION=0.23.0
 curl -L -o toolbox https://storage.googleapis.com/genai-toolbox/v$VERSION/linux/amd64/toolbox
 chmod +x toolbox
 ```
@@ -114,7 +114,7 @@ To install Toolbox as a binary on macOS (Apple Silicon):

 ```sh
 # see releases page for other versions
-export VERSION=0.25.0
+export VERSION=0.23.0
 curl -L -o toolbox https://storage.googleapis.com/genai-toolbox/v$VERSION/darwin/arm64/toolbox
 chmod +x toolbox
 ```
@@ -125,7 +125,7 @@ To install Toolbox as a binary on macOS (Intel):

 ```sh
 # see releases page for other versions
-export VERSION=0.25.0
+export VERSION=0.23.0
 curl -L -o toolbox https://storage.googleapis.com/genai-toolbox/v$VERSION/darwin/amd64/toolbox
 chmod +x toolbox
 ```
@@ -136,7 +136,7 @@ To install Toolbox as a binary on Windows (Command Prompt):

 ```cmd
 :: see releases page for other versions
-set VERSION=0.25.0
+set VERSION=0.23.0
 curl -o toolbox.exe "https://storage.googleapis.com/genai-toolbox/v%VERSION%/windows/amd64/toolbox.exe"
 ```

@@ -146,7 +146,7 @@ To install Toolbox as a binary on Windows (PowerShell):

 ```powershell
 # see releases page for other versions
-$VERSION = "0.25.0"
+$VERSION = "0.23.0"
 curl.exe -o toolbox.exe "https://storage.googleapis.com/genai-toolbox/v$VERSION/windows/amd64/toolbox.exe"
 ```

@@ -158,7 +158,7 @@ You can also install Toolbox as a container:

 ```sh
 # see releases page for other versions
-export VERSION=0.25.0
+export VERSION=0.23.0
 docker pull us-central1-docker.pkg.dev/database-toolbox/toolbox/toolbox:$VERSION
 ```

@@ -177,7 +177,7 @@ To install from source, ensure you have the latest version of
 [Go installed](https://go.dev/doc/install), and then run the following command:

 ```sh
-go install github.com/googleapis/genai-toolbox@v0.25.0
+go install github.com/googleapis/genai-toolbox@v0.23.0
 ```

 {{% /tab %}}
--- a/docs/en/getting-started/mcp_quickstart/_index.md
+++ b/docs/en/getting-started/mcp_quickstart/_index.md
@@ -105,7 +105,7 @@ In this section, we will download Toolbox, configure our tools in a
    <!-- {x-release-please-start-version} -->
    ```bash
    export OS="linux/amd64" # one of linux/amd64, darwin/arm64, darwin/amd64, or windows/amd64
-    curl -O https://storage.googleapis.com/genai-toolbox/v0.25.0/$OS/toolbox
+    curl -O https://storage.googleapis.com/genai-toolbox/v0.23.0/$OS/toolbox
    ```
    <!-- {x-release-please-end} -->

--- a/docs/en/getting-started/quickstart/go/adkgo/go.mod
+++ b/docs/en/getting-started/quickstart/go/adkgo/go.mod
@@ -28,11 +28,11 @@ require (
 	go.opentelemetry.io/otel/metric v1.38.0 // indirect
 	go.opentelemetry.io/otel/sdk v1.38.0 // indirect
 	go.opentelemetry.io/otel/trace v1.38.0 // indirect
-	golang.org/x/crypto v0.45.0 // indirect
-	golang.org/x/net v0.47.0 // indirect
+	golang.org/x/crypto v0.43.0 // indirect
+	golang.org/x/net v0.46.0 // indirect
 	golang.org/x/oauth2 v0.32.0 // indirect
-	golang.org/x/sys v0.38.0 // indirect
-	golang.org/x/text v0.31.0 // indirect
+	golang.org/x/sys v0.37.0 // indirect
+	golang.org/x/text v0.30.0 // indirect
 	google.golang.org/api v0.255.0 // indirect
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20251029180050-ab9386a59fda // indirect
 	google.golang.org/grpc v1.76.0 // indirect
--- a/docs/en/getting-started/quickstart/go/adkgo/go.sum
+++ b/docs/en/getting-started/quickstart/go/adkgo/go.sum
@@ -88,18 +88,18 @@ go.opentelemetry.io/otel/trace v1.38.0 h1:Fxk5bKrDZJUH+AMyyIXGcFAPah0oRcT+LuNtJr
 go.opentelemetry.io/otel/trace v1.38.0/go.mod h1:j1P9ivuFsTceSWe1oY+EeW3sc+Pp42sO++GHkg4wwhs=
 go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
 go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
-golang.org/x/crypto v0.45.0 h1:jMBrvKuj23MTlT0bQEOBcAE0mjg8mK9RXFhRH6nyF3Q=
-golang.org/x/crypto v0.45.0/go.mod h1:XTGrrkGJve7CYK7J8PEww4aY7gM3qMCElcJQ8n8JdX4=
-golang.org/x/net v0.47.0 h1:Mx+4dIFzqraBXUugkia1OOvlD6LemFo1ALMHjrXDOhY=
-golang.org/x/net v0.47.0/go.mod h1:/jNxtkgq5yWUGYkaZGqo27cfGZ1c5Nen03aYrrKpVRU=
+golang.org/x/crypto v0.43.0 h1:dduJYIi3A3KOfdGOHX8AVZ/jGiyPa3IbBozJ5kNuE04=
+golang.org/x/crypto v0.43.0/go.mod h1:BFbav4mRNlXJL4wNeejLpWxB7wMbc79PdRGhWKncxR0=
+golang.org/x/net v0.46.0 h1:giFlY12I07fugqwPuWJi68oOnpfqFnJIJzaIIm2JVV4=
+golang.org/x/net v0.46.0/go.mod h1:Q9BGdFy1y4nkUwiLvT5qtyhAnEHgnQ/zd8PfU6nc210=
 golang.org/x/oauth2 v0.32.0 h1:jsCblLleRMDrxMN29H3z/k1KliIvpLgCkE6R8FXXNgY=
 golang.org/x/oauth2 v0.32.0/go.mod h1:lzm5WQJQwKZ3nwavOZ3IS5Aulzxi68dUSgRHujetwEA=
-golang.org/x/sync v0.18.0 h1:kr88TuHDroi+UVf+0hZnirlk8o8T+4MrK6mr60WkH/I=
-golang.org/x/sync v0.18.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI=
-golang.org/x/sys v0.38.0 h1:3yZWxaJjBmCWXqhN1qh02AkOnCQ1poK6oF+a7xWL6Gc=
-golang.org/x/sys v0.38.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
-golang.org/x/text v0.31.0 h1:aC8ghyu4JhP8VojJ2lEHBnochRno1sgL6nEi9WGFGMM=
-golang.org/x/text v0.31.0/go.mod h1:tKRAlv61yKIjGGHX/4tP1LTbc13YSec1pxVEWXzfoeM=
+golang.org/x/sync v0.17.0 h1:l60nONMj9l5drqw6jlhIELNv9I0A4OFgRsG9k2oT9Ug=
+golang.org/x/sync v0.17.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI=
+golang.org/x/sys v0.37.0 h1:fdNQudmxPjkdUTPnLn5mdQv7Zwvbvpaxqs831goi9kQ=
+golang.org/x/sys v0.37.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
+golang.org/x/text v0.30.0 h1:yznKA/E9zq54KzlzBEAWn1NXSQ8DIp/NYMy88xJjl4k=
+golang.org/x/text v0.30.0/go.mod h1:yDdHFIX9t+tORqspjENWgzaCVXgk0yYnYuSZ8UzzBVM=
 golang.org/x/time v0.14.0 h1:MRx4UaLrDotUKUdCIqzPC48t1Y9hANFKIRpNx+Te8PI=
 golang.org/x/time v0.14.0/go.mod h1:eL/Oa2bBBK0TkX57Fyni+NgnyQQN4LitPmob2Hjnqw4=
 gonum.org/v1/gonum v0.16.0 h1:5+ul4Swaf3ESvrOnidPp4GZbzf0mxVQpDCYUQE7OJfk=
--- a/docs/en/getting-started/quickstart/go/genkit/go.mod
+++ b/docs/en/getting-started/quickstart/go/genkit/go.mod
@@ -39,11 +39,11 @@ require (
 	go.opentelemetry.io/otel/metric v1.38.0 // indirect
 	go.opentelemetry.io/otel/sdk v1.38.0 // indirect
 	go.opentelemetry.io/otel/trace v1.38.0 // indirect
-	golang.org/x/crypto v0.45.0 // indirect
-	golang.org/x/net v0.47.0 // indirect
+	golang.org/x/crypto v0.43.0 // indirect
+	golang.org/x/net v0.46.0 // indirect
 	golang.org/x/oauth2 v0.32.0 // indirect
-	golang.org/x/sys v0.38.0 // indirect
-	golang.org/x/text v0.31.0 // indirect
+	golang.org/x/sys v0.37.0 // indirect
+	golang.org/x/text v0.30.0 // indirect
 	google.golang.org/api v0.255.0 // indirect
 	google.golang.org/genai v1.34.0 // indirect
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20251029180050-ab9386a59fda // indirect
--- a/docs/en/getting-started/quickstart/go/genkit/go.sum
+++ b/docs/en/getting-started/quickstart/go/genkit/go.sum
@@ -123,18 +123,18 @@ go.opentelemetry.io/otel/trace v1.38.0 h1:Fxk5bKrDZJUH+AMyyIXGcFAPah0oRcT+LuNtJr
 go.opentelemetry.io/otel/trace v1.38.0/go.mod h1:j1P9ivuFsTceSWe1oY+EeW3sc+Pp42sO++GHkg4wwhs=
 go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
 go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
-golang.org/x/crypto v0.45.0 h1:jMBrvKuj23MTlT0bQEOBcAE0mjg8mK9RXFhRH6nyF3Q=
-golang.org/x/crypto v0.45.0/go.mod h1:XTGrrkGJve7CYK7J8PEww4aY7gM3qMCElcJQ8n8JdX4=
-golang.org/x/net v0.47.0 h1:Mx+4dIFzqraBXUugkia1OOvlD6LemFo1ALMHjrXDOhY=
-golang.org/x/net v0.47.0/go.mod h1:/jNxtkgq5yWUGYkaZGqo27cfGZ1c5Nen03aYrrKpVRU=
+golang.org/x/crypto v0.43.0 h1:dduJYIi3A3KOfdGOHX8AVZ/jGiyPa3IbBozJ5kNuE04=
+golang.org/x/crypto v0.43.0/go.mod h1:BFbav4mRNlXJL4wNeejLpWxB7wMbc79PdRGhWKncxR0=
+golang.org/x/net v0.46.0 h1:giFlY12I07fugqwPuWJi68oOnpfqFnJIJzaIIm2JVV4=
+golang.org/x/net v0.46.0/go.mod h1:Q9BGdFy1y4nkUwiLvT5qtyhAnEHgnQ/zd8PfU6nc210=
 golang.org/x/oauth2 v0.32.0 h1:jsCblLleRMDrxMN29H3z/k1KliIvpLgCkE6R8FXXNgY=
 golang.org/x/oauth2 v0.32.0/go.mod h1:lzm5WQJQwKZ3nwavOZ3IS5Aulzxi68dUSgRHujetwEA=
-golang.org/x/sync v0.18.0 h1:kr88TuHDroi+UVf+0hZnirlk8o8T+4MrK6mr60WkH/I=
-golang.org/x/sync v0.18.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI=
-golang.org/x/sys v0.38.0 h1:3yZWxaJjBmCWXqhN1qh02AkOnCQ1poK6oF+a7xWL6Gc=
-golang.org/x/sys v0.38.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
-golang.org/x/text v0.31.0 h1:aC8ghyu4JhP8VojJ2lEHBnochRno1sgL6nEi9WGFGMM=
-golang.org/x/text v0.31.0/go.mod h1:tKRAlv61yKIjGGHX/4tP1LTbc13YSec1pxVEWXzfoeM=
+golang.org/x/sync v0.17.0 h1:l60nONMj9l5drqw6jlhIELNv9I0A4OFgRsG9k2oT9Ug=
+golang.org/x/sync v0.17.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI=
+golang.org/x/sys v0.37.0 h1:fdNQudmxPjkdUTPnLn5mdQv7Zwvbvpaxqs831goi9kQ=
+golang.org/x/sys v0.37.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
+golang.org/x/text v0.30.0 h1:yznKA/E9zq54KzlzBEAWn1NXSQ8DIp/NYMy88xJjl4k=
+golang.org/x/text v0.30.0/go.mod h1:yDdHFIX9t+tORqspjENWgzaCVXgk0yYnYuSZ8UzzBVM=
 golang.org/x/time v0.14.0 h1:MRx4UaLrDotUKUdCIqzPC48t1Y9hANFKIRpNx+Te8PI=
 golang.org/x/time v0.14.0/go.mod h1:eL/Oa2bBBK0TkX57Fyni+NgnyQQN4LitPmob2Hjnqw4=
 gonum.org/v1/gonum v0.16.0 h1:5+ul4Swaf3ESvrOnidPp4GZbzf0mxVQpDCYUQE7OJfk=
--- a/docs/en/getting-started/quickstart/go/openAI/go.mod
+++ b/docs/en/getting-started/quickstart/go/openAI/go.mod
@@ -26,11 +26,11 @@ require (
 	go.opentelemetry.io/otel v1.38.0 // indirect
 	go.opentelemetry.io/otel/metric v1.38.0 // indirect
 	go.opentelemetry.io/otel/trace v1.38.0 // indirect
-	golang.org/x/crypto v0.45.0 // indirect
-	golang.org/x/net v0.47.0 // indirect
+	golang.org/x/crypto v0.43.0 // indirect
+	golang.org/x/net v0.46.0 // indirect
 	golang.org/x/oauth2 v0.32.0 // indirect
-	golang.org/x/sys v0.38.0 // indirect
-	golang.org/x/text v0.31.0 // indirect
+	golang.org/x/sys v0.37.0 // indirect
+	golang.org/x/text v0.30.0 // indirect
 	google.golang.org/api v0.255.0 // indirect
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20251029180050-ab9386a59fda // indirect
 	google.golang.org/grpc v1.76.0 // indirect
--- a/docs/en/getting-started/quickstart/go/openAI/go.sum
+++ b/docs/en/getting-started/quickstart/go/openAI/go.sum
@@ -94,18 +94,18 @@ go.opentelemetry.io/otel/sdk/metric v1.38.0 h1:aSH66iL0aZqo//xXzQLYozmWrXxyFkBJ6
 go.opentelemetry.io/otel/sdk/metric v1.38.0/go.mod h1:dg9PBnW9XdQ1Hd6ZnRz689CbtrUp0wMMs9iPcgT9EZA=
 go.opentelemetry.io/otel/trace v1.38.0 h1:Fxk5bKrDZJUH+AMyyIXGcFAPah0oRcT+LuNtJrmcNLE=
 go.opentelemetry.io/otel/trace v1.38.0/go.mod h1:j1P9ivuFsTceSWe1oY+EeW3sc+Pp42sO++GHkg4wwhs=
-golang.org/x/crypto v0.45.0 h1:jMBrvKuj23MTlT0bQEOBcAE0mjg8mK9RXFhRH6nyF3Q=
-golang.org/x/crypto v0.45.0/go.mod h1:XTGrrkGJve7CYK7J8PEww4aY7gM3qMCElcJQ8n8JdX4=
-golang.org/x/net v0.47.0 h1:Mx+4dIFzqraBXUugkia1OOvlD6LemFo1ALMHjrXDOhY=
-golang.org/x/net v0.47.0/go.mod h1:/jNxtkgq5yWUGYkaZGqo27cfGZ1c5Nen03aYrrKpVRU=
+golang.org/x/crypto v0.43.0 h1:dduJYIi3A3KOfdGOHX8AVZ/jGiyPa3IbBozJ5kNuE04=
+golang.org/x/crypto v0.43.0/go.mod h1:BFbav4mRNlXJL4wNeejLpWxB7wMbc79PdRGhWKncxR0=
+golang.org/x/net v0.46.0 h1:giFlY12I07fugqwPuWJi68oOnpfqFnJIJzaIIm2JVV4=
+golang.org/x/net v0.46.0/go.mod h1:Q9BGdFy1y4nkUwiLvT5qtyhAnEHgnQ/zd8PfU6nc210=
 golang.org/x/oauth2 v0.32.0 h1:jsCblLleRMDrxMN29H3z/k1KliIvpLgCkE6R8FXXNgY=
 golang.org/x/oauth2 v0.32.0/go.mod h1:lzm5WQJQwKZ3nwavOZ3IS5Aulzxi68dUSgRHujetwEA=
-golang.org/x/sync v0.18.0 h1:kr88TuHDroi+UVf+0hZnirlk8o8T+4MrK6mr60WkH/I=
-golang.org/x/sync v0.18.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI=
-golang.org/x/sys v0.38.0 h1:3yZWxaJjBmCWXqhN1qh02AkOnCQ1poK6oF+a7xWL6Gc=
-golang.org/x/sys v0.38.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
-golang.org/x/text v0.31.0 h1:aC8ghyu4JhP8VojJ2lEHBnochRno1sgL6nEi9WGFGMM=
-golang.org/x/text v0.31.0/go.mod h1:tKRAlv61yKIjGGHX/4tP1LTbc13YSec1pxVEWXzfoeM=
+golang.org/x/sync v0.17.0 h1:l60nONMj9l5drqw6jlhIELNv9I0A4OFgRsG9k2oT9Ug=
+golang.org/x/sync v0.17.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI=
+golang.org/x/sys v0.37.0 h1:fdNQudmxPjkdUTPnLn5mdQv7Zwvbvpaxqs831goi9kQ=
+golang.org/x/sys v0.37.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
+golang.org/x/text v0.30.0 h1:yznKA/E9zq54KzlzBEAWn1NXSQ8DIp/NYMy88xJjl4k=
+golang.org/x/text v0.30.0/go.mod h1:yDdHFIX9t+tORqspjENWgzaCVXgk0yYnYuSZ8UzzBVM=
 golang.org/x/time v0.14.0 h1:MRx4UaLrDotUKUdCIqzPC48t1Y9hANFKIRpNx+Te8PI=
 golang.org/x/time v0.14.0/go.mod h1:eL/Oa2bBBK0TkX57Fyni+NgnyQQN4LitPmob2Hjnqw4=
 gonum.org/v1/gonum v0.16.0 h1:5+ul4Swaf3ESvrOnidPp4GZbzf0mxVQpDCYUQE7OJfk=
--- a/docs/en/getting-started/quickstart/js/adk/package-lock.json
+++ b/docs/en/getting-started/quickstart/js/adk/package-lock.json
@@ -18,6 +18,7 @@
      "resolved": "https://registry.npmjs.org/@google-cloud/paginator/-/paginator-5.0.2.tgz",
      "integrity": "sha512-DJS3s0OVH4zFDB1PzjxAsHqJT6sKVbRwwML0ZBP9PbU7Yebtu/7SWMRzvO2J3nUi9pRNITCfu4LJeooM2w4pjg==",
      "license": "Apache-2.0",
+      "peer": true,
      "dependencies": {
        "arrify": "^2.0.0",
        "extend": "^3.0.2"
@@ -31,6 +32,7 @@
      "resolved": "https://registry.npmjs.org/@google-cloud/projectify/-/projectify-4.0.0.tgz",
      "integrity": "sha512-MmaX6HeSvyPbWGwFq7mXdo0uQZLGBYCwziiLIGq5JVX+/bdI3SAq6bP98trV5eTWfLuvsMcIC1YJOF2vfteLFA==",
      "license": "Apache-2.0",
+      "peer": true,
      "engines": {
        "node": ">=14.0.0"
      }
@@ -40,6 +42,7 @@
      "resolved": "https://registry.npmjs.org/@google-cloud/promisify/-/promisify-4.0.0.tgz",
      "integrity": "sha512-Orxzlfb9c67A15cq2JQEyVc7wEsmFBmHjZWZYQMUyJ1qivXyMwdyNOs9odi79hze+2zqdTtu1E19IM/FtqZ10g==",
      "license": "Apache-2.0",
+      "peer": true,
      "engines": {
        "node": ">=14"
      }
@@ -49,6 +52,7 @@
      "resolved": "https://registry.npmjs.org/@google-cloud/storage/-/storage-7.18.0.tgz",
      "integrity": "sha512-r3ZwDMiz4nwW6R922Z1pwpePxyRwE5GdevYX63hRmAQUkUQJcBH/79EnQPDv5cOv1mFBgevdNWQfi3tie3dHrQ==",
      "license": "Apache-2.0",
+      "peer": true,
      "dependencies": {
        "@google-cloud/paginator": "^5.0.0",
        "@google-cloud/projectify": "^4.0.0",
@@ -75,6 +79,7 @@
      "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
      "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
      "license": "MIT",
+      "peer": true,
      "bin": {
        "uuid": "dist/bin/uuid"
      }
@@ -97,7 +102,6 @@
      "resolved": "https://registry.npmjs.org/@google/genai/-/genai-1.14.0.tgz",
      "integrity": "sha512-jirYprAAJU1svjwSDVCzyVq+FrJpJd5CSxR/g2Ga/gZ0ZYZpcWjMS75KJl9y71K1mDN+tcx6s21CzCbB2R840g==",
      "license": "Apache-2.0",
-      "peer": true,
      "dependencies": {
        "google-auth-library": "^9.14.2",
        "ws": "^8.18.0"
@@ -136,7 +140,6 @@
      "resolved": "https://registry.npmjs.org/@modelcontextprotocol/sdk/-/sdk-1.17.5.tgz",
      "integrity": "sha512-QakrKIGniGuRVfWBdMsDea/dx1PNE739QJ7gCM41s9q+qaCYTHCdsIBXQVVXry3mfWAiaM9kT22Hyz53Uw8mfg==",
      "license": "MIT",
-      "peer": true,
      "dependencies": {
        "ajv": "^6.12.6",
        "content-type": "^1.0.5",
@@ -299,6 +302,7 @@
      "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-2.0.0.tgz",
      "integrity": "sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==",
      "license": "MIT",
+      "peer": true,
      "engines": {
        "node": ">= 10"
      }
@@ -307,13 +311,15 @@
      "version": "0.12.5",
      "resolved": "https://registry.npmjs.org/@types/caseless/-/caseless-0.12.5.tgz",
      "integrity": "sha512-hWtVTC2q7hc7xZ/RLbxapMvDMgUnDvKvMOpKal4DrMyfGBUfB1oKaZlIRr6mJL+If3bAP6sV/QneGzF6tJjZDg==",
-      "license": "MIT"
+      "license": "MIT",
+      "peer": true
    },
    "node_modules/@types/node": {
      "version": "24.10.1",
      "resolved": "https://registry.npmjs.org/@types/node/-/node-24.10.1.tgz",
      "integrity": "sha512-GNWcUTRBgIRJD5zj+Tq0fKOJ5XZajIiBroOF0yvj2bSU1WvNdYS/dn9UxwsujGW4JX06dnHyjV2y9rRaybH0iQ==",
      "license": "MIT",
+      "peer": true,
      "dependencies": {
        "undici-types": "~7.16.0"
      }
@@ -323,6 +329,7 @@
      "resolved": "https://registry.npmjs.org/@types/request/-/request-2.48.13.tgz",
      "integrity": "sha512-FGJ6udDNUCjd19pp0Q3iTiDkwhYup7J8hpMW9c4k53NrccQFFWKRho6hvtPPEhnXWKvukfwAlB6DbDz4yhH5Gg==",
      "license": "MIT",
+      "peer": true,
      "dependencies": {
        "@types/caseless": "*",
        "@types/node": "*",
@@ -335,6 +342,7 @@
      "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.5.5.tgz",
      "integrity": "sha512-jqdObeR2rxZZbPSGL+3VckHMYtu+f9//KXBsVny6JSX/pa38Fy+bGjuG8eW/H6USNQWhLi8Num++cU2yOCNz4A==",
      "license": "MIT",
+      "peer": true,
      "dependencies": {
        "asynckit": "^0.4.0",
        "combined-stream": "^1.0.8",
@@ -352,6 +360,7 @@
      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
      "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
      "license": "MIT",
+      "peer": true,
      "engines": {
        "node": ">= 0.6"
      }
@@ -361,6 +370,7 @@
      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
      "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
      "license": "MIT",
+      "peer": true,
      "dependencies": {
        "mime-db": "1.52.0"
      },
@@ -372,13 +382,15 @@
      "version": "4.0.5",
      "resolved": "https://registry.npmjs.org/@types/tough-cookie/-/tough-cookie-4.0.5.tgz",
      "integrity": "sha512-/Ad8+nIOV7Rl++6f1BdKxFSMgmoqEoYbHRpPcx3JEfv8VRsQe9Z4mCXeJBzxs7mbHY/XOZZuXlRNfhpVPbs6ZA==",
-      "license": "MIT"
+      "license": "MIT",
+      "peer": true
    },
    "node_modules/abort-controller": {
      "version": "3.0.0",
      "resolved": "https://registry.npmjs.org/abort-controller/-/abort-controller-3.0.0.tgz",
      "integrity": "sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg==",
      "license": "MIT",
+      "peer": true,
      "dependencies": {
        "event-target-shim": "^5.0.0"
      },
@@ -453,6 +465,7 @@
      "resolved": "https://registry.npmjs.org/arrify/-/arrify-2.0.1.tgz",
      "integrity": "sha512-3duEwti880xqi4eAMN8AyR4a0ByT90zoYdLlevfrvU43vb0YZwZVfxOgxWrLXXXpyugL0hNZc9G6BiB5B3nUug==",
      "license": "MIT",
+      "peer": true,
      "engines": {
        "node": ">=8"
      }
@@ -462,6 +475,7 @@
      "resolved": "https://registry.npmjs.org/async-retry/-/async-retry-1.3.3.tgz",
      "integrity": "sha512-wfr/jstw9xNi/0teMHrRW7dsz3Lt5ARhYNZ2ewpadnhaIp5mbALhOAP+EAdsC7t4Z6wqsDVv9+W6gm1Dk9mEyw==",
      "license": "MIT",
+      "peer": true,
      "dependencies": {
        "retry": "0.13.1"
      }
@@ -754,6 +768,7 @@
      "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-4.1.3.tgz",
      "integrity": "sha512-M3BmBhwJRZsSx38lZyhE53Csddgzl5R7xGJNk7CVddZD6CcmwMCH8J+7AprIrQKH7TonKxaCjcv27Qmf+sQ+oA==",
      "license": "MIT",
+      "peer": true,
      "dependencies": {
        "end-of-stream": "^1.4.1",
        "inherits": "^2.0.3",
@@ -802,6 +817,7 @@
      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.5.tgz",
      "integrity": "sha512-ooEGc6HP26xXq/N+GCGOT0JKCLDGrq2bQUZrQ7gyrJiZANJ/8YDTxTpQBXGMn+WbIQXNVpyWymm7KYVICQnyOg==",
      "license": "MIT",
+      "peer": true,
      "dependencies": {
        "once": "^1.4.0"
      }
@@ -871,6 +887,7 @@
      "resolved": "https://registry.npmjs.org/event-target-shim/-/event-target-shim-5.0.1.tgz",
      "integrity": "sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ==",
      "license": "MIT",
+      "peer": true,
      "engines": {
        "node": ">=6"
      }
@@ -901,7 +918,6 @@
      "resolved": "https://registry.npmjs.org/express/-/express-5.1.0.tgz",
      "integrity": "sha512-DT9ck5YIRU+8GYzzU5kT3eHGA5iL+1Zd0EutOmTE9Dtk+Tvuzd23VBU+ec7HPNSTxXYO55gPV/hq4pSBJDjFpA==",
      "license": "MIT",
-      "peer": true,
      "dependencies": {
        "accepts": "^2.0.0",
        "body-parser": "^2.2.0",
@@ -983,6 +999,7 @@
        }
      ],
      "license": "MIT",
+      "peer": true,
      "dependencies": {
        "strnum": "^1.1.1"
      },
@@ -1333,7 +1350,8 @@
          "url": "https://patreon.com/mdevils"
        }
      ],
-      "license": "MIT"
+      "license": "MIT",
+      "peer": true
    },
    "node_modules/http-errors": {
      "version": "2.0.0",
@@ -1365,6 +1383,7 @@
      "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz",
      "integrity": "sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==",
      "license": "MIT",
+      "peer": true,
      "dependencies": {
        "@tootallnate/once": "2",
        "agent-base": "6",
@@ -1379,6 +1398,7 @@
      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
      "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
      "license": "MIT",
+      "peer": true,
      "dependencies": {
        "debug": "4"
      },
@@ -1505,12 +1525,12 @@
      }
    },
    "node_modules/jws": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/jws/-/jws-4.0.1.tgz",
-      "integrity": "sha512-EKI/M/yqPncGUUh44xz0PxSidXFr/+r0pA70+gIYhjv+et7yxM+s29Y+VGDkovRofQem0fs7Uvf4+YmAdyRduA==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/jws/-/jws-4.0.0.tgz",
+      "integrity": "sha512-KDncfTmOZoOMTFG4mBlG0qUIOlc03fmzH+ru6RgYVZhPkyiy/92Owlt/8UEN+a4TXR1FQetfIpJE8ApdvdVxTg==",
      "license": "MIT",
      "dependencies": {
-        "jwa": "^2.0.1",
+        "jwa": "^2.0.0",
        "safe-buffer": "^5.0.1"
      }
    },
@@ -1555,6 +1575,7 @@
      "resolved": "https://registry.npmjs.org/mime/-/mime-3.0.0.tgz",
      "integrity": "sha512-jSCU7/VB1loIWBZe14aEYHU/+1UMEHoaO7qxCOVJOw9GgH72VAWppxNcjU+x9a2k3GSIBXNKxXQFqRvvZ7vr3A==",
      "license": "MIT",
+      "peer": true,
      "bin": {
        "mime": "cli.js"
      },
@@ -1715,6 +1736,7 @@
      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
      "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
      "license": "MIT",
+      "peer": true,
      "dependencies": {
        "yocto-queue": "^0.1.0"
      },
@@ -1813,9 +1835,9 @@
      }
    },
    "node_modules/qs": {
-      "version": "6.14.1",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.14.1.tgz",
-      "integrity": "sha512-4EK3+xJl8Ts67nLYNwqw/dsFVnCf+qR7RgXSK9jEEm9unao3njwMDdmsdvoKBKHzxd7tCYz5e5M+SnMjdtXGQQ==",
+      "version": "6.14.0",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.14.0.tgz",
+      "integrity": "sha512-YWWTjgABSKcvs/nWBi9PycY/JiPJqOD4JA6o9Sej2AtvSGarXxKC3OQSk4pAarbdQlKAh5D4FCQkJNkW+GAn3w==",
      "license": "BSD-3-Clause",
      "dependencies": {
        "side-channel": "^1.1.0"
@@ -1856,6 +1878,7 @@
      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
      "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
      "license": "MIT",
+      "peer": true,
      "dependencies": {
        "inherits": "^2.0.3",
        "string_decoder": "^1.1.1",
@@ -1870,6 +1893,7 @@
      "resolved": "https://registry.npmjs.org/retry/-/retry-0.13.1.tgz",
      "integrity": "sha512-XQBQ3I8W1Cge0Seh+6gjj03LbmRFWuoszgK9ooCpwYIrhhoO80pfq4cUkU5DkknwfOfFteRwlZ56PYOGYyFWdg==",
      "license": "MIT",
+      "peer": true,
      "engines": {
        "node": ">= 4"
      }
@@ -1879,6 +1903,7 @@
      "resolved": "https://registry.npmjs.org/retry-request/-/retry-request-7.0.2.tgz",
      "integrity": "sha512-dUOvLMJ0/JJYEn8NrpOaGNE7X3vpI5XlZS/u0ANjqtcZVKnIxP7IgCFwrKTxENw29emmwug53awKtaMm4i9g5w==",
      "license": "MIT",
+      "peer": true,
      "dependencies": {
        "@types/request": "^2.48.8",
        "extend": "^3.0.2",
@@ -2107,6 +2132,7 @@
      "resolved": "https://registry.npmjs.org/stream-events/-/stream-events-1.0.5.tgz",
      "integrity": "sha512-E1GUzBSgvct8Jsb3v2X15pjzN1tYebtbLaMg+eBOUOAxgbLoSbT2NS91ckc5lJD1KfLjId+jXJRgo0qnV5Nerg==",
      "license": "MIT",
+      "peer": true,
      "dependencies": {
        "stubs": "^3.0.0"
      }
@@ -2115,13 +2141,15 @@
      "version": "1.0.3",
      "resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.3.tgz",
      "integrity": "sha512-76ORR0DO1o1hlKwTbi/DM3EXWGf3ZJYO8cXX5RJwnul2DEg2oyoZyjLNoQM8WsvZiFKCRfC1O0J7iCvie3RZmQ==",
-      "license": "MIT"
+      "license": "MIT",
+      "peer": true
    },
    "node_modules/string_decoder": {
      "version": "1.3.0",
      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
      "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
      "license": "MIT",
+      "peer": true,
      "dependencies": {
        "safe-buffer": "~5.2.0"
      }
@@ -2232,19 +2260,22 @@
          "url": "https://github.com/sponsors/NaturalIntelligence"
        }
      ],
-      "license": "MIT"
+      "license": "MIT",
+      "peer": true
    },
    "node_modules/stubs": {
      "version": "3.0.0",
      "resolved": "https://registry.npmjs.org/stubs/-/stubs-3.0.0.tgz",
      "integrity": "sha512-PdHt7hHUJKxvTCgbKX9C1V/ftOcjJQgz8BZwNfV5c4B6dcGqlpelTbJ999jBGZ2jYiPAwcX5dP6oBwVlBlUbxw==",
-      "license": "MIT"
+      "license": "MIT",
+      "peer": true
    },
    "node_modules/teeny-request": {
      "version": "9.0.0",
      "resolved": "https://registry.npmjs.org/teeny-request/-/teeny-request-9.0.0.tgz",
      "integrity": "sha512-resvxdc6Mgb7YEThw6G6bExlXKkv6+YbuzGg9xuXxSgxJF7Ozs+o8Y9+2R3sArdWdW8nOokoQb1yrpFB0pQK2g==",
      "license": "Apache-2.0",
+      "peer": true,
      "dependencies": {
        "http-proxy-agent": "^5.0.0",
        "https-proxy-agent": "^5.0.0",
@@ -2261,6 +2292,7 @@
      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
      "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
      "license": "MIT",
+      "peer": true,
      "dependencies": {
        "debug": "4"
      },
@@ -2273,6 +2305,7 @@
      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz",
      "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==",
      "license": "MIT",
+      "peer": true,
      "dependencies": {
        "agent-base": "6",
        "debug": "4"
@@ -2314,7 +2347,8 @@
      "version": "7.16.0",
      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.16.0.tgz",
      "integrity": "sha512-Zz+aZWSj8LE6zoxD+xrjh4VfkIG8Ya6LvYkZqtUQGJPZjYl53ypCaUwWqo7eI0x66KBGeRo+mlBEkMSeSZ38Nw==",
-      "license": "MIT"
+      "license": "MIT",
+      "peer": true
    },
    "node_modules/unpipe": {
      "version": "1.0.0",
@@ -2338,7 +2372,8 @@
      "version": "1.0.2",
      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
      "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==",
-      "license": "MIT"
+      "license": "MIT",
+      "peer": true
    },
    "node_modules/uuid": {
      "version": "9.0.1",
@@ -2525,6 +2560,7 @@
      "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
      "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
      "license": "MIT",
+      "peer": true,
      "engines": {
        "node": ">=10"
      },
@@ -2537,7 +2573,6 @@
      "resolved": "https://registry.npmjs.org/zod/-/zod-3.25.76.tgz",
      "integrity": "sha512-gzUt/qt81nXsFGKIFcC3YnfEAx5NkunCfnDlvuBSSFS02bcXu4Lmea0AFIUwbLWxWPx3d9p8S5QoaujKcNQxcQ==",
      "license": "MIT",
-      "peer": true,
      "funding": {
        "url": "https://github.com/sponsors/colinhacks"
      }
--- a/docs/en/getting-started/quickstart/js/genAI/package-lock.json
+++ b/docs/en/getting-started/quickstart/js/genAI/package-lock.json
@@ -569,12 +569,11 @@
      }
    },
    "node_modules/jws": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/jws/-/jws-4.0.1.tgz",
-      "integrity": "sha512-EKI/M/yqPncGUUh44xz0PxSidXFr/+r0pA70+gIYhjv+et7yxM+s29Y+VGDkovRofQem0fs7Uvf4+YmAdyRduA==",
-      "license": "MIT",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/jws/-/jws-4.0.0.tgz",
+      "integrity": "sha512-KDncfTmOZoOMTFG4mBlG0qUIOlc03fmzH+ru6RgYVZhPkyiy/92Owlt/8UEN+a4TXR1FQetfIpJE8ApdvdVxTg==",
      "dependencies": {
-        "jwa": "^2.0.1",
+        "jwa": "^2.0.0",
        "safe-buffer": "^5.0.1"
      }
    },
--- a/docs/en/getting-started/quickstart/js/genkit/package-lock.json
+++ b/docs/en/getting-started/quickstart/js/genkit/package-lock.json
@@ -3376,23 +3376,22 @@
      }
    },
    "node_modules/body-parser": {
-      "version": "1.20.4",
-      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.4.tgz",
-      "integrity": "sha512-ZTgYYLMOXY9qKU/57FAo8F+HA2dGX7bqGc71txDRC1rS4frdFI5R7NhluHxH6M0YItAP0sHB4uqAOcYKxO6uGA==",
-      "license": "MIT",
+      "version": "1.20.3",
+      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.3.tgz",
+      "integrity": "sha512-7rAxByjUMqQ3/bHJy7D6OGXvx/MMc4IqBn/X0fcM1QUcAItpZrBEYhWGem+tzXH90c+G01ypMcYJBO9Y30203g==",
      "dependencies": {
-        "bytes": "~3.1.2",
+        "bytes": "3.1.2",
        "content-type": "~1.0.5",
        "debug": "2.6.9",
        "depd": "2.0.0",
-        "destroy": "~1.2.0",
-        "http-errors": "~2.0.1",
-        "iconv-lite": "~0.4.24",
-        "on-finished": "~2.4.1",
-        "qs": "~6.14.0",
-        "raw-body": "~2.5.3",
+        "destroy": "1.2.0",
+        "http-errors": "2.0.0",
+        "iconv-lite": "0.4.24",
+        "on-finished": "2.4.1",
+        "qs": "6.13.0",
+        "raw-body": "2.5.2",
        "type-is": "~1.6.18",
-        "unpipe": "~1.0.0"
+        "unpipe": "1.0.0"
      },
      "engines": {
        "node": ">= 0.8",
@@ -3407,40 +3406,11 @@
        "ms": "2.0.0"
      }
    },
-    "node_modules/body-parser/node_modules/http-errors": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.1.tgz",
-      "integrity": "sha512-4FbRdAX+bSdmo4AUFuS0WNiPz8NgFt+r8ThgNWmlrjQjt1Q7ZR9+zTlce2859x4KSXrwIsaeTqDoKQmtP8pLmQ==",
-      "license": "MIT",
-      "dependencies": {
-        "depd": "~2.0.0",
-        "inherits": "~2.0.4",
-        "setprototypeof": "~1.2.0",
-        "statuses": "~2.0.2",
-        "toidentifier": "~1.0.1"
-      },
-      "engines": {
-        "node": ">= 0.8"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/express"
-      }
-    },
    "node_modules/body-parser/node_modules/ms": {
      "version": "2.0.0",
      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
    },
-    "node_modules/body-parser/node_modules/statuses": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.2.tgz",
-      "integrity": "sha512-DvEy55V3DB7uknRo+4iOGT5fP1slR8wQohVdknigZPMpMstaKJQWhwiYBACJE3Ul2pTnATihhBYnRhZQHGBiRw==",
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
    "node_modules/buffer-equal-constant-time": {
      "version": "1.0.1",
      "resolved": "https://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz",
@@ -3464,7 +3434,6 @@
      "version": "3.1.2",
      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
      "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==",
-      "license": "MIT",
      "engines": {
        "node": ">= 0.8"
      }
@@ -3861,39 +3830,38 @@
      }
    },
    "node_modules/express": {
-      "version": "4.22.1",
-      "resolved": "https://registry.npmjs.org/express/-/express-4.22.1.tgz",
-      "integrity": "sha512-F2X8g9P1X7uCPZMA3MVf9wcTqlyNp7IhH5qPCI0izhaOIYXaW9L535tGA3qmjRzpH+bZczqq7hVKxTR4NWnu+g==",
-      "license": "MIT",
+      "version": "4.21.2",
+      "resolved": "https://registry.npmjs.org/express/-/express-4.21.2.tgz",
+      "integrity": "sha512-28HqgMZAmih1Czt9ny7qr6ek2qddF4FclbMzwhCREB6OFfH+rXAnuNCwo1/wFvrtbgsQDb4kSbX9de9lFbrXnA==",
      "dependencies": {
        "accepts": "~1.3.8",
        "array-flatten": "1.1.1",
-        "body-parser": "~1.20.3",
-        "content-disposition": "~0.5.4",
+        "body-parser": "1.20.3",
+        "content-disposition": "0.5.4",
        "content-type": "~1.0.4",
-        "cookie": "~0.7.1",
-        "cookie-signature": "~1.0.6",
+        "cookie": "0.7.1",
+        "cookie-signature": "1.0.6",
        "debug": "2.6.9",
        "depd": "2.0.0",
        "encodeurl": "~2.0.0",
        "escape-html": "~1.0.3",
        "etag": "~1.8.1",
-        "finalhandler": "~1.3.1",
-        "fresh": "~0.5.2",
-        "http-errors": "~2.0.0",
+        "finalhandler": "1.3.1",
+        "fresh": "0.5.2",
+        "http-errors": "2.0.0",
        "merge-descriptors": "1.0.3",
        "methods": "~1.1.2",
-        "on-finished": "~2.4.1",
+        "on-finished": "2.4.1",
        "parseurl": "~1.3.3",
-        "path-to-regexp": "~0.1.12",
+        "path-to-regexp": "0.1.12",
        "proxy-addr": "~2.0.7",
-        "qs": "~6.14.0",
+        "qs": "6.13.0",
        "range-parser": "~1.2.1",
        "safe-buffer": "5.2.1",
-        "send": "~0.19.0",
-        "serve-static": "~1.16.2",
+        "send": "0.19.0",
+        "serve-static": "1.16.2",
        "setprototypeof": "1.2.0",
-        "statuses": "~2.0.1",
+        "statuses": "2.0.1",
        "type-is": "~1.6.18",
        "utils-merge": "1.0.1",
        "vary": "~1.1.2"
@@ -4936,7 +4904,6 @@
      "version": "0.4.24",
      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
      "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
-      "license": "MIT",
      "dependencies": {
        "safer-buffer": ">= 2.1.2 < 3"
      },
@@ -5694,12 +5661,11 @@
      }
    },
    "node_modules/qs": {
-      "version": "6.14.1",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.14.1.tgz",
-      "integrity": "sha512-4EK3+xJl8Ts67nLYNwqw/dsFVnCf+qR7RgXSK9jEEm9unao3njwMDdmsdvoKBKHzxd7tCYz5e5M+SnMjdtXGQQ==",
-      "license": "BSD-3-Clause",
+      "version": "6.13.0",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.13.0.tgz",
+      "integrity": "sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg==",
      "dependencies": {
-        "side-channel": "^1.1.0"
+        "side-channel": "^1.0.6"
      },
      "engines": {
        "node": ">=0.6"
@@ -5717,49 +5683,19 @@
      }
    },
    "node_modules/raw-body": {
-      "version": "2.5.3",
-      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.3.tgz",
-      "integrity": "sha512-s4VSOf6yN0rvbRZGxs8Om5CWj6seneMwK3oDb4lWDH0UPhWcxwOWw5+qk24bxq87szX1ydrwylIOp2uG1ojUpA==",
-      "license": "MIT",
+      "version": "2.5.2",
+      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.2.tgz",
+      "integrity": "sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA==",
      "dependencies": {
-        "bytes": "~3.1.2",
-        "http-errors": "~2.0.1",
-        "iconv-lite": "~0.4.24",
-        "unpipe": "~1.0.0"
+        "bytes": "3.1.2",
+        "http-errors": "2.0.0",
+        "iconv-lite": "0.4.24",
+        "unpipe": "1.0.0"
      },
      "engines": {
        "node": ">= 0.8"
      }
    },
-    "node_modules/raw-body/node_modules/http-errors": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.1.tgz",
-      "integrity": "sha512-4FbRdAX+bSdmo4AUFuS0WNiPz8NgFt+r8ThgNWmlrjQjt1Q7ZR9+zTlce2859x4KSXrwIsaeTqDoKQmtP8pLmQ==",
-      "license": "MIT",
-      "dependencies": {
-        "depd": "~2.0.0",
-        "inherits": "~2.0.4",
-        "setprototypeof": "~1.2.0",
-        "statuses": "~2.0.2",
-        "toidentifier": "~1.0.1"
-      },
-      "engines": {
-        "node": ">= 0.8"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/express"
-      }
-    },
-    "node_modules/raw-body/node_modules/statuses": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.2.tgz",
-      "integrity": "sha512-DvEy55V3DB7uknRo+4iOGT5fP1slR8wQohVdknigZPMpMstaKJQWhwiYBACJE3Ul2pTnATihhBYnRhZQHGBiRw==",
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
    "node_modules/readable-stream": {
      "version": "3.6.2",
      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
@@ -5877,8 +5813,7 @@
    "node_modules/safer-buffer": {
      "version": "2.1.2",
      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
-      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
-      "license": "MIT"
+      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
    },
    "node_modules/semver": {
      "version": "7.7.2",
--- a/docs/en/getting-started/quickstart/js/langchain/package-lock.json
+++ b/docs/en/getting-started/quickstart/js/langchain/package-lock.json
@@ -45,9 +45,9 @@
      }
    },
    "node_modules/@langchain/core": {
-      "version": "1.1.8",
-      "resolved": "https://registry.npmjs.org/@langchain/core/-/core-1.1.8.tgz",
-      "integrity": "sha512-kIUidOgc0ZdyXo4Ahn9Zas+OayqOfk4ZoKPi7XaDipNSWSApc2+QK5BVcjvwtzxstsNOrmXJiJWEN6WPF/MvAw==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@langchain/core/-/core-1.1.0.tgz",
+      "integrity": "sha512-yJ6JHcU9psjnQbzRFkXjIdNTA+3074dA+2pHdH8ewvQCSleSk6JcjkCMIb5+NASjeMoi1ZuntlLKVsNqF38YxA==",
      "license": "MIT",
      "peer": true,
      "dependencies": {
@@ -56,9 +56,10 @@
        "camelcase": "6",
        "decamelize": "1.2.0",
        "js-tiktoken": "^1.0.12",
-        "langsmith": ">=0.4.0 <1.0.0",
+        "langsmith": "^0.3.64",
        "mustache": "^4.2.0",
        "p-queue": "^6.6.2",
+        "p-retry": "^7.0.0",
        "uuid": "^10.0.0",
        "zod": "^3.25.76 || ^4"
      },
@@ -66,10 +67,25 @@
        "node": ">=20"
      }
    },
+    "node_modules/@langchain/core/node_modules/p-retry": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/p-retry/-/p-retry-7.1.0.tgz",
+      "integrity": "sha512-xL4PiFRQa/f9L9ZvR4/gUCRNus4N8YX80ku8kv9Jqz+ZokkiZLM0bcvX0gm1F3PDi9SPRsww1BDsTWgE6Y1GLQ==",
+      "license": "MIT",
+      "dependencies": {
+        "is-network-error": "^1.1.0"
+      },
+      "engines": {
+        "node": ">=20"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
    "node_modules/@langchain/google-genai": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/@langchain/google-genai/-/google-genai-2.1.3.tgz",
-      "integrity": "sha512-ZdlFK/N10GyU6ATzkM01Sk1rlHBoy36Q/MawGD1SyXdD2lQxZxuQZjFWewj6uzWQ2Nnjj70EvU/kmmHVPn6sfQ==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@langchain/google-genai/-/google-genai-2.0.0.tgz",
+      "integrity": "sha512-PaAWkogQdF+Y2bhhXWXUrC2nO7sTgWLtobBbZl/0V8Aa1F/KG2wrMECie3S17bAdFu/6VmQOuFFrlgSMwQC5KA==",
      "license": "MIT",
      "dependencies": {
        "@google/generative-ai": "^0.24.0",
@@ -79,7 +95,7 @@
        "node": ">=20"
      },
      "peerDependencies": {
-        "@langchain/core": "1.1.8"
+        "@langchain/core": "1.1.0"
      }
    },
    "node_modules/@langchain/google-genai/node_modules/uuid": {
@@ -798,6 +814,18 @@
        "node": ">=8"
      }
    },
+    "node_modules/is-network-error": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/is-network-error/-/is-network-error-1.3.0.tgz",
+      "integrity": "sha512-6oIwpsgRfnDiyEDLMay/GqCl3HoAtH5+RUKW29gYkL0QA+ipzpDLA16yQs7/RHCSu+BwgbJaOUqa4A99qNVQVw==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=16"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
    "node_modules/isexe": {
      "version": "2.0.0",
      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
@@ -844,24 +872,22 @@
      }
    },
    "node_modules/jws": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/jws/-/jws-4.0.1.tgz",
-      "integrity": "sha512-EKI/M/yqPncGUUh44xz0PxSidXFr/+r0pA70+gIYhjv+et7yxM+s29Y+VGDkovRofQem0fs7Uvf4+YmAdyRduA==",
-      "license": "MIT",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/jws/-/jws-4.0.0.tgz",
+      "integrity": "sha512-KDncfTmOZoOMTFG4mBlG0qUIOlc03fmzH+ru6RgYVZhPkyiy/92Owlt/8UEN+a4TXR1FQetfIpJE8ApdvdVxTg==",
      "dependencies": {
-        "jwa": "^2.0.1",
+        "jwa": "^2.0.0",
        "safe-buffer": "^5.0.1"
      }
    },
    "node_modules/langchain": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/langchain/-/langchain-1.2.3.tgz",
-      "integrity": "sha512-3k986xJuqg4az53JxV5LnGlOzIXF1d9Kq6Y9s7XjitvzhpsbFuTDV5/kiF4cx3pkNGyw0mUXC4tLz9RxucO0hw==",
-      "license": "MIT",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/langchain/-/langchain-1.0.2.tgz",
+      "integrity": "sha512-He/xvjVl8DHESvdaW6Dpyba72OaLCAfS2CyOm1aWrlJ4C38dKXyTIxphtld8hiii6MWX7qMSmu2EaUwWBx2STg==",
      "dependencies": {
        "@langchain/langgraph": "^1.0.0",
        "@langchain/langgraph-checkpoint": "^1.0.0",
-        "langsmith": ">=0.4.0 <1.0.0",
+        "langsmith": "~0.3.74",
        "uuid": "^10.0.0",
        "zod": "^3.25.76 || ^4"
      },
@@ -869,19 +895,19 @@
        "node": ">=20"
      },
      "peerDependencies": {
-        "@langchain/core": "1.1.8"
+        "@langchain/core": "^1.0.0"
      }
    },
    "node_modules/langsmith": {
-      "version": "0.4.3",
-      "resolved": "https://registry.npmjs.org/langsmith/-/langsmith-0.4.3.tgz",
-      "integrity": "sha512-vuBAagBZulXj0rpZhUTxmHhrYIBk53z8e2Q8ty4OHVkahN4ul7Im3OZxD9jsXZB0EuncK1xRYtY8J3BW4vj1zw==",
-      "license": "MIT",
+      "version": "0.3.77",
+      "resolved": "https://registry.npmjs.org/langsmith/-/langsmith-0.3.77.tgz",
+      "integrity": "sha512-wbS/9IX/hOAsOEOtPj8kCS8H0tFHaelwQ97gTONRtIfoPPLd9MMUmhk0KQB5DdsGAI5abg966+f0dZ/B+YRRzg==",
      "dependencies": {
        "@types/uuid": "^10.0.0",
        "chalk": "^4.1.2",
        "console-table-printer": "^2.12.1",
        "p-queue": "^6.6.2",
+        "p-retry": "4",
        "semver": "^7.6.3",
        "uuid": "^10.0.0"
      },
--- a/docs/en/getting-started/quickstart/js/llamaindex/package-lock.json
+++ b/docs/en/getting-started/quickstart/js/llamaindex/package-lock.json
@@ -882,12 +882,11 @@
      }
    },
    "node_modules/jws": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/jws/-/jws-4.0.1.tgz",
-      "integrity": "sha512-EKI/M/yqPncGUUh44xz0PxSidXFr/+r0pA70+gIYhjv+et7yxM+s29Y+VGDkovRofQem0fs7Uvf4+YmAdyRduA==",
-      "license": "MIT",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/jws/-/jws-4.0.0.tgz",
+      "integrity": "sha512-KDncfTmOZoOMTFG4mBlG0qUIOlc03fmzH+ru6RgYVZhPkyiy/92Owlt/8UEN+a4TXR1FQetfIpJE8ApdvdVxTg==",
      "dependencies": {
-        "jwa": "^2.0.1",
+        "jwa": "^2.0.0",
        "safe-buffer": "^5.0.1"
      }
    },
--- a/docs/en/getting-started/quickstart/python/adk/requirements.txt
+++ b/docs/en/getting-started/quickstart/python/adk/requirements.txt
@@ -1,3 +1,3 @@
-google-adk==1.21.0
-toolbox-core==0.5.4
-pytest==9.0.2
+google-adk==1.19.0
+toolbox-core==0.5.3
+pytest==9.0.1
--- a/docs/en/getting-started/quickstart/python/core/requirements.txt
+++ b/docs/en/getting-started/quickstart/python/core/requirements.txt
@@ -1,3 +1,3 @@
-google-genai==1.57.0
-toolbox-core==0.5.4
-pytest==9.0.2
+google-genai==1.52.0
+toolbox-core==0.5.3
+pytest==9.0.1
--- a/docs/en/getting-started/quickstart/python/langchain/requirements.txt
+++ b/docs/en/getting-started/quickstart/python/langchain/requirements.txt
@@ -1,5 +1,5 @@
-langchain==1.2.2
-langchain-google-vertexai==3.2.1
-langgraph==1.0.5
-toolbox-langchain==0.5.4
-pytest==9.0.2
+langchain==1.1.0
+langchain-google-vertexai==3.1.0
+langgraph==1.0.4
+toolbox-langchain==0.5.3
+pytest==9.0.1
--- a/docs/en/getting-started/quickstart/python/llamaindex/requirements.txt
+++ b/docs/en/getting-started/quickstart/python/llamaindex/requirements.txt
@@ -1,4 +1,4 @@
-llama-index==0.14.12
-llama-index-llms-google-genai==0.8.3
-toolbox-llamaindex==0.5.4
-pytest==9.0.2
+llama-index==0.14.10
+llama-index-llms-google-genai==0.7.3
+toolbox-llamaindex==0.5.3
+pytest==9.0.1
--- a/docs/en/getting-started/quickstart/shared/configure_toolbox.md
+++ b/docs/en/getting-started/quickstart/shared/configure_toolbox.md
@@ -13,7 +13,7 @@ In this section, we will download Toolbox, configure our tools in a
    <!-- {x-release-please-start-version} -->
    ```bash
    export OS="linux/amd64" # one of linux/amd64, darwin/arm64, darwin/amd64, or windows/amd64
-    curl -O https://storage.googleapis.com/genai-toolbox/v0.25.0/$OS/toolbox
+    curl -O https://storage.googleapis.com/genai-toolbox/v0.23.0/$OS/toolbox
    ```
    <!-- {x-release-please-end} -->

--- a/docs/en/how-to/connect-ide/cloud_sql_mssql_admin_mcp.md
+++ b/docs/en/how-to/connect-ide/cloud_sql_mssql_admin_mcp.md
@@ -48,7 +48,6 @@ instance, database and users:
    * `roles/cloudsql.editor`: Provides permissions to manage existing resources.
        * All `viewer` tools
        * `create_database`
-        * `create_backup`
    * `roles/cloudsql.admin`: Provides full control over all resources.
        * All `editor` and `viewer` tools
        * `create_instance`
@@ -300,7 +299,6 @@ instances and interacting with your database:
 * **create_user**: Creates a new user in a Cloud SQL instance.
 * **wait_for_operation**: Waits for a Cloud SQL operation to complete.
 * **clone_instance**: Creates a clone of an existing Cloud SQL for SQL Server instance.
-* **create_backup**: Creates a backup on a Cloud SQL instance.

 {{< notice note >}}
 Prebuilt tools are pre-1.0, so expect some tool changes between versions. LLMs
--- a/docs/en/how-to/connect-ide/cloud_sql_mysql_admin_mcp.md
+++ b/docs/en/how-to/connect-ide/cloud_sql_mysql_admin_mcp.md
@@ -48,7 +48,6 @@ database and users:
    * `roles/cloudsql.editor`: Provides permissions to manage existing resources.
        * All `viewer` tools
        * `create_database`
-        * `create_backup`
    * `roles/cloudsql.admin`: Provides full control over all resources.
        * All `editor` and `viewer` tools
        * `create_instance`
@@ -300,7 +299,6 @@ instances and interacting with your database:
 * **create_user**: Creates a new user in a Cloud SQL instance.
 * **wait_for_operation**: Waits for a Cloud SQL operation to complete.
 * **clone_instance**: Creates a clone of an existing Cloud SQL for MySQL instance.
-* **create_backup**: Creates a backup on a Cloud SQL instance.

 {{< notice note >}}
 Prebuilt tools are pre-1.0, so expect some tool changes between versions. LLMs
--- a/docs/en/how-to/connect-ide/cloud_sql_pg_admin_mcp.md
+++ b/docs/en/how-to/connect-ide/cloud_sql_pg_admin_mcp.md
@@ -48,7 +48,6 @@ instance, database and users:
    * `roles/cloudsql.editor`: Provides permissions to manage existing resources.
        * All `viewer` tools
        * `create_database`
-        * `create_backup`
    * `roles/cloudsql.admin`: Provides full control over all resources.
        * All `editor` and `viewer` tools
        * `create_instance`
@@ -300,7 +299,6 @@ instances and interacting with your database:
 * **create_user**: Creates a new user in a Cloud SQL instance.
 * **wait_for_operation**: Waits for a Cloud SQL operation to complete.
 * **clone_instance**: Creates a clone of an existing Cloud SQL for PostgreSQL instance.
-* **create_backup**: Creates a backup on a Cloud SQL instance.

 {{< notice note >}}
 Prebuilt tools are pre-1.0, so expect some tool changes between versions. LLMs
--- a/docs/en/how-to/connect-ide/looker_mcp.md
+++ b/docs/en/how-to/connect-ide/looker_mcp.md
@@ -18,7 +18,6 @@ to expose your developer assistant tools to a Looker instance:
 * [Cline][cline] (VS Code extension)
 * [Claude desktop][claudedesktop]
 * [Claude code][claudecode]
-* [Antigravity][antigravity]

 [toolbox]: https://github.com/googleapis/genai-toolbox
 [gemini-cli]: #configure-your-mcp-client
@@ -28,7 +27,6 @@ to expose your developer assistant tools to a Looker instance:
 [cline]: #configure-your-mcp-client
 [claudedesktop]: #configure-your-mcp-client
 [claudecode]: #configure-your-mcp-client
-[antigravity]: #connect-with-antigravity

 ## Set up Looker

@@ -40,55 +38,6 @@ to expose your developer assistant tools to a Looker instance:
   listening at a different port, and you will need to use
   `https://looker.example.com:19999` instead.

-## Connect with Antigravity
-
-You can connect Looker to Antigravity in the following ways:
-
-* Using the MCP Store
-* Using a custom configuration
-
-{{< notice note >}}
-You don't need to download the MCP Toolbox binary to use these methods.
-{{< /notice >}}
-
-{{< tabpane text=true >}}
-{{% tab header="MCP Store" lang="en" %}}
-The most straightforward way to connect to Looker in Antigravity is by using the built-in MCP Store.
-
-1. Open Antigravity and open the editor's agent panel.
-1. Click the **"..."** icon at the top of the panel and select **MCP Servers**.
-1. Locate **Looker** in the list of available servers and click Install.
-1. Follow the on-screen prompts to securely link your accounts where applicable.
-
-After you install Looker in the MCP Store, resources and tools from the server are automatically available to the editor. 
-
-{{% /tab %}}
-{{% tab header="Custom config" lang="en" %}}
- To connect to a custom MCP server, follow these steps:
-
-1. Open Antigravity and navigate to the MCP store using the **"..."** drop-down at the top of the editor's agent panel.
-1. To open the **mcp_config.json** file, click **MCP Servers** and then click **Manage MCP Servers > View raw config**.
-1. Add the following configuration, replace the environment variables with your values, and save.
-    
-    ```json
-    {
-      "mcpServers": {
-        "looker": {
-          "command": "npx",
-          "args": ["-y", "@toolbox-sdk/server", "--prebuilt", "looker", "--stdio"],
-          "env": {
-              "LOOKER_BASE_URL": "https://looker.example.com",
-              "LOOKER_CLIENT_ID": "your-client-id",
-              "LOOKER_CLIENT_SECRET": "your-client-secret"
-          }
-        }
-      }
-    }
-    ```
-
-{{% /tab %}}
-{{< /tabpane >}}
-
 ## Install MCP Toolbox

 1. Download the latest version of Toolbox as a binary. Select the [correct
@@ -100,19 +49,19 @@ After you install Looker in the MCP Store, resources and tools from the server a

 {{< tabpane persist=header >}}
 {{< tab header="linux/amd64" lang="bash" >}}
-curl -O https://storage.googleapis.com/genai-toolbox/v0.25.0/linux/amd64/toolbox
+curl -O https://storage.googleapis.com/genai-toolbox/v0.23.0/linux/amd64/toolbox
 {{< /tab >}}

 {{< tab header="darwin/arm64" lang="bash" >}}
-curl -O https://storage.googleapis.com/genai-toolbox/v0.25.0/darwin/arm64/toolbox
+curl -O https://storage.googleapis.com/genai-toolbox/v0.23.0/darwin/arm64/toolbox
 {{< /tab >}}

 {{< tab header="darwin/amd64" lang="bash" >}}
-curl -O https://storage.googleapis.com/genai-toolbox/v0.25.0/darwin/amd64/toolbox
+curl -O https://storage.googleapis.com/genai-toolbox/v0.23.0/darwin/amd64/toolbox
 {{< /tab >}}

 {{< tab header="windows/amd64" lang="bash" >}}
-curl -O https://storage.googleapis.com/genai-toolbox/v0.25.0/windows/amd64/toolbox.exe
+curl -O https://storage.googleapis.com/genai-toolbox/v0.23.0/windows/amd64/toolbox.exe
 {{< /tab >}}
 {{< /tabpane >}}
    <!-- {x-release-please-end} -->
@@ -341,7 +290,7 @@ assistant to list models, explores, dimensions, and measures. Run a
 query, retrieve the SQL for a query, and run a saved Look.

 The full tool list is available in the [Prebuilt Tools
-Reference](../../reference/prebuilt-tools.md/#looker).
+Reference](../../reference/prebuilt-tools/#looker).

 The following tools are available to the LLM:

--- a/docs/en/how-to/connect-ide/mssql_mcp.md
+++ b/docs/en/how-to/connect-ide/mssql_mcp.md
@@ -45,19 +45,19 @@ instance:
   <!-- {x-release-please-start-version} -->
   {{< tabpane persist=header >}}
 {{< tab header="linux/amd64" lang="bash" >}}
-curl -O https://storage.googleapis.com/genai-toolbox/v0.25.0/linux/amd64/toolbox
+curl -O https://storage.googleapis.com/genai-toolbox/v0.23.0/linux/amd64/toolbox
 {{< /tab >}}

 {{< tab header="darwin/arm64" lang="bash" >}}
-curl -O https://storage.googleapis.com/genai-toolbox/v0.25.0/darwin/arm64/toolbox
+curl -O https://storage.googleapis.com/genai-toolbox/v0.23.0/darwin/arm64/toolbox
 {{< /tab >}}

 {{< tab header="darwin/amd64" lang="bash" >}}
-curl -O https://storage.googleapis.com/genai-toolbox/v0.25.0/darwin/amd64/toolbox
+curl -O https://storage.googleapis.com/genai-toolbox/v0.23.0/darwin/amd64/toolbox
 {{< /tab >}}

 {{< tab header="windows/amd64" lang="bash" >}}
-curl -O https://storage.googleapis.com/genai-toolbox/v0.25.0/windows/amd64/toolbox.exe
+curl -O https://storage.googleapis.com/genai-toolbox/v0.23.0/windows/amd64/toolbox.exe
 {{< /tab >}}
 {{< /tabpane >}}
    <!-- {x-release-please-end} -->
--- a/docs/en/how-to/connect-ide/mysql_mcp.md
+++ b/docs/en/how-to/connect-ide/mysql_mcp.md
@@ -43,19 +43,19 @@ expose your developer assistant tools to a MySQL instance:
   <!-- {x-release-please-start-version} -->
   {{< tabpane persist=header >}}
 {{< tab header="linux/amd64" lang="bash" >}}
-curl -O https://storage.googleapis.com/genai-toolbox/v0.25.0/linux/amd64/toolbox
+curl -O https://storage.googleapis.com/genai-toolbox/v0.23.0/linux/amd64/toolbox
 {{< /tab >}}

 {{< tab header="darwin/arm64" lang="bash" >}}
-curl -O https://storage.googleapis.com/genai-toolbox/v0.25.0/darwin/arm64/toolbox
+curl -O https://storage.googleapis.com/genai-toolbox/v0.23.0/darwin/arm64/toolbox
 {{< /tab >}}

 {{< tab header="darwin/amd64" lang="bash" >}}
-curl -O https://storage.googleapis.com/genai-toolbox/v0.25.0/darwin/amd64/toolbox
+curl -O https://storage.googleapis.com/genai-toolbox/v0.23.0/darwin/amd64/toolbox
 {{< /tab >}}

 {{< tab header="windows/amd64" lang="bash" >}}
-curl -O https://storage.googleapis.com/genai-toolbox/v0.25.0/windows/amd64/toolbox.exe
+curl -O https://storage.googleapis.com/genai-toolbox/v0.23.0/windows/amd64/toolbox.exe
 {{< /tab >}}
 {{< /tabpane >}}
    <!-- {x-release-please-end} -->
--- a/docs/en/how-to/connect-ide/neo4j_mcp.md
+++ b/docs/en/how-to/connect-ide/neo4j_mcp.md
@@ -44,19 +44,19 @@ expose your developer assistant tools to a Neo4j instance:
   <!-- {x-release-please-start-version} -->
   {{< tabpane persist=header >}}
 {{< tab header="linux/amd64" lang="bash" >}}
-curl -O https://storage.googleapis.com/genai-toolbox/v0.25.0/linux/amd64/toolbox
+curl -O https://storage.googleapis.com/genai-toolbox/v0.23.0/linux/amd64/toolbox
 {{< /tab >}}

 {{< tab header="darwin/arm64" lang="bash" >}}
-curl -O https://storage.googleapis.com/genai-toolbox/v0.25.0/darwin/arm64/toolbox
+curl -O https://storage.googleapis.com/genai-toolbox/v0.23.0/darwin/arm64/toolbox
 {{< /tab >}}

 {{< tab header="darwin/amd64" lang="bash" >}}
-curl -O https://storage.googleapis.com/genai-toolbox/v0.25.0/darwin/amd64/toolbox
+curl -O https://storage.googleapis.com/genai-toolbox/v0.23.0/darwin/amd64/toolbox
 {{< /tab >}}

 {{< tab header="windows/amd64" lang="bash" >}}
-curl -O https://storage.googleapis.com/genai-toolbox/v0.25.0/windows/amd64/toolbox.exe
+curl -O https://storage.googleapis.com/genai-toolbox/v0.23.0/windows/amd64/toolbox.exe
 {{< /tab >}}
 {{< /tabpane >}}
    <!-- {x-release-please-end} -->
--- a/docs/en/how-to/connect-ide/postgres_mcp.md
+++ b/docs/en/how-to/connect-ide/postgres_mcp.md
@@ -56,19 +56,19 @@ Omni](https://cloud.google.com/alloydb/omni/current/docs/overview).
   <!-- {x-release-please-start-version} -->
   {{< tabpane persist=header >}}
 {{< tab header="linux/amd64" lang="bash" >}}
-curl -O https://storage.googleapis.com/genai-toolbox/v0.25.0/linux/amd64/toolbox
+curl -O https://storage.googleapis.com/genai-toolbox/v0.23.0/linux/amd64/toolbox
 {{< /tab >}}

 {{< tab header="darwin/arm64" lang="bash" >}}
-curl -O https://storage.googleapis.com/genai-toolbox/v0.25.0/darwin/arm64/toolbox
+curl -O https://storage.googleapis.com/genai-toolbox/v0.23.0/darwin/arm64/toolbox
 {{< /tab >}}

 {{< tab header="darwin/amd64" lang="bash" >}}
-curl -O https://storage.googleapis.com/genai-toolbox/v0.25.0/darwin/amd64/toolbox
+curl -O https://storage.googleapis.com/genai-toolbox/v0.23.0/darwin/amd64/toolbox
 {{< /tab >}}

 {{< tab header="windows/amd64" lang="bash" >}}
-curl -O https://storage.googleapis.com/genai-toolbox/v0.25.0/windows/amd64/toolbox.exe
+curl -O https://storage.googleapis.com/genai-toolbox/v0.23.0/windows/amd64/toolbox.exe
 {{< /tab >}}
 {{< /tabpane >}}
    <!-- {x-release-please-end} -->
--- a/docs/en/how-to/connect-ide/sqlite_mcp.md
+++ b/docs/en/how-to/connect-ide/sqlite_mcp.md
@@ -43,19 +43,19 @@ to expose your developer assistant tools to a SQLite instance:
   <!-- {x-release-please-start-version} -->
   {{< tabpane persist=header >}}
 {{< tab header="linux/amd64" lang="bash" >}}
-curl -O https://storage.googleapis.com/genai-toolbox/v0.25.0/linux/amd64/toolbox
+curl -O https://storage.googleapis.com/genai-toolbox/v0.23.0/linux/amd64/toolbox
 {{< /tab >}}

 {{< tab header="darwin/arm64" lang="bash" >}}
-curl -O https://storage.googleapis.com/genai-toolbox/v0.25.0/darwin/arm64/toolbox
+curl -O https://storage.googleapis.com/genai-toolbox/v0.23.0/darwin/arm64/toolbox
 {{< /tab >}}

 {{< tab header="darwin/amd64" lang="bash" >}}
-curl -O https://storage.googleapis.com/genai-toolbox/v0.25.0/darwin/amd64/toolbox
+curl -O https://storage.googleapis.com/genai-toolbox/v0.23.0/darwin/amd64/toolbox
 {{< /tab >}}

 {{< tab header="windows/amd64" lang="bash" >}}
-curl -O https://storage.googleapis.com/genai-toolbox/v0.25.0/windows/amd64/toolbox.exe
+curl -O https://storage.googleapis.com/genai-toolbox/v0.23.0/windows/amd64/toolbox.exe
 {{< /tab >}}
 {{< /tabpane >}}
    <!-- {x-release-please-end} -->
--- a/docs/en/how-to/deploy_docker.md
+++ b/docs/en/how-to/deploy_docker.md
@@ -68,12 +68,7 @@ networks:
 ```

    {{< notice tip >}}  
-To prevent DNS rebinding attack, use the `--allowed-hosts` flag to specify a
-list of hosts for validation. E.g. `command: [ "toolbox",
-"--tools-file", "/config/tools.yaml", "--address", "0.0.0.0",
-"--allowed-hosts", "localhost:5000"]`
-
-To implement CORs, use the `--allowed-origins` flag to specify a
+To prevent DNS rebinding attack, use the `--allowed-origins` flag to specify a
 list of origins permitted to access the server. E.g. `command: [ "toolbox",
 "--tools-file", "/config/tools.yaml", "--address", "0.0.0.0",
 "--allowed-origins", "https://foo.bar"]`
--- a/docs/en/how-to/deploy_gke.md
+++ b/docs/en/how-to/deploy_gke.md
@@ -188,13 +188,9 @@ description: >
                  path: tools.yaml
    ```

-    {{< notice tip >}}
+    {{< notice tip >}}  
 To prevent DNS rebinding attack, use the `--allowed-origins` flag to specify a
 list of origins permitted to access the server. E.g. `args: ["--address",
-"0.0.0.0", "--allowed-hosts", "foo.bar:5000"]`
-
-To implement CORs, use the `--allowed-origins` flag to specify a
-list of origins permitted to access the server. E.g. `args: ["--address",
 "0.0.0.0", "--allowed-origins", "https://foo.bar"]`
 {{< /notice >}}

--- a/docs/en/how-to/deploy_toolbox.md
+++ b/docs/en/how-to/deploy_toolbox.md
@@ -142,18 +142,14 @@ deployment will time out.

 ### Update deployed server to be secure

-To prevent DNS rebinding attack, use the `--allowed-hosts` flag to specify a
-list of hosts. In order to do that, you will
+To prevent DNS rebinding attack, use the `--allowed-origins` flag to specify a
+list of origins permitted to access the server. In order to do that, you will
 have to re-deploy the cloud run service with the new flag.

-To implement CORs checks, use the `--allowed-origins` flag to specify a list of
-origins permitted to access the server.
-
 1. Set an environment variable to the cloud run url: 

    ```bash
    export URL=<cloud run url>
-    export HOST=<cloud run host>
    ```

 2. Redeploy Toolbox:
@@ -164,7 +160,7 @@ origins permitted to access the server.
        --service-account toolbox-identity \
        --region us-central1 \
        --set-secrets "/app/tools.yaml=tools:latest" \
-        --args="--tools-file=/app/tools.yaml","--address=0.0.0.0","--port=8080","--allowed-origins=$URL","--allowed-hosts=$HOST"
+        --args="--tools-file=/app/tools.yaml","--address=0.0.0.0","--port=8080","--allowed-origins=$URL"
        # --allow-unauthenticated # https://cloud.google.com/run/docs/authenticating/public#gcloud
    ```

@@ -176,7 +172,7 @@ origins permitted to access the server.
        --service-account toolbox-identity \
        --region us-central1 \
        --set-secrets "/app/tools.yaml=tools:latest" \
-        --args="--tools-file=/app/tools.yaml","--address=0.0.0.0","--port=8080","--allowed-origins=$URL","--allowed-hosts=$HOST" \
+        --args="--tools-file=/app/tools.yaml","--address=0.0.0.0","--port=8080","--allowed-origins=$URL" \
        # TODO(dev): update the following to match your VPC if necessary
        --network default \
        --subnet default
--- a/docs/en/how-to/export_telemetry.md
+++ b/docs/en/how-to/export_telemetry.md
@@ -79,16 +79,12 @@ There are a couple of steps to run and use a Collector.
    ```

 1. Run toolbox with the `--telemetry-otlp` flag. Configure it to send them to
-   `127.0.0.1:4553` (for HTTP) or the Collector's URL.
+   `http://127.0.0.1:4553` (for HTTP) or the Collector's URL.

    ```bash
-    ./toolbox --telemetry-otlp=127.0.0.1:4553
+    ./toolbox --telemetry-otlp=http://127.0.0.1:4553
    ```

-    {{< notice tip >}}
-    To pass an insecure endpoint, set environment variable `OTEL_EXPORTER_OTLP_INSECURE=true`.
-    {{< /notice >}}
-
 1. Once telemetry datas are collected, you can view them in your telemetry
   backend. If you are using GCP exporters, telemetry will be visible in GCP
   dashboard at [Metrics Explorer][metrics-explorer] and [Trace
--- a/docs/en/reference/cli.md
+++ b/docs/en/reference/cli.md
@@ -8,26 +8,25 @@ description: >

 ## Reference

-| Flag (Short) | Flag (Long)                | Description                                                                                                                                                                      | Default     |
-|--------------|----------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-------------|
-| `-a`         | `--address`                | Address of the interface the server will listen on.                                                                                                                              | `127.0.0.1` |
-|              | `--disable-reload`         | Disables dynamic reloading of tools file.                                                                                                                                        |             |
-| `-h`         | `--help`                   | help for toolbox                                                                                                                                                                 |             |
-|              | `--log-level`              | Specify the minimum level logged. Allowed: 'DEBUG', 'INFO', 'WARN', 'ERROR'.                                                                                                     | `info`      |
-|              | `--logging-format`         | Specify logging format to use. Allowed: 'standard' or 'JSON'.                                                                                                                    | `standard`  |
-| `-p`         | `--port`                   | Port the server will listen on.                                                                                                                                                  | `5000`      |
-|              | `--prebuilt`               | Use a prebuilt tool configuration by source type. See [Prebuilt Tools Reference](prebuilt-tools.md) for allowed values.                                                          |             |
-|              | `--stdio`                  | Listens via MCP STDIO instead of acting as a remote HTTP server.                                                                                                                 |             |
-|              | `--telemetry-gcp`          | Enable exporting directly to Google Cloud Monitoring.                                                                                                                            |             |
-|              | `--telemetry-otlp`         | Enable exporting using OpenTelemetry Protocol (OTLP) to the specified endpoint (e.g. 'http://127.0.0.1:4318')                                                                    |             |
-|              | `--telemetry-service-name` | Sets the value of the service.name resource attribute for telemetry data.                                                                                                        | `toolbox`   |
-|              | `--tools-file`             | File path specifying the tool configuration. Cannot be used with --tools-files or --tools-folder.                                                                                |             |
-|              | `--tools-files`            | Multiple file paths specifying tool configurations. Files will be merged. Cannot be used with --tools-file or --tools-folder.                                                    |             |
-|              | `--tools-folder`           | Directory path containing YAML tool configuration files. All .yaml and .yml files in the directory will be loaded and merged. Cannot be used with --tools-file or --tools-files. |             |
-|              | `--ui`                     | Launches the Toolbox UI web server.                                                                                                                                              |             |
-|              | `--allowed-origins`        | Specifies a list of origins permitted to access this server for CORs access.                                                                                                     | `*`         |
-|              | `--allowed-hosts`          | Specifies a list of hosts permitted to access this server to prevent DNS rebinding attacks.                                                                                      | `*`         |
-| `-v`         | `--version`                | version for toolbox                                                                                                                                                              |             |
+| Flag (Short) | Flag (Long)                | Description                                                                                                                                                                                   | Default     |
+|--------------|----------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-------------|
+| `-a`         | `--address`                | Address of the interface the server will listen on.                                                                                                                                           | `127.0.0.1` |
+|              | `--disable-reload`         | Disables dynamic reloading of tools file.                                                                                                                                                     |             |
+| `-h`         | `--help`                   | help for toolbox                                                                                                                                                                              |             |
+|              | `--log-level`              | Specify the minimum level logged. Allowed: 'DEBUG', 'INFO', 'WARN', 'ERROR'.                                                                                                                  | `info`      |
+|              | `--logging-format`         | Specify logging format to use. Allowed: 'standard' or 'JSON'.                                                                                                                                 | `standard`  |
+| `-p`         | `--port`                   | Port the server will listen on.                                                                                                                                                               | `5000`      |
+|              | `--prebuilt`               | Use a prebuilt tool configuration by source type. Cannot be used with --tools-file. See [Prebuilt Tools Reference](prebuilt-tools.md) for allowed values.                                     |             |
+|              | `--stdio`                  | Listens via MCP STDIO instead of acting as a remote HTTP server.                                                                                                                              |             |
+|              | `--telemetry-gcp`          | Enable exporting directly to Google Cloud Monitoring.                                                                                                                                         |             |
+|              | `--telemetry-otlp`         | Enable exporting using OpenTelemetry Protocol (OTLP) to the specified endpoint (e.g. 'http://127.0.0.1:4318')                                                                                 |             |
+|              | `--telemetry-service-name` | Sets the value of the service.name resource attribute for telemetry data.                                                                                                                     | `toolbox`   |
+|              | `--tools-file`             | File path specifying the tool configuration. Cannot be used with --prebuilt, --tools-files, or --tools-folder.                                                                                |             |
+|              | `--tools-files`            | Multiple file paths specifying tool configurations. Files will be merged. Cannot be used with --prebuilt, --tools-file, or --tools-folder.                                                    |             |
+|              | `--tools-folder`           | Directory path containing YAML tool configuration files. All .yaml and .yml files in the directory will be loaded and merged. Cannot be used with --prebuilt, --tools-file, or --tools-files. |             |
+|              | `--ui`                     | Launches the Toolbox UI web server.                                                                                                                                                           |             |
+|              | `--allowed-origins`        | Specifies a list of origins permitted to access this server.                                                                                                                                  | `*`         |
+| `-v`         | `--version`                | version for toolbox                                                                                                                                                                           |             |

 ## Examples

@@ -47,9 +46,6 @@ description: >
 ```bash
 # Basic server with custom port configuration
 ./toolbox --tools-file "tools.yaml" --port 8080
-
-# Server with prebuilt + custom tools configurations
-./toolbox --tools-file tools.yaml --prebuilt alloydb-postgres
 ```

 ### Tool Configuration Sources
@@ -76,8 +72,8 @@ The CLI supports multiple mutually exclusive ways to specify tool configurations

 {{< notice tip >}}
 The CLI enforces mutual exclusivity between configuration source flags,
-preventing simultaneous use of the file-based options ensuring only one of
-`--tools-file`, `--tools-files`, or `--tools-folder` is
+preventing simultaneous use of `--prebuilt` with file-based options, and
+ensuring only one of `--tools-file`, `--tools-files`, or `--tools-folder` is
 used at a time.
 {{< /notice >}}

--- a/docs/en/reference/prebuilt-tools.md
+++ b/docs/en/reference/prebuilt-tools.md
@@ -13,12 +13,6 @@ allowing developers to interact with and take action on databases.
 See guides, [Connect from your IDE](../how-to/connect-ide/_index.md), for
 details on how to connect your AI tools (IDEs) to databases via Toolbox and MCP.

-{{< notice tip >}}
-You can now use `--prebuilt` along `--tools-file`, `--tools-files`, or
-`--tools-folder` to combine prebuilt configs with custom tools.
-See [Usage Examples](../reference/cli.md#examples).
-{{< /notice >}}
-
 ## AlloyDB Postgres

 *   `--prebuilt` value: `alloydb-postgres`
@@ -105,8 +99,6 @@ See [Usage Examples](../reference/cli.md#examples).
    *   `BIGQUERY_LOCATION`: (Optional) The dataset location.
    *   `BIGQUERY_USE_CLIENT_OAUTH`: (Optional) If `true`, forwards the client's
        OAuth access token for authentication. Defaults to `false`.
-    *   `BIGQUERY_SCOPES`: (Optional) A comma-separated list of OAuth scopes to
-        use for authentication.
 *   **Permissions:**
    *   **BigQuery User** (`roles/bigquery.user`) to execute queries and view
        metadata.
@@ -187,7 +179,6 @@ See [Usage Examples](../reference/cli.md#examples).
        manage existing resources.
        * All `viewer` tools
        * `create_database`
-        * `create_backup`
    *   **Cloud SQL Admin** (`roles/cloudsql.admin`): Provides full control over
        all resources.
        * All `editor` and `viewer` tools
@@ -204,7 +195,6 @@ See [Usage Examples](../reference/cli.md#examples).
    *   `create_user`: Creates a new user in a Cloud SQL instance.
    *   `wait_for_operation`: Waits for a Cloud SQL operation to complete.
    *   `clone_instance`: Creates a clone for an existing Cloud SQL for MySQL instance.
-    *   `create_backup`: Creates a backup on a Cloud SQL instance.

 ## Cloud SQL for PostgreSQL

@@ -277,7 +267,6 @@ See [Usage Examples](../reference/cli.md#examples).
        manage existing resources.
        * All `viewer` tools
        * `create_database`
-        * `create_backup`
    *   **Cloud SQL Admin** (`roles/cloudsql.admin`): Provides full control over
        all resources.
        * All `editor` and `viewer` tools
@@ -293,7 +282,6 @@ See [Usage Examples](../reference/cli.md#examples).
    *   `create_user`: Creates a new user in a Cloud SQL instance.
    *   `wait_for_operation`: Waits for a Cloud SQL operation to complete.
    *   `clone_instance`: Creates a clone for an existing Cloud SQL for PostgreSQL instance.
-    *   `create_backup`: Creates a backup on a Cloud SQL instance.

 ## Cloud SQL for SQL Server

@@ -340,7 +328,6 @@ See [Usage Examples](../reference/cli.md#examples).
        manage existing resources.
        * All `viewer` tools
        * `create_database`
-        * `create_backup`
    *   **Cloud SQL Admin** (`roles/cloudsql.admin`): Provides full control over
        all resources.
        * All `editor` and `viewer` tools
@@ -356,7 +343,6 @@ See [Usage Examples](../reference/cli.md#examples).
    *   `create_user`: Creates a new user in a Cloud SQL instance.
    *   `wait_for_operation`: Waits for a Cloud SQL operation to complete.
    *   `clone_instance`: Creates a clone for an existing Cloud SQL for SQL Server instance.
-    *   `create_backup`: Creates a backup on a Cloud SQL instance.

 ## Dataplex

--- a/docs/en/resources/embeddingModels/_index.md
+++ b/docs/en/resources/embeddingModels/_index.md
@@ -1,84 +0,0 @@
---
-title: "EmbeddingModels"
-type: docs
-weight: 2
-description: >
-  EmbeddingModels represent services that transform text into vector embeddings for semantic search.
---
-
-EmbeddingModels represent services that generate vector representations of text
-data. In the MCP Toolbox, these models enable **Semantic Queries**,
-allowing [Tools](../tools/) to automatically convert human-readable text into
-numerical vectors before using them in a query.
-
-This is primarily used in two scenarios:
-
- **Vector Ingestion**: Converting a text parameter into a vector string during
-  an `INSERT` operation.
-
- **Semantic Search**: Converting a natural language query into a vector to
-  perform similarity searches.
-
-## Example
-
-The following configuration defines an embedding model and applies it to
-specific tool parameters.
-
-{{< notice tip >}}
-Use environment variable replacement with the format ${ENV_NAME}
-instead of hardcoding your API keys into the configuration file.
-{{< /notice >}}
-
-### Step 1 - Define an Embedding Model
-
-Define an embedding model in the `embeddingModels` section:
-
-```yaml
-embeddingModels:
-  gemini-model: # Name of the embedding model
-    kind: gemini
-    model: gemini-embedding-001
-    apiKey: ${GOOGLE_API_KEY}
-    dimension: 768
-
-```
-
-### Step 2 - Embed Tool Parameters
-
-Use the defined embedding model, embed your query parameters using the
-`embeddedBy` field. Only string-typed
-parameters can be embedded:
-
-```yaml
-tools:
-  # Vector ingestion tool
-  insert_embedding:
-    kind: postgres-sql
-    source: my-pg-instance
-    statement: |
-      INSERT INTO documents (content, embedding) 
-      VALUES ($1, $2);
-    parameters:
-      - name: content
-        type: string
-      - name: vector_string
-        type: string
-        description: The text to be vectorized and stored.
-        embeddedBy: gemini-model # refers to the name of a defined embedding model
-
-  # Semantic search tool
-  search_embedding:
-    kind: postgres-sql
-    source: my-pg-instance
-    statement: |
-      SELECT id, content, embedding <-> $1 AS distance 
-      FROM documents
-      ORDER BY distance LIMIT 1
-    parameters:
-      - name: semantic_search_string
-        type: string
-        description: The search query that will be converted to a vector.
-        embeddedBy: gemini-model # refers to the name of a defined embedding model
-```
-
-## Kinds of Embedding Models
--- a/docs/en/resources/embeddingModels/gemini.md
+++ b/docs/en/resources/embeddingModels/gemini.md
@@ -1,73 +0,0 @@
---
-title: "Gemini Embedding"
-type: docs
-weight: 1
-description: >
-  Use Google's Gemini models to generate high-performance text embeddings for vector databases.
---
-
-## About
-
-Google Gemini provides state-of-the-art embedding models that convert text into
-high-dimensional vectors. 
-
-### Authentication
-
-Toolbox uses your [Application Default Credentials
-(ADC)][adc] to authorize with the
-Gemini API client.
-
-Optionally, you can use an [API key][api-key] obtain an API
-Key from the [Google AI Studio][ai-studio].
-
-We recommend using an API key for testing and using application default
-credentials for production.
-
-[adc]: https://cloud.google.com/docs/authentication#adc
-[api-key]: https://ai.google.dev/gemini-api/docs/api-key#api-keys
-[ai-studio]: https://aistudio.google.com/app/apikey
-
-## Behavior
-
-### Automatic Vectorization
-
-When a tool parameter is configured with `embeddedBy: <your-gemini-model-name>`,
-the Toolbox intercepts the raw text input from the client and sends it to the
-Gemini API. The resulting numerical array is then formatted before being passed
-to your database source.
-
-### Dimension Matching
-
-The `dimension` field must match the expected size of your database column
-(e.g., a `vector(768)` column in PostgreSQL). This setting is supported by newer
-models since 2024 only. You cannot set this value if using the earlier model
-(`models/embedding-001`). Check out [available Gemini models][modellist] for more
-information.
-
-[modellist]:
-    https://docs.cloud.google.com/vertex-ai/generative-ai/docs/embeddings/get-text-embeddings#supported-models
-
-## Example
-
-```yaml
-embeddingModels:
-  gemini-model:
-    kind: gemini
-    model: gemini-embedding-001
-    apiKey: ${GOOGLE_API_KEY}
-    dimension: 768
-```
-
-{{< notice tip >}}
-Use environment variable replacement with the format ${ENV_NAME}
-instead of hardcoding your secrets into the configuration file.
-{{< /notice >}}
-
-## Reference
-
-| **field** | **type** | **required** | **description**                                              |
-|-----------|:--------:|:------------:|--------------------------------------------------------------|
-| kind      |  string  |     true     | Must be `gemini`.                                            |
-| model     |  string  |     true     | The Gemini model ID to use (e.g., `gemini-embedding-001`).   |
-| apiKey    |  string  |    false     | Your API Key from Google AI Studio.                          |
-| dimension | integer  |    false     | The number of dimensions in the output vector (e.g., `768`). |
--- a/docs/en/resources/sources/alloydb-pg.md
+++ b/docs/en/resources/sources/alloydb-pg.md
@@ -94,10 +94,7 @@ cluster][alloydb-free-trial].
  instance.

 - [`postgres-list-roles`](../tools/postgres/postgres-list-roles.md)
-  Lists all the user-created roles in PostgreSQL database.
-
- [`postgres-list-stored-procedure`](../tools/postgres/postgres-list-stored-procedure.md)
-  Lists all the stored procedure in PostgreSQL database.
+  Lists all the user-created roles in PostgreSQL database..

 ### Pre-built Configurations

--- a/docs/en/resources/sources/bigquery.md
+++ b/docs/en/resources/sources/bigquery.md
@@ -94,13 +94,6 @@ intend to run. Common roles include `roles/bigquery.user` (which includes
 permissions to run jobs and read data) or `roles/bigbigquery.dataViewer`.
 Follow this [guide][set-adc] to set up your ADC.

-If you are running on Google Compute Engine (GCE) or Google Kubernetes Engine
-(GKE), you might need to explicitly set the access scopes for the service
-account. While you can configure scopes when creating the VM or node pool, you
-can also specify them in the source configuration using the `scopes` field.
-Common scopes include `https://www.googleapis.com/auth/bigquery` or
-`https://www.googleapis.com/auth/cloud-platform`.
-
 ### Authentication via User's OAuth Access Token

 If the `useClientOAuth` parameter is set to `true`, Toolbox will instead use the
@@ -131,10 +124,6 @@ sources:
    #   - "my_dataset_1"
    #   - "other_project.my_dataset_2"
    # impersonateServiceAccount: "service-account@project-id.iam.gserviceaccount.com" # Optional: Service account to impersonate
-    # scopes: # Optional: List of OAuth scopes to request.
-    #   - "https://www.googleapis.com/auth/bigquery"
-    #   - "https://www.googleapis.com/auth/drive.readonly"
-    # maxQueryResultRows: 50 # Optional: Limits the number of rows returned by queries. Defaults to 50.
 ```

 Initialize a BigQuery source that uses the client's access token:
@@ -151,10 +140,6 @@ sources:
    #   - "my_dataset_1"
    #   - "other_project.my_dataset_2"
    # impersonateServiceAccount: "service-account@project-id.iam.gserviceaccount.com" # Optional: Service account to impersonate
-    # scopes: # Optional: List of OAuth scopes to request.
-    #   - "https://www.googleapis.com/auth/bigquery"
-    #   - "https://www.googleapis.com/auth/drive.readonly"
-    # maxQueryResultRows: 50 # Optional: Limits the number of rows returned by queries. Defaults to 50.
 ```

 ## Reference
@@ -167,6 +152,4 @@ sources:
 | writeMode                 |  string  |    false     | Controls the write behavior for tools. `allowed` (default): All queries are permitted. `blocked`: Only `SELECT` statements are allowed for the `bigquery-execute-sql` tool. `protected`: Enables session-based execution where all tools associated with this source instance share the same [BigQuery session](https://cloud.google.com/bigquery/docs/sessions-intro). This allows for stateful operations using temporary tables (e.g., `CREATE TEMP TABLE`). For `bigquery-execute-sql`, `SELECT` statements can be used on all tables, but write operations are restricted to the session's temporary dataset. For tools like `bigquery-sql`, `bigquery-forecast`, and `bigquery-analyze-contribution`, the `writeMode` restrictions do not apply, but they will operate within the shared session. **Note:** The `protected` mode cannot be used with `useClientOAuth: true`. It is also not recommended for multi-user server environments, as all users would share the same session. A session is terminated automatically after 24 hours of inactivity or after 7 days, whichever comes first. A new session is created on the next request, and any temporary data from the previous session will be lost. |
 | allowedDatasets           | []string |    false     | An optional list of dataset IDs that tools using this source are allowed to access. If provided, any tool operation attempting to access a dataset not in this list will be rejected. To enforce this, two types of operations are also disallowed: 1) Dataset-level operations (e.g., `CREATE SCHEMA`), and 2) operations where table access cannot be statically analyzed (e.g., `EXECUTE IMMEDIATE`, `CREATE PROCEDURE`). If a single dataset is provided, it will be treated as the default for prebuilt tools. |
 | useClientOAuth            |   bool   |    false     | If true, forwards the client's OAuth access token from the "Authorization" header to downstream queries. **Note:** This cannot be used with `writeMode: protected`.                                                                                                                                                                                                                                                                                                                                                |
-| scopes                    | []string |    false     | A list of OAuth 2.0 scopes to use for the credentials. If not provided, default scopes are used.                                                                                                                                                                                                                                                                                                                                                                                                                     |
 | impersonateServiceAccount |  string  |    false     | Service account email to impersonate when making BigQuery and Dataplex API calls. The authenticated principal must have the `roles/iam.serviceAccountTokenCreator` role on the target service account. [Learn More](https://cloud.google.com/iam/docs/service-account-impersonation)                                                                                                                                                                                                                                |
-| maxQueryResultRows             |   int    |    false     | The maximum number of rows to return from a query. Defaults to 50. |
--- a/docs/en/resources/sources/cloud-gda.md
+++ b/docs/en/resources/sources/cloud-gda.md
@@ -1,40 +0,0 @@
---
-title: "Gemini Data Analytics"
-type: docs
-weight: 1
-description: >
-  A "cloud-gemini-data-analytics" source provides a client for the Gemini Data Analytics API.
-aliases:
-  - /resources/sources/cloud-gemini-data-analytics
---
-
-## About
-
-The `cloud-gemini-data-analytics` source provides a client to interact with the [Gemini Data Analytics API](https://docs.cloud.google.com/gemini/docs/conversational-analytics-api/reference/rest). This allows tools to send natural language queries to the API.
-
-Authentication can be handled in two ways:
-
-1.  **Application Default Credentials (ADC) (Recommended):** By default, the source uses ADC to authenticate with the API. The Toolbox server will fetch the credentials from its running environment (server-side authentication). This is the recommended method.
-2.  **Client-side OAuth:** If `useClientOAuth` is set to `true`, the source expects the authentication token to be provided by the caller when making a request to the Toolbox server (typically via an HTTP Bearer token). The Toolbox server will then forward this token to the underlying Gemini Data Analytics API calls.
-
-## Example
-
-```yaml
-sources:
-  my-gda-source:
-    kind: cloud-gemini-data-analytics
-    projectId: my-project-id
-
-  my-oauth-gda-source:
-    kind: cloud-gemini-data-analytics
-    projectId: my-project-id
-    useClientOAuth: true
-```
-
-## Reference
-
-| **field**      | **type** | **required** | **description**                                                                                                                                                              |
-| -------------- | :------: | :----------: | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| kind           |  string  |     true     | Must be "cloud-gemini-data-analytics".                                                                                                                                       |
-| projectId      |  string  |     true     | The Google Cloud Project ID where the API is enabled.                                                                                                                        |
-| useClientOAuth | boolean  |    false     | If true, the source uses the token provided by the caller (forwarded to the API). Otherwise, it uses server-side Application Default Credentials (ADC). Defaults to `false`. |
--- a/docs/en/resources/sources/cloud-sql-mysql.md
+++ b/docs/en/resources/sources/cloud-sql-mysql.md
@@ -31,9 +31,6 @@ to a database by following these instructions][csql-mysql-quickstart].
 - [`mysql-list-active-queries`](../tools/mysql/mysql-list-active-queries.md)
  List active queries in Cloud SQL for MySQL.

- [`mysql-get-query-plan`](../tools/mysql/mysql-get-query-plan.md)
-  Provide information about how MySQL executes a SQL statement (EXPLAIN).
-
 - [`mysql-list-tables`](../tools/mysql/mysql-list-tables.md)
  List tables in a Cloud SQL for MySQL database.

--- a/docs/en/resources/sources/cloud-sql-pg.md
+++ b/docs/en/resources/sources/cloud-sql-pg.md
@@ -91,10 +91,7 @@ to a database by following these instructions][csql-pg-quickstart].
  instance.

 - [`postgres-list-roles`](../tools/postgres/postgres-list-roles.md)
-  Lists all the user-created roles in PostgreSQL database.
-
- [`postgres-list-stored-procedure`](../tools/postgres/postgres-list-stored-procedure.md)
-  Lists all the stored procedure in PostgreSQL database.
+  Lists all the user-created roles in PostgreSQL database..

 ### Pre-built Configurations

--- a/docs/en/resources/sources/dataplex.md
+++ b/docs/en/resources/sources/dataplex.md
@@ -229,38 +229,22 @@ Finds resources that were created within, before, or after a given date or time.
 ### Aspect Search
 To search for entries based on their attached aspects, use the following query syntax.

-`has:x`
-Matches `x` as a substring of the full path to the aspect type of an aspect that is attached to the entry, in the format `projectid.location.ASPECT_TYPE_ID`
+aspect:x	Matches x as a substring of the full path to the aspect type of an aspect that is attached to the entry, in the format projectid.location.ASPECT_TYPE_ID
+aspect=x	Matches x as the full path to the aspect type of an aspect that is attached to the entry, in the format projectid.location.ASPECT_TYPE_ID
+aspect:xOPERATORvalue	
+Searches for aspect field values. Matches x as a substring of the full path to the aspect type and field name of an aspect that is attached to the entry, in the format projectid.location.ASPECT_TYPE_ID.FIELD_NAME

-`has=x`
-Matches `x` as the full path to the aspect type of an aspect that is attached to the entry, in the format `projectid.location.ASPECT_TYPE_ID`
+The list of supported {OPERATOR}s depends on the type of field in the aspect, as follows:
+- String: = (exact match) and : (substring)
+- All number types: =, :, <, >, <=, >=, =>, =<
+- Enum: =
+- Datetime: same as for numbers, but the values to compare are treated as datetimes instead of numbers
+- Boolean: =

-`xOPERATORvalue`
-Searches for aspect field values. Matches x as a substring of the full path to the aspect type and field name of an aspect that is attached to the entry, in the format `projectid.location.ASPECT_TYPE_ID.FIELD_NAME`
-
-The list of supported operators depends on the type of field in the aspect, as follows:
-* **String**: `=` (exact match)
-* **All number types**: `=`, `:`, `<`, `>`, `<=`, `>=`, `=>`, `=<`
-* **Enum**: `=` (exact match only)
-* **Datetime**: same as for numbers, but the values to compare are treated as datetimes instead of numbers
-* **Boolean**: `=`
-
-Only top-level fields of the aspect are searchable.
-
-* Syntax for system aspect types:
-    * `ASPECT_TYPE_ID.FIELD_NAME`
-    * `dataplex-types.ASPECT_TYPE_ID.FIELD_NAME`
-    * `dataplex-types.LOCATION.ASPECT_TYPE_ID.FIELD_NAME`
-For example, the following queries match entries where the value of the `type` field in the `bigquery-dataset` aspect is `default`:
-    * `bigquery-dataset.type=default`
-    * `dataplex-types.bigquery-dataset.type=default`
-    * `dataplex-types.global.bigquery-dataset.type=default`
-* Syntax for custom aspect types:
-    * If the aspect is created in the global region: `PROJECT_ID.ASPECT_TYPE_ID.FIELD_NAME`
-    * If the aspect is created in a specific region: `PROJECT_ID.REGION.ASPECT_TYPE_ID.FIELD_NAME`
-For example, the following queries match entries where the value of the `is-enrolled` field in the `employee-info` aspect is `true`.
-    * `example-project.us-central1.employee-info.is-enrolled=true`
-    * `example-project.employee-info.is-enrolled=true`
+Only top-level fields of the aspect are searchable. For example, all of the following queries match entries where the value of the is-enrolled field in the employee-info aspect type is true. Other entries that match on the substring are also returned.
+- aspect:example-project.us-central1.employee-info.is-enrolled=true
+- aspect:example-project.us-central1.employee=true
+- aspect:employee=true

 Example:-
 You can use following filters
@@ -274,25 +258,6 @@ Logical AND and logical OR are supported. For example, foo OR bar.
 You can negate a predicate with a - (hyphen) or NOT prefix. For example, -name:foo returns resources with names that don't match the predicate foo.
 Logical operators are case-sensitive. `OR` and `AND` are acceptable whereas `or` and `and` are not.

-### Abbreviated syntax
-
-An abbreviated search syntax is also available, using `|` (vertical bar) for `OR` operators and `,` (comma) for `AND` operators.
-
-For example, to search for entries inside one of many projects using the `OR` operator, you can use the following abbreviated syntax:
-
-`projectid:(id1|id2|id3|id4)`
-
-The same search without using abbreviated syntax looks like the following:
-
-`projectid:id1 OR projectid:id2 OR projectid:id3 OR projectid:id4`
-
-To search for entries with matching column names, use the following:
-
-* **AND**: `column:(name1,name2,name3)`
-* **OR**: `column:(name1|name2|name3)`
-
-This abbreviated syntax works for the qualified predicates except for `label` in keyword search.
-
 ### Request
 1. Always try to rewrite the prompt using search syntax.

--- a/docs/en/resources/sources/mysql.md
+++ b/docs/en/resources/sources/mysql.md
@@ -25,9 +25,6 @@ reliability, performance, and ease of use.
 - [`mysql-list-active-queries`](../tools/mysql/mysql-list-active-queries.md)
  List active queries in MySQL.

- [`mysql-get-query-plan`](../tools/mysql/mysql-get-query-plan.md)
-  Provide information about how MySQL executes a SQL statement (EXPLAIN).
-
 - [`mysql-list-tables`](../tools/mysql/mysql-list-tables.md)
  List tables in a MySQL database.

--- a/docs/en/resources/sources/oracle.md
+++ b/docs/en/resources/sources/oracle.md
@@ -18,10 +18,10 @@ DW) database workloads.
 ## Available Tools

 - [`oracle-sql`](../tools/oracle/oracle-sql.md)
-    Execute pre-defined prepared SQL queries in Oracle.
+  Execute pre-defined prepared SQL queries in Oracle.

 - [`oracle-execute-sql`](../tools/oracle/oracle-execute-sql.md)
-    Run parameterized SQL queries in Oracle.
+  Run parameterized SQL queries in Oracle.

 ## Requirements

@@ -33,25 +33,6 @@ user][oracle-users] to log in to the database with the necessary permissions.
 [oracle-users]:
    https://docs.oracle.com/en/database/oracle/oracle-database/21/sqlrf/CREATE-USER.html

-### Oracle Driver Requirement (Conditional)
-
-The Oracle source offers two connection drivers:
-
-1. **Pure Go Driver (`useOCI: false`, default):** Uses the `go-ora` library.
-   This driver is simpler and does not require any local Oracle software
-   installation, but it **lacks support for advanced features** like Oracle
-   Wallets or Kerberos authentication.
-
-2. **OCI-Based Driver (`useOCI: true`):** Uses the `godror` library, which
-   provides access to **advanced Oracle features** like Digital Wallet support.
-
-If you set `useOCI: true`, you **must** install the **Oracle Instant Client**
-libraries on the machine where this tool runs.
-
-You can download the Instant Client from the official Oracle website: [Oracle
-Instant Client
-Downloads](https://www.oracle.com/database/technologies/instant-client/downloads.html)
-
 ## Connection Methods

 You can configure the connection to your Oracle database using one of the
@@ -85,15 +66,12 @@ using a TNS (Transparent Network Substrate) alias.
  containing it. This setting will override the `TNS_ADMIN` environment
  variable.

-## Examples
-
-This example demonstrates the four connection methods you could choose from:
+## Example

 ```yaml
 sources:
    my-oracle-source:
        kind: oracle
-        
        # --- Choose one connection method ---
        # 1. Host, Port, and Service Name
        host: 127.0.0.1
@@ -110,43 +88,6 @@ sources:
        user: ${USER_NAME}
        password: ${PASSWORD}

-        # Optional: Set to true to use the OCI-based driver for advanced features (Requires Oracle Instant Client)
-```
-
-### Using an Oracle Wallet
-
-Oracle Wallet allows you to store credentails used for database connection. Depending whether you are using an OCI-based driver, the wallet configuration is different.
-
-#### Pure Go Driver (`useOCI: false`) - Oracle Wallet
-
-The `go-ora` driver uses the `walletLocation` field to connect to a database secured with an Oracle Wallet without standard username and password.
-
-```yaml
-sources:
-    pure-go-wallet:
-        kind: oracle
-        connectionString: "127.0.0.1:1521/XEPDB1"
-        user: ${USER_NAME}
-        password: ${PASSWORD}
-        # The TNS Alias is often required to connect to a service registered in tnsnames.ora
-        tnsAlias: "SECURE_DB_ALIAS"
-        walletLocation: "/path/to/my/wallet/directory"
-```
-
-#### OCI-Based Driver (`useOCI: true`) - Oracle Wallet
-
-For the OCI-based driver, wallet authentication is triggered by setting tnsAdmin to the wallet directory and connecting via a tnsAlias. 
-
-```yaml
-sources:
-    oci-wallet:
-        kind: oracle
-        connectionString: "127.0.0.1:1521/XEPDB1"
-        user: ${USER_NAME}
-        password: ${PASSWORD}
-        tnsAlias: "WALLET_DB_ALIAS"
-        tnsAdmin: "/opt/oracle/wallet" # Directory containing tnsnames.ora, sqlnet.ora, and wallet files
-        useOCI: true
 ```

 {{< notice tip >}}
@@ -156,15 +97,14 @@ instead of hardcoding your secrets into the configuration file.

 ## Reference

-| **field**        | **type** | **required** | **description**                                                                                                                                                                         |
-|------------------|:--------:|:------------:|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| kind             |  string  |     true     | Must be "oracle".                                                                                                                                                                       |
-| user             |  string  |     true     | Name of the Oracle user to connect as (e.g. "my-oracle-user").                                                                                                                          |
-| password         |  string  |     true     | Password of the Oracle user (e.g. "my-password").                                                                                                                                       |
-| host             |  string  |    false     | IP address or hostname to connect to (e.g. "127.0.0.1"). Required if not using `connectionString` or `tnsAlias`.                                                                        |
-| port             | integer  |    false     | Port to connect to (e.g. "1521"). Required if not using `connectionString` or `tnsAlias`.                                                                                               |
-| serviceName      |  string  |    false     | The Oracle service name of the database to connect to. Required if not using `connectionString` or `tnsAlias`.                                                                          |
-| connectionString |  string  |    false     | A direct connection string (e.g. "hostname:port/servicename"). Use as an alternative to `host`, `port`, and `serviceName`.                                                              |
-| tnsAlias         |  string  |    false     | A TNS alias from a `tnsnames.ora` file. Use as an alternative to `host`/`port` or `connectionString`.                                                                                   |
-| tnsAdmin         |  string  |    false     | Path to the directory containing the `tnsnames.ora` file. This overrides the `TNS_ADMIN` environment variable if it is set.                                                             |
-| useOCI           |   bool   |    false     | If true, uses the OCI-based driver (godror) which supports Oracle Wallet/Kerberos but requires the Oracle Instant Client libraries to be installed. Defaults to false (pure Go driver). |
+| **field**        | **type** | **required** | **description**                                                                                                             |
+|------------------|:--------:|:------------:|-----------------------------------------------------------------------------------------------------------------------------|
+| kind             |  string  |     true     | Must be "oracle".                                                                                                           |
+| user             |  string  |     true     | Name of the Oracle user to connect as (e.g. "my-oracle-user").                                                              |
+| password         |  string  |     true     | Password of the Oracle user (e.g. "my-password").                                                                           |
+| host             |  string  |    false     | IP address or hostname to connect to (e.g. "127.0.0.1"). Required if not using `connectionString` or `tnsAlias`.            |
+| port             | integer  |    false     | Port to connect to (e.g. "1521"). Required if not using `connectionString` or `tnsAlias`.                                   |
+| serviceName      |  string  |    false     | The Oracle service name of the database to connect to. Required if not using `connectionString` or `tnsAlias`.              |
+| connectionString |  string  |    false     | A direct connection string (e.g. "hostname:port/servicename"). Use as an alternative to `host`, `port`, and `serviceName`.  |
+| tnsAlias         |  string  |    false     | A TNS alias from a `tnsnames.ora` file. Use as an alternative to `host`/`port` or `connectionString`.                       |
+| tnsAdmin         |  string  |    false     | Path to the directory containing the `tnsnames.ora` file. This overrides the `TNS_ADMIN` environment variable if it is set. |
--- a/docs/en/resources/sources/postgres.md
+++ b/docs/en/resources/sources/postgres.md
@@ -85,10 +85,7 @@ reputation for reliability, feature robustness, and performance.
  server.

 - [`postgres-list-roles`](../tools/postgres/postgres-list-roles.md)
-  Lists all the user-created roles in PostgreSQL database.
-
- [`postgres-list-stored-procedure`](../tools/postgres/postgres-list-stored-procedure.md)
-  Lists all the stored procedure in PostgreSQL database.
+  Lists all the user-created roles in PostgreSQL database..

 ### Pre-built Configurations

--- a/docs/en/resources/sources/snowflake.md
+++ b/docs/en/resources/sources/snowflake.md
@@ -1,63 +0,0 @@
---
-title: "Snowflake"
-type: docs
-weight: 1
-description: >
-  Snowflake is a cloud-based data platform.
-
---
-
-## About
-
-[Snowflake][sf-docs] is a cloud data platform that provides a data warehouse-as-a-service designed for the cloud.
-
-[sf-docs]: https://docs.snowflake.com/
-
-## Available Tools
-
- [`snowflake-sql`](../tools/snowflake/snowflake-sql.md)  
-  Execute SQL queries as prepared statements in Snowflake.
-
- [`snowflake-execute-sql`](../tools/snowflake/snowflake-execute-sql.md)  
-  Run parameterized SQL statements in Snowflake.
-
-## Requirements
-
-### Database User
-
-This source only uses standard authentication. You will need to create a
-Snowflake user to login to the database with.
-
-## Example
-
-```yaml
-sources:
-    my-sf-source:
-        kind: snowflake
-        account: ${SNOWFLAKE_ACCOUNT}
-        user: ${SNOWFLAKE_USER}
-        password: ${SNOWFLAKE_PASSWORD}
-        database: ${SNOWFLAKE_DATABASE}
-        schema: ${SNOWFLAKE_SCHEMA}
-        warehouse: ${SNOWFLAKE_WAREHOUSE}
-        role: ${SNOWFLAKE_ROLE}
-```
-
-{{< notice tip >}}
-Use environment variable replacement with the format ${ENV_NAME}
-instead of hardcoding your secrets into the configuration file.
-{{< /notice >}}
-
-## Reference
-
-| **field** | **type** | **required** | **description**                                                        |
-|-----------|:--------:|:------------:|------------------------------------------------------------------------|
-| kind      |  string  |     true     | Must be "snowflake".                                                   |
-| account   |  string  |     true     | Your Snowflake account identifier.                                     |
-| user      |  string  |     true     | Name of the Snowflake user to connect as (e.g. "my-sf-user").          |
-| password  |  string  |     true     | Password of the Snowflake user (e.g. "my-password").                   |
-| database  |  string  |     true     | Name of the Snowflake database to connect to (e.g. "my_db").           |
-| schema    |  string  |     true     | Name of the schema to use (e.g. "my_schema").                          |
-| warehouse |  string  |     false    | The virtual warehouse to use. Defaults to "COMPUTE_WH".                |
-| role      |  string  |     false    | The security role to use. Defaults to "ACCOUNTADMIN".                  |
-| timeout   |  integer |     false    | The connection timeout in seconds. Defaults to 60.                     |
--- a/docs/en/resources/sources/trino.md
+++ b/docs/en/resources/sources/trino.md
@@ -50,19 +50,16 @@ instead of hardcoding your secrets into the configuration file.

 ## Reference

-| **field**              | **type** | **required** | **description**                                                              |
-| ---------------------- | :------: | :----------: | ---------------------------------------------------------------------------- |
-| kind                   |  string  |     true     | Must be "trino".                                                             |
-| host                   |  string  |     true     | Trino coordinator hostname (e.g. "trino.example.com")                        |
-| port                   |  string  |     true     | Trino coordinator port (e.g. "8080", "8443")                                 |
-| user                   |  string  |    false     | Username for authentication (e.g. "analyst"). Optional for anonymous access. |
-| password               |  string  |    false     | Password for basic authentication                                            |
-| catalog                |  string  |     true     | Default catalog to use for queries (e.g. "hive")                             |
-| schema                 |  string  |     true     | Default schema to use for queries (e.g. "default")                           |
-| queryTimeout           |  string  |    false     | Query timeout duration (e.g. "30m", "1h")                                    |
-| accessToken            |  string  |    false     | JWT access token for authentication                                          |
-| kerberosEnabled        | boolean  |    false     | Enable Kerberos authentication (default: false)                              |
-| sslEnabled             | boolean  |    false     | Enable SSL/TLS (default: false)                                              |
-| disableSslVerification | boolean  |    false     | Skip SSL/TLS certificate verification (default: false)                       |
-| sslCertPath            |  string  |    false     | Path to a custom SSL/TLS certificate file                                    |
-| sslCert                |  string  |    false     | Custom SSL/TLS certificate content                                           |
+| **field**       | **type** | **required** | **description**                                                              |
+|-----------------|:--------:|:------------:|------------------------------------------------------------------------------|
+| kind            |  string  |     true     | Must be "trino".                                                             |
+| host            |  string  |     true     | Trino coordinator hostname (e.g. "trino.example.com")                        |
+| port            |  string  |     true     | Trino coordinator port (e.g. "8080", "8443")                                 |
+| user            |  string  |    false     | Username for authentication (e.g. "analyst"). Optional for anonymous access. |
+| password        |  string  |    false     | Password for basic authentication                                            |
+| catalog         |  string  |     true     | Default catalog to use for queries (e.g. "hive")                             |
+| schema          |  string  |     true     | Default schema to use for queries (e.g. "default")                           |
+| queryTimeout    |  string  |    false     | Query timeout duration (e.g. "30m", "1h")                                    |
+| accessToken     |  string  |    false     | JWT access token for authentication                                          |
+| kerberosEnabled | boolean  |    false     | Enable Kerberos authentication (default: false)                              |
+| sslEnabled      | boolean  |    false     | Enable SSL/TLS (default: false)                                              |
--- a/docs/en/resources/tools/alloydbainl/alloydb-ai-nl.md
+++ b/docs/en/resources/tools/alloydbainl/alloydb-ai-nl.md
@@ -91,8 +91,8 @@ visible to the LLM.
    https://cloud.google.com/alloydb/docs/parameterized-secure-views-overview

 {{< notice tip >}} Make sure to enable the `parameterized_views` extension
-to utilize PSV feature (`nlConfigParameters`) with this tool. You can do so by
-running this command in the AlloyDB studio:
+before running this tool. You can do so by running this command in the AlloyDB
+studio:

 ```sql
 CREATE EXTENSION IF NOT EXISTS parameterized_views;
--- a/docs/en/resources/tools/cloudgda/_index.md
+++ b/docs/en/resources/tools/cloudgda/_index.md
@@ -1,7 +0,0 @@
---
-title: "Gemini Data Analytics"
-type: docs
-weight: 1
-description: >
-  Tools for Gemini Data Analytics.
---
--- a/docs/en/resources/tools/cloudgda/cloud-gda-query.md
+++ b/docs/en/resources/tools/cloudgda/cloud-gda-query.md
@@ -1,92 +0,0 @@
---
-title: "Gemini Data Analytics QueryData"
-type: docs
-weight: 1
-description: >
-  A tool to convert natural language queries into SQL statements using the Gemini Data Analytics QueryData API.
-aliases:
-  - /resources/tools/cloud-gemini-data-analytics-query
---
-
-## About
-
-The `cloud-gemini-data-analytics-query` tool allows you to send natural language questions to the Gemini Data Analytics API and receive structured responses containing SQL queries, natural language answers, and explanations. For details on defining data agent context for database data sources, see the official [documentation](https://docs.cloud.google.com/gemini/docs/conversational-analytics-api/data-agent-authored-context-databases).
-
-## Example
-
-```yaml
-tools:
-  my-gda-query-tool:
-    kind: cloud-gemini-data-analytics-query
-    source: my-gda-source
-    description: "Use this tool to send natural language queries to the Gemini Data Analytics API and receive SQL, natural language answers, and explanations."
-    location: ${your_database_location}
-    context:
-      datasourceReferences:
-        cloudSqlReference:
-          databaseReference:
-            projectId: "${your_project_id}"
-            region: "${your_database_instance_region}"
-            instanceId: "${your_database_instance_id}"
-            databaseId: "${your_database_name}"
-            engine: "POSTGRESQL"
-          agentContextReference:
-            contextSetId: "${your_context_set_id}" # E.g. projects/${project_id}/locations/${context_set_location}/contextSets/${context_set_id}
-    generationOptions:
-      generateQueryResult: true
-      generateNaturalLanguageAnswer: true
-      generateExplanation: true
-      generateDisambiguationQuestion: true
-```
-
-### Usage Flow
-
-When using this tool, a `prompt` parameter containing a natural language query is provided to the tool (typically by an agent). The tool then interacts with the Gemini Data Analytics API using the context defined in your configuration.
-
-The structure of the response depends on the `generationOptions` configured in your tool definition (e.g., enabling `generateQueryResult` will include the SQL query results).
-
-See [Data Analytics API REST documentation](https://clouddocs.devsite.corp.google.com/gemini/docs/conversational-analytics-api/reference/rest/v1alpha/projects.locations/queryData?rep_location=global) for details.
-
-**Example Input Prompt:**
-
-```text
-How many accounts who have region in Prague are eligible for loans? A3 contains the data of region.
-```
-
-**Example API Response:**
-
-```json
-{
-  "generatedQuery": "SELECT COUNT(T1.account_id) FROM account AS T1 INNER JOIN loan AS T2 ON T1.account_id = T2.account_id INNER JOIN district AS T3 ON T1.district_id = T3.district_id WHERE T3.A3 = 'Prague'",
-  "intentExplanation": "I found a template that matches the user's question. The template asks about the number of accounts who have region in a given city and are eligible for loans. The question asks about the number of accounts who have region in Prague and are eligible for loans. The template's parameterized SQL is 'SELECT COUNT(T1.account_id) FROM account AS T1 INNER JOIN loan AS T2 ON T1.account_id = T2.account_id INNER JOIN district AS T3 ON T1.district_id = T3.district_id WHERE T3.A3 = ?'. I will replace the named parameter '?' with 'Prague'.",
-  "naturalLanguageAnswer": "There are 84 accounts from the Prague region that are eligible for loans.",
-  "queryResult": {
-    "columns": [
-      {
-        "type": "INT64"
-      }
-    ],
-    "rows": [
-      {
-        "values": [
-          {
-            "value": "84"
-          }
-        ]
-      }
-    ],
-    "totalRowCount": "1"
-  }
-}
-```
-
-## Reference
-
-| **field**         | **type** | **required** | **description**                                                                                                                                                                                                                                              |
-| ----------------- | :------: | :----------: | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
-| kind              |  string  |     true     | Must be "cloud-gemini-data-analytics-query".                                                                                                                                                                                                                 |
-| source            |  string  |     true     | The name of the `cloud-gemini-data-analytics` source to use.                                                                                                                                                                                                 |
-| description       |  string  |     true     | A description of the tool's purpose.                                                                                                                                                                                                                         |
-| location          |  string  |     true     | The Google Cloud location of the target database resource (e.g., "us-central1"). This is used to construct the parent resource name in the API call.                                                                                                         |
-| context           |  object  |     true     | The context for the query, including datasource references. See [QueryDataContext](https://github.com/googleapis/googleapis/blob/b32495a713a68dd0dff90cf0b24021debfca048a/google/cloud/geminidataanalytics/v1beta/data_chat_service.proto#L156) for details. |
-| generationOptions |  object  |    false     | Options for generating the response. See [GenerationOptions](https://github.com/googleapis/googleapis/blob/b32495a713a68dd0dff90cf0b24021debfca048a/google/cloud/geminidataanalytics/v1beta/data_chat_service.proto#L135) for details.                       |
--- a/docs/en/resources/tools/cloudsql/cloudsqlcreatebackup.md
+++ b/docs/en/resources/tools/cloudsql/cloudsqlcreatebackup.md
@@ -1,45 +0,0 @@
---
-title: cloud-sql-create-backup
-type: docs
-weight: 10
-description: "Creates a backup on a Cloud SQL instance."
---
-
-The `cloud-sql-create-backup` tool creates an on-demand backup on a Cloud SQL instance using the Cloud SQL Admin API.
-
-{{< notice info dd>}}
-This tool uses a `source` of kind `cloud-sql-admin`.
-{{< /notice >}}
-
-## Examples
-
-Basic backup creation (current state)
-
-```yaml
-tools:
-  backup-creation-basic:
-    kind: cloud-sql-create-backup
-    source: cloud-sql-admin-source
-    description: "Creates a backup on the given Cloud SQL instance."
-```
-## Reference
-### Tool Configuration
-| **field**      | **type** | **required** | **description**                                               |
-| -------------- | :------: | :----------: | ------------------------------------------------------------- |
-| kind           | string   | true         | Must be "cloud-sql-create-backup".                            |
-| source         | string   | true         | The name of the `cloud-sql-admin` source to use.              |
-| description    | string   | false        | A description of the tool.                                    |
-
-### Tool Inputs
-
-| **parameter**              | **type** | **required** | **description**                                                                 |
-| -------------------------- | :------: | :----------: | ------------------------------------------------------------------------------- |
-| project                    | string   | true         | The project ID.                                                                 |
-| instance                   | string   | true         | The name of the instance to take a backup on. Does not include the project ID.  |
-| location                   | string   | false        | (Optional) Location of the backup run.                                          |
-| backup_description         | string   | false        | (Optional) The description of this backup run.                                  |
-
-## See Also
- [Cloud SQL Admin API documentation](https://cloud.google.com/sql/docs/mysql/admin-api)
- [Toolbox Cloud SQL tools documentation](../cloudsql)
- [Cloud SQL Backup API documentation](https://cloud.google.com/sql/docs/mysql/backup-recovery/backups)
--- a/docs/en/resources/tools/looker/looker-make-dashboard.md
+++ b/docs/en/resources/tools/looker/looker-make-dashboard.md
@@ -18,11 +18,9 @@ It's compatible with the following sources:

 - [looker](../../sources/looker.md)

-`looker-make-dashboard` takes three parameters:
+`looker-make-dashboard` takes one parameter:

 1. the `title`
-2. the `description`
-3. an optional `folder` id. If not provided, the user's default folder will be used.

 ## Example

--- a/docs/en/resources/tools/looker/looker-make-look.md
+++ b/docs/en/resources/tools/looker/looker-make-look.md
@@ -18,7 +18,7 @@ It's compatible with the following sources:

 - [looker](../../sources/looker.md)

-`looker-make-look` takes twelve parameters:
+`looker-make-look` takes eleven parameters:

 1. the `model`
 2. the `explore`
@@ -31,7 +31,6 @@ It's compatible with the following sources:
 9. an optional `vis_config`
 10. the `title`
 11. an optional `description`
-12. an optional `folder` id. If not provided, the user's default folder will be used.

 ## Example

--- a/docs/en/resources/tools/mindsdb/mindsdb-sql.md
+++ b/docs/en/resources/tools/mindsdb/mindsdb-sql.md
@@ -169,5 +169,5 @@ tools:
 | source             |                   string                         |     true     | Name of the source the SQL should execute on.                                                                                              |
 | description        |                   string                         |     true     | Description of the tool that is passed to the LLM.                                                                                         |
 | statement          |                   string                         |     true     | SQL statement to execute on.                                                                                                               |
-| parameters         | [parameters](../#specifying-parameters)       |    false     | List of [parameters](../#specifying-parameters) that will be inserted into the SQL statement.                                           |
-| templateParameters | [templateParameters](../#template-parameters) |    false     | List of [templateParameters](../#template-parameters) that will be inserted into the SQL statement before executing prepared statement. |
+| parameters         | [parameters](_index#specifying-parameters)       |    false     | List of [parameters](_index#specifying-parameters) that will be inserted into the SQL statement.                                           |
+| templateParameters | [templateParameters](_index#template-parameters) |    false     | List of [templateParameters](_index#template-parameters) that will be inserted into the SQL statement before executing prepared statement. |
--- a/docs/en/resources/tools/mysql/mysql-get-query-plan.md
+++ b/docs/en/resources/tools/mysql/mysql-get-query-plan.md
@@ -1,39 +0,0 @@
---
-title: "mysql-get-query-plan"
-type: docs
-weight: 1
-description: >
-  A "mysql-get-query-plan" tool gets the execution plan for a SQL statement against a MySQL
-  database.
-aliases:
- /resources/tools/mysql-get-query-plan
---
-
-## About
-
-A `mysql-get-query-plan` tool gets the execution plan for a SQL statement against a MySQL
-database. It's compatible with any of the following sources:
-
- [cloud-sql-mysql](../../sources/cloud-sql-mysql.md)
- [mysql](../../sources/mysql.md)
-
-`mysql-get-query-plan` takes one input parameter `sql_statement` and gets the execution plan for the SQL
-statement against the `source`.
-
-## Example
-
-```yaml
-tools:
- get_query_plan_tool:
-    kind: mysql-get-query-plan
-    source: my-mysql-instance
-    description: Use this tool to get the execution plan for a sql statement.
-```
-
-## Reference
-
-| **field**   |                  **type**                  | **required** | **description**                                                                                  |
-|-------------|:------------------------------------------:|:------------:|--------------------------------------------------------------------------------------------------|
-| kind        |                   string                   |     true     | Must be "mysql-get-query-plan".                                                                     |
-| source      |                   string                   |     true     | Name of the source the SQL should execute on.                                                    |
-| description |                   string                   |     true     | Description of the tool that is passed to the LLM.                                               |
--- a/docs/en/resources/tools/postgres/postgres-list-stored-procedure.md
+++ b/docs/en/resources/tools/postgres/postgres-list-stored-procedure.md
@@ -1,141 +0,0 @@
---
-title: "postgres-list-stored-procedure"
-type: docs
-weight: 1
-description: >
-  The "postgres-list-stored-procedure" tool retrieves metadata for stored procedures in PostgreSQL, including procedure definitions, owners, languages, and descriptions.
-aliases:
- /resources/tools/postgres-list-stored-procedure
---
-
-## About
-
-The `postgres-list-stored-procedure` tool queries PostgreSQL system catalogs (`pg_proc`, `pg_namespace`, `pg_roles`, and `pg_language`) to retrieve comprehensive metadata about stored procedures in the database. It filters for procedures (kind = 'p') and provides the full procedure definition along with ownership and language information.
-
-Compatible sources:
-
- [alloydb-postgres](../../sources/alloydb-pg.md)
- [cloud-sql-postgres](../../sources/cloud-sql-pg.md)
- [postgres](../../sources/postgres.md)
-
-The tool returns a JSON array where each element represents a stored procedure with its schema, name, owner, language, complete definition, and optional description. Results are sorted by schema name and procedure name, with a default limit of 20 procedures.
-
-## Parameters
-
-| parameter    | type    | required | default | description |
-|--------------|---------|----------|---------|-------------|
-| role_name    | string  | false    | null    | Optional: The owner name to filter stored procedures by (supports partial matching) |
-| schema_name  | string  | false    | null    | Optional: The schema name to filter stored procedures by (supports partial matching) |
-| limit        | integer | false    | 20      | Optional: The maximum number of stored procedures to return |
-
-## Example
-
-```yaml
-tools:
-  list_stored_procedure:
-    kind: postgres-list-stored-procedure
-    source: postgres-source
-    description: "Retrieves stored procedure metadata including definitions and owners."
-```
-
-### Example Requests
-
-**List all stored procedures (default limit 20):**
-```json
-{}
-```
-
-**Filter by specific owner (role):**
-```json
-{
-  "role_name": "app_user"
-}
-```
-
-**Filter by schema:**
-```json
-{
-  "schema_name": "public"
-}
-```
-
-**Filter by owner and schema with custom limit:**
-```json
-{
-  "role_name": "postgres",
-  "schema_name": "public",
-  "limit": 50
-}
-```
-
-**Filter by partial schema name:**
-```json
-{
-  "schema_name": "audit"
-}
-```
-
-### Example Response
-
-```json
-[
-  {
-    "schema_name": "public",
-    "name": "process_payment",
-    "owner": "postgres",
-    "language": "plpgsql",
-    "definition": "CREATE OR REPLACE PROCEDURE public.process_payment(p_order_id integer, p_amount numeric)\n LANGUAGE plpgsql\nAS $procedure$\nBEGIN\n  UPDATE orders SET status = 'paid', amount = p_amount WHERE id = p_order_id;\n  INSERT INTO payment_log (order_id, amount, timestamp) VALUES (p_order_id, p_amount, now());\n  COMMIT;\nEND\n$procedure$",
-    "description": "Processes payment for an order and logs the transaction"
-  },
-  {
-    "schema_name": "public",
-    "name": "cleanup_old_records",
-    "owner": "postgres",
-    "language": "plpgsql",
-    "definition": "CREATE OR REPLACE PROCEDURE public.cleanup_old_records(p_days_old integer)\n LANGUAGE plpgsql\nAS $procedure$\nDECLARE\n  v_deleted integer;\nBEGIN\n  DELETE FROM audit_logs WHERE created_at < now() - (p_days_old || ' days')::interval;\n  GET DIAGNOSTICS v_deleted = ROW_COUNT;\n  RAISE NOTICE 'Deleted % records', v_deleted;\nEND\n$procedure$",
-    "description": "Removes audit log records older than specified days"
-  },
-  {
-    "schema_name": "audit",
-    "name": "audit_table_changes",
-    "owner": "app_user",
-    "language": "plpgsql",
-    "definition": "CREATE OR REPLACE PROCEDURE audit.audit_table_changes()\n LANGUAGE plpgsql\nAS $procedure$\nBEGIN\n  INSERT INTO audit.change_log (table_name, operation, changed_at) VALUES (TG_TABLE_NAME, TG_OP, now());\nEND\n$procedure$",
-    "description": null
-  }
-]
-```
-
-## Output Fields Reference
-
-| field       | type    | description |
-|-------------|---------|-------------|
-| schema_name | string  | Name of the schema containing the stored procedure. |
-| name        | string  | Name of the stored procedure. |
-| owner       | string  | PostgreSQL role/user who owns the stored procedure. |
-| language    | string  | Programming language in which the procedure is written (e.g., plpgsql, sql, c). |
-| definition  | string  | Complete SQL definition of the stored procedure, including the CREATE PROCEDURE statement. |
-| description | string  | Optional description or comment for the procedure (may be null if no comment is set). |
-
-## Use Cases
-
- **Code review and auditing**: Export procedure definitions for version control or compliance audits.
- **Documentation generation**: Automatically extract procedure metadata and descriptions for documentation.
- **Permission auditing**: Identify procedures owned by specific users or in specific schemas.
- **Migration planning**: Retrieve all procedure definitions when planning database migrations.
- **Dependency analysis**: Review procedure definitions to understand dependencies and call chains.
- **Security assessment**: Audit which roles own and can modify stored procedures.
-
-## Performance Considerations
-
- The tool filters at the database level using LIKE pattern matching, so partial matches are supported.
- Procedure definitions can be large; consider using the `limit` parameter for large databases with many procedures.
- Results are ordered by schema name and procedure name for consistent output.
- The default limit of 20 procedures is suitable for most use cases; increase as needed.
-
-## Notes
-
- Only stored **procedures** are returned; functions and other callable objects are excluded via the `prokind = 'p'` filter.
- Filtering uses `LIKE` pattern matching, so filter values support partial matches (e.g., `role_name: "app"` will match "app_user", "app_admin", etc.).
- The `definition` field contains the complete, runnable CREATE PROCEDURE statement.
- The `description` field is populated from comments set via PostgreSQL's COMMENT command and may be null.
--- a/docs/en/resources/tools/snowflake/_index.md
+++ b/docs/en/resources/tools/snowflake/_index.md
@@ -1,7 +0,0 @@
---
-title: "Snowflake"
-type: docs
-weight: 1
-description: > 
-  Tools that work with Snowflake Sources.
---
--- a/docs/en/resources/tools/snowflake/snowflake-execute-sql.md
+++ b/docs/en/resources/tools/snowflake/snowflake-execute-sql.md
@@ -1,40 +0,0 @@
---
-title: "snowflake-execute-sql"
-type: docs
-weight: 1
-description: >
-  A "snowflake-execute-sql" tool executes a SQL statement against a Snowflake
-  database.
---
-
-## About
-
-A `snowflake-execute-sql` tool executes a SQL statement against a Snowflake
-database. It's compatible with any of the following sources:
-
- [snowflake](../../sources/snowflake.md)
-
-`snowflake-execute-sql` takes one input parameter `sql` and run the sql
-statement against the `source`.
-
-> **Note:** This tool is intended for developer assistant workflows with
-> human-in-the-loop and shouldn't be used for production agents.
-
-## Example
-
-```yaml
-tools:
- execute_sql_tool:
-    kind: snowflake-execute-sql
-    source: my-snowflake-instance
-    description: Use this tool to execute sql statement.
-```
-
-## Reference
-
-| **field**    |   **type**    | **required** | **description**                                           |
-|--------------|:-------------:|:------------:|-----------------------------------------------------------|
-| kind         |    string     |     true     | Must be "snowflake-execute-sql".                          |
-| source       |    string     |     true     | Name of the source the SQL should execute on.             |
-| description  |    string     |     true     | Description of the tool that is passed to the LLM.        |
-| authRequired | array[string] |    false     | List of auth services that are required to use this tool. |
--- a/docs/en/resources/tools/snowflake/snowflake-sql.md
+++ b/docs/en/resources/tools/snowflake/snowflake-sql.md
@@ -1,103 +0,0 @@
---
-title: "snowflake-sql"
-type: docs
-weight: 1
-description: >
-  A "snowflake-sql" tool executes a pre-defined SQL statement against a 
-  Snowflake database.
---
-
-## About
-
-A `snowflake-sql` tool executes a pre-defined SQL statement against a Snowflake
-database. It's compatible with any of the following sources:
-
- [snowflake](../../sources/snowflake.md)
-
-The specified SQL statement is executed as a prepared statement, and specified
-parameters will be inserted according to their position: e.g. `:1` will be the
-first parameter specified, `:2` will be the second parameter, and so on.
-
-> **Note:** This tool uses parameterized queries to prevent SQL injections.
-> Query parameters can be used as substitutes for arbitrary expressions.
-> Parameters cannot be used as substitutes for identifiers, column names, table
-> names, or other parts of the query.
-
-## Example
-
-```yaml
-tools:
- search_flights_by_number:
-    kind: snowflake-sql
-    source: my-snowflake-instance
-    statement: |
-      SELECT * FROM flights
-      WHERE airline = :1
-      AND flight_number = :2
-      LIMIT 10
-    description: |
-      Use this tool to get information for a specific flight.
-      Takes an airline code and flight number and returns info on the flight.
-      Do NOT use this tool with a flight id. Do NOT guess an airline code or flight number.
-      A airline code is a code for an airline service consisting of two-character
-      airline designator and followed by flight number, which is 1 to 4 digit number.
-      For example, if given CY 0123, the airline is "CY", and flight_number is "123".
-      Another example for this is DL 1234, the airline is "DL", and flight_number is "1234".
-      If the tool returns more than one option choose the date closes to today.
-      Example:
-      {{
-          "airline": "CY",
-          "flight_number": "888",
-      }}
-      Example:
-      {{
-          "airline": "DL",
-          "flight_number": "1234",
-      }}
-    parameters:
-      - name: airline
-        type: string
-        description: Airline unique 2 letter identifier
-      - name: flight_number
-        type: string
-        description: 1 to 4 digit number
-```
-
-### Example with Template Parameters
-
-> **Note:** This tool allows direct modifications to the SQL statement,
-> including identifiers, column names, and table names. **This makes it more
-> vulnerable to SQL injections**. Using basic parameters only (see above) is
-> recommended for performance and safety reasons. For more details, please check
-> [templateParameters](..#template-parameters).
-
-```yaml
-tools:
- list_table:
-    kind: snowflake
-    source: my-snowflake-instance
-    statement: |
-      SELECT * FROM {{.tableName}};
-    description: |
-      Use this tool to list all information from a specific table.
-      Example:
-      {{
-          "tableName": "flights",
-      }}
-    templateParameters:
-      - name: tableName
-        type: string
-        description: Table to select from
-```
-
-## Reference
-
-| **field**          |                   **type**                   | **required** | **description**                                                                                                                        |
-|--------------------|:--------------------------------------------:|:------------:|----------------------------------------------------------------------------------------------------------------------------------------|
-| kind               |                    string                    |     true     | Must be "snowflake-sql".                                                                                                               |
-| source             |                    string                    |     true     | Name of the source the SQL should execute on.                                                                                          |
-| description        |                    string                    |     true     | Description of the tool that is passed to the LLM.                                                                                     |
-| statement          |                    string                    |     true     | SQL statement to execute on.                                                                                                           |
-| parameters         |   [parameters](../#specifying-parameters)    |    false     | List of [parameters](../#specifying-parameters) that will be inserted into the SQL statement.                                          |
-| templateParameters | [templateParameters](..#template-parameters) |    false     | List of [templateParameters](..#template-parameters) that will be inserted into the SQL statement before executing prepared statement. |
-| authRequired       |                array[string]                 |    false     | List of auth services that are required to use this tool.                                                                              |
--- a/docs/en/resources/tools/trino/trino-sql.md
+++ b/docs/en/resources/tools/trino/trino-sql.md
@@ -16,7 +16,11 @@ database. It's compatible with any of the following sources:

 - [trino](../../sources/trino.md)

-The specified SQL statement is executed as a [prepared statement][trino-prepare], and expects parameters in the SQL query to be in the form of placeholders `?`.
+The specified SQL statement is executed as a [prepared statement][trino-prepare],
+and specified parameters will be inserted according to their position: e.g. `$1`
+will be the first parameter specified, `$2` will be the second parameter, and so
+on. If template parameters are included, they will be resolved before execution
+of the prepared statement.

 [trino-prepare]: https://trino.io/docs/current/sql/prepare.html

@@ -34,8 +38,8 @@ tools:
    source: my-trino-instance
    statement: |
      SELECT * FROM hive.sales.orders
-      WHERE region = ?
-      AND order_date >= DATE(?)
+      WHERE region = $1
+      AND order_date >= DATE($2)
      LIMIT 10
    description: |
      Use this tool to get information for orders in a specific region.
--- a/docs/en/samples/alloydb/ai-nl/alloydb_ai_nl.ipynb
+++ b/docs/en/samples/alloydb/ai-nl/alloydb_ai_nl.ipynb
@@ -771,7 +771,7 @@
      },
      "outputs": [],
      "source": [
-        "version = \"0.25.0\" # x-release-please-version\n",
+        "version = \"0.23.0\" # x-release-please-version\n",
        "! curl -L -o /content/toolbox https://storage.googleapis.com/genai-toolbox/v{version}/linux/amd64/toolbox\n",
        "\n",
        "# Make the binary executable\n",
--- a/docs/en/samples/alloydb/mcp_quickstart.md
+++ b/docs/en/samples/alloydb/mcp_quickstart.md
@@ -123,7 +123,7 @@ In this section, we will download and install the Toolbox binary.
    <!-- {x-release-please-start-version} -->
    ```bash
    export OS="linux/amd64" # one of linux/amd64, darwin/arm64, darwin/amd64, or windows/amd64
-    export VERSION="0.25.0"
+    export VERSION="0.23.0"
    curl -O https://storage.googleapis.com/genai-toolbox/v$VERSION/$OS/toolbox
    ```
    <!-- {x-release-please-end} -->
--- a/docs/en/samples/bigquery/colab_quickstart_bigquery.ipynb
+++ b/docs/en/samples/bigquery/colab_quickstart_bigquery.ipynb
@@ -220,7 +220,7 @@
      },
      "outputs": [],
      "source": [
-        "version = \"0.25.0\" # x-release-please-version\n",
+        "version = \"0.23.0\" # x-release-please-version\n",
        "! curl -O https://storage.googleapis.com/genai-toolbox/v{version}/linux/amd64/toolbox\n",
        "\n",
        "# Make the binary executable\n",
--- a/docs/en/samples/bigquery/local_quickstart.md
+++ b/docs/en/samples/bigquery/local_quickstart.md
@@ -179,7 +179,7 @@ to use BigQuery, and then run the Toolbox server.
    <!-- {x-release-please-start-version} -->
    ```bash
    export OS="linux/amd64" # one of linux/amd64, darwin/arm64, darwin/amd64, or windows/amd64
-    curl -O https://storage.googleapis.com/genai-toolbox/v0.25.0/$OS/toolbox
+    curl -O https://storage.googleapis.com/genai-toolbox/v0.23.0/$OS/toolbox
    ```
    <!-- {x-release-please-end} -->

--- a/docs/en/samples/bigquery/mcp_quickstart/_index.md
+++ b/docs/en/samples/bigquery/mcp_quickstart/_index.md
@@ -98,7 +98,7 @@ In this section, we will download Toolbox, configure our tools in a
    <!-- {x-release-please-start-version} -->
    ```bash
    export OS="linux/amd64" # one of linux/amd64, darwin/arm64, darwin/amd64, or windows/amd64
-    curl -O https://storage.googleapis.com/genai-toolbox/v0.25.0/$OS/toolbox
+    curl -O https://storage.googleapis.com/genai-toolbox/v0.23.0/$OS/toolbox
    ```
    <!-- {x-release-please-end} -->

--- a/docs/en/samples/looker/looker_gemini.md
+++ b/docs/en/samples/looker/looker_gemini.md
@@ -34,7 +34,7 @@ In this section, we will download Toolbox and run the Toolbox server.
    <!-- {x-release-please-start-version} -->
    ```bash
    export OS="linux/amd64" # one of linux/amd64, darwin/arm64, darwin/amd64, or windows/amd64
-    curl -O https://storage.googleapis.com/genai-toolbox/v0.25.0/$OS/toolbox
+    curl -O https://storage.googleapis.com/genai-toolbox/v0.23.0/$OS/toolbox
    ```
    <!-- {x-release-please-end} -->

--- a/docs/en/samples/looker/looker_gemini_oauth/_index.md
+++ b/docs/en/samples/looker/looker_gemini_oauth/_index.md
@@ -48,7 +48,7 @@ In this section, we will download Toolbox and run the Toolbox server.
    <!-- {x-release-please-start-version} -->
    ```bash
    export OS="linux/amd64" # one of linux/amd64, darwin/arm64, darwin/amd64, or windows/amd64
-    curl -O https://storage.googleapis.com/genai-toolbox/v0.25.0/$OS/toolbox
+    curl -O https://storage.googleapis.com/genai-toolbox/v0.23.0/$OS/toolbox
    ```
    <!-- {x-release-please-end} -->

--- a/docs/en/samples/looker/looker_mcp_inspector/_index.md
+++ b/docs/en/samples/looker/looker_mcp_inspector/_index.md
@@ -34,7 +34,7 @@ In this section, we will download Toolbox and run the Toolbox server.
    <!-- {x-release-please-start-version} -->
    ```bash
    export OS="linux/amd64" # one of linux/amd64, darwin/arm64, darwin/amd64, or windows/amd64
-    curl -O https://storage.googleapis.com/genai-toolbox/v0.25.0/$OS/toolbox
+    curl -O https://storage.googleapis.com/genai-toolbox/v0.23.0/$OS/toolbox
    ```
    <!-- {x-release-please-end} -->

--- a/docs/en/samples/neo4j/_index.md
+++ b/docs/en/samples/neo4j/_index.md
@@ -1,7 +0,0 @@
---
-title: "Neo4j"
-type: docs
-weight: 1
-description: >
-  How to get started with Toolbox using Neo4j.
---
--- a/docs/en/samples/neo4j/mcp_quickstart.md
+++ b/docs/en/samples/neo4j/mcp_quickstart.md
@@ -1,141 +0,0 @@
---
-title: "Quickstart (MCP with Neo4j)"
-type: docs
-weight: 1
-description: >
-  How to get started running Toolbox with MCP Inspector and Neo4j as the source.
---
-
-## Overview
-
-[Model Context Protocol](https://modelcontextprotocol.io) is an open protocol that standardizes how applications provide context to LLMs. Check out this page on how to [connect to Toolbox via MCP](../../how-to/connect_via_mcp.md).
-
-
-## Step 1: Set up your Neo4j Database and Data
-
-In this section, you'll set up a database and populate it with sample data for a movies-related agent. This guide assumes you have a running Neo4j instance, either locally or in the cloud.
-
-. **Populate the database with data.**
-To make this quickstart straightforward, we'll use the built-in Movies dataset available in Neo4j.
-
-. In your Neo4j Browser, run the following command to create and populate the database:
-+
-```cypher
-:play movies
-````
-
-. Follow the instructions to load the data. This will create a graph with `Movie`, `Person`, and `Actor` nodes and their relationships.
-
-
-## Step 2: Install and configure Toolbox
-
-In this section, we will install the MCP Toolbox, configure our tools in a `tools.yaml` file, and then run the Toolbox server.
-
-. **Install the Toolbox binary.**
-The simplest way to get started is to download the latest binary for your operating system.
-
-. Download the latest version of Toolbox as a binary:
-\+
-
-```bash
-export OS="linux/amd64" # one of linux/amd64, darwin/arm64, darwin/amd64, or windows/amd64
-curl -O [https://storage.googleapis.com/genai-toolbox/v0.16.0/$OS/toolbox](https://storage.googleapis.com/genai-toolbox/v0.16.0/$OS/toolbox)
-```
-
-  + 
-. Make the binary executable:
-\+
-
-```bash
-chmod +x toolbox
-```
-
-. **Create the `tools.yaml` file.**
-This file defines your Neo4j source and the specific tools that will be exposed to your AI agent.
-\+
-{{\< notice tip \>}}
-Authentication for the Neo4j source uses standard username and password fields. For production use, it is highly recommended to use environment variables for sensitive information like passwords.
-{{\< /notice \>}}
-\+
-Write the following into a `tools.yaml` file:
-\+
-
-```yaml
-sources:
-  my-neo4j-source:
-    kind: neo4j
-    uri: bolt://localhost:7687
-    user: neo4j
-    password: my-password # Replace with your actual password
-
-tools:
-  search-movies-by-actor:
-    kind: neo4j-cypher
-    source: my-neo4j-source
-    description: "Searches for movies an actor has appeared in based on their name. Useful for questions like 'What movies has Tom Hanks been in?'"
-    parameters:
-      - name: actor_name
-        type: string
-        description: The full name of the actor to search for.
-    statement: |
-      MATCH (p:Person {name: $actor_name}) -[:ACTED_IN]-> (m:Movie)
-      RETURN m.title AS title, m.year AS year, m.genre AS genre
-  
-  get-actor-for-movie:
-    kind: neo4j-cypher
-    source: my-neo4j-source
-    description: "Finds the actors who starred in a specific movie. Useful for questions like 'Who acted in Inception?'"
-    parameters:
-      - name: movie_title
-        type: string
-        description: The exact title of the movie.
-    statement: |
-      MATCH (p:Person) -[:ACTED_IN]-> (m:Movie {title: $movie_title})
-      RETURN p.name AS actor
-```
-
-. **Start the Toolbox server.**
-Run the Toolbox server, pointing to the `tools.yaml` file you created earlier.
-\+
-
-```bash
-./toolbox --tools-file "tools.yaml"
-```
-
-## Step 3: Connect to MCP Inspector
-
-. **Run the MCP Inspector:**
-\+
-
-```bash
-npx @modelcontextprotocol/inspector
-```
-
-. Type `y` when it asks to install the inspector package.
-. It should show the following when the MCP Inspector is up and running (please take note of `<YOUR_SESSION_TOKEN>`):
-\+
-
-```bash
-Starting MCP inspector...
-⚙️ Proxy server listening on localhost:6277
-🔑 Session token: <YOUR_SESSION_TOKEN>
-    Use this token to authenticate requests or set DANGEROUSLY_OMIT_AUTH=true to disable auth
-
-🚀 MCP Inspector is up and running at:
-    http://localhost:6274/?MCP_PROXY_AUTH_TOKEN=<YOUR_SESSION_TOKEN>
-```
-
-1. Open the above link in your browser.
-
-1. For `Transport Type`, select `Streamable HTTP`.
-
-1. For `URL`, type in `http://127.0.0.1:5000/mcp`.
-
-1. For `Configuration` -\> `Proxy Session Token`, make sure `<YOUR_SESSION_TOKEN>` is present.
-
-1. Click `Connect`.
-
-1. Select `List Tools`, you will see a list of tools configured in `tools.yaml`.
-
-1. Test out your tools here\!
-
--- a/docs/en/samples/snowflake/_index.md
+++ b/docs/en/samples/snowflake/_index.md
@@ -1,161 +0,0 @@
---
-title: "Snowflake"
-type: docs
-weight: 2
-description: >
-  How to get started running Toolbox with MCP Inspector and Snowflake as the source.
---
-
-## Overview
-
-[Model Context Protocol](https://modelcontextprotocol.io) is an open protocol
-that standardizes how applications provide context to LLMs. Check out this page
-on how to [connect to Toolbox via MCP](../../how-to/connect_via_mcp.md).
-
-## Before you begin
-
-This guide assumes you have already done the following:
-
-1.  [Create a Snowflake account](https://signup.snowflake.com/).
-1.  Connect to the instance using [SnowSQL](https://docs.snowflake.com/en/user-guide/snowsql), or any other Snowflake client.
-
-## Step 1: Set up your environment
-
-Copy the environment template and update it with your Snowflake credentials:
-
-```bash
-cp examples/snowflake-env.sh my-snowflake-env.sh
-```
-
-Edit `my-snowflake-env.sh` with your actual Snowflake connection details:
-
-```bash
-export SNOWFLAKE_ACCOUNT="your-account-identifier"
-export SNOWFLAKE_USER="your-username"
-export SNOWFLAKE_PASSWORD="your-password"
-export SNOWFLAKE_DATABASE="your-database"
-export SNOWFLAKE_SCHEMA="your-schema"
-export SNOWFLAKE_WAREHOUSE="COMPUTE_WH"
-export SNOWFLAKE_ROLE="ACCOUNTADMIN"
-```
-
-## Step 2: Install Toolbox
-
-In this section, we will download and install the Toolbox binary.
-
-1. Download the latest version of Toolbox as a binary:
-
-    {{< notice tip >}}
-   Select the
-   [correct binary](https://github.com/googleapis/genai-toolbox/releases)
-   corresponding to your OS and CPU architecture.
-    {{< /notice >}}
-    <!-- {x-release-please-start-version} -->
-    ```bash
-    export OS="linux/amd64" # one of linux/amd64, darwin/arm64, darwin/amd64, or windows/amd64
-    export VERSION="0.10.0"
-    curl -O https://storage.googleapis.com/genai-toolbox/v$VERSION/$OS/toolbox
-    ```
-    <!-- {x-release-please-end} -->
-
-1. Make the binary executable:
-
-    ```bash
-    chmod +x toolbox
-    ```
-
-## Step 3: Configure the tools
-
-You have two options:
-
-#### Option A: Use the prebuilt configuration
-
-```bash
-./toolbox --prebuilt snowflake
-```
-
-#### Option B: Use the custom configuration
-
-Create a `tools.yaml` file and add the following content. You must replace the placeholders with your actual Snowflake configuration.
-
-```yaml
-sources:
-  snowflake-source:
-    kind: snowflake
-    account: ${SNOWFLAKE_ACCOUNT}
-    user: ${SNOWFLAKE_USER}
-    password: ${SNOWFLAKE_PASSWORD}
-    database: ${SNOWFLAKE_DATABASE}
-    schema: ${SNOWFLAKE_SCHEMA}
-    warehouse: ${SNOWFLAKE_WAREHOUSE}
-    role: ${SNOWFLAKE_ROLE}
-
-tools:
-    execute_sql:
-        kind: snowflake-execute-sql
-        source: snowflake-source
-        description: Use this tool to execute SQL.
-
-    list_tables:
-        kind: snowflake-sql
-        source: snowflake-source
-        description: "Lists detailed schema information for user-created tables."
-        statement: |
-           SELECT table_name, table_type 
-           FROM information_schema.tables 
-           WHERE table_schema = current_schema()
-           ORDER BY table_name;
-```
-
-For more info on tools, check out the
-[Tools](../../resources/tools/) section.
-
-## Step 4: Run the Toolbox server
-
-Run the Toolbox server, pointing to the `tools.yaml` file created earlier:
-
-```bash
-./toolbox --tools-file "tools.yaml"
-```
-
-## Step 5: Connect to MCP Inspector
-
-1. Run the MCP Inspector:
-
-    ```bash
-    npx @modelcontextprotocol/inspector
-    ```
-
-1. Type `y` when it asks to install the inspector package.
-
-1. It should show the following when the MCP Inspector is up and running (please take note of `<YOUR_SESSION_TOKEN>`):
-
-    ```bash
-    Starting MCP inspector...
-    ⚙️ Proxy server listening on localhost:6277
-    🔑 Session token: <YOUR_SESSION_TOKEN>
-       Use this token to authenticate requests or set DANGEROUSLY_OMIT_AUTH=true to disable auth
-
-    🚀 MCP Inspector is up and running at:
-       http://localhost:6274/?MCP_PROXY_AUTH_TOKEN=<YOUR_SESSION_TOKEN>
-    ```
-
-1. Open the above link in your browser.
-
-1. For `Transport Type`, select `Streamable HTTP`.
-
-1. For `URL`, type in `http://127.0.0.1:5000/mcp`.
-
-1. For `Configuration` -> `Proxy Session Token`, make sure `<YOUR_SESSION_TOKEN>` is present.
-
-1. Click Connect.
-
-1. Select `List Tools`, you will see a list of tools configured in `tools.yaml`.
-
-1. Test out your tools here!
-
-## What's next
-
- Learn more about [MCP Inspector](../../how-to/connect_via_mcp.md).
- Learn more about [Toolbox Resources](../../resources/).
- Learn more about [Toolbox How-to guides](../../how-to/).
--- a/docs/en/samples/snowflake/runme.py
+++ b/docs/en/samples/snowflake/runme.py
@@ -1,18 +0,0 @@
-import asyncio
-from toolbox_core import ToolboxClient
-
-
-async def main():
-    # Replace with the actual URL where your Toolbox service is running
-    async with ToolboxClient("http://127.0.0.1:5000") as toolbox:
-        tool = await toolbox.load_tool("execute_sql")
-        result = await tool("SELECT 1")
-        print(result)
-
-        tool = await toolbox.load_tool("list_tables")
-        result = await tool(table_names="DIM_DATE")
-        print(result)
-
-
-if __name__ == "__main__":
-    asyncio.run(main())
--- a/docs/en/samples/snowflake/snowflake-config.yaml
+++ b/docs/en/samples/snowflake/snowflake-config.yaml
@@ -1,68 +0,0 @@
-# Copyright 2026 Google LLC
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-sources:
-  my-snowflake-db:
-    kind: snowflake
-    account: ${SNOWFLAKE_ACCOUNT}
-    user: ${SNOWFLAKE_USER}
-    password: ${SNOWFLAKE_PASSWORD}
-    database: ${SNOWFLAKE_DATABASE}
-    schema: ${SNOWFLAKE_SCHEMA}
-    warehouse: ${SNOWFLAKE_WAREHOUSE}  # Optional, defaults to COMPUTE_WH if not set
-    role: ${SNOWFLAKE_ROLE}           # Optional, defaults to ACCOUNTADMIN if not set
-
-tools:
-  execute_sql:
-    kind: snowflake-execute-sql
-    source: my-snowflake-db
-    description: Execute arbitrary SQL statements on Snowflake
-
-  get_customer_orders:
-    kind: snowflake-sql
-    source: my-snowflake-db
-    description: Get orders for a specific customer
-    statement: |
-      SELECT o.order_id, o.order_date, o.total_amount, o.status
-      FROM orders o
-      WHERE o.customer_id = $1
-      ORDER BY o.order_date DESC
-    parameters:
-      - name: customer_id
-        type: string
-        description: The customer ID to look up orders for
-
-  daily_sales_report:
-    kind: snowflake-sql
-    source: my-snowflake-db
-    description: Generate daily sales report for a specific date
-    statement: |
-      SELECT 
-        DATE(order_date) as sales_date,
-        COUNT(*) as total_orders,
-        SUM(total_amount) as total_revenue,
-        AVG(total_amount) as avg_order_value
-      FROM orders
-      WHERE DATE(order_date) = $1
-      GROUP BY DATE(order_date)
-    parameters:
-      - name: report_date
-        type: string
-        description: The date to generate report for (YYYY-MM-DD format)
-
-toolsets:
-  snowflake-analytics:
-    - execute_sql
-    - get_customer_orders
-    - daily_sales_report
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Mike DeAngelo	271f4d6f2f	chore: refactor common code into helper function	2025-12-15 12:21:40 -05:00
Mike DeAngelo	881c3a1ac3	feat: serve /.well-known/... oauth metadata files	2025-12-15 12:21:40 -05:00
@@ -1 +1 @@
 .25.0
 .23.0