Refactor Github Action per b/485167538

resolve comments
docs: update configure instructions
2026-02-18 11:02:26 -05:00 · 2026-02-18 10:46:26 +00:00 · 2025-11-24 09:59:01 -08:00 · 2025-11-24 09:59:01 -08:00
399 changed files with 2578 additions and 16081 deletions
--- a/.ci/integration.cloudbuild.yaml
+++ b/.ci/integration.cloudbuild.yaml
@@ -273,7 +273,7 @@ steps:
        .ci/test_with_coverage.sh \
          "Cloud Healthcare API" \
          cloudhealthcare \
-          cloudhealthcare || echo "Integration tests failed."
+          cloudhealthcare

  - id: "postgres"
    name: golang:1
@@ -385,7 +385,7 @@ steps:
        .ci/test_with_coverage.sh \
          "Cloud SQL MySQL" \
          cloudsqlmysql \
-          mysql
+          mysql || echo "Integration tests failed." # ignore test failures

  - id: "mysql"
    name: golang:1
@@ -407,7 +407,7 @@ steps:
        .ci/test_with_coverage.sh \
          "MySQL" \
          mysql \
-          mysql
+          mysql || echo "Integration tests failed." # ignore test failures

  - id: "mssql"
    name: golang:1
@@ -589,26 +589,6 @@ steps:
          firestore \
          firestore

-  - id: "mongodb"
-    name: golang:1
-    waitFor: ["compile-test-binary"]
-    entrypoint: /bin/bash
-    env:
-      - "GOPATH=/gopath"
-      - "MONGODB_DATABASE=$_DATABASE_NAME"
-      - "SERVICE_ACCOUNT_EMAIL=$SERVICE_ACCOUNT_EMAIL"
-    secretEnv: ["MONGODB_URI", "CLIENT_ID"]
-    volumes:
-      - name: "go"
-        path: "/gopath"
-    args:
-      - -c
-      - |
-        .ci/test_with_coverage.sh \
-          "MongoDB" \
-          mongodb \
-          mongodb
-
  - id: "looker"
    name: golang:1
    waitFor: ["compile-test-binary"]
@@ -887,26 +867,6 @@ steps:
          singlestore \
          singlestore

-  - id: "mariadb"
-    name: golang:1
-    waitFor: ["compile-test-binary"]
-    entrypoint: /bin/bash
-    env:
-      - "GOPATH=/gopath"
-      - "MARIADB_DATABASE=$_MARIADB_DATABASE"
-      - "MARIADB_PORT=$_MARIADB_PORT"
-      - "SERVICE_ACCOUNT_EMAIL=$SERVICE_ACCOUNT_EMAIL"
-    secretEnv: ["MARIADB_USER", "MARIADB_PASS", "MARIADB_HOST", "CLIENT_ID"]
-    volumes:
-      - name: "go"
-        path: "/gopath"
-    args:
-      - -c
-      - |
-        # skip coverage check as it re-uses current MySQL implementation
-        go test ./tests/mariadb
-
-
 availableSecrets:
  secretManager:
    - versionName: projects/$PROJECT_ID/secrets/cloud_sql_pg_user/versions/latest
@@ -1019,14 +979,6 @@ availableSecrets:
      env: SINGLESTORE_PASSWORD
    - versionName: projects/$PROJECT_ID/secrets/singlestore_host/versions/latest
      env: SINGLESTORE_HOST
-    - versionName: projects/$PROJECT_ID/secrets/mariadb_user/versions/latest
-      env: MARIADB_USER
-    - versionName: projects/$PROJECT_ID/secrets/mariadb_pass/versions/latest
-      env: MARIADB_PASS
-    - versionName: projects/$PROJECT_ID/secrets/mariadb_host/versions/latest
-      env: MARIADB_HOST
-    - versionName: projects/$PROJECT_ID/secrets/mongodb_uri/versions/latest
-      env: MONGODB_URI

 options:
  logging: CLOUD_LOGGING_ONLY
@@ -1087,6 +1039,3 @@ substitutions:
  _SINGLESTORE_PORT: "3308"
  _SINGLESTORE_DATABASE: "singlestore"
  _SINGLESTORE_USER: "root"
-  _MARIADB_PORT: "3307"
-  _MARIADB_DATABASE: test_database
-
--- a/.ci/quickstart_test/js.integration.cloudbuild.yaml
+++ b/.ci/quickstart_test/js.integration.cloudbuild.yaml
@@ -13,7 +13,7 @@
 # limitations under the License.

 steps:
-  - name: 'node:22'
+  - name: 'node:20'
    id: 'js-quickstart-test'
    entrypoint: 'bash'
    args:
@@ -44,4 +44,4 @@ availableSecrets:
 timeout: 1000s

 options:
-  logging: CLOUD_LOGGING_ONLY
+  logging: CLOUD_LOGGING_ONLY
--- a/.gemini/config.yaml
+++ b/.gemini/config.yaml
@@ -1,18 +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.
-
-ignore_patterns:
-  - "package-lock.json"
-  - "go.sum"
-  - "requirements.txt"
--- a/.github/blunderbuss.yml
+++ b/.github/blunderbuss.yml
@@ -15,6 +15,7 @@
 assign_issues:
  - Yuan325
  - duwenxin99
+  - averikitsch
  - anubhav756
  - twishabansal
  - dishaprakash
@@ -61,7 +62,8 @@ assign_issues_by:
    - 'googleapis/toolbox-spanner'
 assign_prs:
  - Yuan325
-  - duwenxin99
+  - duwenxin99     
+  - averikitsch 
 assign_prs_by:
  - labels:
    - 'product: alloydb'
--- a/.github/trusted-contribution.yml
+++ b/.github/trusted-contribution.yml
@@ -1,27 +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.
-
-# Trigger presubmit tests for trusted contributors
-# https://github.com/googleapis/repo-automation-bots/tree/main/packages/trusted-contribution
-# Install: https://github.com/apps/trusted-contributions-gcf
-
-trustedContributors:
-  - "dependabot[bot]"
-  - "renovate-bot"
-annotations:
-  # Trigger Cloud Build tests
-  - type: comment
-    text: "/gcbrun"
-  - type: label
-    text: "tests: run"
--- a/.github/workflows/deploy_versioned_docs.yaml
+++ b/.github/workflows/deploy_versioned_docs.yaml
@@ -35,7 +35,9 @@ jobs:
          ref: ${{ github.event.release.tag_name }}

      - name: Get Version from Release Tag
-        run: echo "VERSION=${{ github.event.release.tag_name }}" >> $GITHUB_ENV
+        run: echo "VERSION=${GITHUB_EVENT_RELEASE_TAG_NAME}" >> $GITHUB_ENV
+        env:
+          GITHUB_EVENT_RELEASE_TAG_NAME: ${{ github.event.release.tag_name }}

      - name: Setup Hugo
        uses: peaceiris/actions-hugo@75d2e84710de30f6ff7268e08f310b60ef14033f # v3
--- a/.github/workflows/lint.yaml
+++ b/.github/workflows/lint.yaml
@@ -51,7 +51,7 @@ jobs:
              console.log('Failed to remove label. Another job may have already removed it!');
            }
      - name: Setup Go
-        uses: actions/setup-go@4dc6199c7b1a012772edbd06daecab0f50c9053c # v6.1.0
+        uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0
        with:
          go-version: "1.25"
      - name: Checkout code
--- a/.github/workflows/tests.yaml
+++ b/.github/workflows/tests.yaml
@@ -57,7 +57,7 @@ jobs:
            }

      - name: Setup Go
-        uses: actions/setup-go@4dc6199c7b1a012772edbd06daecab0f50c9053c # v6.1.0
+        uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0
        with:
          go-version: "1.24"

--- a/.hugo/assets/scss/_styles_project.scss
+++ b/.hugo/assets/scss/_styles_project.scss
@@ -1,9 +1 @@
-@import 'td/code-dark';
-
-// Make tabs scrollable horizontally instead of wrapping
-.nav-tabs {
-  flex-wrap: nowrap;
-  white-space: nowrap;
-  overflow-x: auto;
-  overflow-y: hidden;
-}
+@import 'td/code-dark';
--- 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.23.0"
-  url = "https://googleapis.github.io/genai-toolbox/v0.23.0/"
-
-[[params.versions]]
-  version = "v0.22.0"
-  url = "https://googleapis.github.io/genai-toolbox/v0.22.0/"
-
 [[params.versions]]
  version = "v0.21.0"
  url = "https://googleapis.github.io/genai-toolbox/v0.21.0/"
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,67 +1,5 @@
 # Changelog

