Inlcude tag for sample agents

Merge branch 'main' of https://github.com/googleapis/genai-toolbox into demo-include-shortcode
refactor(docs): adopt snippet shortcode to reuse content
2026-01-12 08:58:28 -05:00 · 2025-08-19 15:26:17 +05:30 · 2025-08-19 14:56:28 +05:30 · 2025-08-19 11:08:12 +05:30 · 2025-08-05 14:39:53 +05:30 · 2025-08-01 19:56:13 +05:30
431 changed files with 3893 additions and 16595 deletions
--- a/.ci/integration.cloudbuild.yaml
+++ b/.ci/integration.cloudbuild.yaml
@@ -464,7 +464,7 @@ steps:
          "OceanBase" \
          oceanbase \
          oceanbase
-
+          
  - id: "firestore"
    name: golang:1
    waitFor: ["compile-test-binary"]
@@ -553,73 +553,6 @@ steps:
          tidb \
          tidbsql tidbexecutesql

-  - id: "firebird"
-    name: golang:1
-    waitFor: ["compile-test-binary"]
-    entrypoint: /bin/bash
-    env:
-      - "GOPATH=/gopath"
-      - "FIREBIRD_DATABASE=$_FIREBIRD_DATABASE_NAME"
-      - "FIREBIRD_HOST=$_FIREBIRD_HOST"
-      - "FIREBIRD_PORT=$_FIREBIRD_PORT"
-      - "SERVICE_ACCOUNT_EMAIL=$SERVICE_ACCOUNT_EMAIL"
-    secretEnv: ["CLIENT_ID", "FIREBIRD_USER", "FIREBIRD_PASS"]
-    volumes:
-      - name: "go"
-        path: "/gopath"
-    args:
-      - -c
-      - |
-        .ci/test_with_coverage.sh \
-          "Firebird" \
-          firebird \
-          firebirdsql firebirdexecutesql
-
-  - id: "clickhouse"
-    name : golang:1
-    waitFor: ["compile-test-binary"]
-    entrypoint: /bin/bash
-    env:
-      - "GOPATH=/gopath"
-      - "CLICKHOUSE_DATABASE=$_CLICKHOUSE_DATABASE"
-      - "CLICKHOUSE_PORT=$_CLICKHOUSE_PORT"
-      - "CLICKHOUSE_PROTOCOL=$_CLICKHOUSE_PROTOCOL"
-      - "SERVICE_ACCOUNT_EMAIL=$SERVICE_ACCOUNT_EMAIL"
-    secretEnv: ["CLICKHOUSE_HOST", "CLICKHOUSE_USER", "CLIENT_ID"]
-    volumes:
-      - name: "go"
-        path: "/gopath"
-    args:
-      - -c
-      - |
-        .ci/test_with_coverage.sh \
-          "ClickHouse" \
-          clickhouse \
-          clickhouse
-
-  - id: "trino"
-    name: golang:1
-    waitFor: ["compile-test-binary"]
-    entrypoint: /bin/bash
-    env:
-      - "GOPATH=/gopath"
-      - "TRINO_HOST=$_TRINO_HOST"
-      - "TRINO_PORT=$_TRINO_PORT"
-      - "TRINO_CATALOG=$_TRINO_CATALOG"
-      - "TRINO_SCHEMA=$_TRINO_SCHEMA"
-      - "SERVICE_ACCOUNT_EMAIL=$SERVICE_ACCOUNT_EMAIL"
-    secretEnv: ["CLIENT_ID", "TRINO_USER"]
-    volumes:
-      - name: "go"
-        path: "/gopath"
-    args:
-      - -c
-      - |
-        .ci/test_with_coverage.sh \
-          "Trino" \
-          trino \
-          trinosql trinoexecutesql
-
 availableSecrets:
  secretManager:
    - versionName: projects/$PROJECT_ID/secrets/cloud_sql_pg_user/versions/latest
@@ -682,16 +615,6 @@ availableSecrets:
      env: TIDB_USER
    - versionName: projects/$PROJECT_ID/secrets/tidb_pass/versions/latest
      env: TIDB_PASS
-    - versionName: projects/$PROJECT_ID/secrets/clickhouse_host/versions/latest
-      env: CLICKHOUSE_HOST
-    - versionName: projects/$PROJECT_ID/secrets/clickhouse_user/versions/latest
-      env: CLICKHOUSE_USER
-    - versionName: projects/$PROJECT_ID/secrets/firebird_user/versions/latest
-      env: FIREBIRD_USER
-    - versionName: projects/$PROJECT_ID/secrets/firebird_pass/versions/latest
-      env: FIREBIRD_PASS
-    - versionName: projects/$PROJECT_ID/secrets/trino_user/versions/latest
-      env: TRINO_USER
    - versionName: projects/$PROJECT_ID/secrets/oceanbase_host/versions/latest
      env: OCEANBASE_HOST
    - versionName: projects/$PROJECT_ID/secrets/oceanbase_user/versions/latest
@@ -709,7 +632,6 @@ options:

 substitutions:
  _DATABASE_NAME: test_database
-  _FIREBIRD_DATABASE_NAME: /firebird/test_database.fdb
  _REGION: "us-central1"
  _CLOUD_SQL_POSTGRES_INSTANCE: "cloud-sql-pg-testing"
  _ALLOYDB_POSTGRES_CLUSTER: "alloydb-pg-testing"
@@ -733,14 +655,5 @@ substitutions:
  _LOOKER_VERIFY_SSL: "true"
  _TIDB_HOST: 127.0.0.1
  _TIDB_PORT: "4000"
-  _CLICKHOUSE_DATABASE: "default"
-  _CLICKHOUSE_PORT: "8123"
-  _CLICKHOUSE_PROTOCOL: "http"
-  _FIREBIRD_HOST: 127.0.0.1
-  _FIREBIRD_PORT: "3050"
-  _TRINO_HOST: 127.0.0.1
-  _TRINO_PORT: "8080"
-  _TRINO_CATALOG: "memory"
-  _TRINO_SCHEMA: "default"
  _OCEANBASE_PORT: "2883"
  _OCEANBASE_DATABASE: "oceanbase"
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,19 +1,16 @@
 ## Description
-
 ---
 > Should include a concise description of the changes (bug or feature), it's
 > impact, along with a summary of the solution

 ## PR Checklist
-
 ---
 > Thank you for opening a Pull Request! Before submitting your PR, there are a
 > few things you can do to make sure it goes smoothly:
-
 - [ ] Make sure you reviewed
  [CONTRIBUTING.md](https://github.com/googleapis/genai-toolbox/blob/main/CONTRIBUTING.md)
 - [ ] Make sure to open an issue as a
-  [bug/issue](https://github.com/googleapis/genai-toolbox/issues/new/choose)
+  [bug/issue](https://github.com/googleapis/langchain-google-alloydb-pg-python/issues/new/choose)
  before writing your code!  That way we can discuss the change, evaluate
  designs, and agree on the general idea
 - [ ] Ensure the tests and linter pass
@@ -21,4 +18,4 @@
 - [ ] Appropriate docs were updated (if necessary)
 - [ ] Make sure to add `!` if this involve a breaking change

-🛠️ Fixes #<issue_number_goes_here>
+🛠️ Fixes #<issue_number_goes_here>
--- a/.github/blunderbuss.yml
+++ b/.github/blunderbuss.yml
@@ -9,10 +9,6 @@ assign_issues_by:
    - Genesis929
    - shobsi
    - jiaxunwu
-  - labels:
-    - 'product: looker'
-    to:
-    - drstrangelooker
 assign_prs:
  - Yuan325
  - duwenxin99
--- a/.github/header-checker-lint.yaml
+++ b/.github/header-checker-lint.yaml
@@ -20,5 +20,3 @@ sourceFileExtensions:
  - 'go'
  - 'yaml'
  - 'yml'
-ignoreFiles:
-  - 'docs/en/getting-started/quickstart/**'
--- a/.github/labels.yaml
+++ b/.github/labels.yaml
@@ -92,7 +92,3 @@
 - name: 'product: bigquery'
  color: 5065c7
  description: 'Product: Assigned to the BigQuery team.'
-# Product Labels
- name: 'product: looker'
-  color: 5065c7
-  description: 'Product: Assigned to the Looker team.'
--- a/.github/workflows/tests.yaml
+++ b/.github/workflows/tests.yaml
@@ -16,7 +16,7 @@ name: tests
 on:
  push:
    branches:
-      - "main"
+    - 'main'
  pull_request:
  pull_request_target:
    types: [labeled]
@@ -35,9 +35,9 @@ jobs:
        os: [macos-latest, windows-latest, ubuntu-latest]
      fail-fast: false
    permissions:
-      contents: "read"
-      issues: "write"
-      pull-requests: "write"
+      contents: 'read'
+      issues: 'write'
+      pull-requests: 'write'
    steps:
      - name: Remove PR label
        if: "${{ github.event.action == 'labeled' && github.event.label.name == 'tests: run' }}"
@@ -76,8 +76,6 @@ jobs:

      - name: Run tests with coverage
        if: ${{ runner.os == 'Linux' }}
-        env:
-          GOTOOLCHAIN: go1.25.0+auto
        run: |
          source_dir="./internal/sources/*"
          tool_dir="./internal/tools/*"
--- a/.gitignore
+++ b/.gitignore
@@ -20,4 +20,4 @@ node_modules

 # executable
 genai-toolbox
-toolbox
+toolbox
--- a/.hugo/hugo.toml
+++ b/.hugo/hugo.toml
@@ -8,8 +8,6 @@ defaultContentLanguageInSubdir = false
 enableGitInfo = true
 enableRobotsTXT = true

-ignoreFiles = ["quickstart/shared", "quickstart/python", "quickstart/js", "quickstart/go"]
-
 [languages]
  [languages.en]
    languageName ="English"
--- a/.hugo/layouts/shortcodes/ipynb.html
+++ b/.hugo/layouts/shortcodes/ipynb.html
@@ -1,47 +0,0 @@
-{{ $notebookFile := .Get 0 }}
-{{ with .Page.Resources.Get $notebookFile }}
-
-  {{ $content := .Content | transform.Unmarshal }}
-  {{ range $content.cells }}
-
-    {{ if eq .cell_type "markdown" }}
-      <div class="notebook-markdown">
-        {{ $markdown := "" }}
-        {{ range .source }}{{ $markdown = print $markdown . }}{{ end }}
-        {{ $markdown | markdownify }}
-      </div>
-    {{ end }}
-
-    {{ if eq .cell_type "code" }}
-      <div class="notebook-code">
-        {{ $code := "" }}
-        {{ range .source }}{{ $code = print $code . }}{{ end }}
-        {{ highlight $code "python" "" }}
-
-        {{ range .outputs }}
-          <div class="notebook-output">
-            {{ with .text }}
-              <pre class="notebook-stream"><code>{{- range . }}{{ . }}{{ end -}}</code></pre>
-            {{ end }}
-
-            {{ with .data }}
-              {{ with index . "image/png" }}
-                <img src="data:image/png;base64,{{ . }}" alt="Notebook output image">
-              {{ end }}
-              {{ with index . "image/jpeg" }}
-                <img src="data:image/jpeg;base64,{{ . }}" alt="Notebook output image">
-              {{ end }}
-              {{ with index . "text/html" }}
-                {{ $html := "" }}
-                {{ range . }}{{ $html = print $html . }}{{ end }}
-                {{ $html | safeHTML }}
-              {{ end }}
-            {{ end }}
-          </div>
-        {{ end }}
-      </div>
-    {{ end }}
-  {{ end }}
-{{ else }}
-  <p style="color: red;">Error: Notebook '{{ $notebookFile }}' not found in page resources.</p>
-{{ end }}
--- a/.hugo/layouts/shortcodes/regionInclude.html
+++ b/.hugo/layouts/shortcodes/regionInclude.html
@@ -1,8 +1,8 @@
 {{/*
  snippet.html
  Usage:
-    {{< regionInclude "filename.md" "region_name" >}}
-    {{< regionInclude "filename.python" "region_name" "python" >}}
+    {{< snippet "filename.md" "region_name" >}}
+    {{< snippet "filename.python" "region_name" "python" >}}
 */}}

 {{ $file := .Get 0 }}
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,36 +1,5 @@
 # Changelog

-## [0.13.0](https://github.com/googleapis/genai-toolbox/compare/v0.12.0...v0.13.0) (2025-08-27)
-
-### ⚠ BREAKING CHANGES
-
-* **prebuilt/alloydb:** Add bearer token support for alloydb-wait-for-operation ([#1183](https://github.com/googleapis/genai-toolbox/issues/1183))
-
-
-### Features
-
-* Add capability to set default for environment variable in config ([#1248](https://github.com/googleapis/genai-toolbox/issues/1248)) ([5bcd52e](https://github.com/googleapis/genai-toolbox/commit/5bcd52e7dcd0773ded723585f4abe29d044e1540))
-* **firebird:** Add Firebird SQL 2.5+ source and tool ([#1011](https://github.com/googleapis/genai-toolbox/issues/1011)) ([4f6b806](https://github.com/googleapis/genai-toolbox/commit/4f6b806de947efc4e12bdb50dff7781aedb7b966))
-* **oceanbase:** Add Oceanbase source and tool  ([#895](https://github.com/googleapis/genai-toolbox/issues/895)) ([6fc4982](https://github.com/googleapis/genai-toolbox/commit/6fc49826d43f46c84028e752ebebddf3d94b3d13))
-* **server/mcp:** Support `ping` mechanism ([#1178](https://github.com/googleapis/genai-toolbox/issues/1178)) ([5dcc66c](https://github.com/googleapis/genai-toolbox/commit/5dcc66c84fa72c75ec50a9ac5198018212ec2979))
-* **server:** Fail-fast on environment variable substitution ([#1177](https://github.com/googleapis/genai-toolbox/issues/1177)) ([212aaba](https://github.com/googleapis/genai-toolbox/commit/212aaba74c8b431de8a5f7b9822a0af4afcaaa0e))
-* **server:** Implement Tool call auth error propagation ([#1235](https://github.com/googleapis/genai-toolbox/issues/1235)) ([b94a021](https://github.com/googleapis/genai-toolbox/commit/b94a021ca11c6637cf8038449483b5e75f2012b3))
-* **sources/bigquery:** Add support for user-credential passthrough  ([#1067](https://github.com/googleapis/genai-toolbox/issues/1067)) ([650e2e2](https://github.com/googleapis/genai-toolbox/commit/650e2e26f51bff75ce66343f64944d0a89a58b69))
-* **tool/looker:** Add support for `description` field in looker tool ([#1199](https://github.com/googleapis/genai-toolbox/issues/1199)) ([97f0dd2](https://github.com/googleapis/genai-toolbox/commit/97f0dd2acf26caf28ecad65abea8779c196a27f1))
-* **tools/bigquery-ask-data-insights:** Add bigquery `ask-data-insights` tool ([#932](https://github.com/googleapis/genai-toolbox/issues/932)) ([7651357](https://github.com/googleapis/genai-toolbox/commit/7651357d424a2b6656d8b6818cebc5c8a86ed053))
-* **tools/bigquery-forecast:** Add bigqueryforecast tool ([#1148](https://github.com/googleapis/genai-toolbox/issues/1148)) ([2ad0ccf](https://github.com/googleapis/genai-toolbox/commit/2ad0ccf83df542340087742468d6762f81eedee6))
-* **tools/firestore-add-documents:** Add firestore-add-documents tool ([#1107](https://github.com/googleapis/genai-toolbox/issues/1107)) ([ee4a70a](https://github.com/googleapis/genai-toolbox/commit/ee4a70a0e82b346b07b5b4c60dfa060da2273f50))
-* **tools/firestore-update-document:** Add firestore-update-document tool ([#1191](https://github.com/googleapis/genai-toolbox/issues/1191)) ([0010123](https://github.com/googleapis/genai-toolbox/commit/00101232a39c70288aac5715649c184858d351e3))
-* **tools/looker:** Control over whether hidden objects are surfaced ([#1222](https://github.com/googleapis/genai-toolbox/issues/1222)) ([bc91559](https://github.com/googleapis/genai-toolbox/commit/bc91559cc4e5b20385b84cc562b624fabf7e47a8))
-* **trino:** Add Trino source and tools ([#948](https://github.com/googleapis/genai-toolbox/issues/948)) ([7dd123b](https://github.com/googleapis/genai-toolbox/commit/7dd123b3d76b8eb2b74b5d960959c1f90684b37e))
-
-
-### Bug Fixes
-
-* **tools/looker:** Lookergetdashboards uses proper Authorized helper func ([#1255](https://github.com/googleapis/genai-toolbox/issues/1255)) ([00866bc](https://github.com/googleapis/genai-toolbox/commit/00866bc7fc33115c547213e60316ae889735fdbb))
-* **tools/mongodb-find-one:** ProjectPayload unmarshaling ([#1167](https://github.com/googleapis/genai-toolbox/issues/1167)) ([8ea6a98](https://github.com/googleapis/genai-toolbox/commit/8ea6a98bd9096ba97722e5f807366887e864004f))
-* **tools/mysql:** Fix encoded text for mysql ([#1161](https://github.com/googleapis/genai-toolbox/issues/1161)) ([a37cfa8](https://github.com/googleapis/genai-toolbox/commit/a37cfa841d151b9995d4fab73cfc5e4d30d2cc57)), closes [#840](https://github.com/googleapis/genai-toolbox/issues/840)
-
 ## [0.12.0](https://github.com/googleapis/genai-toolbox/compare/v0.11.0...v0.12.0) (2025-08-14)


--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -25,42 +25,33 @@ This project follows

 ## Contribution process

-> [!NOTE]
-> New contributions should always include both unit and integration tests.
- 
+### Code reviews

 All submissions, including submissions by project members, require review. We
 use GitHub pull requests for this purpose. Consult
 [GitHub Help](https://help.github.com/articles/about-pull-requests/) for more
 information on using pull requests.

-### Code reviews
-
-* Within 2-5 days, a reviewer will review your PR. They may approve it, or request
-changes. 
-* When requesting changes, reviewers should self-assign the PR to ensure
+Within 2-5 days, a reviewer will review your PR. They may approve it, or request
+changes. When requesting changes, reviewers should self-assign the PR to ensure
 they are aware of any updates.
-* If additional changes are needed, push additional commits to your PR branch -
-this helps the reviewer know which parts of the PR have changed. 
-* Commits will be
+If additional changes are needed, push additional commits to your PR branch -
+this helps the reviewer know which parts of the PR have changed. Commits will be
 squashed when merged.
-* Please follow up with changes promptly. 
-* If a PR is awaiting changes by the
+Please follow up with changes promptly. If a PR is awaiting changes by the
 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.

-## Adding a New Database Source or Tool
+### Adding a New Database Source and Tool

-Please create an
+We recommend creating an
 [issue](https://github.com/googleapis/genai-toolbox/issues) before
-implementation to ensure we can accept the contribution and no duplicated work. This issue
-should include an overview of the API design. If you have any questions, reach out on our
-[Discord](https://discord.gg/Dmm69peqjh) to chat directly with the team.  
+implementation to ensure we can accept the contribution and no duplicated work.
+If you have any questions, reach out on our
+[Discord](https://discord.gg/Dmm69peqjh) to chat directly with the team. New
+contributions should be added with both unit tests and integration tests.

-> [!NOTE]
-> New tools can be added for [pre-existing data sources](https://github.com/googleapis/genai-toolbox/tree/main/internal/sources). However, any new database source should also include at least one new tool type.
-
-### Adding a New Database Source
+#### 1. Implement the New Data Source

 We recommend looking at an [example source
 implementation](https://github.com/googleapis/genai-toolbox/blob/main/internal/sources/postgres/postgres.go).
@@ -75,7 +66,7 @@ implementation](https://github.com/googleapis/genai-toolbox/blob/main/internal/s
 * **Implement the
  [`SourceConfig`](https://github.com/googleapis/genai-toolbox/blob/fd300dc606d88bf9f7bba689e2cee4e3565537dd/internal/sources/sources.go#L57)
  interface**. This interface requires two methods:
-  * `SourceConfigType() string`: Returns a unique string identifier for your
+  * `SourceConfigKind() string`: Returns a unique string identifier for your
    data source (e.g., `"newdb"`).
  * `Initialize(ctx context.Context, tracer trace.Tracer) (Source, error)`:
    Creates a new instance of your data source and establishes a connection to
@@ -83,11 +74,11 @@ implementation](https://github.com/googleapis/genai-toolbox/blob/main/internal/s
 * **Implement the
  [`Source`](https://github.com/googleapis/genai-toolbox/blob/fd300dc606d88bf9f7bba689e2cee4e3565537dd/internal/sources/sources.go#L63)
  interface**. This interface requires one method:
-  * `SourceType() string`: Returns the same string identifier as `SourceConfigType()`.
+  * `SourceKind() string`: Returns the same string identifier as `SourceConfigKind()`.
 * **Implement `init()`** to register the new Source.
 * **Implement Unit Tests** in a file named `newdb_test.go`.

-### Adding a New Tool
+#### 2. Implement the New Tool

 We recommend looking at an [example tool
 implementation](https://github.com/googleapis/genai-toolbox/tree/main/internal/tools/postgres/postgressql).
@@ -100,7 +91,7 @@ tools.
 * **Implement the
  [`ToolConfig`](https://github.com/googleapis/genai-toolbox/blob/fd300dc606d88bf9f7bba689e2cee4e3565537dd/internal/tools/tools.go#L61)
  interface**. This interface requires one method:
-  * `ToolConfigType() string`: Returns a unique string identifier for your tool
+  * `ToolConfigKind() string`: Returns a unique string identifier for your tool
    (e.g., `"newdb"`).
  * `Initialize(sources map[string]Source) (Tool, error)`: Creates a new
    instance of your tool and validates that it can connect to the specified
@@ -120,14 +111,12 @@ tools.
 * **Implement `init()`** to register the new Tool.
 * **Implement Unit Tests** in a file named `newdb_test.go`.

-### Adding Integration Tests
+#### 3. Add Integration Tests

 * **Add a test file** under a new directory `tests/newdb`.
 * **Add pre-defined integration test suites** in the
  `/tests/newdb/newdb_test.go` that are **required** to be run as long as your
-  code contains related features. Please check each test suites for the config
-  defaults, if your source require test suites config updates, please refer to
-  [config option](./tests/option.go):
+  code contains related features:

     1. [RunToolGetTest][tool-get]: tests for the `GET` endpoint that returns the
            tool's manifest.
@@ -146,7 +135,7 @@ tools.
            parameters][temp-param-doc]. Only run this test if template
            parameters apply to your tool.

-* **Add the new database to the integration test workflow** in
+* **Add the new database to the test config** in
  [integration.cloudbuild.yaml](.ci/integration.cloudbuild.yaml).

 [tool-get]:
@@ -162,7 +151,7 @@ tools.
 [temp-param-doc]:
    https://googleapis.github.io/genai-toolbox/resources/tools/#template-parameters

-### Adding Documentation
+#### 4. Add Documentation

 * **Update the documentation** to include information about your new data source
  and tool. This includes:
@@ -172,7 +161,7 @@ tools.

 * **(Optional) Add samples** to the `docs/en/samples/<newdb>` directory.

-### (Optional) Adding Prebuilt Tools
+#### (Optional) 5. Add Prebuilt Tools

 You can provide developers with a set of "build-time" tools to aid common
 software development user journeys like viewing and creating tables/collections
@@ -186,7 +175,7 @@ and data.
  [internal/prebuiltconfigs/prebuiltconfigs_test.go](internal/prebuiltconfigs/prebuiltconfigs_test.go)
  and [cmd/root_test.go](cmd/root_test.go).

-## Submitting a Pull Request
+#### 6. Submit a Pull Request

 Submit a pull request to the repository with your changes. Be sure to include a
 detailed description of your changes and any requests for long term testing
@@ -215,7 +204,7 @@ resources.
  | style           | Update src code, with only formatting and whitespace updates (e.g. code formatter or linter changes). |

  Pull requests should always add scope whenever possible. The scope is
-  formatted as `<scope-type>/<scope-type>` (e.g., `sources/postgres`, or
+  formatted as `<scope-type>/<scope-kind>` (e.g., `sources/postgres`, or
  `tools/mssql-sql`).
  
  Ideally, **each PR covers only one scope**, if this is
@@ -227,4 +216,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/README.md
+++ b/README.md
@@ -33,15 +33,12 @@ documentation](https://googleapis.github.io/genai-toolbox/).
 - [Getting Started](#getting-started)
  - [Installing the server](#installing-the-server)
  - [Running the server](#running-the-server)
-    - [Homebrew Users](#homebrew-users)
  - [Integrating your application](#integrating-your-application)
 - [Configuration](#configuration)
  - [Sources](#sources)
  - [Tools](#tools)
  - [Toolsets](#toolsets)
 - [Versioning](#versioning)
-  - [Pre-1.0.0 Versioning](#pre-100-versioning)
-  - [Post-1.0.0 Versioning](#post-100-versioning)
 - [Contributing](#contributing)
 - [Community](#community)

@@ -117,7 +114,7 @@ To install Toolbox as a binary:
 <!-- {x-release-please-start-version} -->
 ```sh
 # see releases page for other versions
-export VERSION=0.13.0
+export VERSION=0.12.0
 curl -O https://storage.googleapis.com/genai-toolbox/v$VERSION/linux/amd64/toolbox
 chmod +x toolbox
 ```
@@ -130,7 +127,7 @@ You can also install Toolbox as a container:

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

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

@@ -165,66 +162,22 @@ go install github.com/googleapis/genai-toolbox@v0.13.0
 [Configure](#configuration) a `tools.yaml` to define your tools, and then
 execute `toolbox` to start the server:

-<details open>
-<summary>Binary</summary>
-
-To run Toolbox from binary:
-
 ```sh
 ./toolbox --tools-file "tools.yaml"
 ```

-ⓘ **NOTE:**  
-Toolbox enables dynamic reloading by default. To disable, use the `--disable-reload` flag.
+> [!NOTE]
+> Toolbox enables dynamic reloading by default. To disable, use the
+> `--disable-reload` flag.

-</details>
+#### Homebrew Users

-<details>
-
-<summary>Container image</summary>
-
-To run the server after pulling the [container image](#installing-the-server):
-
-```sh
-export VERSION=0.11.0 # Use the version you pulled
-docker run -p 5000:5000 \
-v $(pwd)/tools.yaml:/app/tools.yaml \
-us-central1-docker.pkg.dev/database-toolbox/toolbox/toolbox:$VERSION \
--tools-file "/app/tools.yaml"
-```
-
-ⓘ **NOTE:**  
-The `-v` flag mounts your local `tools.yaml` into the container, and `-p` maps the container's port `5000` to your host's port `5000`.
-
-</details>
-
-<details>
-
-<summary>Source</summary>
-
-To run the server directly from source, navigate to the project root directory and run:
-
-```sh
-go run .
-```
-
-ⓘ **NOTE:**  
-This command runs the project from source, and is more suitable for development and testing. It does **not** compile a binary into your `$GOPATH`. If you want to compile a binary instead, refer the [Developer Documentation](./DEVELOPER.md#building-the-binary).
-
-</details>
-
-<details>
-
-<summary>Homebrew</summary>
-
-If you installed Toolbox using [Homebrew](https://brew.sh/), the `toolbox` binary is available in your system path. You can start the server with the same command:
+If you installed Toolbox using Homebrew, the `toolbox` binary is available in your system path. You can start the server with the same command:

 ```sh
 toolbox --tools-file "tools.yaml"
 ```

-</details>
-
 You can use `toolbox help` for a full list of flags! To stop the server, send a
 terminate signal (`ctrl+c` on most platforms).

@@ -232,7 +185,6 @@ For more detailed documentation on deploying to different environments, check
 out the resources in the [How-to
 section](https://googleapis.github.io/genai-toolbox/how-to/)

-
 ### Integrating your application

 Once your server is up and running, you can load the tools into your
@@ -726,7 +678,7 @@ For more details on configuring different types of sources, see the
 ### Tools

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

 ```yaml
 tools:
@@ -772,26 +724,12 @@ my_second_toolset = client.load_toolset("my_second_toolset")

 ## Versioning

-This project uses [semantic versioning](https://semver.org/) (`MAJOR.MINOR.PATCH`).
-Since the project is in a pre-release stage (version `0.x.y`), we follow the
-standard conventions for initial  development:
+This project uses [semantic versioning](https://semver.org/), including a
+`MAJOR.MINOR.PATCH` version number that increments with:

-### Pre-1.0.0 Versioning
-While the major version is `0`, the public API should be considered unstable.
-The version will be incremented  as follows:
-
- **`0.MINOR.PATCH`**: The **MINOR** version is incremented when we add
-  new functionality or make breaking, incompatible API changes.
- **`0.MINOR.PATCH`**: The **PATCH** version is incremented for
-  backward-compatible bug fixes.
-
-### Post-1.0.0 Versioning
-Once the project reaches a stable `1.0.0` release, the versioning will follow
-the more common convention:
-
- **`MAJOR.MINOR.PATCH`**: Incremented for incompatible API changes.
- **`MAJOR.MINOR.PATCH`**: Incremented for new, backward-compatible functionality.
- **`MAJOR.MINOR.PATCH`**: Incremented for backward-compatible bug fixes.
+- MAJOR version when we make incompatible API changes
+- MINOR version when we add functionality in a backward compatible manner
+- PATCH version when we make backward compatible bug fixes

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

 	// Import tool packages for side effect of registration
 	_ "github.com/googleapis/genai-toolbox/internal/tools/alloydbainl"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/bigquery/bigqueryconversationalanalytics"
 	_ "github.com/googleapis/genai-toolbox/internal/tools/bigquery/bigqueryexecutesql"
 	_ "github.com/googleapis/genai-toolbox/internal/tools/bigquery/bigqueryforecast"
 	_ "github.com/googleapis/genai-toolbox/internal/tools/bigquery/bigquerygetdatasetinfo"
@@ -52,22 +51,17 @@ import (
 	_ "github.com/googleapis/genai-toolbox/internal/tools/bigquery/bigquerylisttableids"
 	_ "github.com/googleapis/genai-toolbox/internal/tools/bigquery/bigquerysql"
 	_ "github.com/googleapis/genai-toolbox/internal/tools/bigtable"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/clickhouse/clickhouseexecutesql"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/clickhouse/clickhousesql"
 	_ "github.com/googleapis/genai-toolbox/internal/tools/couchbase"
 	_ "github.com/googleapis/genai-toolbox/internal/tools/dataplex/dataplexlookupentry"
 	_ "github.com/googleapis/genai-toolbox/internal/tools/dataplex/dataplexsearchaspecttypes"
 	_ "github.com/googleapis/genai-toolbox/internal/tools/dataplex/dataplexsearchentries"
 	_ "github.com/googleapis/genai-toolbox/internal/tools/dgraph"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/firebird/firebirdexecutesql"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/firebird/firebirdsql"
 	_ "github.com/googleapis/genai-toolbox/internal/tools/firestore/firestoreadddocuments"
 	_ "github.com/googleapis/genai-toolbox/internal/tools/firestore/firestoredeletedocuments"
 	_ "github.com/googleapis/genai-toolbox/internal/tools/firestore/firestoregetdocuments"
 	_ "github.com/googleapis/genai-toolbox/internal/tools/firestore/firestoregetrules"
 	_ "github.com/googleapis/genai-toolbox/internal/tools/firestore/firestorelistcollections"
 	_ "github.com/googleapis/genai-toolbox/internal/tools/firestore/firestorequerycollection"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/firestore/firestoreupdatedocument"
 	_ "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"
@@ -111,8 +105,6 @@ import (
 	_ "github.com/googleapis/genai-toolbox/internal/tools/sqlitesql"
 	_ "github.com/googleapis/genai-toolbox/internal/tools/tidb/tidbexecutesql"
 	_ "github.com/googleapis/genai-toolbox/internal/tools/tidb/tidbsql"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/trino/trinoexecutesql"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/trino/trinosql"
 	_ "github.com/googleapis/genai-toolbox/internal/tools/utility/alloydbwaitforoperation"
 	_ "github.com/googleapis/genai-toolbox/internal/tools/utility/wait"
 	_ "github.com/googleapis/genai-toolbox/internal/tools/valkey"
@@ -122,14 +114,12 @@ import (
 	_ "github.com/googleapis/genai-toolbox/internal/sources/alloydbpg"
 	_ "github.com/googleapis/genai-toolbox/internal/sources/bigquery"
 	_ "github.com/googleapis/genai-toolbox/internal/sources/bigtable"
-	_ "github.com/googleapis/genai-toolbox/internal/sources/clickhouse"
 	_ "github.com/googleapis/genai-toolbox/internal/sources/cloudsqlmssql"
 	_ "github.com/googleapis/genai-toolbox/internal/sources/cloudsqlmysql"
 	_ "github.com/googleapis/genai-toolbox/internal/sources/cloudsqlpg"
 	_ "github.com/googleapis/genai-toolbox/internal/sources/couchbase"
 	_ "github.com/googleapis/genai-toolbox/internal/sources/dataplex"
 	_ "github.com/googleapis/genai-toolbox/internal/sources/dgraph"
-	_ "github.com/googleapis/genai-toolbox/internal/sources/firebird"
 	_ "github.com/googleapis/genai-toolbox/internal/sources/firestore"
 	_ "github.com/googleapis/genai-toolbox/internal/sources/http"
 	_ "github.com/googleapis/genai-toolbox/internal/sources/looker"
@@ -143,7 +133,6 @@ import (
 	_ "github.com/googleapis/genai-toolbox/internal/sources/spanner"
 	_ "github.com/googleapis/genai-toolbox/internal/sources/sqlite"
 	_ "github.com/googleapis/genai-toolbox/internal/sources/tidb"
-	_ "github.com/googleapis/genai-toolbox/internal/sources/trino"
 	_ "github.com/googleapis/genai-toolbox/internal/sources/valkey"
 )

@@ -219,9 +208,6 @@ func NewCommand(opts ...Option) *Command {
 		o(cmd)
 	}

-	// Do not print Usage on runtime error
-	cmd.SilenceUsage = true
-
 	// Set server version
 	cmd.cfg.Version = versionString

@@ -245,13 +231,7 @@ func NewCommand(opts ...Option) *Command {
 	flags.BoolVar(&cmd.cfg.TelemetryGCP, "telemetry-gcp", false, "Enable exporting directly to Google Cloud Monitoring.")
 	flags.StringVar(&cmd.cfg.TelemetryOTLP, "telemetry-otlp", "", "Enable exporting using OpenTelemetry Protocol (OTLP) to the specified endpoint (e.g. 'http://127.0.0.1:4318')")
 	flags.StringVar(&cmd.cfg.TelemetryServiceName, "telemetry-service-name", "toolbox", "Sets the value of the service.name resource attribute for telemetry data.")
-
-	// Fetch prebuilt tools sources to customize the help description
-	prebuiltHelp := fmt.Sprintf(
-		"Use a prebuilt tool configuration by source type. Cannot be used with --tools-file. Allowed: '%s'.",
-		strings.Join(prebuiltconfigs.GetPrebuiltSources(), "', '"),
-	)
-	flags.StringVar(&cmd.prebuiltConfig, "prebuilt", "", prebuiltHelp)
+	flags.StringVar(&cmd.prebuiltConfig, "prebuilt", "", "Use a prebuilt tool configuration by source type. Cannot be used with --tools-file. Allowed: 'alloydb-postgres-admin', alloydb-postgres', 'bigquery', 'cloud-sql-mysql', 'cloud-sql-postgres', 'cloud-sql-mssql', 'dataplex', 'firestore', 'looker', 'mssql', 'mysql', 'oceanbase', 'postgres', 'spanner', 'spanner-postgres'.")
 	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.")
@@ -271,40 +251,32 @@ type ToolsFile struct {
 }

 // parseEnv replaces environment variables ${ENV_NAME} with their values.
-// also support ${ENV_NAME:default_value}.
-func parseEnv(input string) (string, error) {
-	re := regexp.MustCompile(`\$\{(\w+)(:(\w*))?\}`)
+func parseEnv(input string) string {
+	re := regexp.MustCompile(`\$\{(\w+)\}`)

-	var err error
-	output := re.ReplaceAllStringFunc(input, func(match string) string {
+	return re.ReplaceAllStringFunc(input, func(match string) string {
 		parts := re.FindStringSubmatch(match)
+		if len(parts) < 2 {
+			// technically shouldn't happen
+			return match
+		}

 		// extract the variable name
 		variableName := parts[1]
 		if value, found := os.LookupEnv(variableName); found {
 			return value
 		}
-		if parts[2] != "" {
-			return parts[3]
-		}
-		err = fmt.Errorf("environment variable not found: %q", variableName)
-		return ""
+		return match
 	})
-	return output, err
 }

 // parseToolsFile parses the provided yaml into appropriate configs.
 func parseToolsFile(ctx context.Context, raw []byte) (ToolsFile, error) {
 	var toolsFile ToolsFile
 	// Replace environment variables if found
-	output, err := parseEnv(string(raw))
-	if err != nil {
-		return toolsFile, fmt.Errorf("error parsing environment variables: %s", err)
-	}
-	raw = []byte(output)
-
+	raw = []byte(parseEnv(string(raw)))
 	// Parse contents
-	err = yaml.UnmarshalContext(ctx, raw, &toolsFile, yaml.Strict())
+	err := yaml.UnmarshalContext(ctx, raw, &toolsFile, yaml.Strict())
 	if err != nil {
 		return toolsFile, err
 	}
@@ -840,7 +812,7 @@ func run(cmd *Command) error {
 		}
 		cmd.logger.InfoContext(ctx, "Server ready to serve!")
 		if cmd.cfg.UI {
-			cmd.logger.InfoContext(ctx, fmt.Sprintf("Toolbox UI is up and running at: http://%s:%d/ui", cmd.cfg.Address, cmd.cfg.Port))
+			cmd.logger.InfoContext(ctx, fmt.Sprintf("Toolbox UI is up and running at: http://localhost:%d/ui", cmd.cfg.Port))
 		}

 		go func() {
--- a/cmd/root_test.go
+++ b/cmd/root_test.go
@@ -206,72 +206,6 @@ func TestServerConfigFlags(t *testing.T) {
 	}
 }

-func TestParseEnv(t *testing.T) {
-	tcs := []struct {
-		desc      string
-		env       map[string]string
-		in        string
-		want      string
-		err       bool
-		errString string
-	}{
-		{
-			desc:      "without default without env",
-			in:        "${FOO}",
-			want:      "",
-			err:       true,
-			errString: `environment variable not found: "FOO"`,
-		},
-		{
-			desc: "without default with env",
-			env: map[string]string{
-				"FOO": "bar",
-			},
-			in:   "${FOO}",
-			want: "bar",
-		},
-		{
-			desc: "with empty default",
-			in:   "${FOO:}",
-			want: "",
-		},
-		{
-			desc: "with default",
-			in:   "${FOO:bar}",
-			want: "bar",
-		},
-		{
-			desc: "with default with env",
-			env: map[string]string{
-				"FOO": "hello",
-			},
-			in:   "${FOO:bar}",
-			want: "hello",
-		},
-	}
-	for _, tc := range tcs {
-		t.Run(tc.desc, func(t *testing.T) {
-			if tc.env != nil {
-				for k, v := range tc.env {
-					t.Setenv(k, v)
-				}
-			}
-			got, err := parseEnv(tc.in)
-			if tc.err {
-				if err == nil {
-					t.Fatalf("expected error not found")
-				}
-				if tc.errString != err.Error() {
-					t.Fatalf("incorrect error string: got %s, want %s", err, tc.errString)
-				}
-			}
-			if tc.want != got {
-				t.Fatalf("unexpected want: got %s, want %s", got, tc.want)
-			}
-		})
-	}
-}
-
 func TestToolFileFlag(t *testing.T) {
 	tcs := []struct {
 		desc string
@@ -496,7 +430,7 @@ func TestParseToolFile(t *testing.T) {
 				Sources: server.SourceConfigs{
 					"my-pg-instance": cloudsqlpgsrc.Config{
 						Name:     "my-pg-instance",
-						Type:     cloudsqlpgsrc.SourceType,
+						Kind:     cloudsqlpgsrc.SourceKind,
 						Project:  "my-project",
 						Region:   "my-region",
 						Instance: "my-instance",
@@ -509,7 +443,7 @@ func TestParseToolFile(t *testing.T) {
 				Tools: server.ToolConfigs{
 					"example_tool": postgressql.Config{
 						Name:        "example_tool",
-						Type:        "postgres-sql",
+						Kind:        "postgres-sql",
 						Source:      "my-pg-instance",
 						Description: "some description",
 						Statement:   "SELECT * FROM SQL_STATEMENT;\n",
@@ -615,7 +549,7 @@ func TestParseToolFileWithAuth(t *testing.T) {
 				Sources: server.SourceConfigs{
 					"my-pg-instance": cloudsqlpgsrc.Config{
 						Name:     "my-pg-instance",
-						Type:     cloudsqlpgsrc.SourceType,
+						Kind:     cloudsqlpgsrc.SourceKind,
 						Project:  "my-project",
 						Region:   "my-region",
 						Instance: "my-instance",
@@ -628,19 +562,19 @@ func TestParseToolFileWithAuth(t *testing.T) {
 				AuthServices: server.AuthServiceConfigs{
 					"my-google-service": google.Config{
 						Name:     "my-google-service",
-						Type:     google.AuthServiceType,
+						Kind:     google.AuthServiceKind,
 						ClientID: "my-client-id",
 					},
 					"other-google-service": google.Config{
 						Name:     "other-google-service",
-						Type:     google.AuthServiceType,
+						Kind:     google.AuthServiceKind,
 						ClientID: "other-client-id",
 					},
 				},
 				Tools: server.ToolConfigs{
 					"example_tool": postgressql.Config{
 						Name:         "example_tool",
-						Type:         "postgres-sql",
+						Kind:         "postgres-sql",
 						Source:       "my-pg-instance",
 						Description:  "some description",
 						Statement:    "SELECT * FROM SQL_STATEMENT;\n",
@@ -714,7 +648,7 @@ func TestParseToolFileWithAuth(t *testing.T) {
 				Sources: server.SourceConfigs{
 					"my-pg-instance": cloudsqlpgsrc.Config{
 						Name:     "my-pg-instance",
-						Type:     cloudsqlpgsrc.SourceType,
+						Kind:     cloudsqlpgsrc.SourceKind,
 						Project:  "my-project",
 						Region:   "my-region",
 						Instance: "my-instance",
@@ -727,19 +661,19 @@ func TestParseToolFileWithAuth(t *testing.T) {
 				AuthSources: server.AuthServiceConfigs{
 					"my-google-service": google.Config{
 						Name:     "my-google-service",
-						Type:     google.AuthServiceType,
+						Kind:     google.AuthServiceKind,
 						ClientID: "my-client-id",
 					},
 					"other-google-service": google.Config{
 						Name:     "other-google-service",
-						Type:     google.AuthServiceType,
+						Kind:     google.AuthServiceKind,
 						ClientID: "other-client-id",
 					},
 				},
 				Tools: server.ToolConfigs{
 					"example_tool": postgressql.Config{
 						Name:         "example_tool",
-						Type:         "postgres-sql",
+						Kind:         "postgres-sql",
 						Source:       "my-pg-instance",
 						Description:  "some description",
 						Statement:    "SELECT * FROM SQL_STATEMENT;\n",
@@ -815,7 +749,7 @@ func TestParseToolFileWithAuth(t *testing.T) {
 				Sources: server.SourceConfigs{
 					"my-pg-instance": cloudsqlpgsrc.Config{
 						Name:     "my-pg-instance",
-						Type:     cloudsqlpgsrc.SourceType,
+						Kind:     cloudsqlpgsrc.SourceKind,
 						Project:  "my-project",
 						Region:   "my-region",
 						Instance: "my-instance",
@@ -828,19 +762,19 @@ func TestParseToolFileWithAuth(t *testing.T) {
 				AuthServices: server.AuthServiceConfigs{
 					"my-google-service": google.Config{
 						Name:     "my-google-service",
-						Type:     google.AuthServiceType,
+						Kind:     google.AuthServiceKind,
 						ClientID: "my-client-id",
 					},
 					"other-google-service": google.Config{
 						Name:     "other-google-service",
-						Type:     google.AuthServiceType,
+						Kind:     google.AuthServiceKind,
 						ClientID: "other-client-id",
 					},
 				},
 				Tools: server.ToolConfigs{
 					"example_tool": postgressql.Config{
 						Name:         "example_tool",
-						Type:         "postgres-sql",
+						Kind:         "postgres-sql",
 						Source:       "my-pg-instance",
 						Description:  "some description",
 						Statement:    "SELECT * FROM SQL_STATEMENT;\n",
@@ -886,14 +820,13 @@ func TestParseToolFileWithAuth(t *testing.T) {

 func TestEnvVarReplacement(t *testing.T) {
 	ctx, err := testutils.ContextWithNewLogger()
-	t.Setenv("TestHeader", "ACTUAL_HEADER")
-	t.Setenv("API_KEY", "ACTUAL_API_KEY")
-	t.Setenv("clientId", "ACTUAL_CLIENT_ID")
-	t.Setenv("clientId2", "ACTUAL_CLIENT_ID_2")
-	t.Setenv("toolset_name", "ACTUAL_TOOLSET_NAME")
-	t.Setenv("cat_string", "cat")
-	t.Setenv("food_string", "food")
-	t.Setenv("TestHeader", "ACTUAL_HEADER")
+	os.Setenv("TestHeader", "ACTUAL_HEADER")
+	os.Setenv("API_KEY", "ACTUAL_API_KEY")
+	os.Setenv("clientId", "ACTUAL_CLIENT_ID")
+	os.Setenv("clientId2", "ACTUAL_CLIENT_ID_2")
+	os.Setenv("toolset_name", "ACTUAL_TOOLSET_NAME")
+	os.Setenv("cat_string", "cat")
+	os.Setenv("food_string", "food")

 	if err != nil {
 		t.Fatalf("unexpected error: %s", err)
@@ -972,7 +905,7 @@ func TestEnvVarReplacement(t *testing.T) {
 				Sources: server.SourceConfigs{
 					"my-http-instance": httpsrc.Config{
 						Name:           "my-http-instance",
-						Type:           httpsrc.SourceType,
+						Kind:           httpsrc.SourceKind,
 						BaseURL:        "http://test_server/",
 						Timeout:        "10s",
 						DefaultHeaders: map[string]string{"Authorization": "ACTUAL_HEADER"},
@@ -982,19 +915,19 @@ func TestEnvVarReplacement(t *testing.T) {
 				AuthServices: server.AuthServiceConfigs{
 					"my-google-service": google.Config{
 						Name:     "my-google-service",
-						Type:     google.AuthServiceType,
+						Kind:     google.AuthServiceKind,
 						ClientID: "ACTUAL_CLIENT_ID",
 					},
 					"other-google-service": google.Config{
 						Name:     "other-google-service",
-						Type:     google.AuthServiceType,
+						Kind:     google.AuthServiceKind,
 						ClientID: "ACTUAL_CLIENT_ID_2",
 					},
 				},
 				Tools: server.ToolConfigs{
 					"example_tool": http.Config{
 						Name:         "example_tool",
-						Type:         "http",
+						Kind:         "http",
 						Source:       "my-instance",
 						Method:       "GET",
 						Path:         "search?name=alice&pet=cat",
@@ -1228,11 +1161,9 @@ func TestSingleEdit(t *testing.T) {
 }

 func TestPrebuiltTools(t *testing.T) {
-	// Get prebuilt configs
 	alloydb_admin_config, _ := prebuiltconfigs.Get("alloydb-postgres-admin")
 	alloydb_config, _ := prebuiltconfigs.Get("alloydb-postgres")
 	bigquery_config, _ := prebuiltconfigs.Get("bigquery")
-	clickhouse_config, _ := prebuiltconfigs.Get("clickhouse")
 	cloudsqlpg_config, _ := prebuiltconfigs.Get("cloud-sql-postgres")
 	cloudsqlmysql_config, _ := prebuiltconfigs.Get("cloud-sql-mysql")
 	cloudsqlmssql_config, _ := prebuiltconfigs.Get("cloud-sql-mssql")
@@ -1244,80 +1175,6 @@ func TestPrebuiltTools(t *testing.T) {
 	postgresconfig, _ := prebuiltconfigs.Get("postgres")
 	spanner_config, _ := prebuiltconfigs.Get("spanner")
 	spannerpg_config, _ := prebuiltconfigs.Get("spanner-postgres")
-
-	// Set environment variables
-	t.Setenv("API_KEY", "your_api_key")
-
-	t.Setenv("BIGQUERY_PROJECT", "your_gcp_project_id")
-	t.Setenv("DATAPLEX_PROJECT", "your_gcp_project_id")
-	t.Setenv("FIRESTORE_PROJECT", "your_gcp_project_id")
-	t.Setenv("FIRESTORE_DATABASE", "your_firestore_db_name")
-
-	t.Setenv("SPANNER_PROJECT", "your_gcp_project_id")
-	t.Setenv("SPANNER_INSTANCE", "your_spanner_instance")
-	t.Setenv("SPANNER_DATABASE", "your_spanner_db")
-
-	t.Setenv("ALLOYDB_POSTGRES_PROJECT", "your_gcp_project_id")
-	t.Setenv("ALLOYDB_POSTGRES_REGION", "your_gcp_region")
-	t.Setenv("ALLOYDB_POSTGRES_CLUSTER", "your_alloydb_cluster")
-	t.Setenv("ALLOYDB_POSTGRES_INSTANCE", "your_alloydb_instance")
-	t.Setenv("ALLOYDB_POSTGRES_DATABASE", "your_alloydb_db")
-	t.Setenv("ALLOYDB_POSTGRES_USER", "your_alloydb_user")
-	t.Setenv("ALLOYDB_POSTGRES_PASSWORD", "your_alloydb_password")
-
-	t.Setenv("CLICKHOUSE_PROTOCOL", "your_clickhouse_protocol")
-	t.Setenv("CLICKHOUSE_DATABASE", "your_clickhouse_database")
-	t.Setenv("CLICKHOUSE_PASSWORD", "your_clickhouse_password")
-	t.Setenv("CLICKHOUSE_USER", "your_clickhouse_user")
-	t.Setenv("CLICKHOUSE_HOST", "your_clickhosue_host")
-	t.Setenv("CLICKHOUSE_PORT", "8123")
-
-	t.Setenv("CLOUD_SQL_POSTGRES_PROJECT", "your_pg_project")
-	t.Setenv("CLOUD_SQL_POSTGRES_INSTANCE", "your_pg_instance")
-	t.Setenv("CLOUD_SQL_POSTGRES_DATABASE", "your_pg_db")
-	t.Setenv("CLOUD_SQL_POSTGRES_REGION", "your_pg_region")
-	t.Setenv("CLOUD_SQL_POSTGRES_USER", "your_pg_user")
-	t.Setenv("CLOUD_SQL_POSTGRES_PASS", "your_pg_pass")
-
-	t.Setenv("CLOUD_SQL_MYSQL_PROJECT", "your_gcp_project_id")
-	t.Setenv("CLOUD_SQL_MYSQL_REGION", "your_gcp_region")
-	t.Setenv("CLOUD_SQL_MYSQL_INSTANCE", "your_instance")
-	t.Setenv("CLOUD_SQL_MYSQL_DATABASE", "your_cloudsql_mysql_db")
-	t.Setenv("CLOUD_SQL_MYSQL_USER", "your_cloudsql_mysql_user")
-	t.Setenv("CLOUD_SQL_MYSQL_PASSWORD", "your_cloudsql_mysql_password")
-
-	t.Setenv("CLOUD_SQL_MSSQL_PROJECT", "your_gcp_project_id")
-	t.Setenv("CLOUD_SQL_MSSQL_REGION", "your_gcp_region")
-	t.Setenv("CLOUD_SQL_MSSQL_INSTANCE", "your_cloudsql_mssql_instance")
-	t.Setenv("CLOUD_SQL_MSSQL_DATABASE", "your_cloudsql_mssql_db")
-	t.Setenv("CLOUD_SQL_MSSQL_IP_ADDRESS", "127.0.0.1")
-	t.Setenv("CLOUD_SQL_MSSQL_USER", "your_cloudsql_mssql_user")
-	t.Setenv("CLOUD_SQL_MSSQL_PASSWORD", "your_cloudsql_mssql_password")
-	t.Setenv("CLOUD_SQL_POSTGRES_PASSWORD", "your_cloudsql_pg_password")
-
-	t.Setenv("POSTGRES_HOST", "localhost")
-	t.Setenv("POSTGRES_PORT", "5432")
-	t.Setenv("POSTGRES_DATABASE", "your_postgres_db")
-	t.Setenv("POSTGRES_USER", "your_postgres_user")
-	t.Setenv("POSTGRES_PASSWORD", "your_postgres_password")
-
-	t.Setenv("MYSQL_HOST", "localhost")
-	t.Setenv("MYSQL_PORT", "3306")
-	t.Setenv("MYSQL_DATABASE", "your_mysql_db")
-	t.Setenv("MYSQL_USER", "your_mysql_user")
-	t.Setenv("MYSQL_PASSWORD", "your_mysql_password")
-
-	t.Setenv("MSSQL_HOST", "localhost")
-	t.Setenv("MSSQL_PORT", "1433")
-	t.Setenv("MSSQL_DATABASE", "your_mssql_db")
-	t.Setenv("MSSQL_USER", "your_mssql_user")
-	t.Setenv("MSSQL_PASSWORD", "your_mssql_password")
-
-	t.Setenv("LOOKER_BASE_URL", "https://your_company.looker.com")
-	t.Setenv("LOOKER_CLIENT_ID", "your_looker_client_id")
-	t.Setenv("LOOKER_CLIENT_SECRET", "your_looker_client_secret")
-	t.Setenv("LOOKER_VERIFY_SSL", "true")
-
 	ctx, err := testutils.ContextWithNewLogger()
 	if err != nil {
 		t.Fatalf("unexpected error: %s", err)
@@ -1353,17 +1210,7 @@ func TestPrebuiltTools(t *testing.T) {
 			wantToolset: server.ToolsetConfigs{
 				"bigquery-database-tools": tools.ToolsetConfig{
 					Name:      "bigquery-database-tools",
-					ToolNames: []string{"ask_data_insights", "execute_sql", "forecast", "get_dataset_info", "get_table_info", "list_dataset_ids", "list_table_ids"},
-				},
-			},
-		},
-		{
-			name: "clickhouse prebuilt tools",
-			in:   clickhouse_config,
-			wantToolset: server.ToolsetConfigs{
-				"clickhouse-database-tools": tools.ToolsetConfig{
-					Name:      "clickhouse-database-tools",
-					ToolNames: []string{"execute_sql"},
+					ToolNames: []string{"execute_sql", "forecast", "get_dataset_info", "get_table_info", "list_dataset_ids", "list_table_ids"},
 				},
 			},
 		},
@@ -1413,7 +1260,7 @@ func TestPrebuiltTools(t *testing.T) {
 			wantToolset: server.ToolsetConfigs{
 				"firestore-database-tools": tools.ToolsetConfig{
 					Name:      "firestore-database-tools",
-					ToolNames: []string{"firestore-get-documents", "firestore-add-documents", "firestore-update-document", "firestore-list-collections", "firestore-delete-documents", "firestore-query-collection", "firestore-get-rules", "firestore-validate-rules"},
+					ToolNames: []string{"firestore-get-documents", "firestore-add-documents", "firestore-list-collections", "firestore-delete-documents", "firestore-query-collection", "firestore-get-rules", "firestore-validate-rules"},
 				},
 			},
 		},
--- a/cmd/version.txt
+++ b/cmd/version.txt
@@ -1 +1 @@
-0.13.0
+0.12.0
--- a/docs/en/concepts/telemetry/index.md
+++ b/docs/en/concepts/telemetry/index.md
@@ -64,7 +64,7 @@ The structured logging outputs log as JSON:
  "timestamp":"2024-11-04T16:45:11.987299-08:00",
  "severity":"ERROR",
  "logging.googleapis.com/sourceLocation":{...},
-  "message":"unable to parse tool file at \"tools.yaml\": \"cloud-sql-postgres1\" is not a valid type of data source"
+  "message":"unable to parse tool file at \"tools.yaml\": \"cloud-sql-postgres1\" is not a valid kind of data source"
 }
 ```

--- a/docs/en/getting-started/colab_quickstart.ipynb
+++ b/docs/en/getting-started/colab_quickstart.ipynb
@@ -234,7 +234,7 @@
      },
      "outputs": [],
      "source": [
-        "version = \"0.13.0\" # x-release-please-version\n",
+        "version = \"0.12.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/configure.md
+++ b/docs/en/getting-started/configure.md
@@ -22,11 +22,6 @@ etc., you could use environment variables instead with the format `${ENV_NAME}`.
  user: ${USER_NAME}
  password: ${PASSWORD}
 ```
-A default value can be specified like `${ENV_NAME:default}`.
-
-```yaml
-  port: ${DB_PORT:3306}
-```

 ### Sources

@@ -51,7 +46,7 @@ For more details on configuring different types of sources, see the
 ### Tools

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

 ```yaml
--- a/docs/en/getting-started/introduction/_index.md
+++ b/docs/en/getting-started/introduction/_index.md
@@ -86,7 +86,7 @@ To install Toolbox as a binary:

 ```sh
 # see releases page for other versions
-export VERSION=0.13.0
+export VERSION=0.12.0
 curl -O https://storage.googleapis.com/genai-toolbox/v$VERSION/linux/amd64/toolbox
 chmod +x toolbox
 ```
@@ -97,7 +97,7 @@ You can also install Toolbox as a container:

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

@@ -115,7 +115,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.13.0
+go install github.com/googleapis/genai-toolbox@v0.12.0
 ```

 {{% /tab %}}
--- a/docs/en/getting-started/local_quickstart.md
+++ b/docs/en/getting-started/local_quickstart.md
@@ -18,13 +18,273 @@ This guide assumes you have already done the following:
 1. Installed [PostgreSQL 16+ and the `psql` client][install-postgres].

 ### Cloud Setup (Optional)
-{{< regionInclude "quickstart/shared/cloud_setup.md" "cloud_setup" >}}
+<!-- [START cloud_setup] -->
+
+If you plan to use **Google Cloud’s Vertex AI** with your agent (e.g., using
+`vertexai=True` or a Google GenAI model), follow these one-time setup steps for
+local development:
+
+1. [Install the Google Cloud CLI](https://cloud.google.com/sdk/docs/install)
+1. [Set up Application Default Credentials (ADC)](https://cloud.google.com/docs/authentication/set-up-adc-local-dev-environment)
+1. Set your project and enable Vertex AI
+
+    ```bash
+    gcloud config set project YOUR_PROJECT_ID
+    gcloud services enable aiplatform.googleapis.com
+    ```
+
+[install-python]: https://wiki.python.org/moin/BeginnersGuide/Download
+[install-pip]: https://pip.pypa.io/en/stable/installation/
+[install-venv]: https://packaging.python.org/en/latest/tutorials/installing-packages/#creating-virtual-environments
+[install-postgres]: https://www.postgresql.org/download/
+<!-- [END cloud_setup] -->

 ## Step 1: Set up your database
-{{< regionInclude "quickstart/shared/database_setup.md" "database_setup" >}}
+<!-- [START database_setup] -->
+
+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 a table using the following command:
+
+    ```sql
+    CREATE TABLE hotels(
+      id            INTEGER NOT NULL PRIMARY KEY,
+      name          VARCHAR NOT NULL,
+      location      VARCHAR NOT NULL,
+      price_tier    VARCHAR NOT NULL,
+      checkin_date  DATE    NOT NULL,
+      checkout_date DATE    NOT NULL,
+      booked        BIT     NOT NULL
+    );
+    ```
+
+1. Insert data into the table.
+
+    ```sql
+    INSERT INTO hotels(id, name, location, price_tier, checkin_date, checkout_date, booked)
+    VALUES
+      (1, 'Hilton Basel', 'Basel', 'Luxury', '2024-04-22', '2024-04-20', B'0'),
+      (2, 'Marriott Zurich', 'Zurich', 'Upscale', '2024-04-14', '2024-04-21', B'0'),
+      (3, 'Hyatt Regency Basel', 'Basel', 'Upper Upscale', '2024-04-02', '2024-04-20', B'0'),
+      (4, 'Radisson Blu Lucerne', 'Lucerne', 'Midscale', '2024-04-24', '2024-04-05', B'0'),
+      (5, 'Best Western Bern', 'Bern', 'Upper Midscale', '2024-04-23', '2024-04-01', B'0'),
+      (6, 'InterContinental Geneva', 'Geneva', 'Luxury', '2024-04-23', '2024-04-28', B'0'),
+      (7, 'Sheraton Zurich', 'Zurich', 'Upper Upscale', '2024-04-27', '2024-04-02', B'0'),
+      (8, 'Holiday Inn Basel', 'Basel', 'Upper Midscale', '2024-04-24', '2024-04-09', B'0'),
+      (9, 'Courtyard Zurich', 'Zurich', 'Upscale', '2024-04-03', '2024-04-13', B'0'),
+      (10, 'Comfort Inn Bern', 'Bern', 'Midscale', '2024-04-04', '2024-04-16', B'0');
+    ```
+
+1. End the database session:
+
+    ```bash
+    \q
+    ```
+<!-- [END database_setup] -->
+

 ## Step 2: Install and configure Toolbox
-{{< regionInclude "quickstart/shared/configure_toolbox.md" "configure_toolbox" >}}
+<!-- [START configure_toolbox] -->
+
+In this section, we will download Toolbox, configure our tools in a
+`tools.yaml`, and then run the Toolbox server.
+
+1. Download the latest version of Toolbox as a binary:
+
+    {{< notice tip >}}
+  Select the
+  [correct binary](https://github.com/googleapis/genai-toolbox/releases)
+  corresponding to your OS and CPU architecture.
+    {{< /notice >}}
+    <!-- {x-release-please-start-version} -->
+    ```bash
+    export OS="linux/amd64" # one of linux/amd64, darwin/arm64, darwin/amd64, or windows/amd64
+    curl -O https://storage.googleapis.com/genai-toolbox/v0.12.0/$OS/toolbox
+    ```
+    <!-- {x-release-please-end} -->
+
+1. Make the binary executable:
+
+    ```bash
+    chmod +x toolbox
+    ```
+
+1. Write the following into a `tools.yaml` file. Be sure to update any fields
+   such as `user`, `password`, or `database` that you may have customized in the
+   previous step.
+
+    {{< notice tip >}}
+  In practice, use environment variable replacement with the format ${ENV_NAME}
+  instead of hardcoding your secrets into the configuration file.
+    {{< /notice >}}
+
+    ```yaml
+    sources:
+      my-pg-source:
+        kind: postgres
+        host: 127.0.0.1
+        port: 5432
+        database: toolbox_db
+        user: ${USER_NAME}
+        password: ${PASSWORD}
+    tools:
+      search-hotels-by-name:
+        kind: postgres-sql
+        source: my-pg-source
+        description: Search for hotels based on name.
+        parameters:
+          - name: name
+            type: string
+            description: The name of the hotel.
+        statement: SELECT * FROM hotels WHERE name ILIKE '%' || $1 || '%';
+      search-hotels-by-location:
+        kind: postgres-sql
+        source: my-pg-source
+        description: Search for hotels based on location.
+        parameters:
+          - name: location
+            type: string
+            description: The location of the hotel.
+        statement: SELECT * FROM hotels WHERE location ILIKE '%' || $1 || '%';
+      book-hotel:
+        kind: postgres-sql
+        source: my-pg-source
+        description: >-
+           Book a hotel by its ID. If the hotel is successfully booked, returns a NULL, raises an error if not.
+        parameters:
+          - name: hotel_id
+            type: string
+            description: The ID of the hotel to book.
+        statement: UPDATE hotels SET booked = B'1' WHERE id = $1;
+      update-hotel:
+        kind: postgres-sql
+        source: my-pg-source
+        description: >-
+          Update a hotel's check-in and check-out dates by its ID. Returns a message
+          indicating  whether the hotel was successfully updated or not.
+        parameters:
+          - name: hotel_id
+            type: string
+            description: The ID of the hotel to update.
+          - name: checkin_date
+            type: string
+            description: The new check-in date of the hotel.
+          - name: checkout_date
+            type: string
+            description: The new check-out date of the hotel.
+        statement: >-
+          UPDATE hotels SET checkin_date = CAST($2 as date), checkout_date = CAST($3
+          as date) WHERE id = $1;
+      cancel-hotel:
+        kind: postgres-sql
+        source: my-pg-source
+        description: Cancel a hotel by its ID.
+        parameters:
+          - name: hotel_id
+            type: string
+            description: The ID of the hotel to cancel.
+        statement: UPDATE hotels SET booked = B'0' WHERE id = $1;
+   toolsets:
+      my-toolset:
+        - search-hotels-by-name
+        - search-hotels-by-location
+        - book-hotel
+        - update-hotel
+        - cancel-hotel
+    ```
+
+    For more info on tools, check out the `Resources` section of the docs.
+
+1. Run the Toolbox server, pointing to the `tools.yaml` file created earlier:
+
+    ```bash
+    ./toolbox --tools-file "tools.yaml"
+    ```
+
+    {{< notice note >}}
+    Toolbox enables dynamic reloading by default. To disable, use the
+    `--disable-reload` flag.
+    {{< /notice >}}
+
+<!-- [END configure_toolbox] -->

 ## Step 3: Connect your agent to Toolbox

@@ -94,24 +354,16 @@ pip install google-genai
   code to create an agent:
    {{< tabpane persist=header >}}
 {{< tab header="ADK" lang="python" >}}
-
 {{< include "quickstart/python/adk/quickstart.py" >}}
-
 {{< /tab >}}
 {{< tab header="LangChain" lang="python" >}}
-
 {{< include "quickstart/python/langchain/quickstart.py" >}}
-
 {{< /tab >}}
 {{< tab header="LlamaIndex" lang="python" >}}
-
 {{< include "quickstart/python/llamaindex/quickstart.py" >}}
-
 {{< /tab >}}
 {{< tab header="Core" lang="python" >}}
-
 {{< include "quickstart/python/core/quickstart.py" >}}
-
 {{< /tab >}}
 {{< /tabpane >}}

--- a/docs/en/getting-started/local_quickstart_go.md
+++ b/docs/en/getting-started/local_quickstart_go.md
@@ -17,13 +17,13 @@ This guide assumes you have already done the following:
 [install-postgres]: https://www.postgresql.org/download/

 ### Cloud Setup (Optional)
-{{< regionInclude "quickstart/shared/cloud_setup.md" "cloud_setup" >}}
+{{< snippet "local_quickstart.md" "cloud_setup" >}}

 ## Step 1: Set up your database
-{{< regionInclude "quickstart/shared/database_setup.md" "database_setup" >}}
+{{< snippet "local_quickstart.md" "database_setup" >}}

 ## Step 2: Install and configure Toolbox
-{{< regionInclude "quickstart/shared/configure_toolbox.md" "configure_toolbox" >}}
+{{< snippet "local_quickstart.md" "configure_toolbox" >}}

 ## Step 3: Connect your agent to Toolbox

@@ -522,7 +522,6 @@ import (
 	"context"
 	"encoding/json"
 	"log"
-	"fmt

 	"github.com/googleapis/mcp-toolbox-sdk-go/core"
 	openai "github.com/openai/openai-go"
@@ -652,7 +651,7 @@ func main() {

 		params.Messages = append(params.Messages, openai.AssistantMessage(query))

-		fmt.println("\n", completion.Choices[0].Message.Content)
+		println("\n", completion.Choices[0].Message.Content)

 	}

--- a/docs/en/getting-started/local_quickstart_js.md
+++ b/docs/en/getting-started/local_quickstart_js.md
@@ -3,7 +3,7 @@ title: "JS Quickstart (Local)"
 type: docs
 weight: 3
 description: >
-  How to get started running Toolbox locally with [JavaScript](https://github.com/googleapis/mcp-toolbox-sdk-js), PostgreSQL, and orchestration frameworks such as [LangChain](https://js.langchain.com/docs/introduction/), [GenkitJS](https://genkit.dev/docs/get-started/),  [LlamaIndex](https://ts.llamaindex.ai/) and [GoogleGenAI](https://github.com/googleapis/js-genai).
+  How to get started running Toolbox locally with [JavaScript](https://github.com/googleapis/mcp-toolbox-sdk-js), PostgreSQL, and orchestration frameworks such as [LangChain](https://js.langchain.com/docs/introduction/), [GenkitJS](https://genkit.dev/docs/get-started/), and [LlamaIndex](https://ts.llamaindex.ai/).
 ---

 ## Before you begin
@@ -17,13 +17,15 @@ This guide assumes you have already done the following:
 [install-postgres]: https://www.postgresql.org/download/

 ### Cloud Setup (Optional)
-{{< regionInclude "quickstart/shared/cloud_setup.md" "cloud_setup" >}}
+{{< snippet "local_quickstart.md" "cloud_setup" >}}
+
+{{< snippet "test.py" "demo" "py" >}}

 ## Step 1: Set up your database
-{{< regionInclude "quickstart/shared/database_setup.md" "database_setup" >}}
+{{< snippet "local_quickstart.md" "database_setup" >}}

 ## Step 2: Install and configure Toolbox
-{{< regionInclude "quickstart/shared/configure_toolbox.md" "configure_toolbox" >}}
+{{< snippet "local_quickstart.md" "configure_toolbox" >}}

 ## Step 3: Connect your agent to Toolbox

@@ -54,9 +56,6 @@ npm install genkit @genkit-ai/googleai
 {{< tab header="LlamaIndex" lang="bash" >}}
 npm install llamaindex @llamaindex/google @llamaindex/workflow
 {{< /tab >}}
-{{< tab header="GoogleGenAI" lang="bash" >}}
-npm install @google/genai 
-{{< /tab >}}
 {{< /tabpane >}}

 1. Create a new file named `hotelAgent.js` and copy the following code to create an agent:
@@ -64,25 +63,259 @@ npm install @google/genai
    {{< tabpane persist=header >}}
 {{< tab header="LangChain" lang="js" >}}

-{{< include "quickstart/js/langchain/quickstart.js" >}}
+import { ChatGoogleGenerativeAI } from "@langchain/google-genai";
+import { ToolboxClient } from "@toolbox-sdk/core";
+import { tool } from "@langchain/core/tools";
+import { createReactAgent } from "@langchain/langgraph/prebuilt";
+import { MemorySaver } from "@langchain/langgraph";
+
+// Replace it with your API key
+process.env.GOOGLE_API_KEY = 'your-api-key';
+
+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 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.",
+];
+
+async function runApplication() {
+  const model = new ChatGoogleGenerativeAI({
+    model: "gemini-2.0-flash",
+  });
+
+  const client = new ToolboxClient("http://127.0.0.1:5000");
+  const toolboxTools = await client.loadToolset("my-toolset");
+
+  // Define the basics of the tool: name, description, schema and core logic
+  const getTool = (toolboxTool) => tool(toolboxTool, {
+    name: toolboxTool.getName(),
+    description: toolboxTool.getDescription(),
+    schema: toolboxTool.getParamSchema()
+  });
+  const tools = toolboxTools.map(getTool);
+
+  const agent = createReactAgent({
+    llm: model,
+    tools: tools,
+    checkpointer: new MemorySaver(),
+    systemPrompt: prompt,
+  });
+
+  const langGraphConfig = {
+    configurable: {
+        thread_id: "test-thread",
+    },
+  };
+
+  for (const query of queries) {
+    const agentOutput = await agent.invoke(
+    {
+        messages: [
+        {
+            role: "user",
+            content: query,
+        },
+        ],
+        verbose: true,
+    },
+    langGraphConfig
+    );
+    const response = agentOutput.messages[agentOutput.messages.length - 1].content;
+    console.log(response);
+  }
+}
+
+runApplication()
+  .catch(console.error)
+  .finally(() => console.log("\nApplication finished."));

 {{< /tab >}}

 {{< tab header="GenkitJS" lang="js" >}}

-{{< include "quickstart/js/genkit/quickstart.js" >}}
+import { ToolboxClient } from "@toolbox-sdk/core";
+import { genkit } from "genkit";
+import { googleAI } from '@genkit-ai/googleai';

+// Replace it with your API key
+process.env.GOOGLE_API_KEY = 'your-api-key';
+
+const systemPrompt = `
+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 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.",
+];
+
+async function run() {
+  const toolboxClient = new ToolboxClient("http://127.0.0.1:5000");
+
+  const ai = genkit({
+    plugins: [
+      googleAI({
+        apiKey: process.env.GEMINI_API_KEY || process.env.GOOGLE_API_KEY
+      })
+    ],
+    model: googleAI.model('gemini-2.0-flash'),
+  });
+
+  const toolboxTools = await toolboxClient.loadToolset("my-toolset");
+  const toolMap = Object.fromEntries(
+    toolboxTools.map((tool) => {
+      const definedTool = ai.defineTool(
+        {
+          name: tool.getName(),
+          description: tool.getDescription(),
+          inputSchema: tool.getParamSchema(),
+        },
+        tool
+      );
+      return [tool.getName(), definedTool];
+    })
+  );
+  const tools = Object.values(toolMap);
+
+  let conversationHistory = [{ role: "system", content: [{ text: systemPrompt }] }];
+
+  for (const query of queries) {
+    conversationHistory.push({ role: "user", content: [{ text: query }] });
+    const response = await ai.generate({
+      messages: conversationHistory,
+      tools: tools,
+    });
+    conversationHistory.push(response.message);
+
+    const toolRequests = response.toolRequests;
+    if (toolRequests?.length > 0) {
+      // Execute tools concurrently and collect their responses.
+      const toolResponses = await Promise.all(
+        toolRequests.map(async (call) => {
+          try {
+            const toolOutput = await toolMap[call.name].invoke(call.input);
+            return { role: "tool", content: [{ toolResponse: { name: call.name, output: toolOutput } }] };
+          } catch (e) {
+            console.error(`Error executing tool ${call.name}:`, e);
+            return { role: "tool", content: [{ toolResponse: { name: call.name, output: { error: e.message } } }] };
+          }
+        })
+      );
+
+      conversationHistory.push(...toolResponses);
+
+      // Call the AI again with the tool results.
+      response = await ai.generate({ messages: conversationHistory, tools });
+      conversationHistory.push(response.message);
+    }
+
+    console.log(response.text);
+  }
+}
+
+run();
 {{< /tab >}}

 {{< tab header="LlamaIndex" lang="js" >}}

-{{< include "quickstart/js/llamaindex/quickstart.js" >}}
+import { gemini, GEMINI_MODEL } from "@llamaindex/google";
+import { agent } from "@llamaindex/workflow";
+import { createMemory, staticBlock, tool } from "llamaindex";
+import { ToolboxClient } from "@toolbox-sdk/core";

-{{< /tab >}}
+const TOOLBOX_URL = "http://127.0.0.1:5000"; // Update if needed
+process.env.GOOGLE_API_KEY = 'your-api-key'; // Replace it with your API key

-{{< tab header="GoogleGenAI" lang="js" >}}
+const prompt = `

-{{< include "quickstart/js/genAI/quickstart.js" >}}
+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 operations.
+For any bookings or cancellations, please provide the appropriate confirmation.
+Update check-in or check-out dates if mentioned by the user.
+Don't ask for confirmations from the user.
+
+`;
+
+const 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.",
+];
+
+async function main() {
+  // Connect to MCP Toolbox
+  const client = new ToolboxClient(TOOLBOX_URL);
+  const toolboxTools = await client.loadToolset("my-toolset");
+  const tools = toolboxTools.map((toolboxTool) => {
+    return tool({
+      name: toolboxTool.getName(),
+      description: toolboxTool.getDescription(),
+      parameters: toolboxTool.getParamSchema(),
+      execute: toolboxTool,
+    });
+  });
+
+  // Initialize LLM
+  const llm = gemini({
+    model: GEMINI_MODEL.GEMINI_2_0_FLASH,
+    apiKey: process.env.GOOGLE_API_KEY,
+  });
+
+  const memory = createMemory({
+    memoryBlocks: [
+      staticBlock({
+        content: prompt,
+      }),
+    ],
+  });
+
+  // Create the Agent
+  const myAgent = agent({
+    tools: tools,
+    llm,
+    memory,
+    systemPrompt: prompt,
+  });
+
+  for (const query of queries) {
+    const result = await myAgent.run(query);
+    const output = result.data.result;
+
+    console.log(`\nUser: ${query}`);
+    if (typeof output === "string") {
+      console.log(output.trim());
+    } else if (typeof output === "object" && "text" in output) {
+      console.log(output.text.trim());
+    } else {
+      console.log(JSON.stringify(output));
+    }
+  }
+  //You may observe some extra logs during execution due to the run method provided by Llama.
+  console.log("Agent run finished.");
+}
+
+main();

 {{< /tab >}}

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

--- a/docs/en/getting-started/quickstart/js/genAI/quickstart.js
+++ b/docs/en/getting-started/quickstart/js/genAI/quickstart.js
@@ -1,119 +0,0 @@
-import { GoogleGenAI } from "@google/genai";
-import { ToolboxClient } from "@toolbox-sdk/core";
-
-
-const TOOLBOX_URL = "http://127.0.0.1:5000"; // Update if needed
-const GOOGLE_API_KEY = 'enter your api here'; // Replace it with your API key
-
-const prompt = `
-You're a helpful hotel assistant. You handle hotel searching, booking, and
-cancellations. When the user searches for a hotel, you MUST use the available tools to find information. Mention its name, id,
-location and price tier. Always mention hotel id 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 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.",
-];
-
-function mapZodTypeToOpenAPIType(zodTypeName) {
-
-    console.log(zodTypeName)
-    const typeMap = {
-        'ZodString': 'string',
-        'ZodNumber': 'number',
-        'ZodBoolean': 'boolean',
-        'ZodArray': 'array',
-        'ZodObject': 'object',
-    };
-    return typeMap[zodTypeName] || 'string';
-}
-
-async function main() {
-   
-    const toolboxClient = new ToolboxClient(TOOLBOX_URL); 
-    const toolboxTools = await toolboxClient.loadToolset("my-toolset");
-    
-    const geminiTools = [{
-        functionDeclarations: toolboxTools.map(tool => {
-            
-            const schema = tool.getParamSchema();
-            const properties = {};
-            const required = [];
-
-         
-            for (const [key, param] of Object.entries(schema.shape)) {
-                properties[key] = {
-                        type: mapZodTypeToOpenAPIType(param.constructor.name),
-                        description: param.description || '',
-                    };
-                required.push(key)
-                }
-            
-            return {
-                name: tool.getName(),
-                description: tool.getDescription(),
-                parameters: { type: 'object', properties, required },
-            };
-        })
-    }];
-
-
-    const genAI = new GoogleGenAI({ apiKey: GOOGLE_API_KEY });
-    
-    const chat = genAI.chats.create({
-        model: "gemini-2.5-flash",
-        config: {
-            systemInstruction: prompt,
-            tools: geminiTools,
-        }
-    });
-
-    for (const query of queries) {
-        
-        let currentResult = await chat.sendMessage({ message: query });
-        
-        let finalResponseGiven = false
-        while (!finalResponseGiven) {
-            
-            const response = currentResult;
-            const functionCalls = response.functionCalls || [];
-
-            if (functionCalls.length === 0) {
-                console.log(response.text)
-                finalResponseGiven = true;
-            } else {
-                const toolResponses = [];
-                for (const call of functionCalls) {
-                    const toolName = call.name
-                    const toolToExecute = toolboxTools.find(t => t.getName() === toolName);
-                    
-                    if (toolToExecute) {
-                        try {
-                            const functionResult = await toolToExecute(call.args);
-                            toolResponses.push({
-                                functionResponse: { name: call.name, response: { result: functionResult } }
-                            });
-                        } catch (e) {
-                            console.error(`Error executing tool '${toolName}':`, e);
-                            toolResponses.push({
-                                functionResponse: { name: call.name, response: { error: e.message } }
-                            });
-                        }
-                    }
-                }
-                
-                currentResult = await chat.sendMessage({ message: toolResponses });
-            }
-        }
-        
-    }
-}
-
-main();
--- a/docs/en/getting-started/quickstart/js/genkit/quickstart.js
+++ b/docs/en/getting-started/quickstart/js/genkit/quickstart.js
@@ -1,89 +0,0 @@
-import { ToolboxClient } from "@toolbox-sdk/core";
-import { genkit } from "genkit";
-import { googleAI } from '@genkit-ai/googleai';
-
-// Replace it with your API key
-process.env.GOOGLE_API_KEY = 'your-api-key';
-
-const systemPrompt = `
-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 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.",
-];
-
-async function main() {
-  const toolboxClient = new ToolboxClient("http://127.0.0.1:5000");
-
-  const ai = genkit({
-    plugins: [
-      googleAI({
-        apiKey: process.env.GEMINI_API_KEY || process.env.GOOGLE_API_KEY
-      })
-    ],
-    model: googleAI.model('gemini-2.0-flash'),
-  });
-
-  const toolboxTools = await toolboxClient.loadToolset("my-toolset");
-  const toolMap = Object.fromEntries(
-    toolboxTools.map((tool) => {
-      const definedTool = ai.defineTool(
-        {
-          name: tool.getName(),
-          description: tool.getDescription(),
-          inputSchema: tool.getParamSchema(),
-        },
-        tool
-      );
-      return [tool.getName(), definedTool];
-    })
-  );
-  const tools = Object.values(toolMap);
-
-  let conversationHistory = [{ role: "system", content: [{ text: systemPrompt }] }];
-
-  for (const query of queries) {
-    conversationHistory.push({ role: "user", content: [{ text: query }] });
-    const response = await ai.generate({
-      messages: conversationHistory,
-      tools: tools,
-    });
-    conversationHistory.push(response.message);
-
-    const toolRequests = response.toolRequests;
-    if (toolRequests?.length > 0) {
-      // Execute tools concurrently and collect their responses.
-      const toolResponses = await Promise.all(
-        toolRequests.map(async (call) => {
-          try {
-            const toolOutput = await toolMap[call.name].invoke(call.input);
-            return { role: "tool", content: [{ toolResponse: { name: call.name, output: toolOutput } }] };
-          } catch (e) {
-            console.error(`Error executing tool ${call.name}:`, e);
-            return { role: "tool", content: [{ toolResponse: { name: call.name, output: { error: e.message } } }] };
-          }
-        })
-      );
-
-      conversationHistory.push(...toolResponses);
-
-      // Call the AI again with the tool results.
-      response = await ai.generate({ messages: conversationHistory, tools });
-      conversationHistory.push(response.message);
-    }
-
-    console.log(response.text);
-  }
-}
-
-main();
--- a/docs/en/getting-started/quickstart/js/langchain/quickstart.js
+++ b/docs/en/getting-started/quickstart/js/langchain/quickstart.js
@@ -1,74 +0,0 @@
-import { ChatGoogleGenerativeAI } from "@langchain/google-genai";
-import { ToolboxClient } from "@toolbox-sdk/core";
-import { tool } from "@langchain/core/tools";
-import { createReactAgent } from "@langchain/langgraph/prebuilt";
-import { MemorySaver } from "@langchain/langgraph";
-
-// Replace it with your API key
-process.env.GOOGLE_API_KEY = 'your-api-key';
-
-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 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.",
-];
-
-async function main() {
-  const model = new ChatGoogleGenerativeAI({
-    model: "gemini-2.0-flash",
-  });
-
-  const client = new ToolboxClient("http://127.0.0.1:5000");
-  const toolboxTools = await client.loadToolset("my-toolset");
-
-  // Define the basics of the tool: name, description, schema and core logic
-  const getTool = (toolboxTool) => tool(toolboxTool, {
-    name: toolboxTool.getName(),
-    description: toolboxTool.getDescription(),
-    schema: toolboxTool.getParamSchema()
-  });
-  const tools = toolboxTools.map(getTool);
-
-  const agent = createReactAgent({
-    llm: model,
-    tools: tools,
-    checkpointer: new MemorySaver(),
-    systemPrompt: prompt,
-  });
-
-  const langGraphConfig = {
-    configurable: {
-        thread_id: "test-thread",
-    },
-  };
-
-  for (const query of queries) {
-    const agentOutput = await agent.invoke(
-    {
-        messages: [
-        {
-            role: "user",
-            content: query,
-        },
-        ],
-        verbose: true,
-    },
-    langGraphConfig
-    );
-    const response = agentOutput.messages[agentOutput.messages.length - 1].content;
-    console.log(response);
-  }
-}
-
-main();
--- a/docs/en/getting-started/quickstart/js/llamaindex/quickstart.js
+++ b/docs/en/getting-started/quickstart/js/llamaindex/quickstart.js
@@ -1,79 +0,0 @@
-import { gemini, GEMINI_MODEL } from "@llamaindex/google";
-import { agent } from "@llamaindex/workflow";
-import { createMemory, staticBlock, tool } from "llamaindex";
-import { ToolboxClient } from "@toolbox-sdk/core";
-
-const TOOLBOX_URL = "http://127.0.0.1:5000"; // Update if needed
-process.env.GOOGLE_API_KEY = 'your-api-key'; // Replace it with your API key
-
-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 operations.
-For any bookings or cancellations, please provide the appropriate confirmation.
-Update check-in or check-out dates if mentioned by the user.
-Don't ask for confirmations from the user.
-
-`;
-
-const 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.",
-];
-
-async function main() {
-  // Connect to MCP Toolbox
-  const client = new ToolboxClient(TOOLBOX_URL);
-  const toolboxTools = await client.loadToolset("my-toolset");
-  const tools = toolboxTools.map((toolboxTool) => {
-    return tool({
-      name: toolboxTool.getName(),
-      description: toolboxTool.getDescription(),
-      parameters: toolboxTool.getParamSchema(),
-      execute: toolboxTool,
-    });
-  });
-
-  // Initialize LLM
-  const llm = gemini({
-    model: GEMINI_MODEL.GEMINI_2_0_FLASH,
-    apiKey: process.env.GOOGLE_API_KEY,
-  });
-
-  const memory = createMemory({
-    memoryBlocks: [
-      staticBlock({
-        content: prompt,
-      }),
-    ],
-  });
-
-  // Create the Agent
-  const myAgent = agent({
-    tools: tools,
-    llm,
-    memory,
-    systemPrompt: prompt,
-  });
-
-  for (const query of queries) {
-    const result = await myAgent.run(query);
-    const output = result.data.result;
-
-    console.log(`\nUser: ${query}`);
-    if (typeof output === "string") {
-      console.log(output.trim());
-    } else if (typeof output === "object" && "text" in output) {
-      console.log(output.text.trim());
-    } else {
-      console.log(JSON.stringify(output));
-    }
-  }
-  //You may observe some extra logs during execution due to the run method provided by Llama.
-  console.log("Agent run finished.");
-}
-
-main();
--- a/docs/en/getting-started/quickstart/python/adk/quickstart.py
+++ b/docs/en/getting-started/quickstart/python/adk/quickstart.py
@@ -13,7 +13,7 @@ import os
 os.environ['GOOGLE_API_KEY'] = 'your-api-key'

 async def main():
-  with ToolboxSyncClient("http://127.0.0.1:5000") as toolbox_client:
+  with ToolboxSyncClient("<http://127.0.0.1:5000>") as toolbox_client:

      prompt = """
        You're a helpful hotel assistant. You handle hotel searching, booking and
--- a/docs/en/getting-started/quickstart/python/core/quickstart.py
+++ b/docs/en/getting-started/quickstart/python/core/quickstart.py
@@ -29,8 +29,8 @@ queries = [
    "My check in dates for my booking would be from April 10, 2024 to April 19, 2024.",
 ]

-async def main():
-    async with ToolboxClient("http://127.0.0.1:5000") as toolbox_client:
+async def run_application():
+    async with ToolboxClient("<http://127.0.0.1:5000>") as toolbox_client:

        # The toolbox_tools list contains Python callables (functions/methods) designed for LLM tool-use
        # integration. While this example uses Google's genai client, these callables can be adapted for
@@ -105,4 +105,4 @@ async def main():
            history.append(final_model_response_content)
            print(response2.text)

-asyncio.run(main())
+asyncio.run(run_application())
--- a/docs/en/getting-started/quickstart/python/langchain/quickstart.py
+++ b/docs/en/getting-started/quickstart/python/langchain/quickstart.py
@@ -31,7 +31,7 @@ queries = [
    "My check in dates would be from April 10, 2024 to April 19, 2024.",
 ]

-async def main():
+async def run_application():
    # TODO(developer): replace this with another model if needed
    model = ChatVertexAI(model_name="gemini-2.0-flash-001")
    # model = ChatGoogleGenerativeAI(model="gemini-2.0-flash-001")
@@ -49,4 +49,4 @@ async def main():
            response = agent.invoke(inputs, stream_mode="values", config=config)
            print(response["messages"][-1].content)

-asyncio.run(main())
+asyncio.run(run_application())
--- a/docs/en/getting-started/quickstart/python/llamaindex/quickstart.py
+++ b/docs/en/getting-started/quickstart/python/llamaindex/quickstart.py
@@ -30,7 +30,7 @@ queries = [
    "My check in dates would be from April 10, 2024 to April 19, 2024.",
 ]

-async def main():
+async def run_application():
    # TODO(developer): replace this with another model if needed
    llm = GoogleGenAI(
        model="gemini-2.0-flash-001",
@@ -60,4 +60,4 @@ async def main():
            print(f"---- {query} ----")
            print(str(response))

-asyncio.run(main())
+asyncio.run(run_application())
--- a/docs/en/getting-started/quickstart/shared/cloud_setup.md
+++ b/docs/en/getting-started/quickstart/shared/cloud_setup.md
@@ -1,20 +0,0 @@
-<!-- This file has been used in local_quickstart.md, local_quickstart_go.md & local_quickstart_js.md -->
-<!-- [START cloud_setup] -->
-If you plan to use **Google Cloud’s Vertex AI** with your agent (e.g., using
-`vertexai=True` or a Google GenAI model), follow these one-time setup steps for
-local development:
-
-1. [Install the Google Cloud CLI](https://cloud.google.com/sdk/docs/install)
-1. [Set up Application Default Credentials (ADC)](https://cloud.google.com/docs/authentication/set-up-adc-local-dev-environment)
-1. Set your project and enable Vertex AI
-
-    ```bash
-    gcloud config set project YOUR_PROJECT_ID
-    gcloud services enable aiplatform.googleapis.com
-    ```
-
-[install-python]: https://wiki.python.org/moin/BeginnersGuide/Download
-[install-pip]: https://pip.pypa.io/en/stable/installation/
-[install-venv]: https://packaging.python.org/en/latest/tutorials/installing-packages/#creating-virtual-environments
-[install-postgres]: https://www.postgresql.org/download/
-<!-- [END cloud_setup] -->
--- a/docs/en/getting-started/quickstart/shared/configure_toolbox.md
+++ b/docs/en/getting-started/quickstart/shared/configure_toolbox.md
@@ -1,122 +0,0 @@
-<!-- This file has been used in local_quickstart.md, local_quickstart_go.md & local_quickstart_js.md -->
-<!-- [START configure_toolbox] -->
-In this section, we will download Toolbox, configure our tools in a
-`tools.yaml`, and then run the Toolbox server.
-
-1. Download the latest version of Toolbox as a binary:
-
-    {{< notice tip >}}
-  Select the
-  [correct binary](https://github.com/googleapis/genai-toolbox/releases)
-  corresponding to your OS and CPU architecture.
-    {{< /notice >}}
-    <!-- {x-release-please-start-version} -->
-    ```bash
-    export OS="linux/amd64" # one of linux/amd64, darwin/arm64, darwin/amd64, or windows/amd64
-    curl -O https://storage.googleapis.com/genai-toolbox/v0.12.0/$OS/toolbox
-    ```
-    <!-- {x-release-please-end} -->
-
-1. Make the binary executable:
-
-    ```bash
-    chmod +x toolbox
-    ```
-
-1. Write the following into a `tools.yaml` file. Be sure to update any fields
-   such as `user`, `password`, or `database` that you may have customized in the
-   previous step.
-
-    {{< notice tip >}}
-  In practice, use environment variable replacement with the format ${ENV_NAME}
-  instead of hardcoding your secrets into the configuration file.
-    {{< /notice >}}
-
-    ```yaml
-    sources:
-      my-pg-source:
-        kind: postgres
-        host: 127.0.0.1
-        port: 5432
-        database: toolbox_db
-        user: ${USER_NAME}
-        password: ${PASSWORD}
-    tools:
-      search-hotels-by-name:
-        kind: postgres-sql
-        source: my-pg-source
-        description: Search for hotels based on name.
-        parameters:
-          - name: name
-            type: string
-            description: The name of the hotel.
-        statement: SELECT * FROM hotels WHERE name ILIKE '%' || $1 || '%';
-      search-hotels-by-location:
-        kind: postgres-sql
-        source: my-pg-source
-        description: Search for hotels based on location.
-        parameters:
-          - name: location
-            type: string
-            description: The location of the hotel.
-        statement: SELECT * FROM hotels WHERE location ILIKE '%' || $1 || '%';
-      book-hotel:
-        kind: postgres-sql
-        source: my-pg-source
-        description: >-
-           Book a hotel by its ID. If the hotel is successfully booked, returns a NULL, raises an error if not.
-        parameters:
-          - name: hotel_id
-            type: string
-            description: The ID of the hotel to book.
-        statement: UPDATE hotels SET booked = B'1' WHERE id = $1;
-      update-hotel:
-        kind: postgres-sql
-        source: my-pg-source
-        description: >-
-          Update a hotel's check-in and check-out dates by its ID. Returns a message
-          indicating  whether the hotel was successfully updated or not.
-        parameters:
-          - name: hotel_id
-            type: string
-            description: The ID of the hotel to update.
-          - name: checkin_date
-            type: string
-            description: The new check-in date of the hotel.
-          - name: checkout_date
-            type: string
-            description: The new check-out date of the hotel.
-        statement: >-
-          UPDATE hotels SET checkin_date = CAST($2 as date), checkout_date = CAST($3
-          as date) WHERE id = $1;
-      cancel-hotel:
-        kind: postgres-sql
-        source: my-pg-source
-        description: Cancel a hotel by its ID.
-        parameters:
-          - name: hotel_id
-            type: string
-            description: The ID of the hotel to cancel.
-        statement: UPDATE hotels SET booked = B'0' WHERE id = $1;
-   toolsets:
-      my-toolset:
-        - search-hotels-by-name
-        - search-hotels-by-location
-        - book-hotel
-        - update-hotel
-        - cancel-hotel
-    ```
-
-    For more info on tools, check out the `Resources` section of the docs.
-
-1. Run the Toolbox server, pointing to the `tools.yaml` file created earlier:
-
-    ```bash
-    ./toolbox --tools-file "tools.yaml"
-    ```
-
-    {{< notice note >}}
-    Toolbox enables dynamic reloading by default. To disable, use the
-    `--disable-reload` flag.
-    {{< /notice >}}
-<!-- [END configure_toolbox] -->
--- a/docs/en/getting-started/quickstart/shared/database_setup.md
+++ b/docs/en/getting-started/quickstart/shared/database_setup.md
@@ -1,119 +0,0 @@
-<!-- This file has been used in local_quickstart.md, local_quickstart_go.md & local_quickstart_js.md -->
-<!-- [START database_setup] -->
-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 a table using the following command:
-
-    ```sql
-    CREATE TABLE hotels(
-      id            INTEGER NOT NULL PRIMARY KEY,
-      name          VARCHAR NOT NULL,
-      location      VARCHAR NOT NULL,
-      price_tier    VARCHAR NOT NULL,
-      checkin_date  DATE    NOT NULL,
-      checkout_date DATE    NOT NULL,
-      booked        BIT     NOT NULL
-    );
-    ```
-
-1. Insert data into the table.
-
-    ```sql
-    INSERT INTO hotels(id, name, location, price_tier, checkin_date, checkout_date, booked)
-    VALUES
-      (1, 'Hilton Basel', 'Basel', 'Luxury', '2024-04-22', '2024-04-20', B'0'),
-      (2, 'Marriott Zurich', 'Zurich', 'Upscale', '2024-04-14', '2024-04-21', B'0'),
-      (3, 'Hyatt Regency Basel', 'Basel', 'Upper Upscale', '2024-04-02', '2024-04-20', B'0'),
-      (4, 'Radisson Blu Lucerne', 'Lucerne', 'Midscale', '2024-04-24', '2024-04-05', B'0'),
-      (5, 'Best Western Bern', 'Bern', 'Upper Midscale', '2024-04-23', '2024-04-01', B'0'),
-      (6, 'InterContinental Geneva', 'Geneva', 'Luxury', '2024-04-23', '2024-04-28', B'0'),
-      (7, 'Sheraton Zurich', 'Zurich', 'Upper Upscale', '2024-04-27', '2024-04-02', B'0'),
-      (8, 'Holiday Inn Basel', 'Basel', 'Upper Midscale', '2024-04-24', '2024-04-09', B'0'),
-      (9, 'Courtyard Zurich', 'Zurich', 'Upscale', '2024-04-03', '2024-04-13', B'0'),
-      (10, 'Comfort Inn Bern', 'Bern', 'Midscale', '2024-04-04', '2024-04-16', B'0');
-    ```
-
-1. End the database session:
-
-    ```bash
-    \q
-    ```
-<!-- [END database_setup] -->
--- a/docs/en/getting-started/test.py
+++ b/docs/en/getting-started/test.py
@@ -0,0 +1,8 @@
+# [START demo]
+a = 5
+b = 6
+# print('hello' + c)
+print ('This file is used for demo of include shortcodes')
+# [END demo]
+
+
--- a/docs/en/how-to/connect-ide/firestore_mcp.md
+++ b/docs/en/how-to/connect-ide/firestore_mcp.md
@@ -6,9 +6,328 @@ description: >
  Connect your IDE to Firestore using Toolbox.
 ---

-<html>
-  <head>
-    <link rel="canonical" href="https://cloud.google.com/firestore/native/docs/connect-ide-using-mcp-toolbox"/>
-    <meta http-equiv="refresh" content="0;url=https://cloud.google.com/firestore/native/docs/connect-ide-using-mcp-toolbox"/>
-  </head>
-</html>
+[Model Context Protocol (MCP)](https://modelcontextprotocol.io/introduction) is
+an open protocol for connecting Large Language Models (LLMs) to data sources
+like Firestore. This guide covers how to use [MCP Toolbox for Databases][toolbox]
+to expose your developer assistant tools to a Firestore instance:
+
+* [Cursor][cursor]
+* [Windsurf][windsurf] (Codium)
+* [Visual Studio Code][vscode] (Copilot)
+* [Cline][cline]  (VS Code extension)
+* [Claude desktop][claudedesktop]
+* [Claude code][claudecode]
+* [Gemini CLI][geminicli]
+* [Gemini Code Assist][geminicodeassist]
+
+[toolbox]: https://github.com/googleapis/genai-toolbox
+[cursor]: #configure-your-mcp-client
+[windsurf]: #configure-your-mcp-client
+[vscode]: #configure-your-mcp-client
+[cline]: #configure-your-mcp-client
+[claudedesktop]: #configure-your-mcp-client
+[claudecode]: #configure-your-mcp-client
+[geminicli]: #configure-your-mcp-client
+[geminicodeassist]: #configure-your-mcp-client
+
+## Set up Firestore
+
+1. Create or select a Google Cloud project.
+
+    * [Create a new
+      project](https://cloud.google.com/resource-manager/docs/creating-managing-projects)
+    * [Select an existing
+      project](https://cloud.google.com/resource-manager/docs/creating-managing-projects#identifying_projects)
+
+1. [Enable the Firestore
+   API](https://console.cloud.google.com/apis/library/firestore.googleapis.com)
+   for your project.
+
+1. [Create a Firestore
+   database](https://cloud.google.com/firestore/docs/create-database-web-mobile-client-library)
+   if you haven't already.
+
+1. Set up authentication for your local environment.
+
+    * [Install gcloud CLI](https://cloud.google.com/sdk/docs/install)
+    * Run `gcloud auth application-default login` to authenticate
+
+## Install MCP Toolbox
+
+1. Download the latest version of Toolbox as a binary. Select the [correct
+   binary](https://github.com/googleapis/genai-toolbox/releases) corresponding
+   to your OS and CPU architecture. You are required to use Toolbox version
+   V0.10.0+:
+
+   <!-- {x-release-please-start-version} -->
+   {{< tabpane persist=header >}}
+{{< tab header="linux/amd64" lang="bash" >}}
+curl -O https://storage.googleapis.com/genai-toolbox/v0.12.0/linux/amd64/toolbox
+{{< /tab >}}
+
+{{< tab header="darwin/arm64" lang="bash" >}}
+curl -O https://storage.googleapis.com/genai-toolbox/v0.12.0/darwin/arm64/toolbox
+{{< /tab >}}
+
+{{< tab header="darwin/amd64" lang="bash" >}}
+curl -O https://storage.googleapis.com/genai-toolbox/v0.12.0/darwin/amd64/toolbox
+{{< /tab >}}
+
+{{< tab header="windows/amd64" lang="bash" >}}
+curl -O https://storage.googleapis.com/genai-toolbox/v0.12.0/windows/amd64/toolbox
+{{< /tab >}}
+{{< /tabpane >}}
+    <!-- {x-release-please-end} -->
+
+1. Make the binary executable:
+
+    ```bash
+    chmod +x toolbox
+    ```
+
+1. Verify the installation:
+
+    ```bash
+    ./toolbox --version
+    ```
+
+## Configure your MCP Client
+
+{{< tabpane text=true >}}
+{{% tab header="Claude code" lang="en" %}}
+
+1. Install [Claude
+   Code](https://docs.anthropic.com/en/docs/agents-and-tools/claude-code/overview).
+1. Create a `.mcp.json` file in your project root if it doesn't exist.
+1. Add the following configuration, replace the environment variables with your
+   values, and save:
+
+    ```json
+    {
+      "mcpServers": {
+        "firestore": {
+          "command": "./PATH/TO/toolbox",
+          "args": ["--prebuilt","firestore","--stdio"],
+          "env": {
+            "FIRESTORE_PROJECT": "your-project-id",
+            "FIRESTORE_DATABASE": "(default)"
+          }
+        }
+      }
+    }
+    ```
+
+1. Restart Claude code to apply the new configuration.
+{{% /tab %}}
+
+{{% tab header="Claude desktop" lang="en" %}}
+
+1. Open [Claude desktop](https://claude.ai/download) and navigate to Settings.
+1. Under the Developer tab, tap Edit Config to open the configuration file.
+1. Add the following configuration, replace the environment variables with your
+   values, and save:
+
+    ```json
+    {
+      "mcpServers": {
+        "firestore": {
+          "command": "./PATH/TO/toolbox",
+          "args": ["--prebuilt","firestore","--stdio"],
+          "env": {
+            "FIRESTORE_PROJECT": "your-project-id",
+            "FIRESTORE_DATABASE": "(default)"
+          }
+        }
+      }
+    }
+    ```
+
+1. Restart Claude desktop.
+1. From the new chat screen, you should see a hammer (MCP) icon appear with the
+   new MCP server available.
+{{% /tab %}}
+
+{{% tab header="Cline" lang="en" %}}
+
+1. Open the [Cline](https://github.com/cline/cline) extension in VS Code and tap
+   the **MCP Servers** icon.
+1. Tap Configure MCP Servers to open the configuration file.
+1. Add the following configuration, replace the environment variables with your
+   values, and save:
+
+    ```json
+    {
+      "mcpServers": {
+        "firestore": {
+          "command": "./PATH/TO/toolbox",
+          "args": ["--prebuilt","firestore","--stdio"],
+          "env": {
+            "FIRESTORE_PROJECT": "your-project-id",
+            "FIRESTORE_DATABASE": "(default)"
+          }
+        }
+      }
+    }
+    ```
+
+1. You should see a green active status after the server is successfully
+   connected.
+{{% /tab %}}
+
+{{% tab header="Cursor" lang="en" %}}
+
+1. Create a `.cursor` directory in your project root if it doesn't exist.
+1. Create a `.cursor/mcp.json` file if it doesn't exist and open it.
+1. Add the following configuration, replace the environment variables with your
+   values, and save:
+
+    ```json
+    {
+      "mcpServers": {
+        "firestore": {
+          "command": "./PATH/TO/toolbox",
+          "args": ["--prebuilt","firestore","--stdio"],
+          "env": {
+            "FIRESTORE_PROJECT": "your-project-id",
+            "FIRESTORE_DATABASE": "(default)"
+          }
+        }
+      }
+    }
+    ```
+
+1. [Cursor](https://www.cursor.com/) and navigate to **Settings > Cursor
+   Settings > MCP**. You should see a green active status after the server is
+   successfully connected.
+{{% /tab %}}
+
+{{% tab header="Visual Studio Code (Copilot)" lang="en" %}}
+
+1. Open [VS Code](https://code.visualstudio.com/docs/copilot/overview) and
+   create a `.vscode` directory in your project root if it doesn't exist.
+1. Create a `.vscode/mcp.json` file if it doesn't exist and open it.
+1. Add the following configuration, replace the environment variables with your
+   values, and save:
+
+    ```json
+    {
+      "mcpServers": {
+        "firestore": {
+          "command": "./PATH/TO/toolbox",
+          "args": ["--prebuilt","firestore","--stdio"],
+          "env": {
+            "FIRESTORE_PROJECT": "your-project-id",
+            "FIRESTORE_DATABASE": "(default)"
+          }
+        }
+      }
+    }
+    ```
+
+{{% /tab %}}
+
+{{% tab header="Windsurf" lang="en" %}}
+
+1. Open [Windsurf](https://docs.codeium.com/windsurf) and navigate to the
+   Cascade assistant.
+1. Tap on the hammer (MCP) icon, then Configure to open the configuration file.
+1. Add the following configuration, replace the environment variables with your
+   values, and save:
+
+    ```json
+    {
+      "mcpServers": {
+        "firestore": {
+          "command": "./PATH/TO/toolbox",
+          "args": ["--prebuilt","firestore","--stdio"],
+          "env": {
+            "FIRESTORE_PROJECT": "your-project-id",
+            "FIRESTORE_DATABASE": "(default)"
+          }
+        }
+      }
+    }
+
+    ```
+
+{{% /tab %}}
+{{% tab header="Gemini CLI" lang="en" %}}
+
+1. Install the [Gemini
+   CLI](https://github.com/google-gemini/gemini-cli?tab=readme-ov-file#quickstart).
+1. In your working directory, create a folder named `.gemini`. Within it, create
+   a `settings.json` file.
+1. Add the following configuration, replace the environment variables with your
+   values, and then save:
+
+    ```json
+    {
+      "mcpServers": {
+        "firestore": {
+          "command": "./PATH/TO/toolbox",
+          "args": ["--prebuilt","firestore","--stdio"],
+          "env": {
+            "FIRESTORE_PROJECT": "your-project-id",
+            "FIRESTORE_DATABASE": "(default)"
+          }
+        }
+      }
+    }
+
+    ```
+
+{{% /tab %}}
+{{% tab header="Gemini Code Assist" lang="en" %}}
+
+1. Install the [Gemini Code
+   Assist](https://marketplace.visualstudio.com/items?itemName=Google.geminicodeassist)
+   extension in Visual Studio Code.
+1. Enable Agent Mode in Gemini Code Assist chat.
+1. In your working directory, create a folder named `.gemini`. Within it, create
+   a `settings.json` file.
+1. Add the following configuration, replace the environment variables with your
+   values, and then save:
+
+    ```json
+    {
+      "mcpServers": {
+        "firestore": {
+          "command": "./PATH/TO/toolbox",
+          "args": ["--prebuilt","firestore","--stdio"],
+          "env": {
+            "FIRESTORE_PROJECT": "your-project-id",
+            "FIRESTORE_DATABASE": "(default)"
+          }
+        }
+      }
+    }
+
+    ```
+
+{{% /tab %}}
+{{< /tabpane >}}
+
+## Use Tools
+
+Your AI tool is now connected to Firestore using MCP. Try asking your AI
+assistant to list collections, get documents, query collections, or manage
+security rules.
+
+The following tools are available to the LLM:
+
+1. **firestore-get-documents**: Gets multiple documents from Firestore by their
+   paths
+1. **firestore-list-collections**: List Firestore collections for a given parent
+   path
+1. **firestore-delete-documents**: Delete multiple documents from Firestore
+1. **firestore-query-collection**: Query documents from a collection with
+   filtering, ordering, and limit options
+1. **firestore-get-rules**: Retrieves the active Firestore security rules for
+   the current project
+1. **firestore-validate-rules**: Validates Firestore security rules syntax and
+   errors
+
+{{< notice note >}}
+Prebuilt tools are pre-1.0, so expect some tool changes between versions. LLMs
+will adapt to the tools available, so this shouldn't affect most users.
+{{< /notice >}}
--- a/docs/en/how-to/connect-ide/looker_mcp.md
+++ b/docs/en/how-to/connect-ide/looker_mcp.md
@@ -11,7 +11,6 @@ an open protocol for connecting Large Language Models (LLMs) to data sources
 like Postgres. This guide covers how to use [MCP Toolbox for Databases][toolbox]
 to expose your developer assistant tools to a Looker instance:

-* [Gemini-CLI][gemini-cli]
 * [Cursor][cursor]
 * [Windsurf][windsurf] (Codium)
 * [Visual Studio Code][vscode] (Copilot)
@@ -20,7 +19,6 @@ to expose your developer assistant tools to a Looker instance:
 * [Claude code][claudecode]

 [toolbox]: https://github.com/googleapis/genai-toolbox
-[gemini-cli]: #configure-your-mcp-client
 [cursor]: #configure-your-mcp-client
 [windsurf]: #configure-your-mcp-client
 [vscode]: #configure-your-mcp-client
@@ -48,19 +46,19 @@ to expose your developer assistant tools to a Looker instance:
   <!-- {x-release-please-start-version} -->
 {{< tabpane persist=header >}}
 {{< tab header="linux/amd64" lang="bash" >}}
-curl -O https://storage.googleapis.com/genai-toolbox/v0.13.0/linux/amd64/toolbox
+curl -O https://storage.googleapis.com/genai-toolbox/v0.12.0/linux/amd64/toolbox
 {{< /tab >}}

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

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

 {{< tab header="windows/amd64" lang="bash" >}}
-curl -O https://storage.googleapis.com/genai-toolbox/v0.13.0/windows/amd64/toolbox.exe
+curl -O https://storage.googleapis.com/genai-toolbox/v0.12.0/windows/amd64/toolbox.exe
 {{< /tab >}}
 {{< /tabpane >}}
    <!-- {x-release-please-end} -->
@@ -80,36 +78,6 @@ curl -O https://storage.googleapis.com/genai-toolbox/v0.13.0/windows/amd64/toolb
 ## Configure your MCP Client

 {{< tabpane text=true >}}
-{{% tab header="Gemini-CLI" lang="en" %}}
-
-1. Install [Gemini-CLI](https://github.com/google-gemini/gemini-cli#install-globally-with-npm).
-1. Create a directory `.gemini` in your home directory if it doesn't exist.
-1. Create the file `.gemini/settings.json` if it doesn't exist.
-1. Add the following configuration, or add the mcpServers stanza if you already
-   have a `settings.json` with content. Replace the path to the toolbox
-   executable and the environment variables with your values, and save:
-
-    ```json
-    {
-      "mcpServers": {
-        "looker-toolbox": {
-          "command": "./PATH/TO/toolbox",
-          "args": ["--stdio", "--prebuilt", "looker"],
-          "env": {
-            "LOOKER_BASE_URL": "https://looker.example.com",
-            "LOOKER_CLIENT_ID": "",
-            "LOOKER_CLIENT_SECRET": "",
-            "LOOKER_VERIFY_SSL": "true"
-          }
-        }
-      }
-    }
-    ```
-
-1. Start Gemini-CLI with the `gemini` command and use the command `/mcp` to see
-   the configured MCP tools.
-{{% /tab %}}
-
 {{% tab header="Claude code" lang="en" %}}

 1. Install [Claude
@@ -235,7 +203,7 @@ curl -O https://storage.googleapis.com/genai-toolbox/v0.13.0/windows/amd64/toolb

    ```json
    {
-      "servers": {
+      "mcpServers": {
        "looker-toolbox": {
          "command": "./PATH/TO/toolbox",
          "args": ["--stdio", "--prebuilt", "looker"],
@@ -301,9 +269,6 @@ The following tools are available to the LLM:
 1. **get_looks**: Return the saved Looks that match a title or description
 1. **run_look**: Run a saved Look and return the data
 1. **make_look**: Create a saved Look in Looker and return the URL
-1. **get_dashboards**: Return the saved dashboards that match a title or description
-1. **make_dashboard**: Create a saved dashboard in Looker and return the URL
-1. **add_dashboard_element**: Add a tile to a dashboard

 {{< notice note >}}
 Prebuilt tools are pre-1.0, so expect some tool changes between versions. LLMs
--- a/docs/en/how-to/connect-ide/mssql_mcp.md
+++ b/docs/en/how-to/connect-ide/mssql_mcp.md
@@ -37,19 +37,19 @@ description: "Connect your IDE to SQL Server using Toolbox."
   <!-- {x-release-please-start-version} -->
   {{< tabpane persist=header >}}
 {{< tab header="linux/amd64" lang="bash" >}}
-curl -O https://storage.googleapis.com/genai-toolbox/v0.13.0/linux/amd64/toolbox
+curl -O https://storage.googleapis.com/genai-toolbox/v0.12.0/linux/amd64/toolbox
 {{< /tab >}}

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

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

 {{< tab header="windows/amd64" lang="bash" >}}
-curl -O https://storage.googleapis.com/genai-toolbox/v0.13.0/windows/amd64/toolbox.exe
+curl -O https://storage.googleapis.com/genai-toolbox/v0.12.0/windows/amd64/toolbox.exe
 {{< /tab >}}
 {{< /tabpane >}}
    <!-- {x-release-please-end} -->
@@ -182,17 +182,19 @@ curl -O https://storage.googleapis.com/genai-toolbox/v0.13.0/windows/amd64/toolb

    ```json
    {
-      "servers": {
-        "mssql": {
-          "command": "./PATH/TO/toolbox",
-          "args": ["--prebuilt","mssql","--stdio"],
-          "env": {
-            "MSSQL_HOST": "",
-            "MSSQL_PORT": "",
-            "MSSQL_DATABASE": "",
-            "MSSQL_USER": "",
-            "MSSQL_PASSWORD": ""
-          }
+    "mcp" : {
+        "servers": {
+        "cloud-sql-sqlserver": {
+            "command": "./PATH/TO/toolbox",
+            "args": ["--prebuilt","cloud-sql-mssql","--stdio"],
+            "env": {
+              "MSSQL_HOST": "",
+              "MSSQL_PORT": "",
+              "MSSQL_DATABASE": "",
+              "MSSQL_USER": "",
+              "MSSQL_PASSWORD": ""
+            }
+         }
        }
      }
    }
@@ -284,4 +286,4 @@ The following tools are available to the LLM:

 {{< notice note >}}
 Prebuilt tools are pre-1.0, so expect some tool changes between versions. LLMs will adapt to the tools available, so this shouldn't affect most users.
-{{< /notice >}}
+{{< /notice >}}
--- a/docs/en/how-to/connect-ide/mysql_mcp.md
+++ b/docs/en/how-to/connect-ide/mysql_mcp.md
@@ -37,19 +37,19 @@ description: "Connect your IDE to MySQL using Toolbox."
   <!-- {x-release-please-start-version} -->
   {{< tabpane persist=header >}}
 {{< tab header="linux/amd64" lang="bash" >}}
-curl -O https://storage.googleapis.com/genai-toolbox/v0.13.0/linux/amd64/toolbox
+curl -O https://storage.googleapis.com/genai-toolbox/v0.12.0/linux/amd64/toolbox
 {{< /tab >}}

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

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

 {{< tab header="windows/amd64" lang="bash" >}}
-curl -O https://storage.googleapis.com/genai-toolbox/v0.13.0/windows/amd64/toolbox.exe
+curl -O https://storage.googleapis.com/genai-toolbox/v0.12.0/windows/amd64/toolbox.exe
 {{< /tab >}}
 {{< /tabpane >}}
    <!-- {x-release-please-end} -->
@@ -182,7 +182,7 @@ curl -O https://storage.googleapis.com/genai-toolbox/v0.13.0/windows/amd64/toolb

    ```json
    {
-      "servers": {
+      "mcpServers": {
        "mysql": {
          "command": "./PATH/TO/toolbox",
          "args": ["--prebuilt","mysql","--stdio"],
--- a/docs/en/how-to/connect-ide/postgres_mcp.md
+++ b/docs/en/how-to/connect-ide/postgres_mcp.md
@@ -17,8 +17,6 @@ to expose your developer assistant tools to a Postgres instance:
 * [Cline][cline]  (VS Code extension)
 * [Claude desktop][claudedesktop]
 * [Claude code][claudecode]
-* [Gemini CLI][geminicli]
-* [Gemini Code Assist][geminicodeassist]

 [toolbox]: https://github.com/googleapis/genai-toolbox
 [cursor]: #configure-your-mcp-client
@@ -27,8 +25,6 @@ to expose your developer assistant tools to a Postgres instance:
 [cline]: #configure-your-mcp-client
 [claudedesktop]: #configure-your-mcp-client
 [claudecode]: #configure-your-mcp-client
-[geminicli]: #configure-your-mcp-client
-[geminicodeassist]: #configure-your-mcp-client

 {{< notice tip >}}
 This guide can be used with [AlloyDB
@@ -56,19 +52,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.13.0/linux/amd64/toolbox
+curl -O https://storage.googleapis.com/genai-toolbox/v0.12.0/linux/amd64/toolbox
 {{< /tab >}}

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

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

 {{< tab header="windows/amd64" lang="bash" >}}
-curl -O https://storage.googleapis.com/genai-toolbox/v0.13.0/windows/amd64/toolbox.exe
+curl -O https://storage.googleapis.com/genai-toolbox/v0.12.0/windows/amd64/toolbox.exe
 {{< /tab >}}
 {{< /tabpane >}}
    <!-- {x-release-please-end} -->
@@ -217,7 +213,7 @@ curl -O https://storage.googleapis.com/genai-toolbox/v0.13.0/windows/amd64/toolb

    ```json
    {
-      "servers": {
+      "mcpServers": {
        "postgres": {
          "command": "./PATH/TO/toolbox",
          "args": ["--prebuilt","postgres","--stdio"],
@@ -263,57 +259,6 @@ curl -O https://storage.googleapis.com/genai-toolbox/v0.13.0/windows/amd64/toolb
    ```

 {{% /tab %}}
-
-{{% tab header="Gemini CLI" lang="en" %}}
-
-1.  Install the [Gemini CLI](https://github.com/google-gemini/gemini-cli?tab=readme-ov-file#quickstart).
-1.  In your working directory, create a folder named `.gemini`. Within it, create a `settings.json` file.
-1.  Add the following configuration, replace the environment variables with your values, and then save:
-
-    ```json
-    {
-      "mcpServers": {
-        "postgres": {
-          "command": "./PATH/TO/toolbox",
-          "args": ["--prebuilt","postgres","--stdio"],
-          "env": {
-            "POSTGRES_HOST": "",
-            "POSTGRES_PORT": "",
-            "POSTGRES_DATABASE": "",
-            "POSTGRES_USER": "",
-            "POSTGRES_PASSWORD": ""
-          }
-        }
-      }
-    }
-    ```
-{{% /tab %}}
-
-{{% tab header="Gemini Code Assist" lang="en" %}}
-
-1.  Install the [Gemini Code Assist](https://marketplace.visualstudio.com/items?itemName=Google.geminicodeassist) extension in Visual Studio Code.
-1.  Enable Agent Mode in Gemini Code Assist chat.
-1.  In your working directory, create a folder named `.gemini`. Within it, create a `settings.json` file.
-1.  Add the following configuration, replace the environment variables with your values, and then save:
-
-    ```json
-    {
-      "mcpServers": {
-        "postgres": {
-          "command": "./PATH/TO/toolbox",
-          "args": ["--prebuilt","postgres","--stdio"],
-          "env": {
-            "POSTGRES_HOST": "",
-            "POSTGRES_PORT": "",
-            "POSTGRES_DATABASE": "",
-            "POSTGRES_USER": "",
-            "POSTGRES_PASSWORD": ""
-          }
-        }
-      }
-    }
-    ```
-{{% /tab %}}
 {{< /tabpane >}}

 ## Use Tools
--- a/docs/en/how-to/deploy_toolbox.md
+++ b/docs/en/how-to/deploy_toolbox.md
@@ -103,14 +103,6 @@ section.
    ```bash
    export IMAGE=us-central1-docker.pkg.dev/database-toolbox/toolbox/toolbox:latest
    ```
-{{< 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
-**8080**. Your application's `--port` argument **must** be set to listen on this
-port. If there is a mismatch, the container will fail to start and the
-deployment will time out.  
-{{< /notice >}}

 1. Deploy Toolbox to Cloud Run using the following command:

@@ -205,22 +197,3 @@ func main() {


 Now, you can use this client to connect to the deployed Cloud Run instance!
-
-## Troubleshooting
-
-{{< notice note >}}  
-For any deployment or runtime error, the best first step is to check the logs for your service in the Google Cloud Console's Cloud Run section. They often contain the specific error message needed to diagnose the problem.  
-{{< /notice >}}
-
-* **Deployment Fails with "Container failed to start":** This is almost always
-    caused by a port mismatch. Ensure your container's `--port` argument is set to
-    `8080` to match the `$PORT` environment variable provided by Cloud Run.
-
-* **Client Receives Permission Denied Error (401 or 403):** If your client application (e.g., your local SDK) gets a `401 Unauthorized` or `403 Forbidden` error when trying to call your Cloud Run service, it means the client is not properly authenticated as an invoker.
-    * Ensure the user or service account calling the service has the **Cloud Run Invoker** (`roles/run.invoker`) IAM role.
-    * If running locally, make sure your Application Default Credentials are set up correctly by running `gcloud auth application-default login`.
-
-* **Service Fails to Access Secrets (in logs):** If your application starts but the logs show errors like "permission denied" when trying to access Secret Manager, it means the Toolbox service account is missing permissions.
-    * Ensure the `toolbox-identity` service account has the **Secret Manager Secret Accessor** (`roles/secretmanager.secretAccessor`) IAM role.
-
-
--- a/docs/en/reference/_index.md
+++ b/docs/en/reference/_index.md
@@ -1,8 +0,0 @@
---
-title: "Reference"
-type: docs
-weight: 7
-description: >
-  This section contains reference documentation.
---
-
--- a/docs/en/reference/cli.md
+++ b/docs/en/reference/cli.md
@@ -1,75 +0,0 @@
---
-title: "CLI"
-type: docs
-weight: 1
-description: >
-  This page describes the `toolbox` command-line options.
---
-
-## Reference
-
-| Flag (Short) | Flag (Long) | Description | Default |
-|---|---|---|---|
-| `-a` | `--address` | Address of the interface the server will listen on. | `127.0.0.1` |
-| | `--disable-reload` | Disables dynamic reloading of tools file. | |
-| `-h` | `--help` | help for toolbox | |
-| | `--log-level` | Specify the minimum level logged. Allowed: 'DEBUG', 'INFO', 'WARN', 'ERROR'. | `info` |
-| | `--logging-format` | Specify logging format to use. Allowed: 'standard' or 'JSON'. | `standard` |
-| `-p` | `--port` | Port the server will listen on. | `5000` |
-| | `--prebuilt` | Use a prebuilt tool configuration by source type. Cannot be used with --tools-file. See [Prebuilt Tools Reference](prebuilt-tools.md) for allowed values. | |
-| | `--stdio` | Listens via MCP STDIO instead of acting as a remote HTTP server. | |
-| | `--telemetry-gcp` | Enable exporting directly to Google Cloud Monitoring. | |
-| | `--telemetry-otlp` | Enable exporting using OpenTelemetry Protocol (OTLP) to the specified endpoint (e.g. 'http://127.0.0.1:4318') | |
-| | `--telemetry-service-name` | Sets the value of the service.name resource attribute for telemetry data. | `toolbox` |
-| | `--tools-file` | File path specifying the tool configuration. Cannot be used with --prebuilt, --tools-files, or --tools-folder. | |
-| | `--tools-files` | Multiple file paths specifying tool configurations. Files will be merged. Cannot be used with --prebuilt, --tools-file, or --tools-folder. | |
-| | `--tools-folder` | Directory path containing YAML tool configuration files. All .yaml and .yml files in the directory will be loaded and merged. Cannot be used with --prebuilt, --tools-file, or --tools-files. | |
-| | `--ui` | Launches the Toolbox UI web server. | |
-| `-v` | `--version` | version for toolbox | |
-
-## Examples
-
-### Transport Configuration
-
-**Server Settings:**
- `--address`, `-a`: Server listening address (default: "127.0.0.1")
- `--port`, `-p`: Server listening port (default: 5000)
-
-**STDIO:**
- `--stdio`: Run in MCP STDIO mode instead of HTTP server
-
-#### Usage Examples
-
-```bash
-# Basic server with custom port configuration
-./toolbox --tools-file "tools.yaml" --port 8080
-```
-
-### Tool Configuration Sources
-
-The CLI supports multiple mutually exclusive ways to specify tool configurations:
-
-**Single File:** (default)
- `--tools-file`: Path to a single YAML configuration file (default: `tools.yaml`)
-
-**Multiple Files:**
- `--tools-files`: Comma-separated list of YAML files to merge
-
-**Directory:**
- `--tools-folder`: Directory containing YAML files to load and merge
-
-**Prebuilt Configurations:**
- `--prebuilt`: Use predefined configurations for specific database types (e.g., 'bigquery', 'postgres', 'spanner'). See [Prebuilt Tools Reference](prebuilt-tools.md) for allowed values.
-
-{{< notice tip >}}
-The CLI enforces mutual exclusivity between configuration source flags, preventing simultaneous use of `--prebuilt` with file-based options, and ensuring only one of `--tools-file`, `--tools-files`, or `--tools-folder` is used at a time.
-{{< /notice >}}
-
-### Hot Reload
-
-Toolbox enables dynamic reloading by default. To disable, use the
-`--disable-reload` flag.
-
-### Toolbox UI
-
-To launch Toolbox's interactive UI, use the `--ui` flag. This allows you to test tools and toolsets with features such as authorized parameters. To learn more, visit [Toolbox UI](../how-to/toolbox-ui/index.md).
--- a/docs/en/reference/prebuilt-tools.md
+++ b/docs/en/reference/prebuilt-tools.md
@@ -1,265 +0,0 @@
---
-title: "Prebuilt Tools"
-type: docs
-weight: 1
-description: >
-    This page lists all the prebuilt tools available.
---
-
-Prebuilt tools are reusable, pre-packaged toolsets that are designed to extend the capabilities of agents. These tools are built to be generic and adaptable, allowing developers to interact with and take action on databases.
-
-See guides, [Connect from your IDE](../how-to/connect-ide/_index.md), for details on how to connect your AI tools (IDEs) to databases via Toolbox and MCP.
-
-## AlloyDB Postgres
-
-*   `--prebuilt` value: `alloydb-postgres`
-*   **Environment Variables:**
-    *   `ALLOYDB_POSTGRES_PROJECT`: The GCP project ID.
-    *   `ALLOYDB_POSTGRES_REGION`: The region of your AlloyDB instance.
-    *   `ALLOYDB_POSTGRES_CLUSTER`: The ID of your AlloyDB cluster.
-    *   `ALLOYDB_POSTGRES_INSTANCE`: The ID of your AlloyDB instance.
-    *   `ALLOYDB_POSTGRES_DATABASE`: The name of the database to connect to.
-    *   `ALLOYDB_POSTGRES_USER`: The database username. Defaults to IAM authentication if unspecified.
-    *   `ALLOYDB_POSTGRES_PASSWORD`: The password for the database user. Defaults to IAM authentication if unspecified.
-    *   `ALLOYDB_POSTGRES_IP_TYPE`: The IP type i.e. "Public
-     or "Private" (Default: Public).
-*   **Permissions:**
-    *   **AlloyDB Client** (`roles/alloydb.client`) to connect to the instance.
-    *   Database-level permissions (e.g., `SELECT`, `INSERT`) are required to execute queries.
-*   **Tools:**
-    *   `execute_sql`: Executes a SQL query.
-    *   `list_tables`: Lists tables in the database.
-
-## AlloyDB Postgres Admin
-
-* `--prebuilt` value: `alloydb-postgres-admin`
-*   **Environment Variables:**
-    *   `API_KEY`: Your API key for the AlloyDB API.
-*   **Permissions:**
-    *   **AlloyDB Admin** (`roles/alloydb.admin`) IAM role is required on the project.
-*   **Tools:**
-    *   `alloydb-create-cluster`: Creates a new AlloyDB cluster.
-    *   `alloydb-operations-get`: Polls the operations API to track the status of long-running operations.
-    *   `alloydb-create-instance`: Creates a new AlloyDB instance within a cluster.
-    *   `alloydb-list-clusters`: Lists all AlloyDB clusters in a project.
-    *   `alloydb-list-instances`: Lists all instances within an AlloyDB cluster.
-    *   `alloydb-list-users`: Lists all database users within an AlloyDB cluster.
-    *   `alloydb-create-user`: Creates a new database user in an AlloyDB cluster.
-
-## BigQuery
-
-*   `--prebuilt` value: `bigquery`
-*   **Environment Variables:**
-    *   `BIGQUERY_PROJECT`: The GCP project ID.
-*   **Permissions:**
-    *   **BigQuery User** (`roles/bigquery.user`) to execute queries and view metadata.
-    *   **BigQuery Metadata Viewer** (`roles/bigquery.metadataViewer`) to view all datasets.
-    *   **BigQuery Data Editor** (`roles/bigquery.dataEditor`) to create or modify datasets and tables.
-    *   **Gemini for Google Cloud** (`roles/cloudaicompanion.user`) to use the conversational analytics API.
-*   **Tools:**
-    *   `ask_data_insights`: Use this tool to perform data analysis, get insights, or answer complex questions about the contents of specific BigQuery tables. For more information on required roles, API setup, and IAM configuration, see the setup and authentication section of the [Conversational Analytics API documentation](https://cloud.google.com/gemini/docs/conversational-analytics-api/overview).
-    *   `execute_sql`: Executes a SQL statement.
-    *   `forecast`: Use this tool to forecast time series data.
-    *   `get_dataset_info`: Gets dataset metadata.
-    *   `get_table_info`: Gets table metadata.
-    *   `list_dataset_ids`: Lists datasets.
-    *   `list_table_ids`: Lists tables.
-
-## Cloud SQL for MySQL
-
-*   `--prebuilt` value: `cloud-sql-mysql`
-*   **Environment Variables:**
-    *   `CLOUD_SQL_MYSQL_PROJECT`: The GCP project ID.
-    *   `CLOUD_SQL_MYSQL_REGION`: The region of your Cloud SQL instance.
-    *   `CLOUD_SQL_MYSQL_INSTANCE`: The ID of your Cloud SQL instance.
-    *   `CLOUD_SQL_MYSQL_DATABASE`: The name of the database to connect to.
-    *   `CLOUD_SQL_MYSQL_USER`: The database username.
-    *   `CLOUD_SQL_MYSQL_PASSWORD`: The password for the database user.
-*   **Permissions:**
-    *   **Cloud SQL Client** (`roles/cloudsql.client`) to connect to the instance.
-    *   Database-level permissions (e.g., `SELECT`, `INSERT`) are required to execute queries.
-*   **Tools:**
-    *   `execute_sql`: Executes a SQL query.
-    *   `list_tables`: Lists tables in the database.
-
-## Cloud SQL for PostgreSQL
-
-*   `--prebuilt` value: `cloud-sql-postgres`
-*   **Environment Variables:**
-    *   `CLOUD_SQL_POSTGRES_PROJECT`: The GCP project ID.
-    *   `CLOUD_SQL_POSTGRES_REGION`: The region of your Cloud SQL instance.
-    *   `CLOUD_SQL_POSTGRES_INSTANCE`: The ID of your Cloud SQL instance.
-    *   `CLOUD_SQL_POSTGRES_DATABASE`: The name of the database to connect to.
-    *   `CLOUD_SQL_POSTGRES_USER`: The database username.
-    *   `CLOUD_SQL_POSTGRES_PASSWORD`: The password for the database user.
-*   **Permissions:**
-    *   **Cloud SQL Client** (`roles/cloudsql.client`) to connect to the instance.
-    *   Database-level permissions (e.g., `SELECT`, `INSERT`) are required to execute queries.
-*   **Tools:**
-    *   `execute_sql`: Executes a SQL query.
-    *   `list_tables`: Lists tables in the database.
-
-## Cloud SQL for SQL Server
-
-*   `--prebuilt` value: `cloud-sql-mssql`
-*   **Environment Variables:**
-    *   `CLOUD_SQL_MSSQL_PROJECT`: The GCP project ID.
-    *   `CLOUD_SQL_MSSQL_REGION`: The region of your Cloud SQL instance.
-    *   `CLOUD_SQL_MSSQL_INSTANCE`: The ID of your Cloud SQL instance.
-    *   `CLOUD_SQL_MSSQL_DATABASE`: The name of the database to connect to.
-    *   `CLOUD_SQL_MSSQL_IP_ADDRESS`: The IP address of the Cloud SQL instance.
-    *   `CLOUD_SQL_MSSQL_USER`: The database username.
-    *   `CLOUD_SQL_MSSQL_PASSWORD`: The password for the database user.
-*   **Permissions:**
-    *   **Cloud SQL Client** (`roles/cloudsql.client`) to connect to the instance.
-    *   Database-level permissions (e.g., `SELECT`, `INSERT`) are required to execute queries.
-*   **Tools:**
-    *   `execute_sql`: Executes a SQL query.
-    *   `list_tables`: Lists tables in the database.
-
-## Dataplex
-
-*   `--prebuilt` value: `dataplex`
-*   **Environment Variables:**
-    *   `DATAPLEX_PROJECT`: The GCP project ID.
-*   **Permissions:**
-    *   **Dataplex Reader** (`roles/dataplex.viewer`) to search and look up entries.
-    *   **Dataplex Editor** (`roles/dataplex.editor`) to modify entries.
-*   **Tools:**
-    *   `dataplex_search_entries`: Searches for entries in Dataplex Catalog.
-    *   `dataplex_lookup_entry`: Retrieves a specific entry from Dataplex Catalog.
-    *   `dataplex_search_aspect_types`: Finds aspect types relevant to the query.
-
-## Firestore
-
-*   `--prebuilt` value: `firestore`
-*   **Environment Variables:**
-    *   `FIRESTORE_PROJECT`: The GCP project ID.
-    *   `FIRESTORE_DATABASE`: The Firestore database ID.
-*   **Permissions:**
-    *   **Cloud Datastore User** (`roles/datastore.user`) to get documents, list collections, and query collections.
-    *   **Firebase Rules Viewer** (`roles/firebaserules.viewer`) to get and validate Firestore rules.
-*   **Tools:**
-    *   `firestore-get-documents`: Gets multiple documents from Firestore by their paths.
-    *   `firestore-list-collections`: Lists Firestore collections for a given parent path.
-    *   `firestore-delete-documents`: Deletes multiple documents from Firestore.
-    *   `firestore-query-collection`: Retrieves one or more Firestore documents from a collection.
-    *   `firestore-get-rules`: Retrieves the active Firestore security rules.
-    *   `firestore-validate-rules`: Checks the provided Firestore Rules source for syntax and validation errors.
-
-## Looker
-
-*   `--prebuilt` value: `looker`
-*   **Environment Variables:**
-    *   `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.
-*   **Permissions:**
-    *   A Looker account with permissions to access the desired models, explores, and data is required.
-*   **Tools:**
-    *   `get_models`: Retrieves the list of LookML models.
-    *   `get_explores`: Retrieves the list of explores in a model.
-    *   `get_dimensions`: Retrieves the list of dimensions in an explore.
-    *   `get_measures`: Retrieves the list of measures in an explore.
-    *   `get_filters`: Retrieves the list of filters in an explore.
-    *   `get_parameters`: Retrieves the list of parameters in an explore.
-    *   `query`: Runs a query against the LookML model.
-    *   `query_sql`: Generates the SQL for a query.
-    *   `query_url`: Generates a URL for a query in Looker.
-    *   `get_looks`: Searches for saved looks.
-    *   `run_look`: Runs the query associated with a look.
-    *   `make_look`: Creates a new look.
-    *   `get_dashboards`: Searches for saved dashboards.
-    *   `make_dashboard`: Creates a new dashboard.
-    *   `add_dashboard_element`: Adds a tile to a dashboard.
-
-## Microsoft SQL Server
-
-*   `--prebuilt` value: `mssql`
-*   **Environment Variables:**
-    *   `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.
-*   **Permissions:**
-    *   Database-level permissions (e.g., `SELECT`, `INSERT`) are required to execute queries.
-*   **Tools:**
-    *   `execute_sql`: Executes a SQL query.
-    *   `list_tables`: Lists tables in the database.
-
-## MySQL
-
-*   `--prebuilt` value: `mysql`
-*   **Environment Variables:**
-    *   `MYSQL_HOST`: The hostname or IP address of the MySQL server.
-    *   `MYSQL_PORT`: The port number for the MySQL server.
-    *   `MYSQL_DATABASE`: The name of the database to connect to.
-    *   `MYSQL_USER`: The database username.
-    *   `MYSQL_PASSWORD`: The password for the database user.
-*   **Permissions:**
-    *   Database-level permissions (e.g., `SELECT`, `INSERT`) are required to execute queries.
-*   **Tools:**
-    *   `execute_sql`: Executes a SQL query.
-    *   `list_tables`: Lists tables in the database.
-
-## OceanBase
-
-*   `--prebuilt` value: `oceanbase`
-*   **Environment Variables:**
-    *   `OCEANBASE_HOST`: The hostname or IP address of the OceanBase server.
-    *   `OCEANBASE_PORT`: The port number for the OceanBase server.
-    *   `OCEANBASE_DATABASE`: The name of the database to connect to.
-    *   `OCEANBASE_USER`: The database username.
-    *   `OCEANBASE_PASSWORD`: The password for the database user.
-*   **Permissions:**
-    *   Database-level permissions (e.g., `SELECT`, `INSERT`) are required to execute queries.
-*   **Tools:**
-    *   `execute_sql`: Executes a SQL query.
-    *   `list_tables`: Lists tables in the database.
-
-## PostgreSQL
-
-*   `--prebuilt` value: `postgres`
-*   **Environment Variables:**
-    *   `POSTGRES_HOST`: The hostname or IP address of the PostgreSQL server.
-    *   `POSTGRES_PORT`: The port number for the PostgreSQL server.
-    *   `POSTGRES_DATABASE`: The name of the database to connect to.
-    *   `POSTGRES_USER`: The database username.
-    *   `POSTGRES_PASSWORD`: The password for the database user.
-*   **Permissions:**
-    *   Database-level permissions (e.g., `SELECT`, `INSERT`) are required to execute queries.
-*   **Tools:**
-    *   `execute_sql`: Executes a SQL query.
-    *   `list_tables`: Lists tables in the database.
-
-## Spanner (GoogleSQL dialect)
-
-*   `--prebuilt` value: `spanner`
-*   **Environment Variables:**
-    *   `SPANNER_PROJECT`: The GCP project ID.
-    *   `SPANNER_INSTANCE`: The Spanner instance ID.
-    *   `SPANNER_DATABASE`: The Spanner database ID.
-*   **Permissions:**
-    *   **Cloud Spanner Database Reader** (`roles/spanner.databaseReader`) to execute DQL queries and list tables.
-    *   **Cloud Spanner Database User** (`roles/spanner.databaseUser`) to execute DML queries.
-*   **Tools:**
-    *   `execute_sql`: Executes a DML SQL query.
-    *   `execute_sql_dql`: Executes a DQL SQL query.
-    *   `list_tables`: Lists tables in the database.
-
-## Spanner (PostgreSQL dialect)
-
-*   `--prebuilt` value: `spanner-postgres`
-*   **Environment Variables:**
-    *   `SPANNER_PROJECT`: The GCP project ID.
-    *   `SPANNER_INSTANCE`: The Spanner instance ID.
-    *   `SPANNER_DATABASE`: The Spanner database ID.
-*   **Permissions:**
-    *   **Cloud Spanner Database Reader** (`roles/spanner.databaseReader`) to execute DQL queries and list tables.
-    *   **Cloud Spanner Database User** (`roles/spanner.databaseUser`) to execute DML queries.
-*   **Tools:**
-    *   `execute_sql`: Executes a DML SQL query using the PostgreSQL interface for Spanner.
-    *   `execute_sql_dql`: Executes a DQL SQL query using the PostgreSQL interface for Spanner.
-    *   `list_tables`: Lists tables in the database.
--- a/docs/en/resources/authServices/_index.md
+++ b/docs/en/resources/authServices/_index.md
@@ -28,7 +28,7 @@ The following configurations are placed at the top level of a `tools.yaml` file.
 {{< notice tip >}}
 If you are accessing Toolbox with multiple applications, each
 application should register their own Client ID even if they use the same
- "type" of auth provider.
+ "kind" of auth provider.
 {{< /notice >}}

 ```yaml
@@ -300,4 +300,4 @@ func main() {
 }
 ```

-## Types of Auth Services
+## Kinds of Auth Services
--- a/docs/en/resources/authServices/google.md
+++ b/docs/en/resources/authServices/google.md
@@ -55,5 +55,5 @@ instead of hardcoding your secrets into the configuration file.

 | **field** | **type** | **required** | **description**                                                  |
 |-----------|:--------:|:------------:|------------------------------------------------------------------|
-| type      |  string  |     true     | Must be "google".                                                |
+| kind      |  string  |     true     | Must be "google".                                                |
 | clientId  |  string  |     true     | Client ID of your application from registering your application. |
--- a/docs/en/resources/sources/alloydb-pg.md
+++ b/docs/en/resources/sources/alloydb-pg.md
@@ -132,7 +132,7 @@ instead of hardcoding your secrets into the configuration file.

 | **field** | **type** | **required** | **description**                                                                                                          |
 |-----------|:--------:|:------------:|--------------------------------------------------------------------------------------------------------------------------|
-| type      |  string  |     true     | Must be "alloydb-postgres".                                                                                              |
+| kind      |  string  |     true     | Must be "alloydb-postgres".                                                                                              |
 | project   |  string  |     true     | Id of the GCP project that the cluster was created in (e.g. "my-project-id").                                            |
 | region    |  string  |     true     | Name of the GCP region that the cluster was created in (e.g. "us-central1").                                             |
 | cluster   |  string  |     true     | Name of the AlloyDB cluster (e.g. "my-cluster").                                                                         |
--- a/docs/en/resources/sources/bigquery.md
+++ b/docs/en/resources/sources/bigquery.md
@@ -36,15 +36,12 @@ avoiding full table scans or complex filters.

 ## Available Tools

- [`bigquery-conversational-analytics`](../tools/bigquery/bigquery-conversational-analytics.md)
-  Allows conversational interaction with a BigQuery source.
+- [`bigquery-sql`](../tools/bigquery/bigquery-sql.md)  
+  Run SQL queries directly against BigQuery datasets.

 - [`bigquery-execute-sql`](../tools/bigquery/bigquery-execute-sql.md)  
  Execute structured queries using parameters.

- [`bigquery-forecast`](../tools/bigquery/bigquery-forecast.md)
-  Forecasts time series data in BigQuery.
-
 - [`bigquery-get-dataset-info`](../tools/bigquery/bigquery-get-dataset-info.md)  
  Retrieve metadata for a specific dataset.

@@ -57,9 +54,6 @@ avoiding full table scans or complex filters.
 - [`bigquery-list-table-ids`](../tools/bigquery/bigquery-list-table-ids.md)  
  List tables in a given dataset.

- [`bigquery-sql`](../tools/bigquery/bigquery-sql.md)  
-  Run SQL queries directly against BigQuery datasets.
-
 ### Pre-built Configurations

 - [BigQuery using MCP](https://googleapis.github.io/genai-toolbox/how-to/connect-ide/bigquery_mcp/)  
@@ -71,64 +65,34 @@ Connect your IDE to BigQuery using Toolbox.

 BigQuery uses [Identity and Access Management (IAM)][iam-overview] to control
 user and group access to BigQuery resources like projects, datasets, and tables.
+Toolbox will use your [Application Default Credentials (ADC)][adc] to authorize
+and authenticate when interacting with [BigQuery][bigquery-docs].

-### Authentication via Application Default Credentials (ADC)
-
-By **default**, Toolbox will use your [Application Default Credentials (ADC)][adc] to authorize and authenticate when interacting with [BigQuery][bigquery-docs].
-
-When using this method, you need to ensure the IAM identity associated with your
-ADC (such as a service account) has the correct permissions for the queries you
-intend to run. Common roles include `roles/bigquery.user` (which includes
-permissions to run jobs and read data) or `roles/bigbigquery.dataViewer`.
-Follow this [guide][set-adc] to set up your ADC.
-
-### Authentication via User's OAuth Access Token
-
-If the `useClientOAuth` parameter is set to `true`, Toolbox will instead use the
-OAuth access token for authentication. This token is parsed from the
-`Authorization` header passed in with the tool invocation request. This method
-allows Toolbox to make queries to [BigQuery][bigquery-docs] on behalf of the
-client or the end-user.
-
-When using this on-behalf-of authentication, you must ensure that the
-identity used has been granted the correct IAM permissions. Currently,
-this option is only supported by the following BigQuery tools:
-
- [`bigquery-sql`](../tools/bigquery/bigquery-sql.md)  
-  Run SQL queries directly against BigQuery datasets.
+In addition to [setting the ADC for your server][set-adc], you need to ensure
+the IAM identity has been given the correct IAM permissions for the queries
+you intend to run. Common roles include `roles/bigquery.user` (which includes
+permissions to run jobs and read data) or `roles/bigquery.dataViewer`. See
+[Introduction to BigQuery IAM][grant-permissions] for more information on
+applying IAM permissions and roles to an identity.

 [iam-overview]: https://cloud.google.com/bigquery/docs/access-control
 [adc]: https://cloud.google.com/docs/authentication#adc
 [set-adc]: https://cloud.google.com/docs/authentication/provide-credentials-adc
+[grant-permissions]: https://cloud.google.com/bigquery/docs/access-control

 ## Example

-Initialize a BigQuery source that uses ADC:
-
 ```yaml
 sources:
  my-bigquery-source:
    kind: "bigquery"
    project: "my-project-id"
-    # location: "US" # Optional: Specifies the location for query jobs.
-```
-
-Initialize a BigQuery source that uses the client's access token:
-
-```yaml
-sources:
-  my-bigquery-client-auth-source:
-    kind: "bigquery"
-    project: "my-project-id"
-    useClientOAuth: true
-    # location: "US" # Optional: Specifies the location for query jobs.
 ```

 ## Reference

-| **field**      | **type** | **required** | **description**                                                                                                                                                                                                                         |
-|----------------|:--------:|:------------:|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| type           |  string  |     true     | Must be "bigquery".                                                                                                                                                                                                                     |
-| project        |  string  |     true     | Id of the Google Cloud project to use for billing and as the default project for BigQuery resources.                                                                               |
-| location       |  string  |    false     | Specifies the location (e.g., 'us', 'asia-northeast1') in which to run the query job. This location must match the location of any tables referenced in the query. Defaults to the table's location or 'US' if the location cannot be determined. [Learn More](https://cloud.google.com/bigquery/docs/locations) |
-| useClientOAuth |   bool   |    false     | If true, forwards the client's OAuth access token from the "Authorization" header to downstream queries.                                                                                                                                |
+| **field** | **type** | **required** | **description**                                                               |
+|-----------|:--------:|:------------:|-------------------------------------------------------------------------------|
+| kind      |  string  |     true     | Must be "bigquery".                                                           |
+| project   |  string  |     true     | Id of the GCP project that the cluster was created in (e.g. "my-project-id"). |
+| location  |  string  |    false     | Specifies the location (e.g., 'us', 'asia-northeast1') in which to run the query job. This location must match the location of any tables referenced in the query. The default behavior is for it to be executed in the US multi-region |
--- a/docs/en/resources/sources/bigtable.md
+++ b/docs/en/resources/sources/bigtable.md
@@ -70,6 +70,6 @@ sources:

 | **field** | **type** | **required** | **description**                                                               |
 |-----------|:--------:|:------------:|-------------------------------------------------------------------------------|
-| type      |  string  |     true     | Must be "bigtable".                                                           |
+| kind      |  string  |     true     | Must be "bigtable".                                                           |
 | project   |  string  |     true     | Id of the GCP project that the cluster was created in (e.g. "my-project-id"). |
 | instance  |  string  |     true     | Name of the Bigtable instance.                                                |
--- a/docs/en/resources/sources/clickhouse.md
+++ b/docs/en/resources/sources/clickhouse.md
@@ -1,91 +0,0 @@
---
-title: "ClickHouse"
-type: docs
-weight: 1
-description: >
-  ClickHouse is an open-source, OLTP database.
-
---
-
-## About
-
-[ClickHouse][clickhouse-docs] is a fast, open-source, column-oriented database 
-
-[clickhouse-docs]: https://clickhouse.com/docs
-
-## Available Tools
-
- [`clickhouse-execute-sql`](../tools/clickhouse/clickhouse-execute-sql.md)  
-  Execute parameterized SQL queries in ClickHouse with query logging.
-
- [`clickhouse-sql`](../tools/clickhouse/clickhouse-sql.md)  
-  Execute SQL queries as prepared statements in ClickHouse.
-
-
-## Requirements
-
-### Database User
-
-This source uses standard ClickHouse authentication. You will need to [create a
-ClickHouse user][clickhouse-users] (or with [ClickHouse Cloud][clickhouse-cloud]) to connect to the database with. The user
-should have appropriate permissions for the operations you plan to perform.
-
-[clickhouse-cloud]: https://clickhouse.com/docs/getting-started/quick-start/cloud#connect-with-your-app
-[clickhouse-users]: https://clickhouse.com/docs/en/sql-reference/statements/create/user
-
-### Network Access
-
-ClickHouse supports multiple protocols:
-
- **HTTPS protocol** (default port 8443) - Secure HTTP access (default)
- **HTTP protocol** (default port 8123) - Good for web-based access
-
-## Example
-
-### Secure Connection Example
-
-```yaml
-sources:
-    secure-clickhouse-source:
-        kind: clickhouse
-        host: clickhouse.example.com
-        port: "8443"
-        database: analytics
-        user: ${CLICKHOUSE_USER}
-        password: ${CLICKHOUSE_PASSWORD}
-        protocol: https
-        secure: true
-```
-
-### HTTP Protocol Example
-
-```yaml
-sources:
-    http-clickhouse-source:
-        kind: clickhouse
-        host: localhost
-        port: "8123"
-        database: logs
-        user: ${CLICKHOUSE_USER}
-        password: ${CLICKHOUSE_PASSWORD}
-        protocol: http
-        secure: false
-```
-
-{{< notice tip >}}
-Use environment variable replacement with the format ${ENV_NAME}
-instead of hardcoding your secrets into the configuration file.
-{{< /notice >}}
-
-## Reference
-
-| **field**   | **type** | **required** | **description**                                                                    |
-|-------------|:--------:|:------------:|------------------------------------------------------------------------------------|
-| type        |  string  |     true     | Must be "clickhouse".                                                              |
-| host        |  string  |     true     | IP address or hostname to connect to (e.g. "127.0.0.1" or "clickhouse.example.com") |
-| port        |  string  |     true     | Port to connect to (e.g. "8443" for HTTPS, "8123" for HTTP)                     |
-| database    |  string  |     true     | Name of the ClickHouse database to connect to (e.g. "my_database").              |
-| user        |  string  |     true     | Name of the ClickHouse user to connect as (e.g. "analytics_user").               |
-| password    |  string  |    false     | Password of the ClickHouse user (e.g. "my-password").                             |
-| protocol    |  string  |    false     | Connection protocol: "https" (default) or "http".                      |
-| secure      |  boolean |    false     | Whether to use a secure connection (TLS). Default: false.                         |
--- a/docs/en/resources/sources/cloud-sql-mssql.md
+++ b/docs/en/resources/sources/cloud-sql-mssql.md
@@ -106,7 +106,7 @@ instead of hardcoding your secrets into the configuration file.

 | **field** | **type** | **required** | **description**                                                                             |
 |-----------|:--------:|:------------:|---------------------------------------------------------------------------------------------|
-| type      |  string  |     true     | Must be "cloud-sql-mssql".                                                                  |
+| kind      |  string  |     true     | Must be "cloud-sql-mssql".                                                                  |
 | project   |  string  |     true     | Id of the GCP project that the cluster was created in (e.g. "my-project-id").               |
 | 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").                     |
--- a/docs/en/resources/sources/cloud-sql-mysql.md
+++ b/docs/en/resources/sources/cloud-sql-mysql.md
@@ -106,7 +106,7 @@ instead of hardcoding your secrets into the configuration file.

 | **field** | **type** | **required** | **description**                                                                             |
 |-----------|:--------:|:------------:|---------------------------------------------------------------------------------------------|
-| type      |  string  |     true     | Must be "cloud-sql-mysql".                                                                  |
+| kind      |  string  |     true     | Must be "cloud-sql-mysql".                                                                  |
 | project   |  string  |     true     | Id of the GCP project that the cluster was created in (e.g. "my-project-id").               |
 | 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").                     |
--- a/docs/en/resources/sources/cloud-sql-pg.md
+++ b/docs/en/resources/sources/cloud-sql-pg.md
@@ -131,7 +131,7 @@ instead of hardcoding your secrets into the configuration file.

 | **field** | **type** | **required** | **description**                                                                                                          |
 |-----------|:--------:|:------------:|--------------------------------------------------------------------------------------------------------------------------|
-| type      |  string  |     true     | Must be "cloud-sql-postgres".                                                                                            |
+| kind      |  string  |     true     | Must be "cloud-sql-postgres".                                                                                            |
 | project   |  string  |     true     | Id of the GCP project that the cluster was created in (e.g. "my-project-id").                                            |
 | 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").                                                  |
--- a/docs/en/resources/sources/couchbase.md
+++ b/docs/en/resources/sources/couchbase.md
@@ -22,22 +22,18 @@ allowing tools to execute SQL queries against it.
 sources:
    my-couchbase-instance:
        kind: couchbase
-        connectionString: couchbase://localhost
+        connectionString: couchbase://localhost:8091
        bucket: travel-sample
        scope: inventory
        username: Administrator
        password: password
 ```

-{{< notice note >}}
-For more details about alternate addresses and custom ports refer to [Managing Connections](https://docs.couchbase.com/java-sdk/current/howtos/managing-connections.html).
-{{< /notice >}}
-
 ## Reference

 | **field**            | **type** | **required** | **description**                                         |
 |----------------------|:--------:|:------------:|---------------------------------------------------------|
-| type                 | string   |    true      | Must be "couchbase".                                    |
+| kind                 | string   |    true      | Must be "couchbase".                                    |
 | connectionString     | string   |    true      | Connection string for the Couchbase cluster.            |
 | bucket               | string   |    true      | Name of the bucket to connect to.                       |
 | scope                | string   |    true      | Name of the scope within the bucket.                    |
--- a/docs/en/resources/sources/dataplex.md
+++ b/docs/en/resources/sources/dataplex.md
@@ -320,5 +320,5 @@ Logical operators are case-sensitive. `OR` and `AND` are acceptable whereas `or`

 | **field** | **type** | **required** | **description**                                                                  |
 |-----------|:--------:|:------------:|----------------------------------------------------------------------------------|
-| type      |  string  |     true     | Must be "dataplex".                                                              |
+| kind      |  string  |     true     | Must be "dataplex".                                                              |
 | project   |  string  |     true     | ID of the GCP project used for quota and billing purposes (e.g. "my-project-id").|
--- a/docs/en/resources/sources/dgraph.md
+++ b/docs/en/resources/sources/dgraph.md
@@ -59,7 +59,7 @@ instead of hardcoding your secrets into the configuration file.

 | **Field**   | **Type** | **Required** | **Description**                                                                                  |
 |-------------|:--------:|:------------:|--------------------------------------------------------------------------------------------------|
-| type        |  string  |     true     | Must be "dgraph".                                                                                |
+| kind        |  string  |     true     | Must be "dgraph".                                                                                |
 | dgraphUrl   |  string  |     true     | Connection URI (e.g. "<https://xxx.cloud.dgraph.io>", "<https://localhost:8080>").               |
 | user        |  string  |     false    | Name of the Dgraph user to connect as (e.g., "groot").                                           |
 | password    |  string  |     false    | Password of the Dgraph user (e.g., "password").                                                  |
--- a/docs/en/resources/sources/firebird.md
+++ b/docs/en/resources/sources/firebird.md
@@ -1,59 +0,0 @@
---
-title: "Firebird"
-type: docs
-weight: 1
-description: >
-  Firebird is a powerful, cross-platform, and open-source relational database.
-
---
-
-## About
-
-[Firebird][fb-docs] is a relational database management system offering many ANSI SQL standard features that runs on Linux, Windows, and a variety of Unix platforms. It is known for its small footprint, powerful features, and easy maintenance.
-
-[fb-docs]: https://firebirdsql.org/
-
-## Available Tools
-
- [`firebird-sql`](../tools/firebird/firebird-sql.md)  
-  Execute SQL queries as prepared statements in Firebird.
-
- [`firebird-execute-sql`](../tools/firebird/firebird-execute-sql.md)  
-  Run parameterized SQL statements in Firebird.
-
-## Requirements
-
-### Database User
-
-This source uses standard authentication. You will need to [create a Firebird user][fb-users] to login to the database with.
-
-[fb-users]: https://firebirdsql.org/refdocs/langrefupd25-sql-create-user.html
-
-## Example
-
-```yaml
-sources:
-    my_firebird_db:
-        kind: firebird
-        host: "localhost"
-        port: 3050
-        database: "/path/to/your/database.fdb"
-        user: ${FIREBIRD_USER}
-        password: ${FIREBIRD_PASS}
-```
-
-{{< notice tip >}}
-Use environment variable replacement with the format ${ENV_NAME}
-instead of hardcoding your secrets into the configuration file.
-{{< /notice >}}
-
-## Reference
-
-| **field** | **type** | **required** | **description**                                                        |
-|-----------|:--------:|:------------:|------------------------------------------------------------------------|
-| type      |  string  |     true     | Must be "firebird".                                                    |
-| host      |  string  |     true     | IP address to connect to (e.g. "127.0.0.1")                            |
-| port      |  string  |     true     | Port to connect to (e.g. "3050")                                       |
-| database  |  string  |     true     | Path to the Firebird database file (e.g. "/var/lib/firebird/data/test.fdb"). |
-| user      |  string  |     true     | Name of the Firebird user to connect as (e.g. "SYSDBA").               |
-| password  |  string  |     true     | Password of the Firebird user (e.g. "masterkey").                      |
--- a/docs/en/resources/sources/firestore.md
+++ b/docs/en/resources/sources/firestore.md
@@ -72,6 +72,6 @@ sources:

 | **field** | **type** | **required** | **description**                                                                                          |
 |-----------|:--------:|:------------:|----------------------------------------------------------------------------------------------------------|
-| type      |  string  |     true     | Must be "firestore".                                                                                     |
+| kind      |  string  |     true     | Must be "firestore".                                                                                     |
 | project   |  string  |     true     | Id of the GCP project that contains the Firestore database (e.g. "my-project-id").                       |
 | database  |  string  |     false    | Name of the Firestore database to connect to. Defaults to "(default)" if not specified.                  |
--- a/docs/en/resources/sources/http.md
+++ b/docs/en/resources/sources/http.md
@@ -44,7 +44,7 @@ instead of hardcoding your secrets into the configuration file.

 | **field**              |     **type**      | **required** | **description**                                                                                                                    |
 |------------------------|:-----------------:|:------------:|------------------------------------------------------------------------------------------------------------------------------------|
-| type                   |      string       |     true     | Must be "http".                                                                                                                    |
+| kind                   |      string       |     true     | Must be "http".                                                                                                                    |
 | baseUrl                |      string       |     true     | The base URL for the HTTP requests (e.g., `https://api.example.com`).                                                              |
 | timeout                |      string       |    false     | The timeout for HTTP requests (e.g., "5s", "1m", refer to [ParseDuration][parse-duration-doc] for more examples). Defaults to 30s. |
 | headers                | map[string]string |    false     | Default headers to include in the HTTP requests.                                                                                   |
--- a/docs/en/resources/sources/looker.md
+++ b/docs/en/resources/sources/looker.md
@@ -47,8 +47,7 @@ a self-signed ssl certificate for the Looker server. Anything other than "true"
 will be interpreted as false.

 The client id and client secret are seemingly random character sequences
-assigned by the looker server. If you are using Looker OAuth you don't need
-these settings
+assigned by the looker server.

 {{< notice tip >}}
 Use environment variable replacement with the format ${ENV_NAME}
@@ -57,15 +56,11 @@ instead of hardcoding your secrets into the configuration file.

 ## Reference

-| **field**            | **type** | **required** | **description**                                                                           |
-| -------------------- | :------: | :----------: | ----------------------------------------------------------------------------------------- |
-| type                 |  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.                                       |
-| 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)                 |
-| 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  |     true     | The client id assigned by Looker.                                                         |
+| client_secret |  string  |     true     | The client secret assigned by Looker.                                                     |
+| verify_ssl    |  string  |     true     | Whether to check the ssl certificate of the server.                                       |
+| timeout       |  string  |    false     | Maximum time to wait for query execution (e.g. "30s", "2m"). By default, 120s is applied. |
--- a/docs/en/resources/sources/mongodb.md
+++ b/docs/en/resources/sources/mongodb.md
@@ -21,12 +21,12 @@ sources:
    my-mongodb:
        kind: mongodb
        uri: "mongodb+srv://username:password@host.mongodb.net"       
-
 ```

 ## Reference

 | **field** | **type** | **required** | **description**                                                   |
 |-----------|:--------:|:------------:|-------------------------------------------------------------------|
-| type      |  string  |     true     | Must be "mongodb".                                                |
+| kind      |  string  |     true     | Must be "mongodb".                                                |
 | uri       |  string  |     true     | connection string to connect to MongoDB                           |
+| database  |  string  |     true     | Name of the mongodb database to connect to (e.g. "sample_mflix"). |
--- a/docs/en/resources/sources/mssql.md
+++ b/docs/en/resources/sources/mssql.md
@@ -55,7 +55,7 @@ instead of hardcoding your secrets into the configuration file.

 | **field** | **type** | **required** | **description**                                                                                                                                                                            |
 |-----------|:--------:|:------------:|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| type      |  string  |     true     | Must be "mssql".                                                                                                                                                                           |
+| kind      |  string  |     true     | Must be "mssql".                                                                                                                                                                           |
 | host      |  string  |     true     | IP address to connect to (e.g. "127.0.0.1").                                                                                                                                               |
 | port      |  string  |     true     | Port to connect to (e.g. "1433").                                                                                                                                                          |
 | database  |  string  |     true     | Name of the SQL Server database to connect to (e.g. "my_db").                                                                                                                              |
--- a/docs/en/resources/sources/mysql.md
+++ b/docs/en/resources/sources/mysql.md
@@ -42,9 +42,6 @@ sources:
        database: my_db
        user: ${USER_NAME}
        password: ${PASSWORD}
-        # Optional TLS and other driver parameters. For example, enable preferred TLS:
-        # queryParams:
-        #     tls: preferred
        queryTimeout: 30s # Optional: query timeout duration
 ```

@@ -57,11 +54,10 @@ instead of hardcoding your secrets into the configuration file.

 | **field**    | **type** | **required** | **description**                                                                                 |
 | ------------ | :------: | :----------: | ----------------------------------------------------------------------------------------------- |
-| type         |  string  |     true     | Must be "mysql".                                                                                |
+| 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. "3306").                                                               |
 | database     |  string  |     true     | Name of the MySQL database to connect to (e.g. "my_db").                                        |
 | user         |  string  |     true     | Name of the MySQL user to connect as (e.g. "my-mysql-user").                                    |
 | password     |  string  |     true     | Password of the MySQL 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/neo4j.md
+++ b/docs/en/resources/sources/neo4j.md
@@ -51,7 +51,7 @@ instead of hardcoding your secrets into the configuration file.

 | **field** | **type** | **required** | **description**                                                      |
 |-----------|:--------:|:------------:|----------------------------------------------------------------------|
-| type      |  string  |     true     | Must be "neo4j".                                                     |
+| kind      |  string  |     true     | Must be "neo4j".                                                     |
 | uri       |  string  |     true     | Connect URI ("bolt://localhost", "neo4j+s://xxx.databases.neo4j.io") |
 | user      |  string  |     true     | Name of the Neo4j user to connect as (e.g. "neo4j").                 |
 | password  |  string  |     true     | Password of the Neo4j user (e.g. "my-password").                     |
--- a/docs/en/resources/sources/oceanbase.md
+++ b/docs/en/resources/sources/oceanbase.md
@@ -45,7 +45,7 @@ instead of hardcoding your secrets into the configuration file.

 | **field**    | **type** | **required** | **description**                                                                                 |
 | ------------ | :------: | :----------: |-------------------------------------------------------------------------------------------------|
-| type         |  string  |     true     | Must be "oceanbase".                                                                            |
+| kind         |  string  |     true     | Must be "oceanbase".                                                                            |
 | host         |  string  |     true     | IP address to connect to (e.g. "127.0.0.1").                                                    |
 | port         |  string  |     true     | Port to connect to (e.g. "2881").                                                               |
 | database     |  string  |     true     | Name of the OceanBase database to connect to (e.g. "my_db").                                    |
--- a/docs/en/resources/sources/postgres.md
+++ b/docs/en/resources/sources/postgres.md
@@ -59,7 +59,7 @@ instead of hardcoding your secrets into the configuration file.

 |  **field**  |      **type**      | **required** | **description**                                                        |
 |-------------|:------------------:|:------------:|------------------------------------------------------------------------|
-| type        |       string       |     true     | Must be "postgres".                                                    |
+| kind        |       string       |     true     | Must be "postgres".                                                    |
 | host        |       string       |     true     | IP address to connect to (e.g. "127.0.0.1")                            |
 | port        |       string       |     true     | Port to connect to (e.g. "5432")                                       |
 | database    |       string       |     true     | Name of the Postgres database to connect to (e.g. "my_db").            |
--- a/docs/en/resources/sources/redis.md
+++ b/docs/en/resources/sources/redis.md
@@ -91,7 +91,7 @@ sources:

 | **field**      | **type** | **required** | **description**                                                                                                                 |
 |----------------|:--------:|:------------:|---------------------------------------------------------------------------------------------------------------------------------|
-| type           |  string  |     true     | Must be "memorystore-redis".                                                                                                    |
+| kind           |  string  |     true     | Must be "memorystore-redis".                                                                                                    |
 | address        |  string  |     true     | Primary endpoint for the Memorystore Redis instance to connect to.                                                              |
 | username       |  string  |    false     | If you are using a non-default user, specify the user name here. If you are using Memorystore for Redis, leave this field blank |
 | password       |  string  |    false     | If you have [Redis AUTH][auth] enabled, specify the AUTH string here                                                            |
--- a/docs/en/resources/sources/spanner.md
+++ b/docs/en/resources/sources/spanner.md
@@ -71,7 +71,7 @@ sources:

 | **field** | **type** | **required** | **description**                                                                                                     |
 |-----------|:--------:|:------------:|---------------------------------------------------------------------------------------------------------------------|
-| type      |  string  |     true     | Must be "spanner".                                                                                                  |
+| kind      |  string  |     true     | Must be "spanner".                                                                                                  |
 | project   |  string  |     true     | Id of the GCP project that the cluster was created in (e.g. "my-project-id").                                       |
 | instance  |  string  |     true     | Name of the Spanner instance.                                                                                       |
 | database  |  string  |     true     | Name of the database on the Spanner instance                                                                        |
--- a/docs/en/resources/sources/sqlite.md
+++ b/docs/en/resources/sources/sqlite.md
@@ -61,7 +61,7 @@ sources:

 | **field** | **type** | **required** | **description**                                                                                                     |
 |-----------|:--------:|:------------:|---------------------------------------------------------------------------------------------------------------------|
-| type      |  string  |     true     | Must be "sqlite".                                                                                                   |
+| kind      |  string  |     true     | Must be "sqlite".                                                                                                   |
 | database  |  string  |     true     | Path to SQLite database file, or ":memory:" for an in-memory database.                                              |

 ### Connection Properties
--- a/docs/en/resources/sources/tidb.md
+++ b/docs/en/resources/sources/tidb.md
@@ -72,7 +72,7 @@ instead of hardcoding your secrets into the configuration file.

 | **field** | **type** | **required** | **description**                                                                            |
 |-----------|:--------:|:------------:|--------------------------------------------------------------------------------------------|
-| type      |  string  |     true     | Must be "tidb".                                                                            |
+| kind      |  string  |     true     | Must be "tidb".                                                                            |
 | host      |  string  |     true     | IP address or hostname to connect to (e.g. "127.0.0.1" or "gateway01.*.tidbcloud.com").    |
 | port      |  string  |     true     | Port to connect to (typically "4000" for TiDB).                                            |
 | database  |  string  |     true     | Name of the TiDB database to connect to (e.g. "my_db").                                    |
--- a/docs/en/resources/sources/trino.md
+++ b/docs/en/resources/sources/trino.md
@@ -1,62 +0,0 @@
---
-title: "Trino"
-type: docs
-weight: 1
-description: >
-  Trino is a distributed SQL query engine for big data analytics.
---
-
-## About
-
-[Trino][trino-docs] is a distributed SQL query engine designed for fast analytic queries against data of any size. It allows you to query data where it lives, including Hive, Cassandra, relational databases or even proprietary data stores.
-
-[trino-docs]: https://trino.io/docs/
-
-## Available Tools
-
- [`trino-sql`](../tools/trino/trino-sql.md)  
-  Execute parameterized SQL queries against Trino.
-
- [`trino-execute-sql`](../tools/trino/trino-execute-sql.md)  
-  Execute arbitrary SQL queries against Trino.
-
-## Requirements
-
-### Trino Cluster
-
-You need access to a running Trino cluster with appropriate user permissions for the catalogs and schemas you want to query.
-
-## Example
-
-```yaml
-sources:
-    my-trino-source:
-    kind: trino
-    host: trino.example.com
-    port: "8080"
-    user: ${TRINO_USER}  # Optional for anonymous access
-    password: ${TRINO_PASSWORD}  # Optional
-    catalog: hive
-    schema: default
-```
-
-{{< notice tip >}}
-Use environment variable replacement with the format ${ENV_NAME}
-instead of hardcoding your secrets into the configuration file.
-{{< /notice >}}
-
-## Reference
-
-|  **field**  |      **type**      | **required** | **description**                                                        |
-|-------------|:------------------:|:------------:|------------------------------------------------------------------------|
-| type        |       string       |     true     | Must be "trino".                                                       |
-| host        |       string       |     true     | Trino coordinator hostname (e.g. "trino.example.com")                 |
-| port        |       string       |     true     | Trino coordinator port (e.g. "8080", "8443")                          |
-| user        |       string       |     false    | Username for authentication (e.g. "analyst"). Optional for anonymous access. |
-| password    |       string       |     false    | Password for basic authentication                                      |
-| catalog     |       string       |     true     | Default catalog to use for queries (e.g. "hive")                      |
-| schema      |       string       |     true     | Default schema to use for queries (e.g. "default")                    |
-| queryTimeout|       string       |     false    | Query timeout duration (e.g. "30m", "1h")                             |
-| accessToken |       string       |     false    | JWT access token for authentication                                    |
-| kerberosEnabled | boolean        |     false    | Enable Kerberos authentication (default: false)                       |
-| sslEnabled  |       boolean      |     false    | Enable SSL/TLS (default: false)                                       |
--- a/docs/en/resources/sources/valkey.md
+++ b/docs/en/resources/sources/valkey.md
@@ -65,7 +65,7 @@ sources:

 | **field**    | **type** | **required** | **description**                                                                                                                  |
 |--------------|:--------:|:------------:|----------------------------------------------------------------------------------------------------------------------------------|
-| type         |  string  |     true     | Must be "valkey".                                                                                                                |
+| kind         |  string  |     true     | Must be "valkey".                                                                                                                |
 | address      | []string |     true     | Endpoints for the Valkey instance to connect to.                                                                                 |
 | username     |  string  |    false     | If you are using a non-default user, specify the user name here. If you are using Memorystore for Valkey, leave this field blank |
 | password     |  string  |    false     | Password for the Valkey instance                                                                                                 |
--- a/docs/en/resources/tools/_index.md
+++ b/docs/en/resources/tools/_index.md
@@ -259,4 +259,4 @@ tools:
        - other-auth-service
 ```

-## Types of tools
+## Kinds of tools
--- a/docs/en/resources/tools/alloydbainl/alloydb-ai-nl.md
+++ b/docs/en/resources/tools/alloydbainl/alloydb-ai-nl.md
@@ -105,7 +105,7 @@ tools:

 | **field**          |                  **type**                  | **required** | **description**                                                          |
 |--------------------|:------------------------------------------:|:------------:|--------------------------------------------------------------------------|
-| type               |                   string                   |     true     | Must be "alloydb-ai-nl".                                                 |
+| kind               |                   string                   |     true     | Must be "alloydb-ai-nl".                                                 |
 | source             |                   string                   |     true     | Name of the AlloyDB source the natural language query should execute on. |
 | description        |                   string                   |     true     | Description of the tool that is passed to the LLM.                       |
 | nlConfig           |                   string                   |     true     | The name of the  `nl_config` in AlloyDB                                  |
--- a/docs/en/resources/tools/bigquery/bigquery-conversational-analytics.md
+++ b/docs/en/resources/tools/bigquery/bigquery-conversational-analytics.md
@@ -1,54 +0,0 @@
---
-title: "bigquery-conversational-analytics"
-type: docs
-weight: 1
-description: > 
-  A "bigquery-conversational-analytics" tool allows conversational interaction with a BigQuery source.
-aliases:
- /resources/tools/bigquery-conversational-analytics
---
-
-## About
-
-A `bigquery-conversational-analytics` tool allows you to ask questions about your data in natural language. 
-
-This function takes a user's question (which can include conversational history for context) 
-and references to specific BigQuery tables, and sends them to a stateless conversational API.
-
-The API uses a GenAI agent to understand the question, generate and execute SQL queries 
-and Python code, and formulate an answer. This function returns a detailed, sequential 
-log of this entire process, which includes any generated SQL or Python code, the data 
-retrieved, and the final text answer.
-
-**Note**: This tool requires additional setup in your project. Please refer to the 
-official [Conversational Analytics API documentation](https://cloud.google.com/gemini/docs/conversational-analytics-api/overview)
-for instructions.
-
-It's compatible with the following sources:
-
- [bigquery](../sources/bigquery.md)
-
-The tool takes the following input parameters:
-
-*   `user_query_with_context`: The user's question, potentially including conversation history and system instructions for context.
-*   `table_references`: A JSON string of a list of BigQuery tables to use as context. Each object in the list must contain `projectId`, `datasetId`, and `tableId`. Example: `'[{"projectId": "my-gcp-project", "datasetId": "my_dataset", "tableId": "my_table"}]'`
-
-## Example
-
-```yaml
-tools:
-  ask_data_insights:
-    kind: bigquery-conversational-analytics
-    source: my-bigquery-source
-    description: |
-      Use this tool to perform data analysis, get insights, or answer complex 
-      questions about the contents of specific BigQuery tables.
-```
-
-## Reference
-| **field**   |                  **type**                  | **required** | **description**                                                                                  |
-|-------------|:------------------------------------------:|:------------:|--------------------------------------------------------------------------------------------------|
-| type        |                   string                   |     true     | Must be "bigquery-conversational-analytics".                                                     |
-| source      |                   string                   |     true     | Name of the source for chat.                                                    |
-| description |                   string                   |     true     | Description of the tool 
-that is passed to the LLM.                                               |
--- a/docs/en/resources/tools/bigquery/bigquery-execute-sql.md
+++ b/docs/en/resources/tools/bigquery/bigquery-execute-sql.md
@@ -33,6 +33,6 @@ tools:

 | **field**   |                  **type**                  | **required** | **description**                                                                                  |
 |-------------|:------------------------------------------:|:------------:|--------------------------------------------------------------------------------------------------|
-| type        |                   string                   |     true     | Must be "bigquery-execute-sql".                                                                  |
+| kind        |                   string                   |     true     | Must be "bigquery-execute-sql".                                                                  |
 | source      |                   string                   |     true     | Name of the source the SQL should execute on.                                                    |
 | description |                   string                   |     true     | Description of the tool that is passed to the LLM.                                               |
--- a/docs/en/resources/tools/bigquery/bigquery-forecast.md
+++ b/docs/en/resources/tools/bigquery/bigquery-forecast.md
@@ -44,6 +44,6 @@ You can use the following sample prompts to call this tool:

 | **field**   |                  **type**                  | **required** | **description**                                                                                  |
 |-------------|:------------------------------------------:|:------------:|--------------------------------------------------------------------------------------------------|
-| type        |                   string                   |     true     | Must be "bigquery-forecast".                                                                  |
+| kind        |                   string                   |     true     | Must be "bigquery-forecast".                                                                  |
 | source      |                   string                   |     true     | Name of the source the forecast tool should execute on.                                                    |
 | description |                   string                   |     true     | Description of the tool that is passed to the LLM.                                               |
--- a/docs/en/resources/tools/bigquery/bigquery-get-dataset-info.md
+++ b/docs/en/resources/tools/bigquery/bigquery-get-dataset-info.md
@@ -34,6 +34,6 @@ tools:

 | **field**   |                  **type**                  | **required** | **description**                                                                                  |
 |-------------|:------------------------------------------:|:------------:|--------------------------------------------------------------------------------------------------|
-| type        |                   string                   |     true     | Must be "bigquery-get-dataset-info".                                                             |
+| kind        |                   string                   |     true     | Must be "bigquery-get-dataset-info".                                                             |
 | 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/bigquery/bigquery-get-table-info.md
+++ b/docs/en/resources/tools/bigquery/bigquery-get-table-info.md
@@ -34,6 +34,6 @@ tools:

 | **field**   |                  **type**                  | **required** | **description**                                                                                  |
 |-------------|:------------------------------------------:|:------------:|--------------------------------------------------------------------------------------------------|
-| type        |                   string                   |     true     | Must be "bigquery-get-table-info".                                                               |
+| kind        |                   string                   |     true     | Must be "bigquery-get-table-info".                                                               |
 | 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/bigquery/bigquery-list-dataset-ids.md
+++ b/docs/en/resources/tools/bigquery/bigquery-list-dataset-ids.md
@@ -33,6 +33,6 @@ tools:

 | **field**   |                  **type**                  | **required** | **description**                                                                                  |
 |-------------|:------------------------------------------:|:------------:|--------------------------------------------------------------------------------------------------|
-| type        |                   string                   |     true     | Must be "bigquery-list-dataset-ids".                                                             |
+| kind        |                   string                   |     true     | Must be "bigquery-list-dataset-ids".                                                             |
 | 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/bigquery/bigquery-list-table-ids.md
+++ b/docs/en/resources/tools/bigquery/bigquery-list-table-ids.md
@@ -34,6 +34,6 @@ tools:

 | **field**   |                  **type**                  | **required** | **description**                                                                                  |
 |-------------|:------------------------------------------:|:------------:|--------------------------------------------------------------------------------------------------|
-| type        |                   string                   |     true     | Must be "bigquery-list-table-ids".                                                               |
+| kind        |                   string                   |     true     | Must be "bigquery-list-table-ids".                                                               |
 | 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/bigquery/bigquery-sql.md
+++ b/docs/en/resources/tools/bigquery/bigquery-sql.md
@@ -97,7 +97,7 @@ tools:

 | **field**          |                  **type**                        | **required** | **description**                                                                                                                            |
 |--------------------|:------------------------------------------------:|:------------:|--------------------------------------------------------------------------------------------------------------------------------------------|
-| type               |                   string                         |     true     | Must be "bigquery-sql".                                                                                                                    |
+| kind               |                   string                         |     true     | Must be "bigquery-sql".                                                                                                                    |
 | source             |                   string                         |     true     | Name of the source the GoogleSQL should execute on.                                                                                        |
 | description        |                   string                         |     true     | Description of the tool that is passed to the LLM.                                                                                         |
 | statement          |                   string                         |     true     | The GoogleSQL statement to execute.                                                                                                        |
--- a/docs/en/resources/tools/bigtable/bigtable-sql.md
+++ b/docs/en/resources/tools/bigtable/bigtable-sql.md
@@ -102,7 +102,7 @@ tools:

 | **field**          |                  **type**                        | **required** | **description**                                                                                                                            |
 |--------------------|:------------------------------------------------:|:------------:|--------------------------------------------------------------------------------------------------------------------------------------------|
-| type               |                   string                         |     true     | Must be "bigtable-sql".                                                                                                                    |
+| kind               |                   string                         |     true     | Must be "bigtable-sql".                                                                                                                    |
 | source             |                   string                         |     true     | Name of the source the SQL should execute on.                                                                                              |
 | description        |                   string                         |     true     | Description of the tool that is passed to the LLM.                                                                                         |
 | statement          |                   string                         |     true     | SQL statement to execute on.                                                                                                               |
--- a/docs/en/resources/tools/clickhouse/_index.md
+++ b/docs/en/resources/tools/clickhouse/_index.md
@@ -1,7 +0,0 @@
---
-title: "ClickHouse"
-type: docs
-weight: 1
-description: >
-  Tools for interacting with ClickHouse databases and tables.
---
--- a/docs/en/resources/tools/clickhouse/clickhouse-execute-sql.md
+++ b/docs/en/resources/tools/clickhouse/clickhouse-execute-sql.md
@@ -1,46 +0,0 @@
---
-title: "clickhouse-execute-sql"
-type: docs
-weight: 1
-description: >
-  A "clickhouse-execute-sql" tool executes a SQL statement against a ClickHouse
-  database.
-aliases:
- /resources/tools/clickhouse-execute-sql
---
-
-## About
-
-A `clickhouse-execute-sql` tool executes a SQL statement against a ClickHouse
-database. It's compatible with the [clickhouse](../../sources/clickhouse.md) source.
-
-`clickhouse-execute-sql` takes one input parameter `sql` and runs the SQL
-statement against the specified `source`. This tool includes query logging
-capabilities for monitoring and debugging purposes.
-
-> **Note:** This tool is intended for developer assistant workflows with
-> human-in-the-loop and shouldn't be used for production agents.
-
-## Example
-
-```yaml
-tools:
-  execute_sql_tool:
-    kind: clickhouse-execute-sql
-    source: my-clickhouse-instance
-    description: Use this tool to execute SQL statements against ClickHouse.
-```
-
-## Parameters
-
-| **parameter** | **type** | **required** | **description**                                    |
-|---------------|:--------:|:------------:|----------------------------------------------------|
-| sql           |  string  |     true     | The SQL statement to execute against the database |
-
-## Reference
-
-| **field**   | **type** | **required** | **description**                                         |
-|-------------|:--------:|:------------:|---------------------------------------------------------|
-| type        |  string  |     true     | Must be "clickhouse-execute-sql".                      |
-| source      |  string  |     true     | Name of the ClickHouse source to execute SQL against.  |
-| description |  string  |     true     | Description of the tool that is passed to the LLM.     |
--- a/docs/en/resources/tools/clickhouse/clickhouse-sql.md
+++ b/docs/en/resources/tools/clickhouse/clickhouse-sql.md
@@ -1,81 +0,0 @@
---
-title: "clickhouse-sql"
-type: docs
-weight: 2
-description: >
-  A "clickhouse-sql" tool executes SQL queries as prepared statements in ClickHouse.
-aliases:
- /resources/tools/clickhouse-sql
---
-
-## About
-
-A `clickhouse-sql` tool executes SQL queries as prepared statements against a 
-ClickHouse database. It's compatible with the [clickhouse](../../sources/clickhouse.md) source.
-
-This tool supports both template parameters (for SQL statement customization) 
-and regular parameters (for prepared statement values), providing flexible 
-query execution capabilities.
-
-## Example
-
-```yaml
-tools:
-  my_analytics_query:
-    kind: clickhouse-sql
-    source: my-clickhouse-instance
-    description: Get user analytics for a specific date range
-    statement: |
-      SELECT 
-        user_id,
-        count(*) as event_count,
-        max(timestamp) as last_event
-      FROM events 
-      WHERE date >= ? AND date <= ?
-      GROUP BY user_id
-      ORDER BY event_count DESC
-      LIMIT ?
-    parameters:
-      - name: start_date
-        description: Start date for the query (YYYY-MM-DD format)
-      - name: end_date  
-        description: End date for the query (YYYY-MM-DD format)
-      - name: limit
-        description: Maximum number of results to return
-```
-
-## Template Parameters Example
-
-```yaml
-tools:
-  flexible_table_query:
-    kind: clickhouse-sql
-    source: my-clickhouse-instance
-    description: Query any table with flexible columns
-    statement: |
-      SELECT {{columns}}
-      FROM {{table_name}}
-      WHERE created_date >= ?
-      LIMIT ?
-    templateParameters:
-      - name: columns
-        description: Comma-separated list of columns to select
-      - name: table_name
-        description: Name of the table to query
-    parameters:
-      - name: start_date
-        description: Start date filter
-      - name: limit
-        description: Maximum number of results
-```
-
-## Reference
-
-| **field**          | **type**           | **required** | **description**                                           |
-|--------------------|:------------------:|:------------:|-----------------------------------------------------------|
-| type               | string             | true         | Must be "clickhouse-sql".                                |
-| source             | string             | true         | Name of the ClickHouse source to execute SQL against.    |
-| description        | string             | true         | Description of the tool that is passed to the LLM.       |
-| statement          | string             | true         | The SQL statement template to execute.                    |
-| parameters         | array of Parameter | false        | Parameters for prepared statement values.                 |
-| templateParameters | array of Parameter | false        | Parameters for SQL statement template customization.     |
--- a/docs/en/resources/tools/couchbase/couchbase-sql.md
+++ b/docs/en/resources/tools/couchbase/couchbase-sql.md
@@ -91,7 +91,7 @@ tools:

 | **field**          |                  **type**                        | **required** | **description**                                                                                                                            |
 |--------------------|:------------------------------------------------:|:------------:|--------------------------------------------------------------------------------------------------------------------------------------------|
-| type               |                   string                         |     true     | Must be "couchbase-sql".                                                                                                                   |
+| kind               |                   string                         |     true     | Must be "couchbase-sql".                                                                                                                   |
 | source             |                   string                         |     true     | Name of the source the SQL query should execute on.                                                                                        |
 | description        |                   string                         |     true     | Description of the tool that is passed to the LLM.                                                                                         |
 | statement          |                   string                         |     true     | SQL statement to execute                                                                                                                   |
--- a/docs/en/resources/tools/dataplex/dataplex-lookup-entry.md
+++ b/docs/en/resources/tools/dataplex/dataplex-lookup-entry.md
@@ -55,6 +55,6 @@ tools:

 | **field**   |                  **type**                  | **required** | **description**                                                                                  |
 |-------------|:------------------------------------------:|:------------:|--------------------------------------------------------------------------------------------------|
-| type        |                   string                   |     true     | Must be "dataplex-lookup-entry".                                                                 |
+| kind        |                   string                   |     true     | Must be "dataplex-lookup-entry".                                                                 |
 | source      |                   string                   |     true     | Name of the source the tool should execute on.                                                   |
 | description |                   string                   |     true     | Description of the tool that is passed to the LLM.                                               |
--- a/docs/en/resources/tools/dataplex/dataplex-search-aspect-types.md
+++ b/docs/en/resources/tools/dataplex/dataplex-search-aspect-types.md
@@ -57,6 +57,6 @@ tools:

 | **field**   |                  **type**                  | **required** | **description**                                                                                  |
 |-------------|:------------------------------------------:|:------------:|--------------------------------------------------------------------------------------------------|
-| type        |                   string                   |     true     | Must be "dataplex-search-aspect-types".                                                          |
+| kind        |                   string                   |     true     | Must be "dataplex-search-aspect-types".                                                          |
 | source      |                   string                   |     true     | Name of the source the tool should execute on.                                                   |
 | description |                   string                   |     true     | Description of the tool that is passed to the LLM.                                               |
--- a/docs/en/resources/tools/dataplex/dataplex-search-entries.md
+++ b/docs/en/resources/tools/dataplex/dataplex-search-entries.md
@@ -59,6 +59,6 @@ tools:

 | **field**   |                  **type**                  | **required** | **description**                                                                                  |
 |-------------|:------------------------------------------:|:------------:|--------------------------------------------------------------------------------------------------|
-| type        |                   string                   |     true     | Must be "dataplex-search-entries".                                                               |
+| kind        |                   string                   |     true     | Must be "dataplex-search-entries".                                                               |
 | source      |                   string                   |     true     | Name of the source the tool should execute on.                                                   |
 | description |                   string                   |     true     | Description of the tool that is passed to the LLM.                                               |
--- a/docs/en/resources/tools/dgraph/dgraph-dql.md
+++ b/docs/en/resources/tools/dgraph/dgraph-dql.md
@@ -115,7 +115,7 @@ tools:

 | **field**   |                  **type**                  | **required** | **description**                                                                              |
 |-------------|:------------------------------------------:|:------------:|----------------------------------------------------------------------------------------------|
-| type        |                   string                   |     true     | Must be "dgraph-dql".                                                                        |
+| kind        |                   string                   |     true     | Must be "dgraph-dql".                                                                        |
 | source      |                   string                   |     true     | Name of the source the dql query should execute on.                                          |
 | description |                   string                   |     true     | Description of the tool that is passed to the LLM.                                           |
 | statement   |                   string                   |     true     | dql statement to execute                                                                     |
--- a/docs/en/resources/tools/firebird/_index.md
+++ b/docs/en/resources/tools/firebird/_index.md
@@ -1,7 +0,0 @@
---
-title: "Firebird"
-type: docs
-weight: 1
-description: > 
-  Tools that work with Firebird Sources.
---
--- a/docs/en/resources/tools/firebird/firebird-execute-sql.md
+++ b/docs/en/resources/tools/firebird/firebird-execute-sql.md
@@ -1,41 +0,0 @@
---
-title: "firebird-execute-sql"
-type: docs
-weight: 1
-description: > 
-  A "firebird-execute-sql" tool executes a SQL statement against a Firebird
-  database.
-aliases:
- /resources/tools/firebird-execute-sql
---
-
-## About
-
-A `firebird-execute-sql` tool executes a SQL statement against a Firebird
-database. It's compatible with the following source:
-
- [firebird](../sources/firebird.md)
-
-`firebird-execute-sql` takes one input parameter `sql` and runs the sql
-statement against the `source`.
-
-> **Note:** This tool is intended for developer assistant workflows with
-> human-in-the-loop and shouldn't be used for production agents.
-
-## Example
-
-```yaml
-tools:
-  execute_sql_tool:
-    kind: firebird-execute-sql
-    source: my_firebird_db
-    description: Use this tool to execute a SQL statement against the Firebird database.
-```
-
-## Reference
-
-| **field**   |                  **type**                  | **required** | **description**                                                                                  |
-|-------------|:------------------------------------------:|:------------:|--------------------------------------------------------------------------------------------------|
-| type        |                   string                   |     true     | Must be "firebird-execute-sql".                                                                  |
-| source      |                   string                   |     true     | Name of the source the SQL should execute on.                                                    |
-| description |                   string                   |     true     | Description of the tool that is passed to the LLM.                                               |
--- a/docs/en/resources/tools/firebird/firebird-sql.md
+++ b/docs/en/resources/tools/firebird/firebird-sql.md
@@ -1,135 +0,0 @@
---
-title: "firebird-sql"
-type: docs
-weight: 1
-description: > 
-  A "firebird-sql" tool executes a pre-defined SQL statement against a Firebird
-  database.
-aliases:
- /resources/tools/firebird-sql
---
-
-## About
-
-A `firebird-sql` tool executes a pre-defined SQL statement against a Firebird
-database. It's compatible with the following source:
-
- [firebird](../sources/firebird.md)
-
-The specified SQL statement is executed as a [prepared statement][fb-prepare],
-and supports both positional parameters (`?`) and named parameters (`:param_name`).
-Parameters will be inserted according to their position or name. If template 
-parameters are included, they will be resolved before the execution of the 
-prepared statement.
-
-[fb-prepare]: https://firebirdsql.org/refdocs/langrefupd25-psql-execstat.html
-
-## Example
-
-> **Note:** This tool uses parameterized queries to prevent SQL injections.
-> Query parameters can be used as substitutes for arbitrary expressions.
-> Parameters cannot be used as substitutes for identifiers, column names, table
-> names, or other parts of the query.
-
-```yaml
-tools:
-  search_flights_by_number:
-    kind: firebird-sql
-    source: my_firebird_db
-    statement: |
-      SELECT * FROM flights
-      WHERE airline = ?
-      AND flight_number = ?
-      LIMIT 10
-    description: |
-      Use this tool to get information for a specific flight.
-      Takes an airline code and flight number and returns info on the flight.
-      Do NOT use this tool with a flight id. Do NOT guess an airline code or flight number.
-      A airline code is a code for an airline service consisting of two-character
-      airline designator and followed by flight number, which is 1 to 4 digit number.
-      For example, if given CY 0123, the airline is "CY", and flight_number is "123".
-      Another example for this is DL 1234, the airline is "DL", and flight_number is "1234".
-      If the tool returns more than one option choose the date closes to today.
-      Example:
-      {{
-          "airline": "CY",
-          "flight_number": "888",
-      }}
-      Example:
-      {{
-          "airline": "DL",
-          "flight_number": "1234",
-      }}
-    parameters:
-      - name: airline
-        type: string
-        description: Airline unique 2 letter identifier
-      - name: flight_number
-        type: string
-        description: 1 to 4 digit number
-```
-
-### Example with Named Parameters
-
-```yaml
-tools:
-  search_flights_by_airline:
-    kind: firebird-sql
-    source: my_firebird_db
-    statement: |
-      SELECT * FROM flights
-      WHERE airline = :airline
-      AND departure_date >= :start_date
-      AND departure_date <= :end_date
-      ORDER BY departure_date
-    description: |
-      Search for flights by airline within a date range using named parameters.
-    parameters:
-      - name: airline
-        type: string
-        description: Airline unique 2 letter identifier
-      - name: start_date
-        type: string
-        description: Start date in YYYY-MM-DD format
-      - name: end_date
-        type: string
-        description: End date in YYYY-MM-DD format
-```
-
-### Example with Template Parameters
-
-> **Note:** This tool allows direct modifications to the SQL statement,
-> including identifiers, column names, and table names. **This makes it more
-> vulnerable to SQL injections**. Using basic parameters only (see above) is
-> recommended for performance and safety reasons. For more details, please check
-> [templateParameters](_index#template-parameters).
-
-```yaml
-tools:
-  list_table:
-    kind: firebird-sql
-    source: my_firebird_db
-    statement: |
-      SELECT * FROM {{.tableName}}
-    description: |
-      Use this tool to list all information from a specific table.
-      Example:
-      {{
-          "tableName": "flights",
-      }}
-    templateParameters:
-      - name: tableName
-        type: string
-        description: Table to select from
-```
-
-## Reference
-
-| **field**           |                  **type**                                 | **required** | **description**                                                                                                                            |
-|---------------------|:---------------------------------------------------------:|:------------:|--------------------------------------------------------------------------------------------------------------------------------------------|
-| type                |                   string                                  |     true     | Must be "firebird-sql".                                                                                                                    |
-| source              |                   string                                  |     true     | Name of the source the SQL should execute on.                                                                                              |
-| description         |                   string                                  |     true     | Description of the tool that is passed to the LLM.                                                                                         |
-| statement           |                   string                                  |     true     | SQL statement to execute on.                                                                                                               |
-| parameters          | [parameters](_index#specifying-parameters)                |    false     | List of [parameters](_index#specifying-parameters) that will be inserted into the SQL statement.                                           |
-| templateParameters  |  [templateParameters](_index#template-parameters)         |    false     | List of [templateParameters](_index#template-parameters) that will be inserted into the SQL statement before executing prepared statement. |
--- a/docs/en/resources/tools/firestore/firestore-delete-documents.md
+++ b/docs/en/resources/tools/firestore/firestore-delete-documents.md
@@ -34,6 +34,6 @@ tools:

 | **field**   |     **type**   | **required** | **description**                                          |
 |-------------|:--------------:|:------------:|----------------------------------------------------------|
-| type        |     string     |     true     | Must be "firestore-delete-documents".                    |
+| kind        |     string     |     true     | Must be "firestore-delete-documents".                    |
 | source      |     string     |     true     | Name of the Firestore source to delete documents from.   |
 | description |     string     |     true     | Description of the tool that is passed to the LLM.       |
--- a/docs/en/resources/tools/firestore/firestore-get-documents.md
+++ b/docs/en/resources/tools/firestore/firestore-get-documents.md
@@ -34,6 +34,6 @@ tools:

 | **field**   |    **type**    | **required** | **description**                                            |
 |-------------|:--------------:|:------------:|------------------------------------------------------------|
-| type        |     string     |     true     | Must be "firestore-get-documents".                         |
+| kind        |     string     |     true     | Must be "firestore-get-documents".                         |
 | source      |     string     |     true     | Name of the Firestore source to retrieve documents from.   |
 | description |     string     |     true     | Description of the tool that is passed to the LLM.         |
--- a/docs/en/resources/tools/firestore/firestore-get-rules.md
+++ b/docs/en/resources/tools/firestore/firestore-get-rules.md
@@ -34,6 +34,6 @@ tools:

 | **field**   |    **type**   | **required** | **description**                                       |
 |-------------|:-------------:|:------------:|-------------------------------------------------------|
-| type        |     string    |     true     | Must be "firestore-get-rules".                        |
+| kind        |     string    |     true     | Must be "firestore-get-rules".                        |
 | source      |     string    |     true     | Name of the Firestore source to retrieve rules from.  |
 | description |     string    |     true     | Description of the tool that is passed to the LLM.    |
--- a/docs/en/resources/tools/firestore/firestore-list-collections.md
+++ b/docs/en/resources/tools/firestore/firestore-list-collections.md
@@ -37,6 +37,6 @@ tools:

 | **field**   |      **type**    | **required** | **description**                                        |
 |-------------|:----------------:|:------------:|--------------------------------------------------------|
-| type        |      string      |     true     | Must be "firestore-list-collections".                  |
+| kind        |      string      |     true     | Must be "firestore-list-collections".                  |
 | source      |      string      |     true     | Name of the Firestore source to list collections from. |
 | description |      string      |     true     | Description of the tool that is passed to the LLM.     |
--- a/docs/en/resources/tools/firestore/firestore-update-document.md
+++ b/docs/en/resources/tools/firestore/firestore-update-document.md
@@ -1,327 +0,0 @@
---
-title: "firestore-update-document"
-type: docs
-weight: 1
-description: >
-  A "firestore-update-document" tool updates an existing document in Firestore.
-aliases:
- /resources/tools/firestore-update-document
---
-## Description
-
-The `firestore-update-document` tool allows you to update existing documents in Firestore. It supports all Firestore data types using Firestore's native JSON format. The tool can perform both full document updates (replacing all fields) or selective field updates using an update mask. When using an update mask, fields referenced in the mask but not present in the document data will be deleted from the document, following Firestore's native behavior.
-
-## Parameters
-
-| Parameter | Type | Required | Description |
-|-----------|------|----------|-------------|
-| `documentPath` | string | Yes | The path of the document which needs to be updated |
-| `documentData` | map | Yes | The data to update in the document. Must use [Firestore's native JSON format](https://cloud.google.com/firestore/docs/reference/rest/Shared.Types/ArrayValue#Value) with typed values |
-| `updateMask` | array | No | The selective fields to update. If not provided, all fields in documentData will be updated. When provided, only the specified fields will be updated. Fields referenced in the mask but not present in documentData will be deleted from the document |
-| `returnData` | boolean | No | If set to true, the output will include the data of the updated document. Defaults to false to help avoid overloading the context |
-
-## Output
-
-The tool returns a map containing:
-
-| Field | Type | Description |
-|-------|------|-------------|
-| `documentPath` | string | The full path of the updated document |
-| `updateTime` | string | The timestamp when the document was updated |
-| `documentData` | map | The current data of the document after the update (only included when `returnData` is true) |
-
-## Data Type Format
-
-The tool requires Firestore's native JSON format for document data. Each field must be wrapped with its type indicator:
-
-### Basic Types
- **String**: `{"stringValue": "your string"}`
- **Integer**: `{"integerValue": "123"}` or `{"integerValue": 123}`
- **Double**: `{"doubleValue": 123.45}`
- **Boolean**: `{"booleanValue": true}`
- **Null**: `{"nullValue": null}`
- **Bytes**: `{"bytesValue": "base64EncodedString"}`
- **Timestamp**: `{"timestampValue": "2025-01-07T10:00:00Z"}` (RFC3339 format)
-
-### Complex Types
- **GeoPoint**: `{"geoPointValue": {"latitude": 34.052235, "longitude": -118.243683}}`
- **Array**: `{"arrayValue": {"values": [{"stringValue": "item1"}, {"integerValue": "2"}]}}`
- **Map**: `{"mapValue": {"fields": {"key1": {"stringValue": "value1"}, "key2": {"booleanValue": true}}}}`
- **Reference**: `{"referenceValue": "collection/document"}`
-
-## Update Modes
-
-### Full Document Update (Merge All)
-
-When `updateMask` is not provided, the tool performs a merge operation that updates all fields specified in `documentData` while preserving other existing fields in the document.
-
-### Selective Field Update
-
-When `updateMask` is provided, only the fields listed in the mask are updated. This allows for precise control over which fields are modified, added, or deleted. To delete a field, include it in the `updateMask` but omit it from `documentData`.
-
-## Reference
-
-| **field**   |     **type**   | **required** | **description**                                          |
-|-------------|:--------------:|:------------:|----------------------------------------------------------|
-| type        |     string     |     true     | Must be "firestore-update-document".                     |
-| source      |     string     |     true     | Name of the Firestore source to update documents in.     |
-| description |     string     |     true     | Description of the tool that is passed to the LLM.       |
-
-
-## Examples
-
-### Basic Document Update (Full Merge)
-
-```yaml
-tools:
-  update-user-doc:
-    kind: firestore-update-document
-    source: my-firestore
-    description: Update a user document
-```
-Usage:
-```json
-{
-  "documentPath": "users/user123",
-  "documentData": {
-    "name": {
-      "stringValue": "Jane Doe"
-    },
-    "lastUpdated": {
-      "timestampValue": "2025-01-15T10:30:00Z"
-    },
-    "status": {
-      "stringValue": "active"
-    },
-    "score": {
-      "integerValue": "150"
-    }
-  }
-}
-```
-
-### Selective Field Update with Update Mask
-
-```json
-{
-  "documentPath": "users/user123",
-  "documentData": {
-    "email": {
-      "stringValue": "newemail@example.com"
-    },
-    "profile": {
-      "mapValue": {
-        "fields": {
-          "bio": {
-            "stringValue": "Updated bio text"
-          },
-          "avatar": {
-            "stringValue": "https://example.com/new-avatar.jpg"
-          }
-        }
-      }
-    }
-  },
-  "updateMask": ["email", "profile.bio", "profile.avatar"]
-}
-```
-
-### Update with Field Deletion
-
-To delete fields, include them in the `updateMask` but omit them from `documentData`:
-
-```json
-{
-  "documentPath": "users/user123",
-  "documentData": {
-    "name": {
-      "stringValue": "John Smith"
-    }
-  },
-  "updateMask": ["name", "temporaryField", "obsoleteData"],
-  "returnData": true
-}
-```
-
-In this example:
- `name` will be updated to "John Smith"
- `temporaryField` and `obsoleteData` will be deleted from the document (they are in the mask but not in the data)
-
-### Complex Update with Nested Data
-
-```json
-{
-  "documentPath": "companies/company456",
-  "documentData": {
-    "metadata": {
-      "mapValue": {
-        "fields": {
-          "lastModified": {
-            "timestampValue": "2025-01-15T14:30:00Z"
-          },
-          "modifiedBy": {
-            "stringValue": "admin@company.com"
-          }
-        }
-      }
-    },
-    "locations": {
-      "arrayValue": {
-        "values": [
-          {
-            "mapValue": {
-              "fields": {
-                "city": {
-                  "stringValue": "San Francisco"
-                },
-                "coordinates": {
-                  "geoPointValue": {
-                    "latitude": 37.7749,
-                    "longitude": -122.4194
-                  }
-                }
-              }
-            }
-          },
-          {
-            "mapValue": {
-              "fields": {
-                "city": {
-                  "stringValue": "New York"
-                },
-                "coordinates": {
-                  "geoPointValue": {
-                    "latitude": 40.7128,
-                    "longitude": -74.0060
-                  }
-                }
-              }
-            }
-          }
-        ]
-      }
-    },
-    "revenue": {
-      "doubleValue": 5678901.23
-    }
-  },
-  "updateMask": ["metadata", "locations", "revenue"]
-}
-```
-
-### Update with All Data Types
-
-```json
-{
-  "documentPath": "test-documents/doc789",
-  "documentData": {
-    "stringField": {
-      "stringValue": "Updated string"
-    },
-    "integerField": {
-      "integerValue": "999"
-    },
-    "doubleField": {
-      "doubleValue": 2.71828
-    },
-    "booleanField": {
-      "booleanValue": false
-    },
-    "nullField": {
-      "nullValue": null
-    },
-    "timestampField": {
-      "timestampValue": "2025-01-15T16:45:00Z"
-    },
-    "geoPointField": {
-      "geoPointValue": {
-        "latitude": 51.5074,
-        "longitude": -0.1278
-      }
-    },
-    "bytesField": {
-      "bytesValue": "VXBkYXRlZCBkYXRh"
-    },
-    "arrayField": {
-      "arrayValue": {
-        "values": [
-          {
-            "stringValue": "updated1"
-          },
-          {
-            "integerValue": "200"
-          },
-          {
-            "booleanValue": true
-          }
-        ]
-      }
-    },
-    "mapField": {
-      "mapValue": {
-        "fields": {
-          "nestedString": {
-            "stringValue": "updated nested value"
-          },
-          "nestedNumber": {
-            "doubleValue": 88.88
-          }
-        }
-      }
-    },
-    "referenceField": {
-      "referenceValue": "users/updatedUser"
-    }
-  },
-  "returnData": true
-}
-```
-
-## Authentication
-
-The tool can be configured to require authentication:
-
-```yaml
-tools:
-  secure-update-doc:
-    kind: firestore-update-document
-    source: prod-firestore
-    description: Update documents with authentication required
-    authRequired:
-      - google-oauth
-      - api-key
-```
-## Error Handling
-Common errors include:
- Document not found (when using update with a non-existent document)
- Invalid document path
- Missing or invalid document data
- Permission denied (if Firestore security rules block the operation)
- Invalid data type conversions
-
-## Best Practices
-1. **Use update masks for precision**: When you only need to update specific fields, use the `updateMask` parameter to avoid unintended changes
-2. **Always use typed values**: Every field must be wrapped with its appropriate type indicator (e.g., `{"stringValue": "text"}`)
-3. **Integer values can be strings**: The tool accepts integer values as strings (e.g., `{"integerValue": "1500"}`)
-4. **Use returnData sparingly**: Only set to true when you need to verify the exact data after the update
-5. **Validate data before sending**: Ensure your data matches Firestore's native JSON format
-6. **Handle timestamps properly**: Use RFC3339 format for timestamp strings
-7. **Base64 encode binary data**: Binary data must be base64 encoded in the `bytesValue` field
-8. **Consider security rules**: Ensure your Firestore security rules allow document updates
-9. **Delete fields using update mask**: To delete fields, include them in the `updateMask` but omit them from `documentData`
-10. **Test with non-production data first**: Always test your updates on non-critical documents first
-
-## Differences from Add Documents
-
- **Purpose**: Updates existing documents vs. creating new ones
- **Document must exist**: For standard updates (though not using updateMask will create if missing with given document id)
- **Update mask support**: Allows selective field updates
- **Field deletion**: Supports removing specific fields by including them in the mask but not in the data
- **Returns updateTime**: Instead of createTime
-
-## Related Tools
-
- [`firestore-add-documents`](firestore-add-documents.md) - Add new documents to Firestore
- [`firestore-get-documents`](firestore-get-documents.md) - Retrieve documents by their paths
- [`firestore-query-collection`](firestore-query-collection.md) - Query documents in a collection
- [`firestore-delete-documents`](firestore-delete-documents.md) - Delete documents from Firestore
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Harsh Jha	0f6b2f11a4	Inlcude tag for sample agents	2025-08-19 15:26:17 +05:30
Harsh Jha	fd9b0ea55b	Merge branch 'main' of https://github.com/googleapis/genai-toolbox into demo-include-shortcode	2025-08-19 14:56:28 +05:30
Harsh Jha	f4ddd194dc	refactor(docs): adopt snippet shortcode to reuse content	2025-08-19 11:08:12 +05:30
Harsh Jha	114a0c91d8	feat: Implement language-agnostic snippet shortcode	2025-08-05 14:39:53 +05:30
Harsh Jha	5f1e4b940c	refactor(docs): Fix Table of Contents and optimize region include shortcode	2025-08-01 19:56:13 +05:30
Harsh Jha	e0b6d2d26b	refactor(docs): Replace duplicated content with a shared shortcode	2025-07-31 18:52:46 +05:30
Harsh Jha	590bfaf4d3	feat: Add shortcode for including file regions	2025-07-31 11:31:19 +05:30
@@ -1 +1 @@
 .13.0
 .12.0