-## [0.23.0](https://github.com/googleapis/genai-toolbox/compare/v0.22.0...v0.23.0) (2025-12-11)
-
-
-### ⚠ BREAKING CHANGES
-
-* **serverless-spark:** add URLs to create batch tool outputs
-* **serverless-spark:** add URLs to list_batches output
-* **serverless-spark:** add Cloud Console and Logging URLs to get_batch
-* **tools/postgres:** Add additional filter params for existing postgres tools ([#2033](https://github.com/googleapis/genai-toolbox/issues/2033))
-
-### Features
-
-* **tools/postgres:** Add list-table-stats-tool to list table statistics. ([#2055](https://github.com/googleapis/genai-toolbox/issues/2055)) ([78b02f0](https://github.com/googleapis/genai-toolbox/commit/78b02f08c3cc3062943bb2f91cf60d5149c8d28d))
-* **looker/tools:** Enhance dashboard creation with dashboard filters ([#2133](https://github.com/googleapis/genai-toolbox/issues/2133)) ([285aa46](https://github.com/googleapis/genai-toolbox/commit/285aa46b887d9acb2da8766e107bbf1ab75b8812))
-* **serverless-spark:** Add Cloud Console and Logging URLs to get_batch ([e29c061](https://github.com/googleapis/genai-toolbox/commit/e29c0616d6b9ecda2badcaf7b69614e511ac031b))
-* **serverless-spark:** Add URLs to create batch tool outputs ([c6ccf4b](https://github.com/googleapis/genai-toolbox/commit/c6ccf4bd87026484143a2d0f5527b2edab03b54a))
-* **serverless-spark:** Add URLs to list_batches output ([5605eab](https://github.com/googleapis/genai-toolbox/commit/5605eabd696696ade07f52431a28ef65c0fb1f77))
-* **sources/mariadb:** Add MariaDB source and MySQL tools integration ([#1908](https://github.com/googleapis/genai-toolbox/issues/1908)) ([3b40fea](https://github.com/googleapis/genai-toolbox/commit/3b40fea25edae607e02c1e8fc2b0c957fa2c8e9a))
-* **tools/postgres:** Add additional filter params for existing postgres tools ([#2033](https://github.com/googleapis/genai-toolbox/issues/2033)) ([489117d](https://github.com/googleapis/genai-toolbox/commit/489117d74711ac9260e7547163ca463eb45eeaa2))
-* **tools/postgres:** Add list_pg_settings, list_database_stats tools for postgres ([#2030](https://github.com/googleapis/genai-toolbox/issues/2030)) ([32367a4](https://github.com/googleapis/genai-toolbox/commit/32367a472fae9653fed7f126428eba0252978bd5))
-* **tools/postgres:** Add new postgres-list-roles tool ([#2038](https://github.com/googleapis/genai-toolbox/issues/2038)) ([bea9705](https://github.com/googleapis/genai-toolbox/commit/bea97054502cfa236aa10e2ebc8ff58eb00ad035))
-
-
-### Bug Fixes
-
-* List tables tools null fix ([#2107](https://github.com/googleapis/genai-toolbox/issues/2107)) ([2b45266](https://github.com/googleapis/genai-toolbox/commit/2b452665983154041d4cd0ed7d82532e4af682eb))
-* **tools/mongodb:** Removed sortPayload and sortParams ([#1238](https://github.com/googleapis/genai-toolbox/issues/1238)) ([c5a6daa](https://github.com/googleapis/genai-toolbox/commit/c5a6daa7683d2f9be654300d977692c368e55e31))
-
-
-### Miscellaneous Chores
-* **looker:** Upgrade to latest go sdk ([#2159](https://github.com/googleapis/genai-toolbox/issues/2159)) ([78e015d](https://github.com/googleapis/genai-toolbox/commit/78e015d7dfd9cce7e2b444ed934da17eb355bc86))
-
-## [0.22.0](https://github.com/googleapis/genai-toolbox/compare/v0.21.0...v0.22.0) (2025-12-04)
-
-
-### Features
-
-* **tools/postgres:** Add allowed-origins flag ([#1984](https://github.com/googleapis/genai-toolbox/issues/1984)) ([862868f](https://github.com/googleapis/genai-toolbox/commit/862868f28476ea981575ce412faa7d6a03138f31))
-* **tools/postgres:** Add list-query-stats and get-column-cardinality functions ([#1976](https://github.com/googleapis/genai-toolbox/issues/1976)) ([9f76026](https://github.com/googleapis/genai-toolbox/commit/9f760269253a8cc92a357e995c6993ccc4a0fb7b))
-* **tools/spanner:** Add spanner list graphs to prebuiltconfigs ([#2056](https://github.com/googleapis/genai-toolbox/issues/2056)) ([0e7fbf4](https://github.com/googleapis/genai-toolbox/commit/0e7fbf465c488397aa9d8cab2e55165fff4eb53c))
-* **prebuilt/cloud-sql:** Add clone instance tool for cloud sql ([#1845](https://github.com/googleapis/genai-toolbox/issues/1845)) ([5e43630](https://github.com/googleapis/genai-toolbox/commit/5e43630907aa2d7bc6818142483a33272eab060b))
-* **serverless-spark:** Add create_pyspark_batch tool ([1bf0b51](https://github.com/googleapis/genai-toolbox/commit/1bf0b51f033c956790be1577bf5310d0b17e9c12))
-* **serverless-spark:** Add create_spark_batch tool ([17a9792](https://github.com/googleapis/genai-toolbox/commit/17a979207dbc4fe70acd0ebda164d1a8d34c1ed3))
-* Support alternate accessToken header name ([#1968](https://github.com/googleapis/genai-toolbox/issues/1968)) ([18017d6](https://github.com/googleapis/genai-toolbox/commit/18017d6545335a6fc1c472617101c35254d9a597))
-* Support for annotations ([#2007](https://github.com/googleapis/genai-toolbox/issues/2007)) ([ac21335](https://github.com/googleapis/genai-toolbox/commit/ac21335f4e88ca52d954d7f8143a551a35661b94))
-* **tool/mssql:** Set default host and port for MSSQL source ([#1943](https://github.com/googleapis/genai-toolbox/issues/1943)) ([7a9cc63](https://github.com/googleapis/genai-toolbox/commit/7a9cc633768d9ae9a7ff8230002da69d6a36ca86))
-* **tools/cloudsqlpg:** Add CloudSQL PostgreSQL pre-check tool ([#1722](https://github.com/googleapis/genai-toolbox/issues/1722)) ([8752e05](https://github.com/googleapis/genai-toolbox/commit/8752e05ab6e98812d95673a6f1ff67e9a6ae48d2))
-* **tools/postgres-list-publication-tables:** Add new postgres-list-publication-tables tool ([#1919](https://github.com/googleapis/genai-toolbox/issues/1919)) ([f4b1f0a](https://github.com/googleapis/genai-toolbox/commit/f4b1f0a68000ca2fc0325f55a1905705417c38a2))
-* **tools/postgres-list-tablespaces:** Add new postgres-list-tablespaces tool ([#1934](https://github.com/googleapis/genai-toolbox/issues/1934)) ([5ad7c61](https://github.com/googleapis/genai-toolbox/commit/5ad7c6127b3e47504fc4afda0b7f3de1dff78b8b))
-* **tools/spanner-list-graph:** Tool impl + docs + tests ([#1923](https://github.com/googleapis/genai-toolbox/issues/1923)) ([a0f44d3](https://github.com/googleapis/genai-toolbox/commit/a0f44d34ea3f044dd08501be616f70ddfd63ab45))
-
-
-### Bug Fixes
-
-* Add import for firebirdsql ([#2045](https://github.com/googleapis/genai-toolbox/issues/2045)) ([fb7aae9](https://github.com/googleapis/genai-toolbox/commit/fb7aae9d35b760d3471d8379642f835a0d84ec41))
-* Correct FAQ to mention HTTP tools ([#2036](https://github.com/googleapis/genai-toolbox/issues/2036)) ([7b44237](https://github.com/googleapis/genai-toolbox/commit/7b44237d4a21bfbf8d3cebe4d32a15affa29584d))
-* Format BigQuery numeric output as decimal strings ([#2084](https://github.com/googleapis/genai-toolbox/issues/2084)) ([155bff8](https://github.com/googleapis/genai-toolbox/commit/155bff80c1da4fae1e169e425fd82e1dc3373041))
-* Set default annotations for tools in code if annotation not provided in yaml ([#2049](https://github.com/googleapis/genai-toolbox/issues/2049)) ([565460c](https://github.com/googleapis/genai-toolbox/commit/565460c4ea8953dbe80070a8e469f957c0f7a70c))
-* **tools/alloydb-postgres-list-tables:** Exclude google_ml schema from list_tables ([#2046](https://github.com/googleapis/genai-toolbox/issues/2046)) ([a03984c](https://github.com/googleapis/genai-toolbox/commit/a03984cc15254c928f30085f8fa509ded6a79a0c))
-* **tools/alloydbcreateuser:** Remove duplication of project praram ([#2028](https://github.com/googleapis/genai-toolbox/issues/2028)) ([730ac6d](https://github.com/googleapis/genai-toolbox/commit/730ac6d22805fd50b4a675b74c1865f4e7689e7c))
-* **tools/mongodb:** Remove `required` tag from the `canonical` field ([#2099](https://github.com/googleapis/genai-toolbox/issues/2099)) ([744214e](https://github.com/googleapis/genai-toolbox/commit/744214e04cd12b11d166e6eb7da8ce4714904abc))
-
 ## [0.21.0](https://github.com/googleapis/genai-toolbox/compare/v0.20.0...v0.21.0) (2025-11-19)


--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -48,17 +48,6 @@ squashed when merged.
 author for more than 10 days, maintainers may mark that PR as Draft. PRs that
 are inactive for more than 30 days may be closed.

-### Automated Code Reviews
-
-This repository uses **Gemini Code Assist** to provide automated code reviews on Pull Requests. While this does not replace human review, it provides immediate feedback on code quality and potential issues.
-
-You can manually trigger the bot by commenting on your Pull Request:
-
-*   `/gemini`: Manually invokes Gemini Code Assist in comments
-*   `/gemini review`: Posts a code review of the changes in the pull request
-*   `/gemini summary`: Posts a summary of the changes in the pull request.
-*   `/gemini help`: Overview of the available commands
-
 ## Adding a New Database Source or Tool

 Please create an
@@ -244,4 +233,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
@@ -109,7 +109,7 @@ golangci-lint run --fix
 Execute unit tests locally:

 ```bash
-go test -race -v ./cmd/... ./internal/...
+go test -race -v ./...
 ```

 ### Integration Tests
--- a/README.md
+++ b/README.md
@@ -105,21 +105,6 @@ redeploying your application.

 ## Getting Started

-### (Non-production) Running Toolbox
-
-You can run Toolbox directly with a [configuration file](#configuration):
-
-```sh
-npx @toolbox-sdk/server --tools-file tools.yaml
-```
-
-This runs the latest version of the toolbox server with your configuration file.
-
-> [!NOTE]
-> This method should only be used for non-production use cases such as
-> experimentation. For any production use-cases, please consider [Installing the
-> server](#installing-the-server) and then [running it](#running-the-server).
-
 ### Installing the server

 For the latest version, check the [releases page][releases] and use the
@@ -140,7 +125,7 @@ To install Toolbox as a binary:
 >
 > ```sh
 > # see releases page for other versions
-> export VERSION=0.23.0
+> export VERSION=0.21.0
 > curl -L -o toolbox https://storage.googleapis.com/genai-toolbox/v$VERSION/linux/amd64/toolbox
 > chmod +x toolbox
 > ```
@@ -153,7 +138,7 @@ To install Toolbox as a binary:
 >
 > ```sh
 > # see releases page for other versions
-> export VERSION=0.23.0
+> export VERSION=0.21.0
 > curl -L -o toolbox https://storage.googleapis.com/genai-toolbox/v$VERSION/darwin/arm64/toolbox
 > chmod +x toolbox
 > ```
@@ -166,33 +151,21 @@ To install Toolbox as a binary:
 >
 > ```sh
 > # see releases page for other versions
-> export VERSION=0.23.0
+> export VERSION=0.21.0
 > curl -L -o toolbox https://storage.googleapis.com/genai-toolbox/v$VERSION/darwin/amd64/toolbox
 > chmod +x toolbox
 > ```
 >
 > </details>
 > <details>
-> <summary>Windows (Command Prompt)</summary>
+> <summary>Windows (AMD64)</summary>
 >
-> To install Toolbox as a binary on Windows (Command Prompt):
->
-> ```cmd
-> :: see releases page for other versions
-> set VERSION=0.23.0
-> curl -o toolbox.exe "https://storage.googleapis.com/genai-toolbox/v%VERSION%/windows/amd64/toolbox.exe"
-> ```
->
-> </details>
-> <details>
-> <summary>Windows (PowerShell)</summary>
->
-> To install Toolbox as a binary on Windows (PowerShell):
+> To install Toolbox as a binary on Windows (AMD64):
 >
 > ```powershell
-> # see releases page for other versions
-> $VERSION = "0.23.0"
-> curl.exe -o toolbox.exe "https://storage.googleapis.com/genai-toolbox/v$VERSION/windows/amd64/toolbox.exe"
+> :: see releases page for other versions
+> set VERSION=0.21.0
+> curl -o toolbox.exe "https://storage.googleapis.com/genai-toolbox/v%VERSION%/windows/amd64/toolbox.exe"
 > ```
 >
 > </details>
@@ -204,7 +177,7 @@ You can also install Toolbox as a container:

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

@@ -228,7 +201,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.23.0
+go install github.com/googleapis/genai-toolbox@v0.21.0
 ```
 <!-- {x-release-please-end} -->

@@ -318,16 +291,6 @@ toolbox --tools-file "tools.yaml"

 </details>

-<details>
-<summary>NPM</summary>
-
-To run Toolbox directly without manually downloading the binary (requires Node.js):
-```sh
-npx @toolbox-sdk/server --tools-file tools.yaml
-```
-
-</details>
-
 <details>

 <summary>Gemini CLI</summary>
@@ -552,36 +515,6 @@ For more detailed instructions on using the Toolbox Core SDK, see the
    ```

  </details>
-  <details>
-    <summary>ADK</summary>
-
-1. Install [Toolbox ADK SDK][toolbox-adk-js]:
-
-    ```bash
-    npm install @toolbox-sdk/adk
-    ```
-
-2. Load tools:
-
-    ```javascript
-    import { ToolboxClient } from '@toolbox-sdk/adk';
-
-    // update the url to point to your server
-    const URL = 'http://127.0.0.1:5000';
-    let client = new ToolboxClient(URL);
-
-    // these tools can be passed to your application!
-    const tools = await client.loadToolset('toolsetName');
-    ```
-
-    For more detailed instructions on using the Toolbox ADK SDK, see the
-    [project's README][toolbox-adk-js-readme].
-
-    [toolbox-adk-js]: https://www.npmjs.com/package/@toolbox-sdk/adk
-    [toolbox-adk-js-readme]:
-       https://github.com/googleapis/mcp-toolbox-sdk-js/blob/main/packages/toolbox-adk/README.md
-
-  </details>
 </details>
 </blockquote>
 <details>
--- a/cmd/root.go
+++ b/cmd/root.go
@@ -89,7 +89,6 @@ import (
 	_ "github.com/googleapis/genai-toolbox/internal/tools/cloudhealthcare/cloudhealthcaresearchdicomseries"
 	_ "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/cloudsqlcreatedatabase"
 	_ "github.com/googleapis/genai-toolbox/internal/tools/cloudsql/cloudsqlcreateusers"
 	_ "github.com/googleapis/genai-toolbox/internal/tools/cloudsql/cloudsqlgetinstances"
@@ -120,7 +119,6 @@ import (
 	_ "github.com/googleapis/genai-toolbox/internal/tools/firestore/firestorevalidaterules"
 	_ "github.com/googleapis/genai-toolbox/internal/tools/http"
 	_ "github.com/googleapis/genai-toolbox/internal/tools/looker/lookeradddashboardelement"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/looker/lookeradddashboardfilter"
 	_ "github.com/googleapis/genai-toolbox/internal/tools/looker/lookerconversationalanalytics"
 	_ "github.com/googleapis/genai-toolbox/internal/tools/looker/lookercreateprojectfile"
 	_ "github.com/googleapis/genai-toolbox/internal/tools/looker/lookerdeleteprojectfile"
@@ -182,22 +180,14 @@ import (
 	_ "github.com/googleapis/genai-toolbox/internal/tools/oracle/oraclesql"
 	_ "github.com/googleapis/genai-toolbox/internal/tools/postgres/postgresdatabaseoverview"
 	_ "github.com/googleapis/genai-toolbox/internal/tools/postgres/postgresexecutesql"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/postgres/postgresgetcolumncardinality"
 	_ "github.com/googleapis/genai-toolbox/internal/tools/postgres/postgreslistactivequeries"
 	_ "github.com/googleapis/genai-toolbox/internal/tools/postgres/postgreslistavailableextensions"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/postgres/postgreslistdatabasestats"
 	_ "github.com/googleapis/genai-toolbox/internal/tools/postgres/postgreslistindexes"
 	_ "github.com/googleapis/genai-toolbox/internal/tools/postgres/postgreslistinstalledextensions"
 	_ "github.com/googleapis/genai-toolbox/internal/tools/postgres/postgreslistlocks"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/postgres/postgreslistpgsettings"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/postgres/postgreslistpublicationtables"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/postgres/postgreslistquerystats"
-	_ "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/postgreslisttables"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/postgres/postgreslisttablespaces"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/postgres/postgreslisttablestats"
 	_ "github.com/googleapis/genai-toolbox/internal/tools/postgres/postgreslisttriggers"
 	_ "github.com/googleapis/genai-toolbox/internal/tools/postgres/postgreslistviews"
 	_ "github.com/googleapis/genai-toolbox/internal/tools/postgres/postgreslongrunningtransactions"
@@ -205,14 +195,11 @@ import (
 	_ "github.com/googleapis/genai-toolbox/internal/tools/postgres/postgressql"
 	_ "github.com/googleapis/genai-toolbox/internal/tools/redis"
 	_ "github.com/googleapis/genai-toolbox/internal/tools/serverlessspark/serverlesssparkcancelbatch"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/serverlessspark/serverlesssparkcreatepysparkbatch"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/serverlessspark/serverlesssparkcreatesparkbatch"
 	_ "github.com/googleapis/genai-toolbox/internal/tools/serverlessspark/serverlesssparkgetbatch"
 	_ "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/spanner/spannerexecutesql"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/spanner/spannerlistgraphs"
 	_ "github.com/googleapis/genai-toolbox/internal/tools/spanner/spannerlisttables"
 	_ "github.com/googleapis/genai-toolbox/internal/tools/spanner/spannersql"
 	_ "github.com/googleapis/genai-toolbox/internal/tools/sqlite/sqliteexecutesql"
@@ -373,9 +360,6 @@ func NewCommand(opts ...Option) *Command {
 	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.")
-	flags.StringSliceVar(&cmd.cfg.AllowedOrigins, "allowed-origins", []string{"*"}, "Specifies a list of origins 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) }
--- a/cmd/root_test.go
+++ b/cmd/root_test.go
@@ -63,9 +63,6 @@ func withDefaults(c server.ServerConfig) server.ServerConfig {
 	if c.TelemetryServiceName == "" {
 		c.TelemetryServiceName = "toolbox"
 	}
-	if c.AllowedOrigins == nil {
-		c.AllowedOrigins = []string{"*"}
-	}
 	return c
 }

@@ -197,13 +194,6 @@ func TestServerConfigFlags(t *testing.T) {
 				DisableReload: true,
 			}),
 		},
-		{
-			desc: "allowed origin",
-			args: []string{"--allowed-origins", "http://foo.com,http://bar.com"},
-			want: withDefaults(server.ServerConfig{
-				AllowedOrigins: []string{"http://foo.com", "http://bar.com"},
-			}),
-		},
 	}
 	for _, tc := range tcs {
 		t.Run(tc.desc, func(t *testing.T) {
@@ -1458,7 +1448,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"},
+					ToolNames: []string{"create_instance", "get_instance", "list_instances", "create_database", "list_databases", "create_user", "wait_for_operation", "postgres_upgrade_precheck"},
 				},
 			},
 		},
@@ -1468,7 +1458,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"},
+					ToolNames: []string{"create_instance", "get_instance", "list_instances", "create_database", "list_databases", "create_user", "wait_for_operation"},
 				},
 			},
 		},
@@ -1478,7 +1468,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"},
+					ToolNames: []string{"create_instance", "get_instance", "list_instances", "create_database", "list_databases", "create_user", "wait_for_operation"},
 				},
 			},
 		},
@@ -1488,7 +1478,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"},
+					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"},
 				},
 			},
 		},
@@ -1518,7 +1508,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"},
+					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"},
 				},
 			},
 		},
@@ -1558,7 +1548,7 @@ func TestPrebuiltTools(t *testing.T) {
 			wantToolset: server.ToolsetConfigs{
 				"serverless_spark_tools": tools.ToolsetConfig{
 					Name:      "serverless_spark_tools",
-					ToolNames: []string{"list_batches", "get_batch", "cancel_batch", "create_pyspark_batch", "create_spark_batch"},
+					ToolNames: []string{"list_batches", "get_batch", "cancel_batch"},
 				},
 			},
 		},
@@ -1598,7 +1588,7 @@ func TestPrebuiltTools(t *testing.T) {
 			wantToolset: server.ToolsetConfigs{
 				"looker_tools": tools.ToolsetConfig{
 					Name:      "looker_tools",
-					ToolNames: []string{"get_models", "get_explores", "get_dimensions", "get_measures", "get_filters", "get_parameters", "query", "query_sql", "query_url", "get_looks", "run_look", "make_look", "get_dashboards", "run_dashboard", "make_dashboard", "add_dashboard_element", "add_dashboard_filter", "generate_embed_url", "health_pulse", "health_analyze", "health_vacuum", "dev_mode", "get_projects", "get_project_files", "get_project_file", "create_project_file", "update_project_file", "delete_project_file", "get_connections", "get_connection_schemas", "get_connection_databases", "get_connection_tables", "get_connection_table_columns"},
+					ToolNames: []string{"get_models", "get_explores", "get_dimensions", "get_measures", "get_filters", "get_parameters", "query", "query_sql", "query_url", "get_looks", "run_look", "make_look", "get_dashboards", "run_dashboard", "make_dashboard", "add_dashboard_element", "health_pulse", "health_analyze", "health_vacuum", "dev_mode", "get_projects", "get_project_files", "get_project_file", "create_project_file", "update_project_file", "delete_project_file", "get_connections", "get_connection_schemas", "get_connection_databases", "get_connection_tables", "get_connection_table_columns"},
 				},
 			},
 		},
@@ -1618,7 +1608,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"},
+					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"},
 				},
 			},
 		},
@@ -1628,7 +1618,7 @@ func TestPrebuiltTools(t *testing.T) {
 			wantToolset: server.ToolsetConfigs{
 				"spanner-database-tools": tools.ToolsetConfig{
 					Name:      "spanner-database-tools",
-					ToolNames: []string{"execute_sql", "execute_sql_dql", "list_tables", "list_graphs"},
+					ToolNames: []string{"execute_sql", "execute_sql_dql", "list_tables"},
 				},
 			},
 		},
--- a/cmd/version.txt
+++ b/cmd/version.txt
@@ -1 +1 @@
-0.23.0
+0.21.0
--- a/docs/ALLOYDBADMIN_README.md
+++ b/docs/ALLOYDBADMIN_README.md
@@ -8,25 +8,54 @@ An editor configured to use the AlloyDB MCP server can use its AI capabilities t

 * **Provision & Manage Infrastructure**: Create and manage AlloyDB clusters, instances, and users

-To connect to the database to explore and query data, search the MCP store for the AlloyDB for PostgreSQL MCP Server.
+## Installation and Setup

-## Prerequisites
+### Prerequisites
+
+*   Download and install [MCP Toolbox](https://github.com/googleapis/genai-toolbox):
+    1.  **Download the Toolbox binary**:
+        Download the latest binary for your operating system and architecture from the storage bucket. Check the [releases page](https://github.com/googleapis/genai-toolbox/releases) for OS and CPU architecture support:
+        `https://storage.googleapis.com/genai-toolbox/v0.21.0/<os>/<arch>/toolbox`
+        *   Replace `<os>` with `linux`, `darwin` (macOS), or `windows`.
+        *   Replace `<arch>` with `amd64` (Intel) or `arm64` (Apple Silicon).
+      
+        <!-- {x-release-please-start-version} -->
+        ```
+        curl -L -o toolbox https://storage.googleapis.com/genai-toolbox/v0.21.0/linux/amd64/toolbox
+        ```
+        <!-- {x-release-please-end} -->
+    2.  **Make it executable**:
+        ```bash
+        chmod +x toolbox
+        ```
+
+    3.  **Move binary to `/usr/local/bin/` or `/usr/bin/`**:
+        ```bash
+        sudo mv toolbox /usr/local/bin/
+        # sudo mv toolbox /usr/bin/
+        ```
+
+        **On Windows, move binary to the `WindowsApps\` folder**:
+        ```
+        move "C:\Users\<path-to-binary>\toolbox.exe" "C:\Users\<username>\AppData\Local\Microsoft\WindowsApps\"
+        ```
+    
+        **Tip:** Ensure the destination folder for your binary is included in
+        your system's PATH environment variable. To check `PATH`, use `echo
+        $PATH` (or `echo %PATH%` on Windows).
+
+        **Note:** You may need to restart Antigravity for changes to take effect.

-*   [Node.js](https://nodejs.org/) installed.
 *   A Google Cloud project with the **AlloyDB API** enabled.
 *   Ensure [Application Default Credentials](https://cloud.google.com/docs/authentication/gcloud) are available in your environment.
 *   IAM Permissions:
    *   AlloyDB Admin (`roles/alloydb.admin`) (for managing infrastructure)
    *   Service Usage Consumer (`roles/serviceusage.serviceUsageConsumer`)

-## Install & Configuration
+### Configuration

-In the Antigravity MCP Store, click the "Install" button.
-
-You'll now be able to see all enabled tools in the "Tools" tab.
-
-> [!NOTE]
-> If you encounter issues with Windows Defender blocking the execution, you may need to configure an allowlist. See [Configure exclusions for Microsoft Defender Antivirus](https://learn.microsoft.com/en-us/microsoft-365/security/defender-endpoint/configure-exclusions-microsoft-defender-antivirus?view=o365-worldwide) for more details.
+1. **Access the Store**: Open the MCP Store panel within the "..." dropdown at the top of the editor's side panel.
+2. **Browse and Install**: Search for "AlloyDB for PostgreSQL Admin", and click "Install".

 ## Usage

@@ -53,20 +82,6 @@ The AlloyDB MCP server provides the following tools:
 | `list_users`         | List users in a given project and location.                        |
 | `wait_for_operation` | Poll the operations API until the operation is done.               |

-## Custom MCP Server Configuration
-
-Add the following configuration to your MCP client (e.g., `settings.json` for Gemini CLI, `mcp_config.json` for Antigravity):
-
-```json
-{
-  "mcpServers": {
-    "alloydb-admin": {
-      "command": "npx",
-      "args": ["-y", "@toolbox-sdk/server", "--prebuilt", "alloydb-postgres-admin", "--stdio"]
-    }
-  }
-}
-```

 ## Documentation

--- a/docs/ALLOYDBPG_README.md
+++ b/docs/ALLOYDBPG_README.md
@@ -11,29 +11,66 @@ An editor configured to use the AlloyDB MCP server can use its AI capabilities t
 - **Monitor Performance** - View active queries, query plans, and other performance metrics (via observability tools)
 - **Manage Extensions** - List available and installed PostgreSQL extensions

-For AlloyDB infrastructure management, search the MCP store for the AlloyDB for PostgreSQL Admin MCP Server.
+## Installation and Setup

-## Prerequisites
+### Prerequisites
+
+*   Download and install [MCP Toolbox](https://github.com/googleapis/genai-toolbox):
+    1.  **Download the Toolbox binary**:
+        Download the latest binary for your operating system and architecture from the storage bucket. Check the [releases page](https://github.com/googleapis/genai-toolbox/releases) for OS and CPU architecture support:
+        `https://storage.googleapis.com/genai-toolbox/v0.21.0/<os>/<arch>/toolbox`
+        *   Replace `<os>` with `linux`, `darwin` (macOS), or `windows`.
+        *   Replace `<arch>` with `amd64` (Intel) or `arm64` (Apple Silicon).
+      
+        <!-- {x-release-please-start-version} -->
+        ```
+        curl -L -o toolbox https://storage.googleapis.com/genai-toolbox/v0.21.0/linux/amd64/toolbox
+        ```
+        <!-- {x-release-please-end} -->
+    2.  **Make it executable**:
+        ```bash
+        chmod +x toolbox
+        ```
+
+    3.  **Move binary to `/usr/local/bin/` or `/usr/bin/`**:
+        ```bash
+        sudo mv toolbox /usr/local/bin/
+        # sudo mv toolbox /usr/bin/
+        ```
+
+        **On Windows, move binary to the `WindowsApps\` folder**:
+        ```
+        move "C:\Users\<path-to-binary>\toolbox.exe" "C:\Users\<username>\AppData\Local\Microsoft\WindowsApps\"
+        ```
+    
+        **Tip:** Ensure the destination folder for your binary is included in
+        your system's PATH environment variable. To check `PATH`, use `echo
+        $PATH` (or `echo %PATH%` on Windows).
+
+        **Note:** You may need to restart Antigravity for changes to take effect.

-*   [Node.js](https://nodejs.org/) installed.
 *   A Google Cloud project with the **AlloyDB API** enabled.
 *   Ensure [Application Default Credentials](https://cloud.google.com/docs/authentication/gcloud) are available in your environment.
 *   IAM Permissions:
    *   AlloyDB Client (`roles/alloydb.client`) (for connecting and querying)
    *   Service Usage Consumer (`roles/serviceusage.serviceUsageConsumer`)

-> **Note:** If your AlloyDB instance uses private IPs, you must run the MCP server in the same Virtual Private Cloud (VPC) network.
+### Configuration

-## Install & Configuration
-
-1. In the Antigravity MCP Store, click the "Install" button.
-
-2. Add the required inputs for your [cluster](https://docs.cloud.google.com/alloydb/docs/cluster-list) in the configuration pop-up, then click "Save". You can update this configuration at any time in the "Configure" tab.
+1. **Access the Store**: Open the MCP Store panel within the "..." dropdown at the top of the editor's side panel.
+2. **Browse and Install**: Search for "AlloyDB for PostgreSQL", and click "Install".
+3. **Configuration**: The following configuration is needed for the server:
+   * AlloyDB Project ID: The GCP project ID.
+   * AlloyDB Region: The region of your AlloyDB instance.
+   * AlloyDB Cluster ID: The ID of your AlloyDB cluster.
+   * AlloyDB Instance ID: The ID of your AlloyDB instance.
+   * AlloyDB Database Name: The name of the database.
+   * AlloyDB Database User: (Optional) The database username. Defaults to IAM authentication if unspecified.
+   * AlloyDB Database Password: (Optional) The password for the database user. Defaults to IAM authentication if unspecified.
+   * AlloyDB IP Type: (Optional) The IP type i.e. “Public” or “Private”. Defaults to "Public" if unspecified.

 > [!NOTE]
-> If you encounter issues with Windows Defender blocking the execution, you may need to configure an allowlist. See [Configure exclusions for Microsoft Defender Antivirus](https://learn.microsoft.com/en-us/microsoft-365/security/defender-endpoint/configure-exclusions-microsoft-defender-antivirus?view=o365-worldwide) for more details.
-
-You'll now be able to see all enabled tools in the "Tools" tab.
+> If your AlloyDB instance uses private IPs, you must run the MCP server in the same Virtual Private Cloud (VPC) network.

 ## Usage

@@ -61,34 +98,6 @@ The AlloyDB MCP server provides the following tools:
 | `list_replication_slots`         | List replication slots.                                    |
 | `list_invalid_indexes`           | List invalid indexes.                                      |

-## Custom MCP Server Configuration
-
-The AlloyDB MCP server is configured using environment variables.
-
-```bash
-export ALLOYDB_POSTGRES_PROJECT="<your-gcp-project-id>"
-export ALLOYDB_POSTGRES_REGION="<your-alloydb-region>"
-export ALLOYDB_POSTGRES_CLUSTER="<your-alloydb-cluster-id>"
-export ALLOYDB_POSTGRES_INSTANCE="<your-alloydb-instance-id>"
-export ALLOYDB_POSTGRES_DATABASE="<your-database-name>"
-export ALLOYDB_POSTGRES_USER="<your-database-user>"  # Optional
-export ALLOYDB_POSTGRES_PASSWORD="<your-database-password>"  # Optional
-export ALLOYDB_POSTGRES_IP_TYPE="PUBLIC"  # Optional: `PUBLIC`, `PRIVATE`, `PSC`. Defaults to `PUBLIC`.
-```
-
-Add the following configuration to your MCP client (e.g., `settings.json` for Gemini CLI, `mcp_config.json` for Antigravity):
-
-```json
-{
-  "mcpServers": {
-    "alloydb-postgres": {
-      "command": "npx",
-      "args": ["-y", "@toolbox-sdk/server", "--prebuilt", "alloydb-postgres", "--stdio"]
-    }
-  }
-}
-```
-
 ## Documentation

 For more information, visit the [AlloyDB for PostgreSQL documentation](https://cloud.google.com/alloydb/docs).
--- a/docs/BIGQUERY_README.md
+++ b/docs/BIGQUERY_README.md
@@ -10,25 +10,56 @@ An editor configured to use the BigQuery MCP server can use its AI capabilities
 - **Seamless Workflow:** Stay within your CLI, eliminating the need to constantly switch to the GCP console for generating analytical insights.
 - **Run Advanced Analytics:** Generate forecasts and perform contribution analysis using built-in advanced tools.

-## Prerequisites
+## Installation and Setup
+
+### Prerequisites
+
+*   Download and install [MCP Toolbox](https://github.com/googleapis/genai-toolbox):
+    1.  **Download the Toolbox binary**:
+        Download the latest binary for your operating system and architecture from the storage bucket. Check the [releases page](https://github.com/googleapis/genai-toolbox/releases) for OS and CPU architecture support:
+        `https://storage.googleapis.com/genai-toolbox/v0.21.0/<os>/<arch>/toolbox`
+        *   Replace `<os>` with `linux`, `darwin` (macOS), or `windows`.
+        *   Replace `<arch>` with `amd64` (Intel) or `arm64` (Apple Silicon).
+      
+        <!-- {x-release-please-start-version} -->
+        ```
+        curl -L -o toolbox https://storage.googleapis.com/genai-toolbox/v0.21.0/linux/amd64/toolbox
+        ```
+        <!-- {x-release-please-end} -->
+    2.  **Make it executable**:
+        ```bash
+        chmod +x toolbox
+        ```
+
+    3.  **Move binary to `/usr/local/bin/` or `/usr/bin/`**:
+        ```bash
+        sudo mv toolbox /usr/local/bin/
+        # sudo mv toolbox /usr/bin/
+        ```
+
+        **On Windows, move binary to the `WindowsApps\` folder**:
+        ```
+        move "C:\Users\<path-to-binary>\toolbox.exe" "C:\Users\<username>\AppData\Local\Microsoft\WindowsApps\"
+        ```
+    
+        **Tip:** Ensure the destination folder for your binary is included in
+        your system's PATH environment variable. To check `PATH`, use `echo
+        $PATH` (or `echo %PATH%` on Windows).
+
+        **Note:** You may need to restart Antigravity for changes to take effect.

-*   [Node.js](https://nodejs.org/) installed.
 *   A Google Cloud project with the **BigQuery API** enabled.
 *   Ensure [Application Default Credentials](https://cloud.google.com/docs/authentication/gcloud) are available in your environment.
 *   IAM Permissions:
    *   BigQuery User (`roles/bigquery.user`)

-## Install & Configuration
-
-1. In the Antigravity MCP Store, click the "Install" button.
-
-2. Add the required inputs in the configuration pop-up, then click "Save". You can update this configuration at any time in the "Configure" tab.
-
-> [!NOTE]
-> If you encounter issues with Windows Defender blocking the execution, you may need to configure an allowlist. See [Configure exclusions for Microsoft Defender Antivirus](https://learn.microsoft.com/en-us/microsoft-365/security/defender-endpoint/configure-exclusions-microsoft-defender-antivirus?view=o365-worldwide) for more details.
-
-You'll now be able to see all enabled tools in the "Tools" tab.
+### Configuration

+1. **Access the Store**: Open the MCP Store panel within the "..." dropdown at the top of the editor's side panel.
+2. **Browse and Install**: Search for "BigQuery", and click "Install".
+3. **Configuration**: The following configuration is needed for the server:
+   * BigQuery Project ID: The GCP project ID.
+   * BigQuery Location: (Optional) The location of your BigQuery dataset (e.g. "US", "EU").

 ### Usage 

@@ -60,29 +91,6 @@ The BigQuery MCP server provides the following tools:
 | `analyze_contribution` | Perform contribution analysis, also called key driver analysis. |
 | `search_catalog`       | Search for tables based on the provided query.                  |

-## Custom MCP Server Configuration
-
-The BigQuery MCP server is configured using environment variables.
-
-```bash
-export BIGQUERY_PROJECT="<your-gcp-project-id>"
-export BIGQUERY_LOCATION="<your-dataset-location>"  # Optional
-export BIGQUERY_USE_CLIENT_OAUTH="true"  # Optional
-```
-
-Add the following configuration to your MCP client (e.g., `settings.json` for Gemini CLI, `mcp_config.json` for Antigravity):
-
-```json
-{
-  "mcpServers": {
-    "bigquery": {
-      "command": "npx",
-      "args": ["-y", "@toolbox-sdk/server", "--prebuilt", "bigquery", "--stdio"]
-    }
-  }
-}
-```
-
 ## Documentation

 For more information, visit the [BigQuery documentation](https://cloud.google.com/bigquery/docs).
--- a/docs/CLOUDSQLMSSQLADMIN_README.md
+++ b/docs/CLOUDSQLMSSQLADMIN_README.md
@@ -8,25 +8,54 @@ An editor configured to use the Cloud SQL for SQL Server MCP server can use its

 - **Provision & Manage Infrastructure** - Create and manage Cloud SQL instances and users

-To connect to the database to explore and query data, search the MCP store for the Cloud SQL for SQL Server MCP Server.
+## Installation and Setup

-## Prerequisites
+### Prerequisites
+
+*   Download and install [MCP Toolbox](https://github.com/googleapis/genai-toolbox):
+    1.  **Download the Toolbox binary**:
+        Download the latest binary for your operating system and architecture from the storage bucket. Check the [releases page](https://github.com/googleapis/genai-toolbox/releases) for OS and CPU architecture support:
+        `https://storage.googleapis.com/genai-toolbox/v0.21.0/<os>/<arch>/toolbox`
+        *   Replace `<os>` with `linux`, `darwin` (macOS), or `windows`.
+        *   Replace `<arch>` with `amd64` (Intel) or `arm64` (Apple Silicon).
+      
+        <!-- {x-release-please-start-version} -->
+        ```
+        curl -L -o toolbox https://storage.googleapis.com/genai-toolbox/v0.21.0/linux/amd64/toolbox
+        ```
+        <!-- {x-release-please-end} -->
+    2.  **Make it executable**:
+        ```bash
+        chmod +x toolbox
+        ```
+
+    3.  **Move binary to `/usr/local/bin/` or `/usr/bin/`**:
+        ```bash
+        sudo mv toolbox /usr/local/bin/
+        # sudo mv toolbox /usr/bin/
+        ```
+
+        **On Windows, move binary to the `WindowsApps\` folder**:
+        ```
+        move "C:\Users\<path-to-binary>\toolbox.exe" "C:\Users\<username>\AppData\Local\Microsoft\WindowsApps\"
+        ```
+    
+        **Tip:** Ensure the destination folder for your binary is included in
+        your system's PATH environment variable. To check `PATH`, use `echo
+        $PATH` (or `echo %PATH%` on Windows).
+
+        **Note:** You may need to restart Antigravity for changes to take effect.

-*   [Node.js](https://nodejs.org/) installed.
 *   A Google Cloud project with the **Cloud SQL Admin API** enabled.
 *   Ensure [Application Default Credentials](https://cloud.google.com/docs/authentication/gcloud) are available in your environment.
 *   IAM Permissions:
  * Cloud SQL Viewer (`roles/cloudsql.viewer`)
  * Cloud SQL Admin (`roles/cloudsql.admin`)

-## Install & Configuration
+### Configuration

-In the Antigravity MCP Store, click the "Install" button.
-
-You'll now be able to see all enabled tools in the "Tools" tab.
-
-> [!NOTE]
-> If you encounter issues with Windows Defender blocking the execution, you may need to configure an allowlist. See [Configure exclusions for Microsoft Defender Antivirus](https://learn.microsoft.com/en-us/microsoft-365/security/defender-endpoint/configure-exclusions-microsoft-defender-antivirus?view=o365-worldwide) for more details.
+1. **Access the Store**: Open the MCP Store panel within the "..." dropdown at the top of the editor's side panel.
+2. **Browse and Install**: Search for "Cloud SQL for SQL Server Admin", and click "Install".

 ## Usage

@@ -49,22 +78,6 @@ The Cloud SQL for SQL Server MCP server provides the following tools:
 | `list_users`         | List users in a given project and location.            |
 | `wait_for_operation` | Poll the operations API until the operation is done.   |

-
-## Custom MCP Server Configuration
-
-Add the following configuration to your MCP client (e.g., `settings.json` for Gemini CLI, `mcp_config.json` for Antigravity):
-
-```json
-{
-  "mcpServers": {
-    "cloud-sql-sqlserver-admin": {
-      "command": "npx",
-      "args": ["-y", "@toolbox-sdk/server", "--prebuilt", "cloud-sql-mssql-admin", "--stdio"]
-    }
-  }
-}
-```
-
 ## Documentation

 For more information, visit the [Cloud SQL for SQL Server documentation](https://cloud.google.com/sql/docs/sqlserver).
--- a/docs/CLOUDSQLMSSQL_README.md
+++ b/docs/CLOUDSQLMSSQL_README.md
@@ -9,28 +9,65 @@ An editor configured to use the Cloud SQL for SQL Server MCP server can use its
 - **Query Data** - Execute SQL queries
 - **Explore Schema** - List tables and view schema details

-For Cloud SQL infrastructure management, search the MCP store for the Cloud SQL for SQL Server Admin MCP Server.
+## Installation and Setup

-## Prerequisites
+### Prerequisites
+
+*   Download and install [MCP Toolbox](https://github.com/googleapis/genai-toolbox):
+    1.  **Download the Toolbox binary**:
+        Download the latest binary for your operating system and architecture from the storage bucket. Check the [releases page](https://github.com/googleapis/genai-toolbox/releases) for OS and CPU architecture support:
+        `https://storage.googleapis.com/genai-toolbox/v0.21.0/<os>/<arch>/toolbox`
+        *   Replace `<os>` with `linux`, `darwin` (macOS), or `windows`.
+        *   Replace `<arch>` with `amd64` (Intel) or `arm64` (Apple Silicon).
+      
+        <!-- {x-release-please-start-version} -->
+        ```
+        curl -L -o toolbox https://storage.googleapis.com/genai-toolbox/v0.21.0/linux/amd64/toolbox
+        ```
+        <!-- {x-release-please-end} -->
+    2.  **Make it executable**:
+        ```bash
+        chmod +x toolbox
+        ```
+
+    3.  **Move binary to `/usr/local/bin/` or `/usr/bin/`**:
+        ```bash
+        sudo mv toolbox /usr/local/bin/
+        # sudo mv toolbox /usr/bin/
+        ```
+
+        **On Windows, move binary to the `WindowsApps\` folder**:
+        ```
+        move "C:\Users\<path-to-binary>\toolbox.exe" "C:\Users\<username>\AppData\Local\Microsoft\WindowsApps\"
+        ```
+    
+        **Tip:** Ensure the destination folder for your binary is included in
+        your system's PATH environment variable. To check `PATH`, use `echo
+        $PATH` (or `echo %PATH%` on Windows).
+
+        **Note:** You may need to restart Antigravity for changes to take effect.

-*   [Node.js](https://nodejs.org/) installed.
 *   A Google Cloud project with the **Cloud SQL Admin API** enabled.
 *   Ensure [Application Default Credentials](https://cloud.google.com/docs/authentication/gcloud) are available in your environment.
 *   IAM Permissions:
    *   Cloud SQL Client (`roles/cloudsql.client`)

-> **Note:** If your instance uses private IPs, you must run the MCP server in the same Virtual Private Cloud (VPC) network.
+### Configuration

-## Install & Configuration
-
-1. In the Antigravity MCP Store, click the "Install" button.
-
-2. Add the required inputs for your [instance](https://cloud.google.com/sql/docs/sqlserver/instance-info) in the configuration pop-up, then click "Save". You can update this configuration at any time in the "Configure" tab.
-
-You'll now be able to see all enabled tools in the "Tools" tab.
+1. **Access the Store**: Open the MCP Store panel within the "..." dropdown at the top of the editor's side panel.
+2. **Browse and Install**: Search for "Cloud SQL for SQL Server", and click "Install".
+3. **Configuration**: The following configuration is needed for the server:
+   * Cloud SQL Project ID: The GCP project ID.
+   * Cloud SQL Region: The region of your Cloud SQL instance.
+   * Cloud SQL Instance ID: The ID of your Cloud SQL instance.
+   * Cloud SQL Database Name: The name of the database.
+   * Cloud SQL Database User: The database username.
+   * Cloud SQL Database Password: The password for the database user.
+   * Cloud SQL IP Type: (Optional) The IP type i.e. “Public” or “Private”. Defaults to "Public" if unspecified.

 > [!NOTE]
-> If you encounter issues with Windows Defender blocking the execution, you may need to configure an allowlist. See [Configure exclusions for Microsoft Defender Antivirus](https://learn.microsoft.com/en-us/microsoft-365/security/defender-endpoint/configure-exclusions-microsoft-defender-antivirus?view=o365-worldwide) for more details.
+> If your instance uses private IPs, you must run the MCP server in the same Virtual Private Cloud (VPC) network.
+

 ## Usage

@@ -48,42 +85,6 @@ The Cloud SQL for SQL Server MCP server provides the following tools:
 | `execute_sql` | Use this tool to execute SQL.                              |
 | `list_tables` | Lists detailed schema information for user-created tables. |

-## Custom MCP Server Configuration
-
-The MCP server is configured using environment variables.
-
-```bash
-export CLOUD_SQL_MSSQL_PROJECT="<your-gcp-project-id>"
-export CLOUD_SQL_MSSQL_REGION="<your-cloud-sql-region>"
-export CLOUD_SQL_MSSQL_INSTANCE="<your-cloud-sql-instance-id>"
-export CLOUD_SQL_MSSQL_DATABASE="<your-database-name>"
-export CLOUD_SQL_MSSQL_USER="<your-database-user>"  # Optional
-export CLOUD_SQL_MSSQL_PASSWORD="<your-database-password>"  # Optional
-export CLOUD_SQL_MSSQL_IP_TYPE="PUBLIC"  # Optional: `PUBLIC`, `PRIVATE`, `PSC`. Defaults to `PUBLIC`.
-```
-
-
-Add the following configuration to your MCP client (e.g., `settings.json` for Gemini CLI, `mcp_config.json` for Antigravity):
-
-```json
-{
-  "mcpServers": {
-    "cloud-sql-mssql": {
-      "command": "npx",
-      "args": ["-y", "@toolbox-sdk/server", "--prebuilt", "cloud-sql-mssql", "--stdio"],
-      "env": {
-        "CLOUD_SQL_MSSQL_PROJECT": "your-project-id",
-        "CLOUD_SQL_MSSQL_REGION": "your-region",
-        "CLOUD_SQL_MSSQL_INSTANCE": "your-instance-id",
-        "CLOUD_SQL_MSSQL_DATABASE": "your-database-name",
-        "CLOUD_SQL_MSSQL_USER": "your-username",
-        "CLOUD_SQL_MSSQL_PASSWORD": "your-password"
-      }
-    }
-  }
-}
-```
-
 ## Documentation

 For more information, visit the [Cloud SQL for SQL Server documentation](https://cloud.google.com/sql/docs/sqlserver).
--- a/docs/CLOUDSQLMYSQLADMIN_README.md
+++ b/docs/CLOUDSQLMYSQLADMIN_README.md
@@ -8,25 +8,54 @@ An editor configured to use the Cloud SQL for MySQL MCP server can use its AI ca

 - **Provision & Manage Infrastructure** - Create and manage Cloud SQL instances and users

-To connect to the database to explore and query data, search the MCP store for the Cloud SQL for MySQL MCP Server.
+## Installation and Setup

-## Prerequisites
+### Prerequisites
+
+*   Download and install [MCP Toolbox](https://github.com/googleapis/genai-toolbox):
+    1.  **Download the Toolbox binary**:
+        Download the latest binary for your operating system and architecture from the storage bucket. Check the [releases page](https://github.com/googleapis/genai-toolbox/releases) for OS and CPU architecture support:
+        `https://storage.googleapis.com/genai-toolbox/v0.21.0/<os>/<arch>/toolbox`
+        *   Replace `<os>` with `linux`, `darwin` (macOS), or `windows`.
+        *   Replace `<arch>` with `amd64` (Intel) or `arm64` (Apple Silicon).
+      
+        <!-- {x-release-please-start-version} -->
+        ```
+        curl -L -o toolbox https://storage.googleapis.com/genai-toolbox/v0.21.0/linux/amd64/toolbox
+        ```
+        <!-- {x-release-please-end} -->
+    2.  **Make it executable**:
+        ```bash
+        chmod +x toolbox
+        ```
+
+    3.  **Move binary to `/usr/local/bin/` or `/usr/bin/`**:
+        ```bash
+        sudo mv toolbox /usr/local/bin/
+        # sudo mv toolbox /usr/bin/
+        ```
+
+        **On Windows, move binary to the `WindowsApps\` folder**:
+        ```
+        move "C:\Users\<path-to-binary>\toolbox.exe" "C:\Users\<username>\AppData\Local\Microsoft\WindowsApps\"
+        ```
+    
+        **Tip:** Ensure the destination folder for your binary is included in
+        your system's PATH environment variable. To check `PATH`, use `echo
+        $PATH` (or `echo %PATH%` on Windows).
+
+        **Note:** You may need to restart Antigravity for changes to take effect.

-*   [Node.js](https://nodejs.org/) installed.
 *   A Google Cloud project with the **Cloud SQL Admin API** enabled.
 *   Ensure [Application Default Credentials](https://cloud.google.com/docs/authentication/gcloud) are available in your environment.
 *   IAM Permissions:
  * Cloud SQL Viewer (`roles/cloudsql.viewer`)
  * Cloud SQL Admin (`roles/cloudsql.admin`)

-## Install & Configuration
+### Configuration

-In the Antigravity MCP Store, click the "Install" button.
-
-You'll now be able to see all enabled tools in the "Tools" tab.
-
-> [!NOTE]
-> If you encounter issues with Windows Defender blocking the execution, you may need to configure an allowlist. See [Configure exclusions for Microsoft Defender Antivirus](https://learn.microsoft.com/en-us/microsoft-365/security/defender-endpoint/configure-exclusions-microsoft-defender-antivirus?view=o365-worldwide) for more details.
+1. **Access the Store**: Open the MCP Store panel within the "..." dropdown at the top of the editor's side panel.
+2. **Browse and Install**: Search for "Cloud SQL for MySQL Admin", and click "Install".

 ## Usage

@@ -49,21 +78,6 @@ The Cloud SQL for MySQL MCP server provides the following tools:
 | `list_users`         | List users in a given project and location.            |
 | `wait_for_operation` | Poll the operations API until the operation is done.   |

-## Custom MCP Server Configuration
-
-Add the following configuration to your MCP client (e.g., `settings.json` for Gemini CLI, `mcp_config.json` for Antigravity):
-
-```json
-{
-  "mcpServers": {
-    "cloud-sql-mysql-admin": {
-      "command": "npx",
-      "args": ["-y", "@toolbox-sdk/server", "--prebuilt", "cloud-sql-mysql-admin", "--stdio"]
-    }
-  }
-}
-```
-
 ## Documentation

 For more information, visit the [Cloud SQL for MySQL documentation](https://cloud.google.com/sql/docs/mysql).
--- a/docs/CLOUDSQLMYSQL_README.md
+++ b/docs/CLOUDSQLMYSQL_README.md
@@ -11,28 +11,64 @@ An editor configured to use the Cloud SQL for MySQL MCP server can use its AI ca
 - **Database Maintenance** - Check for fragmentation and missing indexes
 - **Monitor Performance** - View active queries

-For Cloud SQL infrastructure management, search the MCP store for the Cloud SQL for MySQL Admin MCP Server.
+## Installation and Setup

-## Prerequisites
+### Prerequisites
+
+*   Download and install [MCP Toolbox](https://github.com/googleapis/genai-toolbox):
+    1.  **Download the Toolbox binary**:
+        Download the latest binary for your operating system and architecture from the storage bucket. Check the [releases page](https://github.com/googleapis/genai-toolbox/releases) for OS and CPU architecture support:
+        `https://storage.googleapis.com/genai-toolbox/v0.21.0/<os>/<arch>/toolbox`
+        *   Replace `<os>` with `linux`, `darwin` (macOS), or `windows`.
+        *   Replace `<arch>` with `amd64` (Intel) or `arm64` (Apple Silicon).
+      
+        <!-- {x-release-please-start-version} -->
+        ```
+        curl -L -o toolbox https://storage.googleapis.com/genai-toolbox/v0.21.0/linux/amd64/toolbox
+        ```
+        <!-- {x-release-please-end} -->
+    2.  **Make it executable**:
+        ```bash
+        chmod +x toolbox
+        ```
+
+    3.  **Move binary to `/usr/local/bin/` or `/usr/bin/`**:
+        ```bash
+        sudo mv toolbox /usr/local/bin/
+        # sudo mv toolbox /usr/bin/
+        ```
+
+        **On Windows, move binary to the `WindowsApps\` folder**:
+        ```
+        move "C:\Users\<path-to-binary>\toolbox.exe" "C:\Users\<username>\AppData\Local\Microsoft\WindowsApps\"
+        ```
+    
+        **Tip:** Ensure the destination folder for your binary is included in
+        your system's PATH environment variable. To check `PATH`, use `echo
+        $PATH` (or `echo %PATH%` on Windows).
+
+        **Note:** You may need to restart Antigravity for changes to take effect.

-*   [Node.js](https://nodejs.org/) installed.
 *   A Google Cloud project with the **Cloud SQL Admin API** enabled.
 *   Ensure [Application Default Credentials](https://cloud.google.com/docs/authentication/gcloud) are available in your environment.
 *   IAM Permissions:
    *   Cloud SQL Client (`roles/cloudsql.client`)

-> **Note:** If your instance uses private IPs, you must run the MCP server in the same Virtual Private Cloud (VPC) network.
+### Configuration

-## Install & Configuration
-
-1. In the Antigravity MCP Store, click the "Install" button.
-
-2. Add the required inputs for your [instance](https://cloud.google.com/sql/docs/mysql/instance-info) in the configuration pop-up, then click "Save". You can update this configuration at any time in the "Configure" tab.
-
-You'll now be able to see all enabled tools in the "Tools" tab.
+1. **Access the Store**: Open the MCP Store panel within the "..." dropdown at the top of the editor's side panel.
+2. **Browse and Install**: Search for "Cloud SQL for MySQL", and click "Install".
+3. **Configuration**: The following configuration is needed for the server:
+   * Cloud SQL Project ID: The GCP project ID.
+   * Cloud SQL Region: The region of your Cloud SQL instance.
+   * Cloud SQL Instance ID: The ID of your Cloud SQL instance.
+   * Cloud SQL Database Name: The name of the database.
+   * Cloud SQL Database User: The database username.
+   * Cloud SQL Database Password: The password for the database user.
+   * Cloud SQL IP Type: (Optional) The IP type i.e. “Public” or “Private”. Defaults to "Public" if unspecified.

 > [!NOTE]
-> If you encounter issues with Windows Defender blocking the execution, you may need to configure an allowlist. See [Configure exclusions for Microsoft Defender Antivirus](https://learn.microsoft.com/en-us/microsoft-365/security/defender-endpoint/configure-exclusions-microsoft-defender-antivirus?view=o365-worldwide) for more details.
+> If your instance uses private IPs, you must run the MCP server in the same Virtual Private Cloud (VPC) network.

 ## Usage

@@ -55,41 +91,6 @@ The Cloud SQL for MySQL MCP server provides the following tools:
 | `list_tables_missing_unique_indexes` | Find tables that do not have primary or unique key constraint.          |
 | `list_table_fragmentation`           | List table fragmentation in MySQL.                                      |

-## Custom MCP Server Configuration
-
-The MCP server is configured using environment variables.
-
-```bash
-export CLOUD_SQL_MYSQL_PROJECT="<your-gcp-project-id>"
-export CLOUD_SQL_MYSQL_REGION="<your-cloud-sql-region>"
-export CLOUD_SQL_MYSQL_INSTANCE="<your-cloud-sql-instance-id>"
-export CLOUD_SQL_MYSQL_DATABASE="<your-database-name>"
-export CLOUD_SQL_MYSQL_USER="<your-database-user>"  # Optional
-export CLOUD_SQL_MYSQL_PASSWORD="<your-database-password>"  # Optional
-export CLOUD_SQL_MYSQL_IP_TYPE="PUBLIC"  # Optional: `PUBLIC`, `PRIVATE`, `PSC`. Defaults to `PUBLIC`.
-```
-
-Add the following configuration to your MCP client (e.g., `settings.json` for Gemini CLI, `mcp_config.json` for Antigravity):
-
-```json
-{
-  "mcpServers": {
-    "cloud-sql-mysql": {
-      "command": "npx",
-      "args": ["-y", "@toolbox-sdk/server", "--prebuilt", "cloud-sql-mysql", "--stdio"],
-      "env": {
-        "CLOUD_SQL_MYSQL_PROJECT": "your-project-id",
-        "CLOUD_SQL_MYSQL_REGION": "your-region",
-        "CLOUD_SQL_MYSQL_INSTANCE": "your-instance-id",
-        "CLOUD_SQL_MYSQL_DATABASE": "your-database-name",
-        "CLOUD_SQL_MYSQL_USER": "your-username",
-        "CLOUD_SQL_MYSQL_PASSWORD": "your-password"
-      }
-    }
-  }
-}
-```
-
 ## Documentation

 For more information, visit the [Cloud SQL for MySQL documentation](https://cloud.google.com/sql/docs/mysql).
--- a/docs/CLOUDSQLPGADMIN_README.md
+++ b/docs/CLOUDSQLPGADMIN_README.md
@@ -8,25 +8,54 @@ An editor configured to use the Cloud SQL for PostgreSQL MCP server can use its

 - **Provision & Manage Infrastructure** - Create and manage Cloud SQL instances and users

-To connect to the database to explore and query data, search the MCP store for the Cloud SQL for PostgreSQL MCP Server.
+## Installation and Setup

-## Prerequisites
+### Prerequisites
+
+*   Download and install [MCP Toolbox](https://github.com/googleapis/genai-toolbox):
+    1.  **Download the Toolbox binary**:
+        Download the latest binary for your operating system and architecture from the storage bucket. Check the [releases page](https://github.com/googleapis/genai-toolbox/releases) for OS and CPU architecture support:
+        `https://storage.googleapis.com/genai-toolbox/v0.21.0/<os>/<arch>/toolbox`
+        *   Replace `<os>` with `linux`, `darwin` (macOS), or `windows`.
+        *   Replace `<arch>` with `amd64` (Intel) or `arm64` (Apple Silicon).
+      
+        <!-- {x-release-please-start-version} -->
+        ```
+        curl -L -o toolbox https://storage.googleapis.com/genai-toolbox/v0.21.0/linux/amd64/toolbox
+        ```
+        <!-- {x-release-please-end} -->
+    2.  **Make it executable**:
+        ```bash
+        chmod +x toolbox
+        ```
+
+    3.  **Move binary to `/usr/local/bin/` or `/usr/bin/`**:
+        ```bash
+        sudo mv toolbox /usr/local/bin/
+        # sudo mv toolbox /usr/bin/
+        ```
+
+        **On Windows, move binary to the `WindowsApps\` folder**:
+        ```
+        move "C:\Users\<path-to-binary>\toolbox.exe" "C:\Users\<username>\AppData\Local\Microsoft\WindowsApps\"
+        ```
+    
+        **Tip:** Ensure the destination folder for your binary is included in
+        your system's PATH environment variable. To check `PATH`, use `echo
+        $PATH` (or `echo %PATH%` on Windows).
+
+        **Note:** You may need to restart Antigravity for changes to take effect.

-*   [Node.js](https://nodejs.org/) installed.
 *   A Google Cloud project with the **Cloud SQL Admin API** enabled.
 *   Ensure [Application Default Credentials](https://cloud.google.com/docs/authentication/gcloud) are available in your environment.
 *   IAM Permissions:
-    * Cloud SQL Viewer (`roles/cloudsql.viewer`)
-    * Cloud SQL Admin (`roles/cloudsql.admin`)
+  * Cloud SQL Viewer (`roles/cloudsql.viewer`)
+  * Cloud SQL Admin (`roles/cloudsql.admin`)

-## Install & Configuration
+### Configuration

-In the Antigravity MCP Store, click the "Install" button.
-
-You'll now be able to see all enabled tools in the "Tools" tab.
-
-> [!NOTE]
-> If you encounter issues with Windows Defender blocking the execution, you may need to configure an allowlist. See [Configure exclusions for Microsoft Defender Antivirus](https://learn.microsoft.com/en-us/microsoft-365/security/defender-endpoint/configure-exclusions-microsoft-defender-antivirus?view=o365-worldwide) for more details.
+1. **Access the Store**: Open the MCP Store panel within the "..." dropdown at the top of the editor's side panel.
+2. **Browse and Install**: Search for "Cloud SQL for PostgreSQL Admin", and click "Install".

 ## Usage

@@ -49,21 +78,6 @@ The Cloud SQL for PostgreSQL MCP server provides the following tools:
 | `list_users`         | List users in a given project and location.            |
 | `wait_for_operation` | Poll the operations API until the operation is done.   |

-## Custom MCP Server Configuration
-
-Add the following configuration to your MCP client (e.g., `settings.json` for Gemini CLI, `mcp_config.json` for Antigravity):
-
-```json
-{
-  "mcpServers": {
-    "cloud-sql-postgres-admin": {
-      "command": "npx",
-      "args": ["-y", "@toolbox-sdk/server", "--prebuilt", "cloud-sql-postgres-admin", "--stdio"]
-    }
-  }
-}
-```
-
 ## Documentation

 For more information, visit the [Cloud SQL for PostgreSQL documentation](https://cloud.google.com/sql/docs/postgres).
--- a/docs/CLOUDSQLPG_README.md
+++ b/docs/CLOUDSQLPG_README.md
@@ -11,28 +11,65 @@ An editor configured to use the Cloud SQL for PostgreSQL MCP server can use its
 - **Monitor Performance** - View active queries, bloat, and memory configurations
 - **Manage Extensions** - List available and installed extensions

-For Cloud SQL infrastructure management, search the MCP store for the Cloud SQL for PostgreSQL Admin MCP Server.
+## Installation and Setup

-## Prerequisites
+### Prerequisites
+
+*   Download and install [MCP Toolbox](https://github.com/googleapis/genai-toolbox):
+    1.  **Download the Toolbox binary**:
+        Download the latest binary for your operating system and architecture from the storage bucket. Check the [releases page](https://github.com/googleapis/genai-toolbox/releases) for OS and CPU architecture support:
+        `https://storage.googleapis.com/genai-toolbox/v0.21.0/<os>/<arch>/toolbox`
+        *   Replace `<os>` with `linux`, `darwin` (macOS), or `windows`.
+        *   Replace `<arch>` with `amd64` (Intel) or `arm64` (Apple Silicon).
+      
+        <!-- {x-release-please-start-version} -->
+        ```
+        curl -L -o toolbox https://storage.googleapis.com/genai-toolbox/v0.21.0/linux/amd64/toolbox
+        ```
+        <!-- {x-release-please-end} -->
+    2.  **Make it executable**:
+        ```bash
+        chmod +x toolbox
+        ```
+
+    3.  **Move binary to `/usr/local/bin/` or `/usr/bin/`**:
+        ```bash
+        sudo mv toolbox /usr/local/bin/
+        # sudo mv toolbox /usr/bin/
+        ```
+
+        **On Windows, move binary to the `WindowsApps\` folder**:
+        ```
+        move "C:\Users\<path-to-binary>\toolbox.exe" "C:\Users\<username>\AppData\Local\Microsoft\WindowsApps\"
+        ```
+    
+        **Tip:** Ensure the destination folder for your binary is included in
+        your system's PATH environment variable. To check `PATH`, use `echo
+        $PATH` (or `echo %PATH%` on Windows).
+
+        **Note:** You may need to restart Antigravity for changes to take effect.

-*   [Node.js](https://nodejs.org/) installed.
 *   A Google Cloud project with the **Cloud SQL Admin API** enabled.
 *   Ensure [Application Default Credentials](https://cloud.google.com/docs/authentication/gcloud) are available in your environment.
 *   IAM Permissions:
    *   Cloud SQL Client (`roles/cloudsql.client`)

-> **Note:** If your instance uses private IPs, you must run the MCP server in the same Virtual Private Cloud (VPC) network.
+### Configuration

-## Install & Configuration
-
-1. In the Antigravity MCP Store, click the "Install" button.
-
-2. Add the required inputs for your [instance](https://cloud.google.com/sql/docs/postgres/instance-info) in the configuration pop-up, then click "Save". You can update this configuration at any time in the "Configure" tab.
-
-You'll now be able to see all enabled tools in the "Tools" tab.
+1. **Access the Store**: Open the MCP Store panel within the "..." dropdown at the top of the editor's side panel.
+2. **Browse and Install**: Search for "Cloud SQL for PostgreSQL", and click "Install".
+3. **Configuration**: The following configuration is needed for the server:
+   * Cloud SQL Project ID: The GCP project ID.
+   * Cloud SQL Region: The region of your Cloud SQL instance.
+   * Cloud SQL Instance ID: The ID of your Cloud SQL instance.
+   * Cloud SQL Database Name: The name of the database.
+   * Cloud SQL Database User: (Optional) The database username. Defaults to IAM authentication if unspecified.
+   * Cloud SQL Database Password:  (Optional) The password for the database user. Defaults to IAM authentication if unspecified.
+   * Cloud SQL IP Type: (Optional) The IP type i.e. “Public” or “Private”. Defaults to "Public" if unspecified.

 > [!NOTE]
-> If you encounter issues with Windows Defender blocking the execution, you may need to configure an allowlist. See [Configure exclusions for Microsoft Defender Antivirus](https://learn.microsoft.com/en-us/microsoft-365/security/defender-endpoint/configure-exclusions-microsoft-defender-antivirus?view=o365-worldwide) for more details.
+> If your instance uses private IPs, you must run the MCP server in the same Virtual Private Cloud (VPC) network.
+

 ## Usage

@@ -66,42 +103,6 @@ The Cloud SQL for PostgreSQL MCP server provides the following tools:
 | `list_indexes`                   | Lists available user indexes in the database.                  |
 | `list_sequences`                 | Lists sequences in the database.                               |

-
-## Custom MCP Server Configuration
-
-The MCP server is configured using environment variables.
-
-```bash
-export CLOUD_SQL_POSTGRES_PROJECT="<your-gcp-project-id>"
-export CLOUD_SQL_POSTGRES_REGION="<your-cloud-sql-region>"
-export CLOUD_SQL_POSTGRES_INSTANCE="<your-cloud-sql-instance-id>"
-export CLOUD_SQL_POSTGRES_DATABASE="<your-database-name>"
-export CLOUD_SQL_POSTGRES_USER="<your-database-user>"  # Optional
-export CLOUD_SQL_POSTGRES_PASSWORD="<your-database-password>"  # Optional
-export CLOUD_SQL_POSTGRES_IP_TYPE="PUBLIC"  # Optional: `PUBLIC`, `PRIVATE`, `PSC`. Defaults to `PUBLIC`.
-```
-
-Add the following configuration to your MCP client (e.g., `settings.json` for Gemini CLI, `mcp_config.json` for Antigravity):
-
-```json
-{
-  "mcpServers": {
-    "cloud-sql-postgres": {
-      "command": "npx",
-      "args": ["-y", "@toolbox-sdk/server", "--prebuilt", "cloud-sql-postgres", "--stdio"],
-      "env": {
-        "CLOUD_SQL_POSTGRES_PROJECT": "your-project-id",
-        "CLOUD_SQL_POSTGRES_REGION": "your-region",
-        "CLOUD_SQL_POSTGRES_INSTANCE": "your-instance-id",
-        "CLOUD_SQL_POSTGRES_DATABASE": "your-database-name",
-        "CLOUD_SQL_POSTGRES_USER": "your-username",
-        "CLOUD_SQL_POSTGRES_PASSWORD": "your-password"
-      }
-    }
-  }
-}
-```
-
 ## Documentation

 For more information, visit the [Cloud SQL for PostgreSQL documentation](https://cloud.google.com/sql/docs/postgres).
--- a/docs/DATAPLEX_README.md
+++ b/docs/DATAPLEX_README.md
@@ -9,24 +9,55 @@ An editor configured to use the Dataplex MCP server can use its AI capabilities
 - **Search Catalog** - Search for entries in Dataplex Catalog
 - **Explore Metadata** - Lookup specific entries and search aspect types

-## Prerequisites
+## Installation and Setup
+
+### Prerequisites
+
+*   Download and install [MCP Toolbox](https://github.com/googleapis/genai-toolbox):
+    1.  **Download the Toolbox binary**:
+        Download the latest binary for your operating system and architecture from the storage bucket. Check the [releases page](https://github.com/googleapis/genai-toolbox/releases) for OS and CPU architecture support:
+        `https://storage.googleapis.com/genai-toolbox/v0.21.0/<os>/<arch>/toolbox`
+        *   Replace `<os>` with `linux`, `darwin` (macOS), or `windows`.
+        *   Replace `<arch>` with `amd64` (Intel) or `arm64` (Apple Silicon).
+      
+        <!-- {x-release-please-start-version} -->
+        ```
+        curl -L -o toolbox https://storage.googleapis.com/genai-toolbox/v0.21.0/linux/amd64/toolbox
+        ```
+        <!-- {x-release-please-end} -->
+    2.  **Make it executable**:
+        ```bash
+        chmod +x toolbox
+        ```
+
+    3.  **Move binary to `/usr/local/bin/` or `/usr/bin/`**:
+        ```bash
+        sudo mv toolbox /usr/local/bin/
+        # sudo mv toolbox /usr/bin/
+        ```
+
+        **On Windows, move binary to the `WindowsApps\` folder**:
+        ```
+        move "C:\Users\<path-to-binary>\toolbox.exe" "C:\Users\<username>\AppData\Local\Microsoft\WindowsApps\"
+        ```
+    
+        **Tip:** Ensure the destination folder for your binary is included in
+        your system's PATH environment variable. To check `PATH`, use `echo
+        $PATH` (or `echo %PATH%` on Windows).
+
+        **Note:** You may need to restart Antigravity for changes to take effect.

-*   [Node.js](https://nodejs.org/) installed.
 *   A Google Cloud project with the **Dataplex API** enabled.
 *   Ensure [Application Default Credentials](https://cloud.google.com/docs/authentication/gcloud) are available in your environment.
 *   IAM Permissions:
    *   Dataplex Viewer (`roles/dataplex.viewer`) or equivalent permissions to read catalog entries.

-## Install & Configuration
+### Configuration

-1. In the Antigravity MCP Store, click the "Install" button.
-
-2. Add the required inputs in the configuration pop-up, then click "Save". You can update this configuration at any time in the "Configure" tab.
-
-You'll now be able to see all enabled tools in the "Tools" tab.
-
-> [!NOTE]
-> If you encounter issues with Windows Defender blocking the execution, you may need to configure an allowlist. See [Configure exclusions for Microsoft Defender Antivirus](https://learn.microsoft.com/en-us/microsoft-365/security/defender-endpoint/configure-exclusions-microsoft-defender-antivirus?view=o365-worldwide) for more details.
+1. **Access the Store**: Open the MCP Store panel within the "..." dropdown at the top of the editor's side panel.
+2. **Browse and Install**: Search for "Dataplex", and click "Install".
+3. **Configuration**: The following configuration is needed for the server:
+   * Dataplex Project ID: The GCP project ID.

 ## Usage

@@ -45,30 +76,6 @@ The Dataplex MCP server provides the following tools:
 | `lookup_entry`        | Retrieve a specific entry from Dataplex Catalog. |
 | `search_aspect_types` | Find aspect types relevant to the query.         |

-## Custom MCP Server Configuration
-
-The MCP server is configured using environment variables.
-
-```bash
-export DATAPLEX_PROJECT="<your-gcp-project-id>"
-```
-
-Add the following configuration to your MCP client (e.g., `settings.json` for Gemini CLI, `mcp_config.json` for Antigravity):
-
-```json
-{
-  "mcpServers": {
-    "dataplex": {
-      "command": "npx",
-      "args": ["-y", "@toolbox-sdk/server", "--prebuilt", "dataplex", "--stdio"],
-      "env": {
-        "DATAPLEX_PROJECT": "your-project-id"
-      }
-    }
-  }
-}
-```
-
 ## Documentation

 For more information, visit the [Dataplex documentation](https://cloud.google.com/dataplex/docs).
--- a/docs/LOOKER_README.md
+++ b/docs/LOOKER_README.md
@@ -11,23 +11,62 @@ An editor configured to use the Looker MCP server can use its AI capabilities to
 - **Manage Dashboards** - Create, run, and modify dashboards
 - **Manage Looks** - Search for and run saved looks
 - **Health Checks** - Analyze instance health and performance
+- **Developer Tools** - Manage project files and toggle dev mode

-## Prerequisites
+## Installation and Setup
+
+### Prerequisites
+
+*   Download and install [MCP Toolbox](https://github.com/googleapis/genai-toolbox):
+    1.  **Download the Toolbox binary**:
+        Download the latest binary for your operating system and architecture from the storage bucket. Check the [releases page](https://github.com/googleapis/genai-toolbox/releases) for OS and CPU architecture support:
+        `https://storage.googleapis.com/genai-toolbox/v0.21.0/<os>/<arch>/toolbox`
+        *   Replace `<os>` with `linux`, `darwin` (macOS), or `windows`.
+        *   Replace `<arch>` with `amd64` (Intel) or `arm64` (Apple Silicon).
+      
+        <!-- {x-release-please-start-version} -->
+        ```
+        curl -L -o toolbox https://storage.googleapis.com/genai-toolbox/v0.21.0/linux/amd64/toolbox
+        ```
+        <!-- {x-release-please-end} -->
+    2.  **Make it executable**:
+        ```bash
+        chmod +x toolbox
+        ```
+
+    3.  **Move binary to `/usr/local/bin/` or `/usr/bin/`**:
+        ```bash
+        sudo mv toolbox /usr/local/bin/
+        # sudo mv toolbox /usr/bin/
+        ```
+
+        **On Windows, move binary to the `WindowsApps\` folder**:
+        ```
+        move "C:\Users\<path-to-binary>\toolbox.exe" "C:\Users\<username>\AppData\Local\Microsoft\WindowsApps\"
+        ```
+    
+        **Tip:** Ensure the destination folder for your binary is included in
+        your system's PATH environment variable. To check `PATH`, use `echo
+        $PATH` (or `echo %PATH%` on Windows).
+
+        **Note:** You may need to restart Antigravity for changes to take effect.

-*   [Node.js](https://nodejs.org/) installed.
 *   Access to a Looker instance.
 *   API Credentials (`Client ID` and `Client Secret`) or OAuth configuration.

-## Install & Configuration
+### Configuration

-1. In the Antigravity MCP Store, click the "Install" button.
-
-2. Add the required inputs for your [instance](https://docs.cloud.google.com/looker/docs/set-up-and-administer-looker) in the configuration pop-up, then click "Save". You can update this configuration at any time in the "Configure" tab.
-
-You'll now be able to see all enabled tools in the "Tools" tab.
-
-> [!NOTE]
-> If you encounter issues with Windows Defender blocking the execution, you may need to configure an allowlist. See [Configure exclusions for Microsoft Defender Antivirus](https://learn.microsoft.com/en-us/microsoft-365/security/defender-endpoint/configure-exclusions-microsoft-defender-antivirus?view=o365-worldwide) for more details.
+1. **Access the Store**: Open the MCP Store panel within the "..." dropdown at the top of the editor's side panel.
+2. **Browse and Install**: Search for "Looker", and click "Install".
+3. **Configuration**: The following configuration is needed for the server:
+   * Looker Base URL: The URL of your Looker instance.
+   * Looker Client ID: The client ID for the Looker API.
+   * Looker Client Secret: The client secret for the Looker API.
+   * Looker Verify SSL: Whether to verify SSL certificates.
+   * Looker Use Client OAuth: Whether to use OAuth for authentication.
+   * Looker Show Hidden Models: Whether to show hidden models.
+   * Looker Show Hidden Explores: Whether to show hidden explores.
+   * Looker Show Hidden Fields: Whether to show hidden fields.

 ## Usage

@@ -55,38 +94,8 @@ The Looker MCP server provides a wide range of tools. Here are some of the key c
 | `dev_mode`              | Toggles development mode.                                 |
 | `get_projects`          | Lists LookML projects.                                    |

-## Custom MCP Server Configuration
-
-The MCP server is configured using environment variables.
-
-```bash
-export LOOKER_BASE_URL="<your-looker-instance-url>"  # e.g. `https://looker.example.com`. You may need to add the port, i.e. `:19999`.
-export LOOKER_CLIENT_ID="<your-looker-client-id>"
-export LOOKER_CLIENT_SECRET="<your-looker-client-secret>"
-export LOOKER_VERIFY_SSL="true" # Optional, defaults to true
-export LOOKER_SHOW_HIDDEN_MODELS="true" # Optional, defaults to true
-export LOOKER_SHOW_HIDDEN_EXPLORES="true" # Optional, defaults to true
-export LOOKER_SHOW_HIDDEN_FIELDS="true" # Optional, defaults to true
-```
-
-Add the following configuration to your MCP client (e.g., `settings.json` for Gemini CLI, `mcp_config.json` for Antigravity):
-
-```json
-{
-  "mcpServers": {
-    "looker": {
-      "command": "npx",
-      "args": ["-y", "@toolbox-sdk/server", "--prebuilt", "looker", "--stdio"],
-      "env": {
-        "LOOKER_BASE_URL": "https://your.looker.instance.com",
-        "LOOKER_CLIENT_ID": "your-client-id",
-        "LOOKER_CLIENT_SECRET": "your-client-secret"
-      }
-    }
-  }
-}
-```
+*(See the full list of tools in the extension)*

 ## Documentation

-For more information, visit the [Looker documentation](https://cloud.google.com/looker).
+For more information, visit the [Looker documentation](https://cloud.google.com/looker/docs).
--- a/docs/SPANNER_README.md
+++ b/docs/SPANNER_README.md
@@ -9,25 +9,59 @@ An editor configured to use the Cloud Spanner MCP server can use its AI capabili
 - **Query Data** - Execute DML and DQL SQL queries
 - **Explore Schema** - List tables and view schema details

-## Prerequisites
+## Installation and Setup
+
+### Prerequisites
+
+*   Download and install [MCP Toolbox](https://github.com/googleapis/genai-toolbox):
+    1.  **Download the Toolbox binary**:
+        Download the latest binary for your operating system and architecture from the storage bucket. Check the [releases page](https://github.com/googleapis/genai-toolbox/releases) for OS and CPU architecture support:
+        `https://storage.googleapis.com/genai-toolbox/v0.21.0/<os>/<arch>/toolbox`
+        *   Replace `<os>` with `linux`, `darwin` (macOS), or `windows`.
+        *   Replace `<arch>` with `amd64` (Intel) or `arm64` (Apple Silicon).
+      
+        <!-- {x-release-please-start-version} -->
+        ```
+        curl -L -o toolbox https://storage.googleapis.com/genai-toolbox/v0.21.0/linux/amd64/toolbox
+        ```
+        <!-- {x-release-please-end} -->
+    2.  **Make it executable**:
+        ```bash
+        chmod +x toolbox
+        ```
+
+    3.  **Move binary to `/usr/local/bin/` or `/usr/bin/`**:
+        ```bash
+        sudo mv toolbox /usr/local/bin/
+        # sudo mv toolbox /usr/bin/
+        ```
+
+        **On Windows, move binary to the `WindowsApps\` folder**:
+        ```
+        move "C:\Users\<path-to-binary>\toolbox.exe" "C:\Users\<username>\AppData\Local\Microsoft\WindowsApps\"
+        ```
+    
+        **Tip:** Ensure the destination folder for your binary is included in
+        your system's PATH environment variable. To check `PATH`, use `echo
+        $PATH` (or `echo %PATH%` on Windows).
+
+        **Note:** You may need to restart Antigravity for changes to take effect.

-*   [Node.js](https://nodejs.org/) installed.
 *   A Google Cloud project with the **Cloud Spanner API** enabled.
 *   Ensure [Application Default Credentials](https://cloud.google.com/docs/authentication/gcloud) are available in your environment.
 *   IAM Permissions:
    *   Cloud Spanner Database User (`roles/spanner.databaseUser`) (for data access)
    *   Cloud Spanner Viewer (`roles/spanner.viewer`) (for schema access)

-## Install & Configuration
+### Configuration

-1. In the Antigravity MCP Store, click the "Install" button.
-
-2. Add the required inputs for your [instance](https://docs.cloud.google.com/spanner/docs/instances) in the configuration pop-up, then click "Save". You can update this configuration at any time in the "Configure" tab.
-
-You'll now be able to see all enabled tools in the "Tools" tab.
-
-> [!NOTE]
-> If you encounter issues with Windows Defender blocking the execution, you may need to configure an allowlist. See [Configure exclusions for Microsoft Defender Antivirus](https://learn.microsoft.com/en-us/microsoft-365/security/defender-endpoint/configure-exclusions-microsoft-defender-antivirus?view=o365-worldwide) for more details.
+1. **Access the Store**: Open the MCP Store panel within the "..." dropdown at the top of the editor's side panel.
+2. **Browse and Install**: Search for "Spanner", and click "Install".
+3. **Configuration**: The following configuration is needed for the server:
+   * Spanner Project ID: The GCP project ID.
+   * Spanner Instance ID: The Spanner instance ID.
+   * Spanner Database ID: The Spanner database ID.
+   * Spanner Dialect: (Optional) The database dialect, which can be "googlesql" or "postgresql". Defaults to "googlesql" if unspecified.

 ## Usage

@@ -41,42 +75,11 @@ Once configured, the MCP server will automatically provide Cloud Spanner capabil

 The Cloud Spanner MCP server provides the following tools:

-| Tool Name         | Description                                                      |
-|:------------------|:-----------------------------------------------------------------|
-| `execute_sql`     | Use this tool to execute DML SQL.                                |
-| `execute_sql_dql` | Use this tool to execute DQL SQL.                                |
-| `list_tables`     | Lists detailed schema information for user-created tables.       |
-| `list_graphs`     | Lists detailed graph schema information for user-created graphs. |
-
-## Custom MCP Server Configuration
-
-The MCP server is configured using environment variables.
-
-```bash
-export SPANNER_PROJECT="<your-gcp-project-id>"
-export SPANNER_INSTANCE="<your-spanner-instance-id>"
-export SPANNER_DATABASE="<your-spanner-database-id>"
-export SPANNER_DIALECT="googlesql" # Optional: "googlesql" or "postgresql". Defaults to "googlesql".
-```
-
-Add the following configuration to your MCP client (e.g., `settings.json` for Gemini CLI, `mcp_config.json` for Antigravity):
-
-```json
-{
-  "mcpServers": {
-    "spanner": {
-      "command": "npx",
-      "args": ["-y", "@toolbox-sdk/server", "--prebuilt", "spanner", "--stdio"],
-      "env": {
-        "SPANNER_PROJECT": "your-project-id",
-        "SPANNER_INSTANCE": "your-instance-id",
-        "SPANNER_DATABASE": "your-database-name",
-        "SPANNER_DIALECT": "googlesql"
-      }
-    }
-  }
-}
-```
+| Tool Name         | Description                                                |
+|:------------------|:-----------------------------------------------------------|
+| `execute_sql`     | Use this tool to execute DML SQL.                          |
+| `execute_sql_dql` | Use this tool to execute DQL SQL.                          |
+| `list_tables`     | Lists detailed schema information for user-created tables. |

 ## Documentation

--- a/docs/TOOLBOX_README.md
+++ b/docs/TOOLBOX_README.md
@@ -2,43 +2,59 @@

 The MCP Toolbox for Databases Server gives AI-powered development tools the ability to work with your custom tools. It is designed to simplify and secure the development of tools for interacting with databases.

+## Installation and Setup

-## Prerequisites
+### Prerequisites

-*   [Node.js](https://nodejs.org/) installed.
-*   A Google Cloud project with relevant APIs enabled.
-*   Ensure [Application Default Credentials](https://cloud.google.com/docs/authentication/gcloud) are available in your environment.
+*   Download and install [MCP Toolbox](https://github.com/googleapis/genai-toolbox):
+    1.  **Download the Toolbox binary**:
+        Download the latest binary for your operating system and architecture from the storage bucket. Check the [releases page](https://github.com/googleapis/genai-toolbox/releases) for OS and CPU architecture support:
+        `https://storage.googleapis.com/genai-toolbox/v0.21.0/<os>/<arch>/toolbox`
+        *   Replace `<os>` with `linux`, `darwin` (macOS), or `windows`.
+        *   Replace `<arch>` with `amd64` (Intel) or `arm64` (Apple Silicon).
+      
+        <!-- {x-release-please-start-version} -->
+        ```
+        curl -L -o toolbox https://storage.googleapis.com/genai-toolbox/v0.21.0/linux/amd64/toolbox
+        ```
+        <!-- {x-release-please-end} -->
+    2.  **Make it executable**:
+        ```bash
+        chmod +x toolbox
+        ```

-## Install & Configuration
+    3.  **Move binary to `/usr/local/bin/` or `/usr/bin/`**:
+        ```bash
+        sudo mv toolbox /usr/local/bin/
+        # sudo mv toolbox /usr/bin/
+        ```

-1.  In the Antigravity MCP Store, click the **Install** button. A configuration window will appear.
+        **On Windows, move binary to the `WindowsApps\` folder**:
+        ```
+        move "C:\Users\<path-to-binary>\toolbox.exe" "C:\Users\<username>\AppData\Local\Microsoft\WindowsApps\"
+        ```
+    
+        **Tip:** Ensure the destination folder for your binary is included in
+        your system's PATH environment variable. To check `PATH`, use `echo
+        $PATH` (or `echo %PATH%` on Windows).

-2.  Create your [`tools.yaml` configuration file](https://googleapis.github.io/genai-toolbox/getting-started/configure/).
+        **Note:** You may need to restart Antigravity for changes to take effect.

-3.  In the configuration window, enter the full absolute path to your `tools.yaml` file and click **Save**.
+*   Any required APIs and permissions for connecting to your database.

-> [!NOTE]
-> If you encounter issues with Windows Defender blocking the execution, you may need to configure an allowlist. See [Configure exclusions for Microsoft Defender Antivirus](https://learn.microsoft.com/en-us/microsoft-365/security/defender-endpoint/configure-exclusions-microsoft-defender-antivirus?view=o365-worldwide) for more details.
+### Configuration
+
+1. **Access the Store**: Open the MCP Store panel within the "..." dropdown at the top of the editor's side panel.
+2. **Browse and Install**: Search for "MCP Toolbox for Databases", and click "Install".
+3. **Configuration**: The following configuration is needed for the server:
+   * Add your [`tools.yaml` configuration
+     file](https://googleapis.github.io/genai-toolbox/getting-started/configure/)
+     to the directory you are running Antigravity

 ## Usage

 Interact with your custom tools using natural language.

-## Custom MCP Server Configuration
-
-```json
-{
-  "mcpServers": {
-    "mcp-toolbox": {
-      "command": "npx",
-      "args": ["-y", "@toolbox-sdk/server", "--tools-file", "your-tool-file.yaml"],
-      "env": {
-        "ENV_VAR_NAME": "ENV_VAR_VALUE",
-      }
-    }
-  }
-}
-```

 ## Documentation

--- a/docs/en/about/faq.md
+++ b/docs/en/about/faq.md
@@ -44,11 +44,15 @@ most popular issues, so make sure to +1 ones you are the most interested in.

 ## Can Toolbox be used for non-database tools?

-**Yes!** While Toolbox is primarily focused on databases, it also supports generic 
-**HTTP tools** (`kind: http`). These allow you to connect your agents to REST APIs 
-and other web services, enabling workflows that extend beyond database interactions.
+Currently, Toolbox is primarily focused on making it easier to create and
+develop tools focused on interacting with Databases. We believe that there are a
+lot of unique problems when interacting with Databases for Gen AI use cases, and
+want to prioritize solving those first.  

-For configuration details, see the [HTTP Tools documentation](../resources/tools/http/http.md).
+However, we've also received feedback that supporting more generic HTTP or
+GRPC tools might be helpful in assisting with migrating to Toolbox or in
+accomplishing more complicated workflows. We're looking into what that might
+best look like in Toolbox.

 ## Can I use _$BAR_ orchestration framework to use tools from Toolbox?

--- a/docs/en/getting-started/colab_quickstart.ipynb
+++ b/docs/en/getting-started/colab_quickstart.ipynb
@@ -234,7 +234,7 @@
      },
      "outputs": [],
      "source": [
-        "version = \"0.23.0\" # x-release-please-version\n",
+        "version = \"0.21.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
@@ -71,22 +71,6 @@ redeploying your application.

 ## Getting Started

-### (Non-production) Running Toolbox
-
-You can run Toolbox directly with a [configuration file](../configure.md):
-
-```sh
-npx @toolbox-sdk/server --tools-file tools.yaml
-```
-
-This runs the latest version of the toolbox server with your configuration file.
-
-{{< notice note >}}
-This method should only be used for non-production use cases such as
-experimentation. For any production use-cases, please consider [Installing the
-server](#installing-the-server) and then [running it](#running-the-server).
-{{< /notice >}}
-
 ### Installing the server

 For the latest version, check the [releases page][releases] and use the
@@ -103,7 +87,7 @@ To install Toolbox as a binary on Linux (AMD64):

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

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

 ```sh
 # see releases page for other versions
-export VERSION=0.23.0
+export VERSION=0.21.0
 curl -L -o toolbox https://storage.googleapis.com/genai-toolbox/v$VERSION/darwin/amd64/toolbox
 chmod +x toolbox
 ```

 {{% /tab %}}
-{{% tab header="Windows (Command Prompt)" lang="en" %}}
-To install Toolbox as a binary on Windows (Command Prompt):
-
-```cmd
-:: see releases page for other versions
-set VERSION=0.23.0
-curl -o toolbox.exe "https://storage.googleapis.com/genai-toolbox/v%VERSION%/windows/amd64/toolbox.exe"
-```
-
-{{% /tab %}}
-{{% tab header="Windows (PowerShell)" lang="en" %}}
-To install Toolbox as a binary on Windows (PowerShell):
+{{% tab header="Windows (AMD64)" lang="en" %}}
+To install Toolbox as a binary on Windows (AMD64):

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

 {{% /tab %}}
@@ -158,7 +132,7 @@ You can also install Toolbox as a container:

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

@@ -177,7 +151,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.23.0
+go install github.com/googleapis/genai-toolbox@v0.21.0
 ```

 {{% /tab %}}
@@ -320,10 +294,6 @@ let client = new ToolboxClient(URL);
 const toolboxTools = await client.loadToolset('toolsetName');
 {{< /highlight >}}

-For more detailed instructions on using the Toolbox Core SDK, see the
-[project's
-README](https://github.com/googleapis/mcp-toolbox-sdk-js/blob/main/packages/toolbox-core/README.md).
-
 {{% /tab %}}
 {{% tab header="LangChain/Langraph" lang="en" %}}

@@ -348,10 +318,6 @@ const getTool = (toolboxTool) => tool(currTool, {
 const tools = toolboxTools.map(getTool);
 {{< /highlight >}}

-For more detailed instructions on using the Toolbox Core SDK, see the
-[project's
-README](https://github.com/googleapis/mcp-toolbox-sdk-js/blob/main/packages/toolbox-core/README.md).
-
 {{% /tab %}}
 {{% tab header="Genkit" lang="en" %}}

@@ -387,10 +353,6 @@ const getTool = (toolboxTool) => ai.defineTool({
 const tools = toolboxTools.map(getTool);
 {{< /highlight >}}

-For more detailed instructions on using the Toolbox Core SDK, see the
-[project's
-README](https://github.com/googleapis/mcp-toolbox-sdk-js/blob/main/packages/toolbox-core/README.md).
-
 {{% /tab %}}
 {{% tab header="LlamaIndex" lang="en" %}}

@@ -418,32 +380,12 @@ const tools = toolboxTools.map(getTool);

 {{< /highlight >}}

-For more detailed instructions on using the Toolbox Core SDK, see the
-[project's
-README](https://github.com/googleapis/mcp-toolbox-sdk-js/blob/main/packages/toolbox-core/README.md).
-
-{{% /tab %}}
-{{% tab header="ADK TS" lang="en" %}}
-
-{{< highlight javascript >}}
-import { ToolboxClient } from '@toolbox-sdk/adk';
-
-// Replace with the actual URL where your Toolbox service is running
-const URL = 'http://127.0.0.1:5000';
-
-let client = new ToolboxClient(URL);
-const tools = await client.loadToolset();
-
-// Use the client and tools as per requirement
-
-{{< /highlight >}}
-
-For detailed samples on using the Toolbox JS SDK with ADK JS, see the [project's
-README.](https://github.com/googleapis/mcp-toolbox-sdk-js/tree/main/packages/toolbox-adk/README.md)
-
 {{% /tab %}}
 {{< /tabpane >}}

+For more detailed instructions on using the Toolbox Core SDK, see the
+[project's
+README](https://github.com/googleapis/mcp-toolbox-sdk-js/blob/main/packages/toolbox-core/README.md).

 #### Go

--- a/docs/en/getting-started/local_quickstart.md
+++ b/docs/en/getting-started/local_quickstart.md
@@ -101,62 +101,44 @@ pip install google-genai
 {{< /tab >}}
 {{< /tabpane >}}

-1. Create the agent:
-{{< tabpane persist=header >}}
-{{% tab header="ADK" text=true %}}
+1. Create a new file named `hotel_agent.py` and copy the following
+   code to create an agent:
+    {{< tabpane persist=header >}}
+{{< tab header="ADK" lang="python" >}}

-1. Create a new agent project. This will create a new directory named `my_agent`
-   with a file `agent.py`.
+{{< include "quickstart/python/adk/quickstart.py" >}}

-    ```bash
-    adk create my_agent
-    ```
-    <br/>
+{{< /tab >}}
+{{< tab header="LangChain" lang="python" >}}

-1. Update `my_agent/agent.py` with the following content to connect to Toolbox:
-    ```py
-    {{< include "quickstart/python/adk/quickstart.py" >}}
-    ```
-    <br/>
-
-1. Create a `.env` file with your Google API key:
-    ```bash
-    echo 'GOOGLE_API_KEY="YOUR_API_KEY"' > my_agent/.env
-    ```
-{{% /tab %}}
-{{% tab header="LangChain" text=true %}}
-Create a new file named `agent.py` and copy the following code:
-```py
 {{< include "quickstart/python/langchain/quickstart.py" >}}
-```
-{{% /tab %}}
-{{% tab header="LlamaIndex" text=true %}}
-Create a new file named `agent.py` and copy the following code:
-```py
+
+{{< /tab >}}
+{{< tab header="LlamaIndex" lang="python" >}}
+
 {{< include "quickstart/python/llamaindex/quickstart.py" >}}
-```
-{{% /tab %}}
-{{% tab header="Core" text=true %}}
-Create a new file named `agent.py` and copy the following code:
-```py
+
+{{< /tab >}}
+{{< tab header="Core" lang="python" >}}
+
 {{< include "quickstart/python/core/quickstart.py" >}}
-```
-{{% /tab %}}
+
+{{< /tab >}}
 {{< /tabpane >}}

    {{< tabpane text=true persist=header >}}
 {{% tab header="ADK" lang="en" %}}
 To learn more about Agent Development Kit, check out the [ADK
-Documentation](https://google.github.io/adk-docs/get-started/python/).
+documentation.](https://google.github.io/adk-docs/)
 {{% /tab %}}
 {{% tab header="Langchain" lang="en" %}}
 To learn more about Agents in LangChain, check out the [LangGraph Agent
-Documentation](https://langchain-ai.github.io/langgraph/reference/prebuilt/#langgraph.prebuilt.chat_agent_executor.create_react_agent).
+documentation.](https://langchain-ai.github.io/langgraph/reference/prebuilt/#langgraph.prebuilt.chat_agent_executor.create_react_agent)
 {{% /tab %}}
 {{% tab header="LlamaIndex" lang="en" %}}
 To learn more about Agents in LlamaIndex, check out the [LlamaIndex
 AgentWorkflow
-Documentation](https://docs.llamaindex.ai/en/stable/examples/agent/agent_workflow_basic/).
+documentation.](https://docs.llamaindex.ai/en/stable/examples/agent/agent_workflow_basic/)
 {{% /tab %}}
 {{% tab header="Core" lang="en" %}}
 To learn more about tool calling with Google GenAI, check out the
@@ -165,37 +147,11 @@ Documentation](https://github.com/googleapis/python-genai?tab=readme-ov-file#man
 {{% /tab %}}
 {{< /tabpane >}}

-4. Run your agent, and observe the results:
+1. Run your agent, and observe the results:

-    {{< tabpane persist=header >}}
-{{% tab header="ADK" text=true %}}
-Run your agent locally for testing:
-```sh
-adk run my_agent
-```
-<br/>
-
-Alternatively, serve it via a web interface:
-```sh
-adk web --port 8000
-```
-<br/>
-
-For more information, refer to the ADK documentation on [Running
-Agents](https://google.github.io/adk-docs/get-started/python/#run-your-agent)
-and [Deploying to Cloud](https://google.github.io/adk-docs/deploy/).
-
-{{% /tab %}}
-{{< tab header="Langchain" lang="bash" >}}
-python agent.py
-{{< /tab >}}
-{{< tab header="LlamaIndex" lang="bash" >}}
-python agent.py
-{{< /tab >}}
-{{< tab header="Core" lang="bash" >}}
-python agent.py
-{{< /tab >}}
-    {{< /tabpane >}}
+    ```sh
+    python hotel_agent.py
+    ```

 {{< notice info >}}
 For more information, visit the [Python SDK
--- a/docs/en/getting-started/local_quickstart_js.md
+++ b/docs/en/getting-started/local_quickstart_js.md
@@ -40,24 +40,11 @@ from Toolbox.
    ```

 1. In a new terminal, install the
-   SDK package.
-   {{< tabpane persist=header >}}
-{{< tab header="LangChain" lang="bash" >}}
-npm install @toolbox-sdk/core
-{{< /tab >}}
-{{< tab header="GenkitJS" lang="bash" >}}
-npm install @toolbox-sdk/core
-{{< /tab >}}
-{{< tab header="LlamaIndex" lang="bash" >}}
-npm install @toolbox-sdk/core
-{{< /tab >}}
-{{< tab header="GoogleGenAI" lang="bash" >}}
-npm install @toolbox-sdk/core
-{{< /tab >}}
-{{< tab header="ADK" lang="bash" >}}
-npm install @toolbox-sdk/adk
-{{< /tab >}}
-{{< /tabpane >}}
+   [SDK](https://www.npmjs.com/package/@toolbox-sdk/core).
+
+    ```bash
+    npm install @toolbox-sdk/core
+    ```

 1. Install other required dependencies

@@ -74,9 +61,6 @@ npm install llamaindex @llamaindex/google @llamaindex/workflow
 {{< tab header="GoogleGenAI" lang="bash" >}}
 npm install @google/genai
 {{< /tab >}}
-{{< tab header="ADK" lang="bash" >}}
-npm install @google/adk
-{{< /tab >}}
 {{< /tabpane >}}

 1. Create a new file named `hotelAgent.js` and copy the following code to create
@@ -107,12 +91,6 @@ npm install @google/adk

 {{< /tab >}}

-{{< tab header="ADK" lang="js" >}}
-
-{{< include "quickstart/js/adk/quickstart.js" >}}
-
-{{< /tab >}}
-
 {{< /tabpane >}}

 1. Run your agent, and observe the results:
--- 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.23.0/$OS/toolbox
+    curl -O https://storage.googleapis.com/genai-toolbox/v0.21.0/$OS/toolbox
    ```
    <!-- {x-release-please-end} -->

--- a/docs/en/getting-started/prompts_quickstart_gemini_cli.md
+++ b/docs/en/getting-started/prompts_quickstart_gemini_cli.md
@@ -1,245 +0,0 @@
---
-title: "Prompts using Gemini CLI"
-type: docs
-weight: 5
-description: >
-  How to get started using Toolbox prompts locally with PostgreSQL and [Gemini CLI](https://pypi.org/project/gemini-cli/).
---
-
-## Before you begin
-
-This guide assumes you have already done the following:
-
-1. Installed [PostgreSQL 16+ and the `psql` client][install-postgres].
- 
-[install-postgres]: https://www.postgresql.org/download/
-
-## Step 1: Set up your database
-
-In this section, we will create a database, insert some data that needs to be
-accessed by our agent, and create a database user for Toolbox to connect with.
-
-1. Connect to postgres using the `psql` command:
-
-    ```bash
-    psql -h 127.0.0.1 -U postgres
-    ```
-
-    Here, `postgres` denotes the default postgres superuser.
-
-    {{< notice info >}}
-
-#### **Having trouble connecting?**
-
-* **Password Prompt:** If you are prompted for a password for the `postgres`
-  user and do not know it (or a blank password doesn't work), your PostgreSQL
-  installation might require a password or a different authentication method.
-* **`FATAL: role "postgres" does not exist`:** This error means the default
-  `postgres` superuser role isn't available under that name on your system.
-* **`Connection refused`:** Ensure your PostgreSQL server is actually running.
-  You can typically check with `sudo systemctl status postgresql` and start it
-  with `sudo systemctl start postgresql` on Linux systems.
-
-<br/>
-
-#### **Common Solution**
-
-For password issues or if the `postgres` role seems inaccessible directly, try
-switching to the `postgres` operating system user first. This user often has
-permission to connect without a password for local connections (this is called
-peer authentication).
-
-```bash
-sudo -i -u postgres
-psql -h 127.0.0.1
-```
-
-Once you are in the `psql` shell using this method, you can proceed with the
-database creation steps below. Afterwards, type `\q` to exit `psql`, and then
-`exit` to return to your normal user shell.
-
-If desired, once connected to `psql` as the `postgres` OS user, you can set a
-password for the `postgres` *database* user using: `ALTER USER postgres WITH
-PASSWORD 'your_chosen_password';`. This would allow direct connection with `-U
-postgres` and a password next time.
-    {{< /notice >}}
-
-1. Create a new database and a new user:
-
-    {{< notice tip >}}
-  For a real application, it's best to follow the principle of least permission
-  and only grant the privileges your application needs.
-    {{< /notice >}}
-
-    ```sql
-      CREATE USER toolbox_user WITH PASSWORD 'my-password';
-
-      CREATE DATABASE toolbox_db;
-      GRANT ALL PRIVILEGES ON DATABASE toolbox_db TO toolbox_user;
-
-      ALTER DATABASE toolbox_db OWNER TO toolbox_user;
-    ```
-
-1. End the database session:
-
-    ```bash
-    \q
-    ```
-
-    (If you used `sudo -i -u postgres` and then `psql`, remember you might also
-    need to type `exit` after `\q` to leave the `postgres` user's shell
-    session.)
-
-1. Connect to your database with your new user:
-
-    ```bash
-    psql -h 127.0.0.1 -U toolbox_user -d toolbox_db
-    ```
-
-1. Create the required tables using the following commands:
-
-    ```sql
-    CREATE TABLE users (
-      id SERIAL PRIMARY KEY,
-      username VARCHAR(50) NOT NULL,
-      email VARCHAR(100) UNIQUE NOT NULL,
-      created_at TIMESTAMPTZ DEFAULT NOW()
-    );
-
-    CREATE TABLE restaurants (
-      id SERIAL PRIMARY KEY,
-      name VARCHAR(100) NOT NULL,
-      location VARCHAR(100)
-    );
-
-    CREATE TABLE reviews (
-      id SERIAL PRIMARY KEY,
-      user_id INT REFERENCES users(id),
-      restaurant_id INT REFERENCES restaurants(id),
-      rating INT CHECK (rating >= 1 AND rating <= 5),
-      review_text TEXT,
-      is_published BOOLEAN DEFAULT false,
-      moderation_status VARCHAR(50) DEFAULT 'pending_manual_review',      
-      created_at TIMESTAMPTZ DEFAULT NOW()
-    );
-    ```
-
-1. Insert dummy data into the tables.
-
-    ```sql
-    INSERT INTO users (id, username, email) VALUES
-    (123, 'jane_d', 'jane.d@example.com'),
-    (124, 'john_s', 'john.s@example.com'),
-    (125, 'sam_b', 'sam.b@example.com');
-
-    INSERT INTO restaurants (id, name, location) VALUES
-    (455, 'Pizza Palace', '123 Main St'),
-    (456, 'The Corner Bistro', '456 Oak Ave'),
-    (457, 'Sushi Spot', '789 Pine Ln');
-
-    INSERT INTO reviews (user_id, restaurant_id, rating, review_text, is_published, moderation_status) VALUES
-    (124, 455, 5, 'Best pizza in town! The crust was perfect.', true, 'approved'),
-    (125, 457, 4, 'Great sushi, very fresh. A bit pricey but worth it.', true, 'approved'),
-    (123, 457, 5, 'Absolutely loved the dragon roll. Will be back!', true, 'approved'),
-    (123, 456, 4, 'The atmosphere was lovely and the food was great. My photo upload might have been weird though.', false, 'pending_manual_review'),
-    (125, 456, 1, 'This review contains inappropriate language.', false, 'rejected');
-    ```
-
-1. End the database session:
-
-    ```bash
-    \q
-    ```
-
-## Step 2: Configure Toolbox
-
-Create a file named `tools.yaml`. This file defines the database connection, the
-SQL tools available, and the prompts the agents will use.
-
-```yaml
-sources:
-  my-foodiefind-db:
-    kind: postgres
-    host: 127.0.0.1
-    port: 5432
-    database: toolbox_db
-    user: toolbox_user
-    password: my-password
-tools:
-  find_user_by_email:
-    kind: postgres-sql
-    source: my-foodiefind-db
-    description: Find a user's ID by their email address.
-    parameters:
-      - name: email
-        type: string
-        description: The email address of the user to find.
-    statement: SELECT id FROM users WHERE email = $1;
-  find_restaurant_by_name:
-    kind: postgres-sql
-    source: my-foodiefind-db
-    description: Find a restaurant's ID by its exact name.
-    parameters:
-      - name: name
-        type: string
-        description: The name of the restaurant to find.
-    statement: SELECT id FROM restaurants WHERE name = $1;
-  find_review_by_user_and_restaurant:
-    kind: postgres-sql
-    source: my-foodiefind-db
-    description: Find the full record for a specific review using the user's ID and the restaurant's ID.
-    parameters:
-      - name: user_id
-        type: integer
-        description: The numerical ID of the user.
-      - name: restaurant_id
-        type: integer
-        description: The numerical ID of the restaurant.
-    statement: SELECT * FROM reviews WHERE user_id = $1 AND restaurant_id = $2;
-prompts:
-  investigate_missing_review:
-    description: "Investigates a user's missing review by finding the user, restaurant, and the review itself, then analyzing its status."
-    arguments:
-      - name: "user_email"
-        description: "The email of the user who wrote the review."
-      - name: "restaurant_name"
-        description: "The name of the restaurant being reviewed."
-    messages:
-      - content: >-
-          **Goal:** Find the review written by the user with email '{{.user_email}}' for the restaurant named '{{.restaurant_name}}' and understand its status.
-          **Workflow:**
-          1. Use the `find_user_by_email` tool with the email '{{.user_email}}' to get the `user_id`.
-          2. Use the `find_restaurant_by_name` tool with the name '{{.restaurant_name}}' to get the `restaurant_id`.
-          3. Use the `find_review_by_user_and_restaurant` tool with the `user_id` and `restaurant_id` you just found.
-          4. Analyze the results from the final tool call. Examine the `is_published` and `moderation_status` fields and explain the review's status to the user in a clear, human-readable sentence.
-```
-
-## Step 3: Connect to Gemini CLI
-
-Configure the Gemini CLI to talk to your local Toolbox MCP server.
-
-1. Open or create your Gemini settings file: `~/.gemini/settings.json`.
-2. Add the following configuration to the file:
-
-    ```json
-    {
-      "mcpServers": {
-        "MCPToolbox": {
-          "httpUrl": "http://localhost:5000/mcp"
-        }
-      },
-      "mcp": {
-        "allowed": ["MCPToolbox"]
-      }
-    }
-    ```
-3. Start Gemini CLI using 
-    ```sh
-    gemini
-    ```
-    In case Gemini CLI is already running, use `/mcp refresh` to refresh the MCP server.
-
-4. Use gemini slash commands to run your prompt: 
-    ```sh
-    /investigate_missing_review --user_email="jane.d@example.com" --restaurant_name="The Corner Bistro"
-    ```
--- a/docs/en/getting-started/quickstart/go/adkgo/go.mod
+++ b/docs/en/getting-started/quickstart/go/adkgo/go.mod
@@ -5,7 +5,7 @@ go 1.24.4
 require (
 	github.com/googleapis/mcp-toolbox-sdk-go v0.4.0
 	google.golang.org/adk v0.1.0
-	google.golang.org/genai v1.36.0
+	google.golang.org/genai v1.35.0
 )

 require (
--- a/docs/en/getting-started/quickstart/go/adkgo/go.sum
+++ b/docs/en/getting-started/quickstart/go/adkgo/go.sum
@@ -108,8 +108,8 @@ google.golang.org/adk v0.1.0 h1:+w/fHuqRVolotOATlujRA+2DKUuDrFH2poRdEX2QjB8=
 google.golang.org/adk v0.1.0/go.mod h1:NvtSLoNx7UzZIiUAI1KoJQLMmt9sG3oCgiCx1TLqKFw=
 google.golang.org/api v0.255.0 h1:OaF+IbRwOottVCYV2wZan7KUq7UeNUQn1BcPc4K7lE4=
 google.golang.org/api v0.255.0/go.mod h1:d1/EtvCLdtiWEV4rAEHDHGh2bCnqsWhw+M8y2ECN4a8=
-google.golang.org/genai v1.36.0 h1:sJCIjqTAmwrtAIaemtTiKkg2TO1RxnYEusTmEQ3nGxM=
-google.golang.org/genai v1.36.0/go.mod h1:A3kkl0nyBjyFlNjgxIwKq70julKbIxpSxqKO5gw/gmk=
+google.golang.org/genai v1.35.0 h1:Jo6g25CzVqFzGrX5mhWyBgQqXAUzxcx5jeK7U74zv9c=
+google.golang.org/genai v1.35.0/go.mod h1:A3kkl0nyBjyFlNjgxIwKq70julKbIxpSxqKO5gw/gmk=
 google.golang.org/genproto v0.0.0-20251014184007-4626949a642f h1:vLd1CJuJOUgV6qijD7KT5Y2ZtC97ll4dxjTUappMnbo=
 google.golang.org/genproto v0.0.0-20251014184007-4626949a642f/go.mod h1:PI3KrSadr00yqfv6UDvgZGFsmLqeRIwt8x4p5Oo7CdM=
 google.golang.org/genproto/googleapis/api v0.0.0-20251014184007-4626949a642f h1:OiFuztEyBivVKDvguQJYWq1yDcfAHIID/FVrPR4oiI0=
--- a/docs/en/getting-started/quickstart/go/genAI/go.mod
+++ b/docs/en/getting-started/quickstart/go/genAI/go.mod
@@ -4,7 +4,7 @@ go 1.24.6

 require (
 	github.com/googleapis/mcp-toolbox-sdk-go v0.4.0
-	google.golang.org/genai v1.36.0
+	google.golang.org/genai v1.35.0
 )

 require (
@@ -25,11 +25,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/genAI/go.sum
+++ b/docs/en/getting-started/quickstart/go/genAI/go.sum
@@ -84,26 +84,26 @@ 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=
 gonum.org/v1/gonum v0.16.0/go.mod h1:fef3am4MQ93R2HHpKnLk4/Tbh/s0+wqD5nfa6Pnwy4E=
 google.golang.org/api v0.255.0 h1:OaF+IbRwOottVCYV2wZan7KUq7UeNUQn1BcPc4K7lE4=
 google.golang.org/api v0.255.0/go.mod h1:d1/EtvCLdtiWEV4rAEHDHGh2bCnqsWhw+M8y2ECN4a8=
-google.golang.org/genai v1.36.0 h1:sJCIjqTAmwrtAIaemtTiKkg2TO1RxnYEusTmEQ3nGxM=
-google.golang.org/genai v1.36.0/go.mod h1:A3kkl0nyBjyFlNjgxIwKq70julKbIxpSxqKO5gw/gmk=
+google.golang.org/genai v1.35.0 h1:Jo6g25CzVqFzGrX5mhWyBgQqXAUzxcx5jeK7U74zv9c=
+google.golang.org/genai v1.35.0/go.mod h1:A3kkl0nyBjyFlNjgxIwKq70julKbIxpSxqKO5gw/gmk=
 google.golang.org/genproto v0.0.0-20251014184007-4626949a642f h1:vLd1CJuJOUgV6qijD7KT5Y2ZtC97ll4dxjTUappMnbo=
 google.golang.org/genproto v0.0.0-20251014184007-4626949a642f/go.mod h1:PI3KrSadr00yqfv6UDvgZGFsmLqeRIwt8x4p5Oo7CdM=
 google.golang.org/genproto/googleapis/api v0.0.0-20251014184007-4626949a642f h1:OiFuztEyBivVKDvguQJYWq1yDcfAHIID/FVrPR4oiI0=
--- a/docs/en/getting-started/quickstart/go/langchain/go.mod
+++ b/docs/en/getting-started/quickstart/go/langchain/go.mod
@@ -33,12 +33,12 @@ 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/sync v0.18.0 // indirect
-	golang.org/x/sys v0.38.0 // indirect
-	golang.org/x/text v0.31.0 // indirect
+	golang.org/x/sync v0.17.0 // indirect
+	golang.org/x/sys v0.37.0 // indirect
+	golang.org/x/text v0.30.0 // indirect
 	golang.org/x/time v0.14.0 // indirect
 	google.golang.org/api v0.255.0 // indirect
 	google.golang.org/genproto v0.0.0-20251014184007-4626949a642f // indirect
--- a/docs/en/getting-started/quickstart/go/langchain/go.sum
+++ b/docs/en/getting-started/quickstart/go/langchain/go.sum
@@ -100,18 +100,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
--- a/docs/en/getting-started/quickstart/js/adk/package.json
+++ b/docs/en/getting-started/quickstart/js/adk/package.json
@@ -1,17 +0,0 @@
-{
-  "name": "adk",
-  "version": "1.0.0",
-  "description": "",
-  "main": "quickstart.js",
-  "type": "module",
-  "scripts": {
-    "test": "node --test"
-  },
-  "keywords": [],
-  "author": "",
-  "license": "ISC",
-  "dependencies": {
-    "@google/adk": "^0.1.3",
-    "@toolbox-sdk/adk": "^0.1.5"
-  }
-}
--- a/docs/en/getting-started/quickstart/js/adk/quickstart.js
+++ b/docs/en/getting-started/quickstart/js/adk/quickstart.js
@@ -1,56 +0,0 @@
-import { InMemoryRunner, LlmAgent, LogLevel } from '@google/adk';
-import { ToolboxClient } from '@toolbox-sdk/adk';
-
-const prompt = `
-You're a helpful hotel assistant. You handle hotel searching, booking, and
-cancellations. When the user searches for a hotel, mention its name, id,
-location and price tier. Always mention hotel ids while performing any
-searches. This is very important for any operations. For any bookings or
-cancellations, please provide the appropriate confirmation. Be sure to
-update checkin or checkout dates if mentioned by the user.
-Don't ask for confirmations from the user.
-`;
-
-const queries = [
-  "Find hotels with Basel in its name.",
-  "Can you book the Hilton Basel for me?",
-  "Oh wait, this is too expensive. Please cancel it and book the Hyatt Regency instead.",
-  "My check in dates would be from April 10, 2024 to April 19, 2024.",
-];
-
-process.env.GOOGLE_GENAI_API_KEY = process.env.GOOGLE_API_KEY || 'your-api-key'; // Replace it with your API key
-
-export async function main() {
-  const userId = 'test_user';
-  const client = new ToolboxClient('http://127.0.0.1:5000');
-  const tools = await client.loadToolset("my-toolset");
-
-  const rootAgent = new LlmAgent({
-    name: 'hotel_agent',
-    model: 'gemini-2.5-flash',
-    description: 'Agent for hotel bookings and administration.',
-    instruction: prompt,
-    tools: tools,
-  });
-
-  const appName = rootAgent.name;
-  const runner = new InMemoryRunner({ agent: rootAgent, appName, logLevel: LogLevel.ERROR, });
-  const session = await runner.sessionService.createSession({ appName, userId });
-
-  for (const query of queries) {
-    await runPrompt(runner, userId, session.id, query);
-  }
-}
-
-async function runPrompt(runner, userId, sessionId, prompt) {
-  const content = { role: 'user', parts: [{ text: prompt }] };
-  const stream = runner.runAsync({ userId, sessionId, newMessage: content });
-  const responses = await Array.fromAsync(stream);
-  const accumulatedResponse = responses
-    .flatMap((e) => e.content?.parts?.map((p) => p.text) ?? [])
-    .join('');
-
-  console.log(`\nMODEL RESPONSE: ${accumulatedResponse}\n`);
-}
-
-main();
--- a/docs/en/getting-started/quickstart/js/langchain/package-lock.json
+++ b/docs/en/getting-started/quickstart/js/langchain/package-lock.json
@@ -9,7 +9,7 @@
      "version": "1.0.0",
      "license": "ISC",
      "dependencies": {
-        "@langchain/google-genai": "^2.0.0",
+        "@langchain/google-genai": "^1.0.0",
        "@langchain/langgraph": "^1.0.0",
        "@toolbox-sdk/core": "^0.1.2",
        "langchain": "^1.0.0"
@@ -18,7 +18,8 @@
    "node_modules/@cfworker/json-schema": {
      "version": "4.1.1",
      "resolved": "https://registry.npmjs.org/@cfworker/json-schema/-/json-schema-4.1.1.tgz",
-      "integrity": "sha512-gAmrUZSGtKc3AiBL71iNWxDsyUC5uMaKKGdvzYsBoTW/xi42JQHl7eKV2OYzCUqvc+D2RCcf7EXY2iCyFIk6og=="
+      "integrity": "sha512-gAmrUZSGtKc3AiBL71iNWxDsyUC5uMaKKGdvzYsBoTW/xi42JQHl7eKV2OYzCUqvc+D2RCcf7EXY2iCyFIk6og==",
+      "peer": true
    },
    "node_modules/@google/generative-ai": {
      "version": "0.24.1",
@@ -45,10 +46,9 @@
      }
    },
    "node_modules/@langchain/core": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/@langchain/core/-/core-1.1.0.tgz",
-      "integrity": "sha512-yJ6JHcU9psjnQbzRFkXjIdNTA+3074dA+2pHdH8ewvQCSleSk6JcjkCMIb5+NASjeMoi1ZuntlLKVsNqF38YxA==",
-      "license": "MIT",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/@langchain/core/-/core-1.0.2.tgz",
+      "integrity": "sha512-6mOn4bZyO6XT0GGrEijRtMVrmYJGZ8y1BcwyTPDptFz38lP0CEzrKEYB++h+u3TEcAd3eO25l1aGw/zVlVgw2Q==",
      "peer": true,
      "dependencies": {
        "@cfworker/json-schema": "^4.0.2",
@@ -59,7 +59,7 @@
        "langsmith": "^0.3.64",
        "mustache": "^4.2.0",
        "p-queue": "^6.6.2",
-        "p-retry": "^7.0.0",
+        "p-retry": "4",
        "uuid": "^10.0.0",
        "zod": "^3.25.76 || ^4"
      },
@@ -67,26 +67,10 @@
        "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.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",
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/@langchain/google-genai/-/google-genai-1.0.0.tgz",
+      "integrity": "sha512-ICUBZl/46nG6+Yhe5v7kp/2TQBGOzqEkpfKPLDeNyJ4x9OOL46xsW3ZZrHJjhGMQuR6/JMmQMTU9kLoYgsd1Tg==",
      "dependencies": {
        "@google/generative-ai": "^0.24.0",
        "uuid": "^11.1.0"
@@ -95,7 +79,7 @@
        "node": ">=20"
      },
      "peerDependencies": {
-        "@langchain/core": "1.1.0"
+        "@langchain/core": "^1.0.0"
      }
    },
    "node_modules/@langchain/google-genai/node_modules/uuid": {
@@ -106,7 +90,6 @@
        "https://github.com/sponsors/broofa",
        "https://github.com/sponsors/ctavan"
      ],
-      "license": "MIT",
      "bin": {
        "uuid": "dist/esm/bin/uuid"
      }
@@ -241,6 +224,7 @@
      "version": "5.2.0",
      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
      "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
+      "peer": true,
      "engines": {
        "node": ">=10"
      },
@@ -324,6 +308,7 @@
      "version": "6.3.0",
      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz",
      "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==",
+      "peer": true,
      "engines": {
        "node": ">=10"
      },
@@ -436,6 +421,7 @@
      "version": "1.2.0",
      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
      "integrity": "sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==",
+      "peer": true,
      "engines": {
        "node": ">=0.10.0"
      }
@@ -814,18 +800,6 @@
        "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",
@@ -849,6 +823,7 @@
      "version": "1.0.21",
      "resolved": "https://registry.npmjs.org/js-tiktoken/-/js-tiktoken-1.0.21.tgz",
      "integrity": "sha512-biOj/6M5qdgx5TKjDnFT1ymSpM5tbd3ylwDtrQvFQSu0Z7bBYko2dF+W/aUkXUPuk6IVpRxk/3Q2sHOzGlS36g==",
+      "peer": true,
      "dependencies": {
        "base64-js": "^1.5.1"
      }
@@ -995,6 +970,7 @@
      "version": "4.2.0",
      "resolved": "https://registry.npmjs.org/mustache/-/mustache-4.2.0.tgz",
      "integrity": "sha512-71ippSywq5Yb7/tVYyGbkBggbU8H3u5Rz56fH60jGFgr8uHwxs+aSKeqmluIVzM0m0kB7xQjKS6qPfd0b2ZoqQ==",
+      "peer": true,
      "bin": {
        "mustache": "bin/mustache"
      }
@@ -1433,7 +1409,6 @@
      "version": "3.25.76",
      "resolved": "https://registry.npmjs.org/zod/-/zod-3.25.76.tgz",
      "integrity": "sha512-gzUt/qt81nXsFGKIFcC3YnfEAx5NkunCfnDlvuBSSFS02bcXu4Lmea0AFIUwbLWxWPx3d9p8S5QoaujKcNQxcQ==",
-      "peer": true,
      "funding": {
        "url": "https://github.com/sponsors/colinhacks"
      }
--- a/docs/en/getting-started/quickstart/js/langchain/package.json
+++ b/docs/en/getting-started/quickstart/js/langchain/package.json
@@ -11,7 +11,7 @@
  "author": "",
  "license": "ISC",
  "dependencies": {
-    "@langchain/google-genai": "^2.0.0",
+    "@langchain/google-genai": "^1.0.0",
    "@langchain/langgraph": "^1.0.0",
    "@toolbox-sdk/core": "^0.1.2",
    "langchain": "^1.0.0"
--- a/docs/en/getting-started/quickstart/python/adk/quickstart.py
+++ b/docs/en/getting-started/quickstart/python/adk/quickstart.py
@@ -1,15 +1,71 @@
-from google.adk import Agent
-from google.adk.apps import App
+from google.adk.agents import Agent
+from google.adk.runners import Runner
+from google.adk.sessions import InMemorySessionService
+from google.adk.artifacts.in_memory_artifact_service import InMemoryArtifactService
+from google.genai import types
 from toolbox_core import ToolboxSyncClient

-# TODO(developer): update the TOOLBOX_URL to your toolbox endpoint
-client = ToolboxSyncClient("http://127.0.0.1:5000")
+import asyncio
+import os

-root_agent = Agent(
-    name='root_agent',
-    model='gemini-2.5-flash',
-    instruction="You are a helpful AI assistant designed to provide accurate and useful information.",
-    tools=client.load_toolset(),
-)
+# TODO(developer): replace this with your Google API key

-app = App(root_agent=root_agent, name="my_agent")
+api_key = os.environ.get("GOOGLE_API_KEY") or "your-api-key" # Set your API key here
+os.environ["GOOGLE_API_KEY"] = api_key
+
+async def main():
+  with ToolboxSyncClient("http://127.0.0.1:5000") as toolbox_client:
+
+      prompt = """
+        You're a helpful hotel assistant. You handle hotel searching, booking and
+        cancellations. When the user searches for a hotel, mention it's name, id,
+        location and price tier. Always mention hotel ids while performing any
+        searches. This is very important for any operations. For any bookings or
+        cancellations, please provide the appropriate confirmation. Be sure to
+        update checkin or checkout dates if mentioned by the user.
+        Don't ask for confirmations from the user.
+      """
+
+      root_agent = Agent(
+          model='gemini-2.0-flash-001',
+          name='hotel_agent',
+          description='A helpful AI assistant.',
+          instruction=prompt,
+          tools=toolbox_client.load_toolset("my-toolset"),
+      )
+
+      session_service = InMemorySessionService()
+      artifacts_service = InMemoryArtifactService()
+      session = await session_service.create_session(
+          state={}, app_name='hotel_agent', user_id='123'
+      )
+      runner = Runner(
+          app_name='hotel_agent',
+          agent=root_agent,
+          artifact_service=artifacts_service,
+          session_service=session_service,
+      )
+
+      queries = [
+          "Find hotels in Basel with Basel in its name.",
+          "Can you book the Hilton Basel for me?",
+          "Oh wait, this is too expensive. Please cancel it and book the Hyatt Regency instead.",
+          "My check in dates would be from April 10, 2024 to April 19, 2024.",
+      ]
+
+      for query in queries:
+          content = types.Content(role='user', parts=[types.Part(text=query)])
+          events = runner.run(session_id=session.id,
+                              user_id='123', new_message=content)
+
+          responses = (
+            part.text
+            for event in events
+            for part in event.content.parts
+            if part.text is not None
+          )
+
+          for text in responses:
+            print(text)
+
+asyncio.run(main())
--- 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.1.0
-langchain-google-vertexai==3.1.0
-langgraph==1.0.4
+langchain==1.0.8
+langchain-google-vertexai==3.0.3
+langgraph==1.0.3
 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.10
+llama-index==0.14.8
 llama-index-llms-google-genai==0.7.3
 toolbox-llamaindex==0.5.3
 pytest==9.0.1
--- a/docs/en/getting-started/quickstart/python/quickstart_test.py
+++ b/docs/en/getting-started/quickstart/python/quickstart_test.py
@@ -44,28 +44,15 @@ class TestExecution:
    @pytest.fixture(scope="function")
    def script_output(self, capsys):
        """Run the quickstart function and return its output."""
-
-        # TODO: Add better validation for ADK once we have a way to capture its
-        # output.
-        if ORCH_NAME == "adk":
-            return quickstart.app.root_agent.name
-        else:
-            asyncio.run(quickstart.main())
-
+        asyncio.run(quickstart.main())
        return capsys.readouterr()

    def test_script_runs_without_errors(self, script_output):
        """Test that the script runs and produces no stderr."""
-        if ORCH_NAME == "adk":
-            return
        assert script_output.err == "", f"Script produced stderr: {script_output.err}"

    def test_keywords_in_output(self, script_output, golden_keywords):
        """Test that expected keywords are present in the script's output."""
-        
-        if ORCH_NAME == "adk":
-            assert script_output == "root_agent"
-            return
        output = script_output.out
        missing_keywords = [kw for kw in golden_keywords if kw not in output]
        assert not missing_keywords, f"Missing keywords in output: {missing_keywords}"
--- 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.23.0/$OS/toolbox
+    curl -O https://storage.googleapis.com/genai-toolbox/v0.21.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
@@ -52,7 +52,6 @@ instance, database and users:
        * All `editor` and `viewer` tools
        * `create_instance`
        * `create_user`
-        * `clone_instance`

 ## Install MCP Toolbox

@@ -298,7 +297,6 @@ instances and interacting with your database:
 * **list_databases**: Lists all databases for a Cloud SQL instance.
 * **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.

 {{< 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
@@ -52,7 +52,6 @@ database and users:
        * All `editor` and `viewer` tools
        * `create_instance`
        * `create_user`
-        * `clone_instance`

 ## Install MCP Toolbox

@@ -298,7 +297,6 @@ instances and interacting with your database:
 * **list_databases**: Lists all databases for a Cloud SQL instance.
 * **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.

 {{< 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
@@ -52,7 +52,6 @@ instance, database and users:
        * All `editor` and `viewer` tools
        * `create_instance`
        * `create_user`
-        * `clone_instance`

 ## Install MCP Toolbox

@@ -298,7 +297,6 @@ instances and interacting with your database:
 * **list_databases**: Lists all databases for a Cloud SQL instance.
 * **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.

 {{< 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
@@ -49,19 +49,19 @@ to expose your developer assistant tools to a Looker instance:

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

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

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

 {{< tab header="windows/amd64" lang="bash" >}}
-curl -O https://storage.googleapis.com/genai-toolbox/v0.23.0/windows/amd64/toolbox.exe
+curl -O https://storage.googleapis.com/genai-toolbox/v0.21.0/windows/amd64/toolbox.exe
 {{< /tab >}}
 {{< /tabpane >}}
    <!-- {x-release-please-end} -->
@@ -323,8 +323,6 @@ instance and create new saved content.
   data
 1. **make_dashboard**: Create a saved dashboard in Looker and return the URL
 1. **add_dashboard_element**: Add a tile to a dashboard
-1. **add_dashboard_filter**: Add a filter to a dashboard
-1. **generate_embed_url**: Generate an embed url for content

 ### Looker Instance Health Tools

--- 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.23.0/linux/amd64/toolbox
+curl -O https://storage.googleapis.com/genai-toolbox/v0.21.0/linux/amd64/toolbox
 {{< /tab >}}

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

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

 {{< tab header="windows/amd64" lang="bash" >}}
-curl -O https://storage.googleapis.com/genai-toolbox/v0.23.0/windows/amd64/toolbox.exe
+curl -O https://storage.googleapis.com/genai-toolbox/v0.21.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.23.0/linux/amd64/toolbox
+curl -O https://storage.googleapis.com/genai-toolbox/v0.21.0/linux/amd64/toolbox
 {{< /tab >}}

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

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

 {{< tab header="windows/amd64" lang="bash" >}}
-curl -O https://storage.googleapis.com/genai-toolbox/v0.23.0/windows/amd64/toolbox.exe
+curl -O https://storage.googleapis.com/genai-toolbox/v0.21.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.23.0/linux/amd64/toolbox
+curl -O https://storage.googleapis.com/genai-toolbox/v0.21.0/linux/amd64/toolbox
 {{< /tab >}}

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

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

 {{< tab header="windows/amd64" lang="bash" >}}
-curl -O https://storage.googleapis.com/genai-toolbox/v0.23.0/windows/amd64/toolbox.exe
+curl -O https://storage.googleapis.com/genai-toolbox/v0.21.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.23.0/linux/amd64/toolbox
+curl -O https://storage.googleapis.com/genai-toolbox/v0.21.0/linux/amd64/toolbox
 {{< /tab >}}

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

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

 {{< tab header="windows/amd64" lang="bash" >}}
-curl -O https://storage.googleapis.com/genai-toolbox/v0.23.0/windows/amd64/toolbox.exe
+curl -O https://storage.googleapis.com/genai-toolbox/v0.21.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.23.0/linux/amd64/toolbox
+curl -O https://storage.googleapis.com/genai-toolbox/v0.21.0/linux/amd64/toolbox
 {{< /tab >}}

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

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

 {{< tab header="windows/amd64" lang="bash" >}}
-curl -O https://storage.googleapis.com/genai-toolbox/v0.23.0/windows/amd64/toolbox.exe
+curl -O https://storage.googleapis.com/genai-toolbox/v0.21.0/windows/amd64/toolbox.exe
 {{< /tab >}}
 {{< /tabpane >}}
    <!-- {x-release-please-end} -->
--- a/docs/en/how-to/deploy_adk_agent.md
+++ b/docs/en/how-to/deploy_adk_agent.md
@@ -1,147 +0,0 @@
---
-title: "Deploy ADK Agent and MCP Toolbox"
-type: docs
-weight: 4
-description: >
-  How to deploy your ADK Agent to Vertex AI Agent Engine and connect it to an MCP Toolbox deployed on Cloud Run.
---
-
-## Before you begin
-
-This guide assumes you have already done the following:
-
-1.  Completed the [Python Quickstart
-    (Local)](../getting-started/local_quickstart.md) and have a working ADK
-    agent running locally.
-2.  Installed the [Google Cloud CLI](https://cloud.google.com/sdk/docs/install).
-3.  A Google Cloud project with billing enabled.
-
-## Step 1: Deploy MCP Toolbox to Cloud Run
-
-Before deploying your agent, your MCP Toolbox server needs to be accessible from
-the cloud. We will deploy MCP Toolbox to Cloud Run.
-
-Follow the [Deploy to Cloud Run](deploy_toolbox.md) guide to deploy your MCP
-Toolbox instance.
-
-{{% alert title="Important" %}}
-After deployment, note down the Service URL of your MCP Toolbox Cloud Run
-service. You will need this to configure your agent.
-{{% /alert %}}
-## Step 2: Prepare your Agent for Deployment
-
-We will use the `agent-starter-pack` tool to enhance your local agent project
-with the necessary configuration for deployment to Vertex AI Agent Engine.
-
-1.  Open a terminal and navigate to the **parent directory** of your agent
-    project (the directory containing the `my_agent` folder).
-
-2.  Run the following command to enhance your project:
-
-    ```bash
-    uvx agent-starter-pack enhance --adk -d agent_engine
-    ```
-
-3.  Follow the interactive prompts to configure your deployment settings. This
-    process will generate deployment configuration files (like a `Makefile` and
-    `Dockerfile`) in your project directory.
-
-4.  Add `toolbox-core` as a dependency to the new project:
-
-    ```bash
-    uv add toolbox-core
-    ```
-
-## Step 3: Configure Google Cloud Authentication
-
-Ensure your local environment is authenticated with Google Cloud to perform the
-deployment.
-
-1.  Login with Application Default Credentials (ADC):
-
-    ```bash
-    gcloud auth application-default login
-    ```
-
-2.  Set your active project:
-
-    ```bash
-    gcloud config set project <YOUR_PROJECT_ID>
-    ```
-
-## Step 4: Connect Agent to Deployed MCP Toolbox
-
-You need to update your agent's code to connect to the Cloud Run URL of your MCP
-Toolbox instead of the local address.
-
-1.  Recall that you can find the Cloud Run deployment URL of the MCP Toolbox
-    server using the following command:
-
-    ```bash
-    gcloud run services describe toolbox --format 'value(status.url)'
-    ```
-
-2.  Open your agent file (`my_agent/agent.py`).
-
-3.  Update the `ToolboxSyncClient` initialization to use your Cloud Run URL.
-
-    {{% alert color="info" %}}
-Since Cloud Run services are secured by default, you also need to provide an
-authentication token.
-    {{% /alert %}}
-
-    Replace your existing client initialization code with the following:
-
-    ```python
-    from google.adk import Agent
-    from google.adk.apps import App
-    from toolbox_core import ToolboxSyncClient, auth_methods
-
-    # TODO(developer): Replace with your Toolbox Cloud Run Service URL
-    TOOLBOX_URL = "https://your-toolbox-service-xyz.a.run.app"
-
-    # Initialize the client with the Cloud Run URL and Auth headers
-    client = ToolboxSyncClient(
-        TOOLBOX_URL, 
-        client_headers={"Authorization": auth_methods.get_google_id_token(TOOLBOX_URL)}
-    )
-
-    root_agent = Agent(
-        name='root_agent',
-        model='gemini-2.5-flash',
-        instruction="You are a helpful AI assistant designed to provide accurate and useful information.",
-        tools=client.load_toolset(),
-    )
-
-    app = App(root_agent=root_agent, name="my_agent")
-    ```
-
-    {{% alert title="Important" %}}
-Ensure that the `name` parameter in the `App` initialization matches the name of
-your agent's parent directory (e.g., `my_agent`).
-```python
-...
-
-app = App(root_agent=root_agent, name="my_agent")
-```
-    {{% /alert %}}
-
-## Step 5: Deploy to Agent Engine
-
-Run the deployment command:
-
-```bash
-make backend
-```
-
-This command will build your agent's container image and deploy it to Vertex AI.
-
-## Step 6: Test your Deployment
-
-Once the deployment command (`make backend`) completes, it will output the URL
-for the Agent Engine Playground. You can click on this URL to open the
-Playground in your browser and start chatting with your agent to test the tools.
-
-For additional test scenarios, refer to the [Test deployed
-agent](https://google.github.io/adk-docs/deploy/agent-engine/#test-deployment)
-section in the ADK documentation.
--- a/docs/en/how-to/deploy_docker.md
+++ b/docs/en/how-to/deploy_docker.md
@@ -67,13 +67,6 @@ networks:

 ```

-    {{< 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. `command: [ "toolbox",
-"--tools-file", "/config/tools.yaml", "--address", "0.0.0.0",
-"--allowed-origins", "https://foo.bar"]`
-{{< /notice >}}
-
 1. Run the following command to bring up the Toolbox and Postgres instance

    ```bash
--- a/docs/en/how-to/deploy_gke.md
+++ b/docs/en/how-to/deploy_gke.md
@@ -188,12 +188,6 @@ description: >
                  path: tools.yaml
    ```

-    {{< 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-origins", "https://foo.bar"]`
-{{< /notice >}}
-
 1. Create the deployment.

    ```bash
--- a/docs/en/how-to/deploy_toolbox.md
+++ b/docs/en/how-to/deploy_toolbox.md
@@ -104,7 +104,7 @@ section.
    export IMAGE=us-central1-docker.pkg.dev/database-toolbox/toolbox/toolbox:latest
    ```

-   {{< notice note >}}  
+{{< notice note >}}  
 **The `$PORT` Environment Variable**  
 Google Cloud Run dictates the port your application must listen on by setting
 the `$PORT` environment variable inside your container. This value defaults to
@@ -140,45 +140,6 @@ deployment will time out.
        # --allow-unauthenticated # https://cloud.google.com/run/docs/authenticating/public#gcloud
    ```

-### Update deployed server to be secure
-
-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.
-
-1. Set an environment variable to the cloud run url: 
-
-    ```bash
-    export URL=<cloud run url>
-    ```
-
-2. Redeploy Toolbox:
-
-    ```bash
-    gcloud run deploy toolbox \
-        --image $IMAGE \
-        --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"
-        # --allow-unauthenticated # https://cloud.google.com/run/docs/authenticating/public#gcloud
-    ```
-
-    If you are using a VPC network, use the command below:
-
-    ```bash
-    gcloud run deploy toolbox \
-        --image $IMAGE \
-        --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" \
-        # TODO(dev): update the following to match your VPC if necessary
-        --network default \
-        --subnet default
-        # --allow-unauthenticated # https://cloud.google.com/run/docs/authenticating/public#gcloud
-    ```
-
 ## Connecting with Toolbox Client SDK

 You can connect to Toolbox Cloud Run instances directly through the SDK.
@@ -201,23 +162,18 @@ You can connect to Toolbox Cloud Run instances directly through the SDK.

    {{< tabpane persist=header >}}
 {{< tab header="Python" lang="python" >}}
-import asyncio
 from toolbox_core import ToolboxClient, auth_methods

 # Replace with the Cloud Run service URL generated in the previous step
+
 URL = "https://cloud-run-url.app"

 auth_token_provider = auth_methods.aget_google_id_token(URL) # can also use sync method

-async def main():
-  async with ToolboxClient(
-      URL,
-      client_headers={"Authorization": auth_token_provider},
-  ) as toolbox:
-    toolset = await toolbox.load_toolset()
-    # ...
-
-asyncio.run(main())
+async with ToolboxClient(
+    URL,
+    client_headers={"Authorization": auth_token_provider},
+) as toolbox:
 {{< /tab >}}
 {{< tab header="Javascript" lang="javascript" >}}
 import { ToolboxClient } from '@toolbox-sdk/core';
--- a/docs/en/reference/cli.md
+++ b/docs/en/reference/cli.md
@@ -25,7 +25,6 @@ description: >
 |              | `--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
--- a/docs/en/reference/prebuilt-tools.md
+++ b/docs/en/reference/prebuilt-tools.md
@@ -50,12 +50,6 @@ details on how to connect your AI tools (IDEs) to databases via Toolbox and MCP.
    *   `list_triggers`: Lists triggers in the database. 
    *   `list_indexes`: List available user indexes in a PostgreSQL database.
    *   `list_sequences`: List sequences in a PostgreSQL database.
-    *   `list_publication_tables`: List publication tables in a PostgreSQL database.
-    *   `list_tablespaces`: Lists tablespaces in the database.
-    *   `list_pg_settings`: List configuration parameters for the PostgreSQL server.
-    *   `list_database_stats`: Lists the key performance and activity statistics for
-        each database in the AlloyDB instance.
-    *   `list_roles`: Lists all the user-created roles in PostgreSQL database.  

 ## AlloyDB Postgres Admin

@@ -184,8 +178,6 @@ details on how to connect your AI tools (IDEs) to databases via Toolbox and MCP.
        * All `editor` and `viewer` tools
        * `create_instance`
        * `create_user`
-        * `clone_instance`
-
 *   **Tools:**
    *   `create_instance`: Creates a new Cloud SQL for MySQL instance.
    *   `get_instance`: Gets information about a Cloud SQL instance.
@@ -194,7 +186,6 @@ details on how to connect your AI tools (IDEs) to databases via Toolbox and MCP.
    *   `list_databases`: Lists all databases for a Cloud SQL instance.
    *   `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.

 ## Cloud SQL for PostgreSQL

@@ -233,12 +224,6 @@ details on how to connect your AI tools (IDEs) to databases via Toolbox and MCP.
    *   `list_triggers`: Lists triggers in the database. 
    *   `list_indexes`: List available user indexes in a PostgreSQL database.
    *   `list_sequences`: List sequences in a PostgreSQL database.
-    *   `list_publication_tables`: List publication tables in a PostgreSQL database.
-    *   `list_tablespaces`: Lists tablespaces in the database.
-    *   `list_pg_settings`: List configuration parameters for the PostgreSQL server.
-    *   `list_database_stats`: Lists the key performance and activity statistics for
-        each database in the postgreSQL instance.
-    *   `list_roles`: Lists all the user-created roles in PostgreSQL database.  

 ## Cloud SQL for PostgreSQL Observability

@@ -272,7 +257,6 @@ details on how to connect your AI tools (IDEs) to databases via Toolbox and MCP.
        * All `editor` and `viewer` tools
        * `create_instance`
        * `create_user`
-        * `clone_instance`
 *   **Tools:**
    *   `create_instance`: Creates a new Cloud SQL for PostgreSQL instance.
    *   `get_instance`: Gets information about a Cloud SQL instance.
@@ -281,7 +265,6 @@ details on how to connect your AI tools (IDEs) to databases via Toolbox and MCP.
    *   `list_databases`: Lists all databases for a Cloud SQL instance.
    *   `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.

 ## Cloud SQL for SQL Server

@@ -333,7 +316,6 @@ details on how to connect your AI tools (IDEs) to databases via Toolbox and MCP.
        * All `editor` and `viewer` tools
        * `create_instance`
        * `create_user`
-        * `clone_instance`
 *   **Tools:**
    *   `create_instance`: Creates a new Cloud SQL for SQL Server instance.
    *   `get_instance`: Gets information about a Cloud SQL instance.
@@ -342,7 +324,6 @@ details on how to connect your AI tools (IDEs) to databases via Toolbox and MCP.
    *   `list_databases`: Lists all databases for a Cloud SQL instance.
    *   `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.

 ## Dataplex

@@ -416,8 +397,6 @@ details on how to connect your AI tools (IDEs) to databases via Toolbox and MCP.
    *   `run_dashboard`: Runs the queries associated with a dashboard.
    *   `make_dashboard`: Creates a new dashboard.
    *   `add_dashboard_element`: Adds a tile to a dashboard.
-    *   `add_dashboard_filter`: Adds a filter to a dashboard.
-    *   `generate_embed_url`: Generate an embed url for content.
    *   `health_pulse`: Test the health of a Looker instance.
    *   `health_analyze`: Analyze the LookML usage of a Looker instance.
    *   `health_vacuum`: Suggest LookML elements that can be removed.
@@ -464,8 +443,8 @@ details on how to connect your AI tools (IDEs) to databases via Toolbox and MCP.

 *   `--prebuilt` value: `mssql`
 *   **Environment Variables:**
-    *   `MSSQL_HOST`: (Optional) The hostname or IP address of the SQL Server instance.
-    *   `MSSQL_PORT`: (Optional) The port number for the SQL Server instance.
+    *   `MSSQL_HOST`: The hostname or IP address of the SQL Server instance.
+    *   `MSSQL_PORT`: The port number for the SQL Server instance.
    *   `MSSQL_DATABASE`: The name of the database to connect to.
    *   `MSSQL_USER`: The database username.
    *   `MSSQL_PASSWORD`: The password for the database user.
@@ -546,12 +525,6 @@ details on how to connect your AI tools (IDEs) to databases via Toolbox and MCP.
    *   `list_triggers`: Lists triggers in the database. 
    *   `list_indexes`: List available user indexes in a PostgreSQL database.
    *   `list_sequences`: List sequences in a PostgreSQL database.
-    *   `list_publication_tables`: List publication tables in a PostgreSQL database.
-    *   `list_tablespaces`: Lists tablespaces in the database.
-    *   `list_pg_settings`: List configuration parameters for the PostgreSQL server.
-    *   `list_database_stats`: Lists the key performance and activity statistics for
-        each database in the PostgreSQL server.
-    *   `list_roles`: Lists all the user-created roles in PostgreSQL database.  

 ## Google Cloud Serverless for Apache Spark

@@ -583,7 +556,6 @@ details on how to connect your AI tools (IDEs) to databases via Toolbox and MCP.
    *   `execute_sql`: Executes a DML SQL query.
    *   `execute_sql_dql`: Executes a DQL SQL query.
    *   `list_tables`: Lists tables in the database.
-    *   `list_graphs`: Lists graphs in the database.

 ## Spanner (PostgreSQL dialect)

--- a/docs/en/resources/sources/alloydb-pg.md
+++ b/docs/en/resources/sources/alloydb-pg.md
@@ -71,31 +71,6 @@ cluster][alloydb-free-trial].
 - [`postgres-replication-stats`](../tools/postgres/postgres-replication-stats.md)
  List replication stats in a PostgreSQL database.

- [`postgres-list-query-stats`](../tools/postgres/postgres-list-query-stats.md)
-  List query statistics in a PostgreSQL database.
-
- [`postgres-get-column-cardinality`](../tools/postgres/postgres-get-column-cardinality.md)
-  List cardinality of columns in a table in a PostgreSQL database.
-
- [`postgres-list-table-stats`](../tools/postgres/postgres-list-table-stats.md)
-  List statistics of a table in a PostgreSQL database.
-
- [`postgres-list-publication-tables`](../tools/postgres/postgres-list-publication-tables.md)
-  List publication tables in a PostgreSQL database.
-
- [`postgres-list-tablespaces`](../tools/postgres/postgres-list-tablespaces.md)
-  List tablespaces in an AlloyDB for PostgreSQL database.
-
- [`postgres-list-pg-settings`](../tools/postgres/postgres-list-pg-settings.md)
-  List configuration parameters for the PostgreSQL server.
-
- [`postgres-list-database-stats`](../tools/postgres/postgres-list-database-stats.md)
-  Lists the key performance and activity statistics for each database in the AlloyDB
-  instance.
-
- [`postgres-list-roles`](../tools/postgres/postgres-list-roles.md)
-  Lists all the user-created roles in PostgreSQL database..
-
 ### Pre-built Configurations

 - [AlloyDB using MCP](https://googleapis.github.io/genai-toolbox/how-to/connect-ide/alloydb_pg_mcp/)
--- a/docs/en/resources/sources/cloud-sql-mysql.md
+++ b/docs/en/resources/sources/cloud-sql-mysql.md
@@ -88,40 +88,13 @@ mTLS.
 [public-ip]: https://cloud.google.com/sql/docs/mysql/configure-ip
 [conn-overview]: https://cloud.google.com/sql/docs/mysql/connect-overview

-### Authentication
+### Database User

-This source supports both password-based authentication and IAM
-authentication (using your [Application Default Credentials][adc]).
-
-#### Standard Authentication
-
-To connect using user/password, [create
-a MySQL user][cloud-sql-users] and input your credentials in the `user` and
-`password` fields.
-
-```yaml
-user: ${USER_NAME}
-password: ${PASSWORD}
-```
+Currently, this source only uses standard authentication. You will need to [create
+a MySQL user][cloud-sql-users] to login to the database with.

 [cloud-sql-users]: https://cloud.google.com/sql/docs/mysql/create-manage-users

-#### IAM Authentication
-
-To connect using IAM authentication:
-
-1. Prepare your database instance and user following this [guide][iam-guide].
-2. You could choose one of the two ways to log in:
-    - Specify your IAM email as the `user`.
-    - Leave your `user` field blank. Toolbox will fetch the [ADC][adc]
-      automatically and log in using the email associated with it.
-
-3. Leave the `password` field blank.
-
-[iam-guide]: https://cloud.google.com/sql/docs/mysql/iam-logins
-[cloudsql-users]: https://cloud.google.com/sql/docs/mysql/create-manage-users
-
-
 ## Example

 ```yaml
@@ -151,6 +124,6 @@ instead of hardcoding your secrets into the configuration file.
 | region    |  string  |     true     | Name of the GCP region that the cluster was created in (e.g. "us-central1").                         |
 | instance  |  string  |     true     | Name of the Cloud SQL instance within the cluster (e.g. "my-instance").                              |
 | database  |  string  |     true     | Name of the MySQL database to connect to (e.g. "my_db").                                             |
-| user      |  string  |     false     | Name of the MySQL user to connect as (e.g "my-mysql-user"). Defaults to IAM auth using [ADC][adc] email if unspecified.                                            |
-| password  |  string  |     false     | Password of the MySQL user (e.g. "my-password"). Defaults to attempting IAM authentication if unspecified.                                                    |
+| user      |  string  |     true     | Name of the MySQL user to connect as (e.g. "my-pg-user").                                            |
+| password  |  string  |     true     | Password of the MySQL user (e.g. "my-password").                                                     |
 | ipType    |  string  |    false     | IP Type of the Cloud SQL instance, must be either `public`,  `private`, or `psc`. Default: `public`. |
--- a/docs/en/resources/sources/cloud-sql-pg.md
+++ b/docs/en/resources/sources/cloud-sql-pg.md
@@ -58,7 +58,6 @@ to a database by following these instructions][csql-pg-quickstart].

 - [`postgres-list-sequences`](../tools/postgres/postgres-list-sequences.md)
  List sequences in a PostgreSQL database.
-
 - [`postgres-long-running-transactions`](../tools/postgres/postgres-long-running-transactions.md)
  List long running transactions in a PostgreSQL database.

@@ -68,31 +67,6 @@ to a database by following these instructions][csql-pg-quickstart].
 - [`postgres-replication-stats`](../tools/postgres/postgres-replication-stats.md)
  List replication stats in a PostgreSQL database.

- [`postgres-list-query-stats`](../tools/postgres/postgres-list-query-stats.md)
-  List query statistics in a PostgreSQL database.
-
- [`postgres-get-column-cardinality`](../tools/postgres/postgres-get-column-cardinality.md)
-  List cardinality of columns in a table in a PostgreSQL database.
-
- [`postgres-list-table-stats`](../tools/postgres/postgres-list-table-stats.md)
-  List statistics of a table in a PostgreSQL database.
-
- [`postgres-list-publication-tables`](../tools/postgres/postgres-list-publication-tables.md)
-  List publication tables in a PostgreSQL database.
-
- [`postgres-list-tablespaces`](../tools/postgres/postgres-list-tablespaces.md)
-  List tablespaces in a PostgreSQL database.
-
- [`postgres-list-pg-settings`](../tools/postgres/postgres-list-pg-settings.md)
-  List configuration parameters for the PostgreSQL server.
-
- [`postgres-list-database-stats`](../tools/postgres/postgres-list-database-stats.md)
-  Lists the key performance and activity statistics for each database in the postgreSQL
-  instance.
-
- [`postgres-list-roles`](../tools/postgres/postgres-list-roles.md)
-  Lists all the user-created roles in PostgreSQL database..
-
 ### Pre-built Configurations

 - [Cloud SQL for Postgres using
--- a/docs/en/resources/sources/looker.md
+++ b/docs/en/resources/sources/looker.md
@@ -91,17 +91,18 @@ instead of hardcoding your secrets into the configuration file.

 ## Reference

-| **field**            | **type** | **required** | **description**                                                                                                                                     |
-|----------------------|:--------:|:------------:|-----------------------------------------------------------------------------------------------------------------------------------------------------|
-| kind                 |  string  |     true     | Must be "looker".                                                                                                                                   |
-| base_url             |  string  |     true     | The URL of your Looker server with no trailing /.                                                                                                   |
-| client_id            |  string  |    false     | The client id assigned by Looker.                                                                                                                   |
-| client_secret        |  string  |    false     | The client secret assigned by Looker.                                                                                                               |
-| verify_ssl           |  string  |    false     | Whether to check the ssl certificate of the server.                                                                                                 |
-| project              |  string  |    false     | The project id to use in Google Cloud.                                                                                                              |
-| location             |  string  |    false     | The location to use in Google Cloud. (default: us)                                                                                                  |
-| timeout              |  string  |    false     | Maximum time to wait for query execution (e.g. "30s", "2m"). By default, 120s is applied.                                                           |
-| use_client_oauth     |  string  |    false     | Use OAuth tokens instead of client_id and client_secret. (default: false) If a header name is provided, it will be used instead of "Authorization". |
-| show_hidden_models   |  string  |    false     | Show or hide hidden models. (default: true)                                                                                                         |
-| show_hidden_explores |  string  |    false     | Show or hide hidden explores. (default: true)                                                                                                       |
-| show_hidden_fields   |  string  |    false     | Show or hide hidden fields. (default: true)                                                                                                         |
+| **field**            | **type** | **required** | **description**                                                                           |
+|----------------------|:--------:|:------------:|-------------------------------------------------------------------------------------------|
+| kind                 |  string  |     true     | Must be "looker".                                                                         |
+| base_url             |  string  |     true     | The URL of your Looker server with no trailing /.                                         |
+| client_id            |  string  |    false     | The client id assigned by Looker.                                                         |
+| client_secret        |  string  |    false     | The client secret assigned by Looker.                                                     |
+| verify_ssl           |  string  |    false     | Whether to check the ssl certificate of the server.                                       |
+| project              |  string  |    false     | The project id to use in Google Cloud.                                                    |
+| location             |  string  |    false     | The location to use in Google Cloud. (default: us)                                        |
+| timeout              |  string  |    false     | Maximum time to wait for query execution (e.g. "30s", "2m"). By default, 120s is applied. |
+| use_client_oauth     |  string  |    false     | Use OAuth tokens instead of client_id and client_secret. (default: false) If a header     |
+|                      |          |              | name is provided, it will be used instead of "Authorization".                             |
+| show_hidden_models   |  string  |    false     | Show or hide hidden models. (default: true)                                               |
+| show_hidden_explores |  string  |    false     | Show or hide hidden explores. (default: true)                                             |
+| show_hidden_fields   |  string  |    false     | Show or hide hidden fields. (default: true)                                               |
--- a/docs/en/resources/sources/mariadb.md
+++ b/docs/en/resources/sources/mariadb.md
@@ -1,78 +0,0 @@
---
-title: "MariaDB"
-type: docs
-weight: 1
-description: >
-  MariaDB is an open-source relational database compatible with MySQL.
-
---
-## About
-
-MariaDB is a relational database management system derived from MySQL. It
-implements the MySQL protocol and client libraries and supports modern SQL
-features with a focus on performance and reliability.
-
-**Note**: MariaDB is supported using the MySQL source.
-## Available Tools
-
- [`mysql-sql`](../tools/mysql/mysql-sql.md)
-  Execute pre-defined prepared SQL queries in MariaDB.
-
- [`mysql-execute-sql`](../tools/mysql/mysql-execute-sql.md)
-  Run parameterized SQL queries in MariaDB.
-
- [`mysql-list-active-queries`](../tools/mysql/mysql-list-active-queries.md)
-  List active queries in MariaDB.
-
- [`mysql-list-tables`](../tools/mysql/mysql-list-tables.md)
-  List tables in a MariaDB database.
-
- [`mysql-list-tables-missing-unique-indexes`](../tools/mysql/mysql-list-tables-missing-unique-indexes.md)
-  List tables in a MariaDB database that do not have primary or unique indices.
-
- [`mysql-list-table-fragmentation`](../tools/mysql/mysql-list-table-fragmentation.md)
-  List table fragmentation in MariaDB tables.
-
-## Requirements
-
-### Database User
-
-This source only uses standard authentication. You will need to [create a
-MariaDB user][mariadb-users] to log in to the database.
-
-[mariadb-users]: https://mariadb.com/kb/en/create-user/
-
-## Example
-
-```yaml
-sources:
-    my_mariadb_db:
-        kind: mysql
-        host: 127.0.0.1
-        port: 3306
-        database: my_db
-        user: ${MARIADB_USER}
-        password: ${MARIADB_PASS}
-        # Optional TLS and other driver parameters. For example, enable preferred TLS:
-        # queryParams:
-        #     tls: preferred
-        queryTimeout: 30s # Optional: query timeout duration
-```
-
-{{< notice tip >}}
-Use environment variables instead of committing credentials to source files.
-{{< /notice >}}
-
-
-## Reference
-
-| **field**    | **type** | **required** | **description**                                                                                 |
-| ------------ | :------: | :----------: | ----------------------------------------------------------------------------------------------- |
-| kind         |  string  |     true     | Must be `mysql`.                                                                                |
-| host         |  string  |     true     | IP address to connect to (e.g. "127.0.0.1").                                                    |
-| port         |  string  |     true     | Port to connect to (e.g. "3307").                                                               |
-| database     |  string  |     true     | Name of the MariaDB database to connect to (e.g. "my_db").                                        |
-| user         |  string  |     true     | Name of the MariaDB user to connect as (e.g. "my-mysql-user").                                    |
-| password     |  string  |     true     | Password of the MariaDB user (e.g. "my-password").                                                |
-| queryTimeout |  string  |    false     | Maximum time to wait for query execution (e.g. "30s", "2m"). By default, no timeout is applied. |
-| queryParams | map<string,string> | false | Arbitrary DSN parameters passed to the driver (e.g. `tls: preferred`, `charset: utf8mb4`). Useful for enabling TLS or other connection options. |
--- a/docs/en/resources/sources/postgres.md
+++ b/docs/en/resources/sources/postgres.md
@@ -62,31 +62,6 @@ reputation for reliability, feature robustness, and performance.
 - [`postgres-replication-stats`](../tools/postgres/postgres-replication-stats.md)
  List replication stats in a PostgreSQL database.

- [`postgres-list-query-stats`](../tools/postgres/postgres-list-query-stats.md)
-  List query statistics in a PostgreSQL database.
-
- [`postgres-get-column-cardinality`](../tools/postgres/postgres-get-column-cardinality.md)
-  List cardinality of columns in a table in a PostgreSQL database.
-
- [`postgres-list-table-stats`](../tools/postgres/postgres-list-table-stats.md)
-  List statistics of a table in a PostgreSQL database.
-
- [`postgres-list-publication-tables`](../tools/postgres/postgres-list-publication-tables.md)
-  List publication tables in a PostgreSQL database.
-
- [`postgres-list-tablespaces`](../tools/postgres/postgres-list-tablespaces.md)
-  List tablespaces in a PostgreSQL database.
-
- [`postgres-list-pg-settings`](../tools/postgres/postgres-list-pg-settings.md)
-  List configuration parameters for the PostgreSQL server.
-
- [`postgres-list-database-stats`](../tools/postgres/postgres-list-database-stats.md)
-  Lists the key performance and activity statistics for each database in the postgreSQL
-  server.
-
- [`postgres-list-roles`](../tools/postgres/postgres-list-roles.md)
-  Lists all the user-created roles in PostgreSQL database..
-
 ### Pre-built Configurations

 - [PostgreSQL using MCP](https://googleapis.github.io/genai-toolbox/how-to/connect-ide/postgres_mcp/)
--- a/docs/en/resources/sources/serverless-spark.md
+++ b/docs/en/resources/sources/serverless-spark.md
@@ -21,10 +21,6 @@ Apache Spark.
  Get a Serverless Spark batch.
 - [`serverless-spark-cancel-batch`](../tools/serverless-spark/serverless-spark-cancel-batch.md)
  Cancel a running Serverless Spark batch operation.
- [`serverless-spark-create-pyspark-batch`](../tools/serverless-spark/serverless-spark-create-pyspark-batch.md)
-  Create a Serverless Spark PySpark batch operation.
- [`serverless-spark-create-spark-batch`](../tools/serverless-spark/serverless-spark-create-spark-batch.md)
-  Create a Serverless Spark Java batch operation.

 ## Requirements

--- a/docs/en/resources/sources/spanner.md
+++ b/docs/en/resources/sources/spanner.md
@@ -34,9 +34,6 @@ the Google Cloud console][spanner-quickstart].
 - [`spanner-list-tables`](../tools/spanner/spanner-list-tables.md)  
  Retrieve schema information about tables in a Spanner database.

- [`spanner-list-graphs`](../tools/spanner/spanner-list-graphs.md)  
-  Retrieve schema information about graphs in a Spanner database.
-
 ### Pre-built Configurations

 - [Spanner using MCP](https://googleapis.github.io/genai-toolbox/how-to/connect-ide/spanner_mcp/)  
--- a/docs/en/resources/tools/cloudsql/cloudsqlcloneinstance.md
+++ b/docs/en/resources/tools/cloudsql/cloudsqlcloneinstance.md
@@ -1,68 +0,0 @@
---
-title: cloud-sql-clone-instance
-type: docs
-weight: 10
-description: "Clone a Cloud SQL instance."
---
-
-The `cloud-sql-clone-instance` tool clones 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 clone (current state)
-
-```yaml
-tools:
-  clone-instance-basic:
-    kind: cloud-sql-clone-instance
-    source: cloud-sql-admin-source
-    description: "Creates an exact copy of a Cloud SQL instance. Supports configuring instance zones and high-availability setup through zone preferences."
-```
-
-Point-in-time recovery (PITR) clone
-
-```yaml
-tools:
-  clone-instance-pitr:
-    kind: cloud-sql-clone-instance
-    source: cloud-sql-admin-source
-    description: "Creates an exact copy of a Cloud SQL instance at a specific point in time (PITR). Supports configuring instance zones and high-availability setup through zone preferences"
-```
-
-## Reference
-
-### Tool Configuration
-
-| **field**      | **type** | **required** | **description**                                               |
-| -------------- | :------: | :----------: | ------------------------------------------------------------- |
-| kind           | string   | true         | Must be "cloud-sql-clone-instance".                           |
-| 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.                                                                 |
-| sourceInstanceName         | string   | true         | The name of the source instance to clone.                                       |
-| destinationInstanceName    | string   | true         | The name of the new (cloned) instance.                                          |
-| pointInTime                | string   | false        | (Optional) The point in time for a PITR (Point-In-Time Recovery) clone.         |
-| preferredZone              | string   | false        | (Optional) The preferred zone for the cloned instance. If not specified, defaults to the source instance's zone. |
-| preferredSecondaryZone     | string   | false        | (Optional) The preferred secondary zone for the cloned instance (for HA). |
-
-## Usage Notes
-
- The tool supports both basic clone and point-in-time recovery (PITR) clone operations.
- For PITR, specify the `pointInTime` parameter in RFC3339 format (e.g., `2024-01-01T00:00:00Z`).
- The source must be a valid Cloud SQL Admin API source.
- You can optionally specify the `zone` parameter to set the zone for the cloned instance. If omitted, the zone of the source instance will be used.
- You can optionally specify the `preferredZone` and `preferredSecondaryZone` (only in REGIONAL instances) to set the preferred zones for the cloned instance. These are useful for high availability (HA) configurations. If omitted, defaults will be used based on the source instance.
-
-## See Also
- [Cloud SQL Admin API documentation](https://cloud.google.com/sql/docs/mysql/admin-api)
- [Toolbox Cloud SQL tools documentation](../cloudsql)
- [Cloud SQL Clone API documentation](https://cloud.google.com/sql/docs/mysql/clone-instance)
--- a/docs/en/resources/tools/looker/looker-add-dashboard-element.md
+++ b/docs/en/resources/tools/looker/looker-add-dashboard-element.md
@@ -10,18 +10,27 @@ aliases:

 ## About

-The `looker-add-dashboard-element` tool creates a new tile (element) within an existing Looker dashboard.
-Tiles are added in the order this tool is called for a given `dashboard_id`.
-
-CRITICAL ORDER OF OPERATIONS:
-1. Create the dashboard using `make_dashboard`.
-2. Add any dashboard-level filters using `add_dashboard_filter`.
-3. Then, add elements (tiles) using this tool.
+The `looker-add-dashboard-element` creates a dashboard element
+in the given dashboard.

 It's compatible with the following sources:

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

+`looker-add-dashboard-element` takes eleven parameters:
+
+1. the `model`
+2. the `explore`
+3. the `fields` list
+4. an optional set of `filters`
+5. an optional set of `pivots`
+6. an optional set of `sorts`
+7. an optional `limit`
+8. an optional `tz`
+9. an optional `vis_config`
+10. the `title`
+11. the `dashboard_id`
+
 ## Example

 ```yaml
@@ -30,37 +39,24 @@ tools:
        kind: looker-add-dashboard-element
        source: looker-source
        description: |
-          This tool creates a new tile (element) within an existing Looker dashboard.
-          Tiles are added in the order this tool is called for a given `dashboard_id`.
+          add_dashboard_element Tool

-          CRITICAL ORDER OF OPERATIONS:
-          1. Create the dashboard using `make_dashboard`.
-          2. Add any dashboard-level filters using `add_dashboard_filter`.
-          3. Then, add elements (tiles) using this tool.
+          This tool creates a new tile in a Looker dashboard using
+          the query parameters and the vis_config specified.

-          Required Parameters:
-          - dashboard_id: The ID of the target dashboard, obtained from `make_dashboard`.
-          - model_name, explore_name, fields: These query parameters are inherited
-            from the `query` tool and are required to define the data for the tile.
+          Most of the parameters are the same as the query_url
+          tool. In addition, there is a title that may be provided.
+          The dashboard_id must be specified. That is obtained
+          from calling make_dashboard.

-          Optional Parameters:
-          - title: An optional title for the dashboard tile.
-          - pivots, filters, sorts, limit, query_timezone: These query parameters are
-            inherited from the `query` tool and can be used to customize the tile's query.
-          - vis_config: A JSON object defining the visualization settings for this tile.
-            The structure and options are the same as for the `query_url` tool's `vis_config`.
-
-          Connecting to Dashboard Filters:
-          A dashboard element can be connected to one or more dashboard filters (created with
-          `add_dashboard_filter`). To do this, specify the `name` of the dashboard filter
-          and the `field` from the element's query that the filter should apply to.
-          The format for specifying the field is `view_name.field_name`.
+          This tool can be called many times for one dashboard_id
+          and the resulting tiles will be added in order.
 ```

 ## Reference

 | **field**   | **type** | **required** | **description**                                    |
-|:------------|:--------:|:------------:|----------------------------------------------------|
-| kind        | string   | true         | Must be "looker-add-dashboard-element".            |
-| 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. |
+|-------------|:--------:|:------------:|----------------------------------------------------|
+| kind        |  string  |     true     | Must be "looker-add-dashboard-element"             |
+| 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/looker/looker-add-dashboard-filter.md
+++ b/docs/en/resources/tools/looker/looker-add-dashboard-filter.md
@@ -1,75 +0,0 @@
---
-title: "looker-add-dashboard-filter"
-type: docs
-weight: 1
-description: >
-  The "looker-add-dashboard-filter" tool adds a filter to a specified dashboard.
-aliases:
- /resources/tools/looker-add-dashboard-filter
---
-
-## About
-
-The `looker-add-dashboard-filter` tool adds a filter to a specified Looker dashboard.
-
-CRITICAL ORDER OF OPERATIONS:
-1. Create a dashboard using `make_dashboard`.
-2. Add all desired filters using this tool (`add_dashboard_filter`).
-3. Finally, add dashboard elements (tiles) using `add_dashboard_element`.
-
-It's compatible with the following sources:
-
- [looker](../../sources/looker.md)
-
-## Parameters
-
-| **parameter**         | **type** |   **required**    |  **default**   | **description**                                                                                                               |
-|:----------------------|:--------:|:-----------------:|:--------------:|-------------------------------------------------------------------------------------------------------------------------------|
-| dashboard_id          |  string  |       true        |      none      | The ID of the dashboard to add the filter to, obtained from `make_dashboard`.                                                 |
-| name                  |  string  |       true        |      none      | A unique internal identifier for the filter. This name is used later in `add_dashboard_element` to bind tiles to this filter. |
-| title                 |  string  |       true        |      none      | The label displayed to users in the Looker UI.                                                                                |
-| filter_type           |  string  |       true        | `field_filter` | The filter type of filter. Can be `date_filter`, `number_filter`, `string_filter`, or `field_filter`.                         |
-| default_value         |  string  |       false       |      none      | The initial value for the filter.                                                                                             |
-| model                 |  string  | if `field_filter` |      none      | The name of the LookML model, obtained from `get_models`.                                                                     |
-| explore               |  string  | if `field_filter` |      none      | The name of the explore within the model, obtained from `get_explores`.                                                       |
-| dimension             |  string  | if `field_filter` |      none      | The name of the field (e.g., `view_name.field_name`) to base the filter on, obtained from `get_dimensions`.                   |
-| allow_multiple_values | boolean  |       false       |      true      | The Dashboard Filter should allow multiple values                                                                             |
-| required              | boolean  |       false       |     false      | The Dashboard Filter is required to run dashboard                                                                             |
-
-## Example
-
-```yaml
-tools:
-  add_dashboard_filter:
-    kind: looker-add-dashboard-filter
-    source: looker-source
-    description: |
-      This tool adds a filter to a Looker dashboard.
-
-      CRITICAL ORDER OF OPERATIONS:
-      1. Create a dashboard using `make_dashboard`.
-      2. Add all desired filters using this tool (`add_dashboard_filter`).
-      3. Finally, add dashboard elements (tiles) using `add_dashboard_element`.
-
-      Parameters:
-      - dashboard_id (required): The ID from `make_dashboard`.
-      - name (required): A unique internal identifier for the filter. You will use this `name` later in `add_dashboard_element` to bind tiles to this filter.
-      - title (required): The label displayed to users in the UI.
-      - filter_type (required): One of `date_filter`, `number_filter`, `string_filter`, or `field_filter`.
-      - default_value (optional): The initial value for the filter.
-
-      Field Filters (`flter_type: field_filter`):
-      If creating a field filter, you must also provide:
-      - model
-      - explore
-      - dimension
-      The filter will inherit suggestions and type information from this LookML field.
-```
-
-## Reference
-
-| **field**   | **type** | **required** | **description**                                    |
-|-------------|:--------:|:------------:|----------------------------------------------------|
-| kind        |  string  |     true     | Must be "looker-add-dashboard-filter".             |
-| 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/looker/looker-conversational-analytics.md
+++ b/docs/en/resources/tools/looker/looker-conversational-analytics.md
@@ -34,10 +34,9 @@ tools:
        kind: looker-conversational-analytics
        source: looker-source
        description: |
-          Use this tool to ask questions about your data using the Looker Conversational
-          Analytics API. You must provide a natural language query and a list of
-          1 to 5 model and explore combinations (e.g. [{'model': 'the_model', 'explore': 'the_explore'}]).
-          Use the 'get_models' and 'get_explores' tools to discover available models and explores.
+          Use this tool to perform data analysis, get insights,
+          or answer complex questions about the contents of specific
+          Looker explores.
 ```

 ## Reference
--- a/docs/en/resources/tools/looker/looker-create-project-file.md
+++ b/docs/en/resources/tools/looker/looker-create-project-file.md
@@ -27,18 +27,13 @@ tools:
        kind: looker-create-project-file
        source: looker-source
        description: |
-          This tool creates a new LookML file within a specified project, populating
-          it with the provided content.
+          create_project_file Tool

-          Prerequisite: The Looker session must be in Development Mode. Use `dev_mode: true` first.
+          Given a project_id and a file path within the project, as well as the content
+          of a LookML file, this tool will create a new file within the project.

-          Parameters:
-          - project_id (required): The unique ID of the LookML project.
-          - file_path (required): The desired path and filename for the new file within the project.
-          - content (required): The full LookML content to write into the new file.
-
-          Output:
-          A confirmation message upon successful file creation.
+          This tool must be called after the dev_mode tool has changed the session to
+          dev mode.
 ```

 ## Reference
--- a/docs/en/resources/tools/looker/looker-delete-project-file.md
+++ b/docs/en/resources/tools/looker/looker-delete-project-file.md
@@ -26,17 +26,13 @@ tools:
        kind: looker-delete-project-file
        source: looker-source
        description: |
-          This tool permanently deletes a specified LookML file from within a project.
-          Use with caution, as this action cannot be undone through the API.
+          delete_project_file Tool

-          Prerequisite: The Looker session must be in Development Mode. Use `dev_mode: true` first.
+          Given a project_id and a file path within the project, this tool will delete
+          the file from the project.

-          Parameters:
-          - project_id (required): The unique ID of the LookML project.
-          - file_path (required): The exact path to the LookML file to delete within the project.
-
-          Output:
-          A confirmation message upon successful file deletion.
+          This tool must be called after the dev_mode tool has changed the session to
+          dev mode.
 ```

 ## Reference
--- a/docs/en/resources/tools/looker/looker-dev-mode.md
+++ b/docs/en/resources/tools/looker/looker-dev-mode.md
@@ -27,13 +27,10 @@ tools:
        kind: looker-dev-mode
        source: looker-source
        description: |
-          This tool allows toggling the Looker IDE session between Development Mode and Production Mode.
-          Development Mode enables making and testing changes to LookML projects.
+          dev_mode Tool

-          Parameters:
-          - enable (required): A boolean value.
-            - `true`: Switches the current session to Development Mode.
-            - `false`: Switches the current session to Production Mode.
+          Passing true to this tool switches the session to dev mode. Passing false to this tool switches the
+          session to production mode.
 ```

 ## Reference
--- a/docs/en/resources/tools/looker/looker-generate-embed-url.md
+++ b/docs/en/resources/tools/looker/looker-generate-embed-url.md
@@ -36,17 +36,11 @@ tools:
        kind: looker-generate-embed-url
        source: looker-source
        description: |
-          This tool generates a signed, private embed URL for specific Looker content,
-          allowing users to access it directly.
+          generate_embed_url Tool

-          Parameters:
-          - type (required): The type of content to embed. Common values include:
-            - `dashboards`
-            - `looks`
-            - `explore`
-          - id (required): The unique identifier for the content.
-            - For dashboards and looks, use the numeric ID (e.g., "123").
-            - For explores, use the format "model_name/explore_name".
+          This tool generates an embeddable URL for Looker content.
+          You need to provide the type of content (e.g., 'dashboards', 'looks', 'query-visualization')
+          and the ID of the content.
 ```

 ## Reference
--- a/docs/en/resources/tools/looker/looker-get-connection-databases.md
+++ b/docs/en/resources/tools/looker/looker-get-connection-databases.md
@@ -26,16 +26,10 @@ tools:
        kind: looker-get-connection-databases
        source: looker-source
        description: |
-          This tool retrieves a list of databases available through a specified Looker connection.
-          This is only applicable for connections that support multiple databases.
-          Use `get_connections` to check if a connection supports multiple databases.
+          get_connection_databases Tool

-          Parameters:
-          - connection_name (required): The name of the database connection, obtained from `get_connections`.
-
-          Output:
-          A JSON array of strings, where each string is the name of an available database.
-          If the connection does not support multiple databases, an empty list or an error will be returned.
+          This tool will list the databases available from a connection if the connection
+          supports multiple databases.
 ```

 ## Reference
--- a/docs/en/resources/tools/looker/looker-get-connection-schemas.md
+++ b/docs/en/resources/tools/looker/looker-get-connection-schemas.md
@@ -26,16 +26,10 @@ tools:
        kind: looker-get-connection-schemas
        source: looker-source
        description: |
-          This tool retrieves a list of database schemas available through a specified
-          Looker connection.
+          get_connection_schemas Tool

-          Parameters:
-          - connection_name (required): The name of the database connection, obtained from `get_connections`.
-          - database (optional): An optional database name to filter the schemas.
-            Only applicable for connections that support multiple databases.
-
-          Output:
-          A JSON array of strings, where each string is the name of an available schema.
+          This tool will list the schemas available from a connection, filtered by
+          an optional database name.
 ```

 ## Reference
--- a/docs/en/resources/tools/looker/looker-get-connection-table-columns.md
+++ b/docs/en/resources/tools/looker/looker-get-connection-table-columns.md
@@ -26,20 +26,11 @@ tools:
        kind: looker-get-connection-table-columns
        source: looker-source
        description: |
-          This tool retrieves a list of columns for one or more specified tables within a
-          given database schema and connection.
+          get_connection_table_columns Tool

-          Parameters:
-          - connection_name (required): The name of the database connection, obtained from `get_connections`.
-          - schema (required): The name of the schema where the tables reside, obtained from `get_connection_schemas`.
-          - tables (required): A comma-separated string of table names for which to retrieve columns
-            (e.g., "users,orders,products"), obtained from `get_connection_tables`.
-          - database (optional): The name of the database to filter by. Only applicable for connections
-            that support multiple databases (check with `get_connections`).
-
-          Output:
-          A JSON array of objects, where each object represents a column and contains details
-          such as `table_name`, `column_name`, `data_type`, and `is_nullable`.
+          This tool will list the columns available from a connection, for all the tables
+          given in a comma separated list of table names, filtered by the 
+          schema name and optional database name.
 ```

 ## Reference
--- a/docs/en/resources/tools/looker/looker-get-connection-tables.md
+++ b/docs/en/resources/tools/looker/looker-get-connection-tables.md
@@ -27,17 +27,10 @@ tools:
        kind: looker-get-connection-tables
        source: looker-source
        description: |
-          This tool retrieves a list of tables available within a specified database schema
-          through a Looker connection.
+          get_connection_tables Tool

-          Parameters:
-          - connection_name (required): The name of the database connection, obtained from `get_connections`.
-          - schema (required): The name of the schema to list tables from, obtained from `get_connection_schemas`.
-          - database (optional): The name of the database to filter by. Only applicable for connections
-            that support multiple databases (check with `get_connections`).
-
-          Output:
-          A JSON array of strings, where each string is the name of an available table.
+          This tool will list the tables available from a connection, filtered by the 
+          schema name and optional database name.
 ```

 ## Reference
--- a/docs/en/resources/tools/looker/looker-get-connections.md
+++ b/docs/en/resources/tools/looker/looker-get-connections.md
@@ -26,18 +26,11 @@ tools:
        kind: looker-get-connections
        source: looker-source
        description: |
-          This tool retrieves a list of all database connections configured in the Looker system.
+          get_connections Tool

-          Parameters:
-          This tool takes no parameters.
-
-          Output:
-          A JSON array of objects, each representing a database connection and including details such as:
-          - `name`: The connection's unique identifier.
-          - `dialect`: The database dialect (e.g., "mysql", "postgresql", "bigquery").
-          - `default_schema`: The default schema for the connection.
-          - `database`: The associated database name (if applicable).
-          - `supports_multiple_databases`: A boolean indicating if the connection can access multiple databases.
+          This tool will list all the connections available in the Looker system, as
+          well as the dialect name, the default schema, the database if applicable,
+          and whether the connection supports multiple databases.
 ```

 ## Reference
--- a/docs/en/resources/tools/looker/looker-get-dashboards.md
+++ b/docs/en/resources/tools/looker/looker-get-dashboards.md
@@ -29,29 +29,25 @@ default to 100 and 0.

 ```yaml
 tools:
-        get_dashboards:
-            kind: looker-get-dashboards
-            source: looker-source
-            description: |
-              This tool searches for saved dashboards in a Looker instance. It returns a list of JSON objects, each representing a dashboard.
-    
-              Search Parameters:
-              - title (optional): Filter by dashboard title (supports wildcards).
-              - folder_id (optional): Filter by the ID of the folder where the dashboard is saved.
-              - user_id (optional): Filter by the ID of the user who created the dashboard.
-              - description (optional): Filter by description content (supports wildcards).
-              - id (optional): Filter by specific dashboard ID.
-              - limit (optional): Maximum number of results to return. Defaults to a system limit.
-              - offset (optional): Starting point for pagination.
-    
-              String Search Behavior:
-              - Case-insensitive matching.
-              - Supports SQL LIKE pattern match wildcards:
-                - `%`: Matches any sequence of zero or more characters. (e.g., `"finan%"` matches "financial", "finance")
-                - `_`: Matches any single character. (e.g., `"s_les"` matches "sales")
-              - Special expressions for null checks:
-                - `"IS NULL"`: Matches dashboards where the field is null.
-                - `"NOT NULL"`: Excludes dashboards where the field is null.
+    get_dashboards:
+        kind: looker-get-dashboards
+        source: looker-source
+        description: |
+          get_dashboards Tool
+
+          This tool is used to search for saved dashboards in a Looker instance.
+          String search params use case-insensitive matching. String search
+          params can contain % and '_' as SQL LIKE pattern match wildcard
+          expressions. example="dan%" will match "danger" and "Danzig" but
+          not "David" example="D_m%" will match "Damage" and "dump".
+
+          Most search params can accept "IS NULL" and "NOT NULL" as special
+          expressions to match or exclude (respectively) rows where the
+          column is null.
+
+          The limit and offset are used to paginate the results.
+
+          The result of the get_dashboards tool is a list of json objects.
 ```

 ## Reference
--- a/docs/en/resources/tools/looker/looker-get-dimensions.md
+++ b/docs/en/resources/tools/looker/looker-get-dimensions.md
@@ -28,20 +28,16 @@ tools:
        kind: looker-get-dimensions
        source: looker-source
        description: |
-          This tool retrieves a list of dimensions defined within a specific Looker explore.
-          Dimensions are non-aggregatable attributes or characteristics of your data
-          (e.g., product name, order date, customer city) that can be used for grouping,
-          filtering, or segmenting query results.
+          The get_dimensions tool retrieves the list of dimensions defined in
+          an explore.

-          Parameters:
-          - model_name (required): The name of the LookML model, obtained from `get_models`.
-          - explore_name (required): The name of the explore within the model, obtained from `get_explores`.
+          It takes two parameters, the model_name looked up from get_models and the
+          explore_name looked up from get_explores.

-          Output Details:
-          - If a dimension includes a `suggestions` field, its contents are valid values
-            that can be used directly as filters for that dimension.
-          - If a `suggest_explore` and `suggest_dimension` are provided, you can query
-            that specified explore and dimension to retrieve a list of valid filter values.
+          If this returns a suggestions field for a dimension, the contents of suggestions
+          can be used as filters for this field. If this returns a suggest_explore and
+          suggest_dimension, a query against that explore and dimension can be used to find
+          valid filters for this field.

 ```

--- a/docs/en/resources/tools/looker/looker-get-explores.md
+++ b/docs/en/resources/tools/looker/looker-get-explores.md
@@ -40,13 +40,10 @@ tools:
        kind: looker-get-explores
        source: looker-source
        description: |
-          This tool retrieves a list of explores defined within a specific LookML model.
-          Explores represent a curated view of your data, typically joining several
-          tables together to allow for focused analysis on a particular subject area.
-          The output provides details like the explore's `name` and `label`.
+          The get_explores tool retrieves the list of explores defined in a LookML model
+          in the Looker system.

-          Parameters:
-          - model_name (required): The name of the LookML model, obtained from `get_models`.
+          It takes one parameter, the model_name looked up from get_models.
 ```

 ## Reference
--- a/docs/en/resources/tools/looker/looker-get-filters.md
+++ b/docs/en/resources/tools/looker/looker-get-filters.md
@@ -24,22 +24,15 @@ It's compatible with the following sources:

 ```yaml
 tools:
-    get_filters:
+    get_dimensions:
        kind: looker-get-filters
        source: looker-source
        description: |
-          This tool retrieves a list of "filter-only fields" defined within a specific
-          Looker explore. These are special fields defined in LookML specifically to
-          create user-facing filter controls that do not directly affect the `GROUP BY`
-          clause of the SQL query. They are often used in conjunction with liquid templating
-          to create dynamic queries.
+          The get_filters tool retrieves the list of filters defined in
+          an explore.

-          Note: Regular dimensions and measures can also be used as filters in a query.
-          This tool *only* returns fields explicitly defined as `filter:` in LookML.
-
-          Parameters:
-          - model_name (required): The name of the LookML model, obtained from `get_models`.
-          - explore_name (required): The name of the explore within the model, obtained from `get_explores`.
+          It takes two parameters, the model_name looked up from get_models and the
+          explore_name looked up from get_explores.
 ```

 The response is a json array with the following elements:
--- a/docs/en/resources/tools/looker/looker-get-looks.md
+++ b/docs/en/resources/tools/looker/looker-get-looks.md
@@ -34,26 +34,21 @@ tools:
        kind: looker-get-looks
        source: looker-source
        description: |
-          This tool searches for saved Looks (pre-defined queries and visualizations)
-          in a Looker instance. It returns a list of JSON objects, each representing a Look.
+          get_looks Tool

-          Search Parameters:
-          - title (optional): Filter by Look title (supports wildcards).
-          - folder_id (optional): Filter by the ID of the folder where the Look is saved.
-          - user_id (optional): Filter by the ID of the user who created the Look.
-          - description (optional): Filter by description content (supports wildcards).
-          - id (optional): Filter by specific Look ID.
-          - limit (optional): Maximum number of results to return. Defaults to a system limit.
-          - offset (optional): Starting point for pagination.
+          This tool is used to search for saved looks in a Looker instance.
+          String search params use case-insensitive matching. String search
+          params can contain % and '_' as SQL LIKE pattern match wildcard
+          expressions. example="dan%" will match "danger" and "Danzig" but
+          not "David" example="D_m%" will match "Damage" and "dump".

-          String Search Behavior:
-          - Case-insensitive matching.
-          - Supports SQL LIKE pattern match wildcards:
-            - `%`: Matches any sequence of zero or more characters. (e.g., `"dan%"` matches "danger", "Danzig")
-            - `_`: Matches any single character. (e.g., `"D_m%"` matches "Damage", "dump")
-          - Special expressions for null checks:
-            - `"IS NULL"`: Matches Looks where the field is null.
-            - `"NOT NULL"`: Excludes Looks where the field is null.
+          Most search params can accept "IS NULL" and "NOT NULL" as special
+          expressions to match or exclude (respectively) rows where the
+          column is null.
+
+          The limit and offset are used to paginate the results.
+
+          The result of the get_looks tool is a list of json objects.
 ```

 ## Reference
--- a/docs/en/resources/tools/looker/looker-get-measures.md
+++ b/docs/en/resources/tools/looker/looker-get-measures.md
@@ -28,19 +28,16 @@ tools:
        kind: looker-get-measures
        source: looker-source
        description: |
-          This tool retrieves a list of measures defined within a specific Looker explore.
-          Measures are aggregatable metrics (e.g., total sales, average price, count of users)
-          that are used for calculations and quantitative analysis in your queries.
+          The get_measures tool retrieves the list of measures defined in
+          an explore.

-          Parameters:
-          - model_name (required): The name of the LookML model, obtained from `get_models`.
-          - explore_name (required): The name of the explore within the model, obtained from `get_explores`.
+          It takes two parameters, the model_name looked up from get_models and the
+          explore_name looked up from get_explores.

-          Output Details:
-          - If a measure includes a `suggestions` field, its contents are valid values
-            that can be used directly as filters for that measure.
-          - If a `suggest_explore` and `suggest_dimension` are provided, you can query
-            that specified explore and dimension to retrieve a list of valid filter values.
+          If this returns a suggestions field for a measure, the contents of suggestions
+          can be used as filters for this field. If this returns a suggest_explore and
+          suggest_dimension, a query against that explore and dimension can be used to find
+          valid filters for this field.

 ```

--- a/docs/en/resources/tools/looker/looker-get-models.md
+++ b/docs/en/resources/tools/looker/looker-get-models.md
@@ -26,12 +26,9 @@ tools:
        kind: looker-get-models
        source: looker-source
        description: |
-          This tool retrieves a list of available LookML models in the Looker instance.
-          LookML models define the data structure and relationships that users can query.
-          The output includes details like the model's `name` and `label`, which are
-          essential for subsequent calls to tools like `get_explores` or `query`.
+          The get_models tool retrieves the list of LookML models in the Looker system.

-          This tool takes no parameters.
+          It takes no parameters.
 ```

 ## Reference
--- a/docs/en/resources/tools/looker/looker-get-parameters.md
+++ b/docs/en/resources/tools/looker/looker-get-parameters.md
@@ -28,15 +28,11 @@ tools:
        kind: looker-get-parameters
        source: looker-source
        description: |
-          This tool retrieves a list of parameters defined within a specific Looker explore.
-          LookML parameters are dynamic input fields that allow users to influence query
-          behavior without directly modifying the underlying LookML. They are often used
-          with `liquid` templating to create flexible dashboards and reports, enabling
-          users to choose dimensions, measures, or other query components at runtime.
+          The get_parameters tool retrieves the list of parameters defined in
+          an explore.

-          Parameters:
-          - model_name (required): The name of the LookML model, obtained from `get_models`.
-          - explore_name (required): The name of the explore within the model, obtained from `get_explores`.
+          It takes two parameters, the model_name looked up from get_models and the
+          explore_name looked up from get_explores.
 ```

 The response is a json array with the following elements:
--- a/docs/en/resources/tools/looker/looker-get-project-file.md
+++ b/docs/en/resources/tools/looker/looker-get-project-file.md
@@ -26,15 +26,10 @@ tools:
        kind: looker-get-project-file
        source: looker-source
        description: |
-          This tool retrieves the raw content of a specific LookML file from within a project.
+          get_project_file Tool

-          Parameters:
-          - project_id (required): The unique ID of the LookML project, obtained from `get_projects`.
-          - file_path (required): The path to the LookML file within the project,
-            typically obtained from `get_project_files`.
-
-          Output:
-          The raw text content of the specified LookML file.
+          Given a project_id and a file path within the project, this tool returns
+          the contents of the LookML file.
 ```

 ## Reference
--- a/docs/en/resources/tools/looker/looker-get-project-files.md
+++ b/docs/en/resources/tools/looker/looker-get-project-files.md
@@ -26,15 +26,10 @@ tools:
        kind: looker-get-project-files
        source: looker-source
        description: |
-          This tool retrieves a list of all LookML files within a specified project,
-          providing details about each file.
+          get_project_files Tool

-          Parameters:
-          - project_id (required): The unique ID of the LookML project, obtained from `get_projects`.
-
-          Output:
-          A JSON array of objects, each representing a LookML file and containing
-          details such as `path`, `id`, `type`, and `git_status`.
+          Given a project_id this tool returns the details about
+          the LookML files that make up that project.
 ```

 ## Reference
--- a/docs/en/resources/tools/looker/looker-get-projects.md
+++ b/docs/en/resources/tools/looker/looker-get-projects.md
@@ -26,16 +26,10 @@ tools:
        kind: looker-get-projects
        source: looker-source
        description: |
-          This tool retrieves a list of all LookML projects available on the Looker instance.
-          It is useful for identifying projects before performing actions like retrieving
-          project files or making modifications.
+          get_projects Tool

-          Parameters:
-          This tool takes no parameters.
-
-          Output:
-          A JSON array of objects, each containing the `project_id` and `project_name`
-          for a LookML project.
+          This tool returns the project_id and project_name for
+          all the LookML projects on the looker instance.
 ```

 ## Reference
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Ben Knutson	6d1e38281a	Refactor Github Action per b/485167538	2026-02-18 10:46:26 +00:00
Yuan Teoh	89c85729d1	resolve comments	2025-11-24 09:59:01 -08:00
Yuan Teoh	93f638650d	docs: update configure instructions	2025-11-24 09:59:01 -08:00
@@ -1 +1 @@
 .23.0
 .21.0