fix: optional parameter int type conversion

2026-01-12 00:49:08 -05:00 · 2025-07-01 11:27:23 -06:00
236 changed files with 1378 additions and 22763 deletions
--- a/.ci/integration.cloudbuild.yaml
+++ b/.ci/integration.cloudbuild.yaml
@@ -425,87 +425,8 @@ steps:
          "Valkey" \
          valkey \
          valkey
-          
-  - id: "firestore"
-    name: golang:1
-    waitFor: ["compile-test-binary"]
-    entrypoint: /bin/bash
-    env:
-      - "GOPATH=/gopath"
-      - "FIRESTORE_PROJECT=$PROJECT_ID"
-      - "SERVICE_ACCOUNT_EMAIL=$SERVICE_ACCOUNT_EMAIL"
-    secretEnv: ["CLIENT_ID"]
-    volumes:
-      - name: "go"
-        path: "/gopath"
-    args:
-      - -c
-      - |
-        .ci/test_with_coverage.sh \
-          "Firestore" \
-          firestore \
-          firestore
+    

-  - id: "looker"
-    name: golang:1
-    waitFor: ["compile-test-binary"]
-    entrypoint: /bin/bash
-    env:
-      - "GOPATH=/gopath"
-      - "FIRESTORE_PROJECT=$PROJECT_ID"
-      - "SERVICE_ACCOUNT_EMAIL=$SERVICE_ACCOUNT_EMAIL"
-      - "LOOKER_VERIFY_SSL=$_LOOKER_VERIFY_SSL"
-    secretEnv: ["CLIENT_ID", "LOOKER_BASE_URL", "LOOKER_CLIENT_ID", "LOOKER_CLIENT_SECRET"]
-    volumes:
-      - name: "go"
-        path: "/gopath"
-    args:
-      - -c
-      - |
-        .ci/test_with_coverage.sh \
-          "Looker" \
-          looker \
-          looker
-
-  - id: "mongodb"
-    name : golang:1
-    waitFor: ["compile-test-binary"]
-    entrypoint: /bin/bash
-    env:
-      - "GOPATH=/gopath"
-      - "SERVICE_ACCOUNT_EMAIL=$SERVICE_ACCOUNT_EMAIL"
-      - "MONGODB_DATABASE=$_MONGODB_DATABASE"
-    secretEnv: ["CLIENT_ID", "MONGODB_URI"]
-    volumes:
-      - name: "go"
-        path: "/gopath"
-    args:
-      - -c
-      - |
-        .ci/test_with_coverage.sh \
-          "MongoDB" \
-          mongodb \
-          mongodb
-
-  - id: "alloydbwaitforoperation"
-    name: golang:1
-    waitFor: ["compile-test-binary"]
-    entrypoint: /bin/bash
-    env:
-      - "GOPATH=/gopath"
-      - "API_KEY=$(gcloud auth print-access-token)"
-    secretEnv: ["CLIENT_ID"]
-    volumes:
-      - name: "go"
-        path: "/gopath"
-    args:
-      - -c
-      - |
-        .ci/test_with_coverage.sh \
-          "Alloydb Wait for Operation" \
-          utility \
-          utility/alloydbwaitforoperation
-          
 availableSecrets:
  secretManager:
    - versionName: projects/$PROJECT_ID/secrets/cloud_sql_pg_user/versions/latest
@@ -558,14 +479,6 @@ availableSecrets:
      env: REDIS_PASS
    - versionName: projects/$PROJECT_ID/secrets/memorystore_valkey_address/versions/latest
      env: VALKEY_ADDRESS
-    - versionName: projects/107716898620/secrets/looker_base_url/versions/latest
-      env: LOOKER_BASE_URL
-    - versionName: projects/107716898620/secrets/looker_client_id/versions/latest
-      env: LOOKER_CLIENT_ID
-    - versionName: projects/107716898620/secrets/looker_client_secret/versions/latest
-      env: LOOKER_CLIENT_SECRET
-    - versionName: projects/$PROJECT_ID/secrets/mongodb_uri/versions/latest
-      env: MONGODB_URI


 options:
@@ -597,6 +510,4 @@ substitutions:
  _MSSQL_PORT: "1433"
  _DGRAPHURL: "https://play.dgraph.io"
  _COUCHBASE_BUCKET: "couchbase-bucket"
-  _COUCHBASE_SCOPE: "couchbase-scope"
-  _LOOKER_VERIFY_SSL: "true"
-  _MONGODB_DATABASE: "test"
+  _COUCHBASE_SCOPE: "couchbase-scope"
--- a/.ci/test_with_coverage.sh
+++ b/.ci/test_with_coverage.sh
@@ -2,10 +2,8 @@

 # Arguments:
 # $1: Display name for logs (e.g., "Cloud SQL Postgres")
-# $2: Integration test's package name (e.g., cloudsqlpg)
-# $3, $4, ...: Tool package names for grep (e.g., postgressql), if the
-# integration test specifically check a separate package inside a folder, please
-# specify the full path instead (e.g., postgressql/postgresexecutesql)
+# $2: Source package name (e.g., cloudsqlpg)
+# $3, $4, ...: Tool package names for grep (e.g., postgressql)

 DISPLAY_NAME="$1"
 SOURCE_PACKAGE_NAME="$2"
@@ -59,4 +57,4 @@ if awk -v coverage="$coverage_numeric" 'BEGIN {exit !(coverage < 50)}'; then
    exit 1
 else
    echo "Coverage for ${DISPLAY_NAME} is sufficient."
-fi
+fi
--- a/.github/blunderbuss.yml
+++ b/.github/blunderbuss.yml
@@ -1,7 +1,7 @@
 assign_issues:
+  - kurtisvg
  - Yuan325
  - duwenxin99
-  - akitsch
 assign_issues_by:
  - labels:
    - 'product: bigquery'
@@ -10,6 +10,6 @@ assign_issues_by:
    - shobsi
    - jiaxunwu
 assign_prs:
+  - kurtisvg
  - Yuan325
  - duwenxin99
-  - akitsch
--- a/.github/labels.yaml
+++ b/.github/labels.yaml
@@ -50,7 +50,7 @@
  color: ffffc7
  description: Desirable enhancement or fix. May not be included in next release.

- name: 'do not merge'
+- name: do not merge
  color: d93f0b
  description: Indicates a pull request not ready for merge, due to either quality
    or timing.
@@ -65,26 +65,28 @@
  color: ededed
  description: Release please has completed a release for this.

- name: 'blunderbuss: assign'
-  color: 3DED97
-  description: Have blunderbuss assign this to someone new.
-
 - name: 'tests: run'
  color: 3DED97
  description: Label to trigger Github Action tests.
-  
+
 - name: 'docs: deploy-preview'
  color: BFDADC
  description: Label to trigger Github Action docs preview.

- name: 'status: help wanted'
+- name: 'status: contribution welcome'
  color: 8befd7
-  description: 'Status: Unplanned work open to contributions from the community.'
- name: 'status: feedback wanted'
+  description: Status - Contributions welcome.
+
+- name: 'status: awaiting response'
  color: 8befd7
-  description: 'Status: waiting for feedback from community or issue author.'
+  description: Status - Awaiting response from author.
+
+- name: 'status: awaiting codeowners'
+  color: 8befd7
+  description: Status - Awaiting response from code owners.

 # Product Labels
 - name: 'product: bigquery'
  color: 5065c7
-  description: 'Product: Assigned to the BigQuery team.'
+  description: Product - Assigned to the BigQuery team. 
+
--- a/.github/release-please.yml
+++ b/.github/release-please.yml
@@ -20,8 +20,6 @@ extraFiles: [
    "README.md",
    "docs/en/getting-started/introduction/_index.md",
    "docs/en/getting-started/local_quickstart.md",
-    "docs/en/getting-started/local_quickstart_js.md",
-    "docs/en/getting-started/local_quickstart_go.md",
    "docs/en/getting-started/mcp_quickstart/_index.md",
    "docs/en/samples/bigquery/local_quickstart.md",
    "docs/en/samples/bigquery/mcp_quickstart/_index.md",
--- a/.github/workflows/docs_preview_deploy.yaml
+++ b/.github/workflows/docs_preview_deploy.yaml
@@ -51,8 +51,6 @@ jobs:
    steps:
      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
        with:
-          # Checkout the PR's HEAD commit (supports forks).
-          ref: ${{ github.event.pull_request.head.sha }}
          fetch-depth: 0 # Fetch all history for .GitInfo and .Lastmod

      - name: Setup Hugo
--- a/.gitignore
+++ b/.gitignore
@@ -4,9 +4,6 @@
 # vscode
 .vscode/

-# idea
-.idea/
-
 # npm
 node_modules

@@ -17,7 +14,3 @@ node_modules

 # coverage
 .coverage
-
-# executable
-genai-toolbox
-toolbox
--- a/.hugo/assets/scss/_styles_project.scss
+++ b/.hugo/assets/scss/_styles_project.scss
@@ -1 +0,0 @@
-@import 'td/code-dark';
--- a/.hugo/hugo.toml
+++ b/.hugo/hugo.toml
@@ -48,11 +48,7 @@ enableRobotsTXT = true
  pre = "<i class='fa-brands fa-github'></i>"

 [markup.goldmark.renderer]
-  unsafe= true
-
-[markup.highlight]
-  noClasses = false
-  style = "tango"
+  unsafe= true 

 [outputFormats]
  [outputFormats.LLMS]
--- a/.hugo/layouts/shortcodes/include.html
+++ b/.hugo/layouts/shortcodes/include.html
@@ -1,2 +0,0 @@
-{{ $file := .Get 0 }}
-{{ (printf "%s%s" .Page.File.Dir $file) | readFile | replaceRE "^---[\\s\\S]+?---" "" | safeHTML }}
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,54 +1,5 @@
 # Changelog

-## [0.9.0](https://github.com/googleapis/genai-toolbox/compare/v0.8.0...v0.9.0) (2025-07-11)
-
-
-### Features
-
-* Dynamic reloading for toolbox config ([#800](https://github.com/googleapis/genai-toolbox/issues/800)) ([4c240ac](https://github.com/googleapis/genai-toolbox/commit/4c240ac3c961cd14738c998ba2d10d5235ef523e))
-* **sources/mysql:** Add queryTimeout support to MySQL source ([#830](https://github.com/googleapis/genai-toolbox/issues/830)) ([391cb5b](https://github.com/googleapis/genai-toolbox/commit/391cb5bfe845e554411240a1d9838df5331b25fa))
-* **tools/bigquery:** Add optional projectID parameter to bigquery tools ([#799](https://github.com/googleapis/genai-toolbox/issues/799)) ([c6ab74c](https://github.com/googleapis/genai-toolbox/commit/c6ab74c5dad53a0e7885a18438ab3be36b9b7cb3))
-
-
-### Bug Fixes
-
-* Cleanup unassigned err log ([#857](https://github.com/googleapis/genai-toolbox/issues/857)) ([c081ace](https://github.com/googleapis/genai-toolbox/commit/c081ace46bb24cb3fd2adb21d519489be0d3f3c3))
-* Fix docs preview deployment pipeline ([#787](https://github.com/googleapis/genai-toolbox/issues/787)) ([0a93b04](https://github.com/googleapis/genai-toolbox/commit/0a93b0482c8d3c64b324e67408d408f5576ecaf3))
-* **tools:** Nil parameter error when arrays are used ([#801](https://github.com/googleapis/genai-toolbox/issues/801)) ([2bdcc08](https://github.com/googleapis/genai-toolbox/commit/2bdcc0841ab37d18e2f0d6fe63fb6f10da3e302b))
-* Trigger reload on additional fsnotify operations ([#854](https://github.com/googleapis/genai-toolbox/issues/854)) ([aa8dbec](https://github.com/googleapis/genai-toolbox/commit/aa8dbec97095cf0d7ac771c8084a84e2d3d8ce4e))
-
-## [0.8.0](https://github.com/googleapis/genai-toolbox/compare/v0.7.0...v0.8.0) (2025-07-02)
-
-
-### ⚠ BREAKING CHANGES
-
-* **postgres,mssql,cloudsqlmssql:** encode source connection url for  sources ([#727](https://github.com/googleapis/genai-toolbox/issues/727))
-
-### Features
-
-* Add support for multiple YAML configuration files ([#760](https://github.com/googleapis/genai-toolbox/issues/760)) ([40679d7](https://github.com/googleapis/genai-toolbox/commit/40679d700eded50d19569923e2a71c51e907a8bf))
-* Add support for optional parameters ([#617](https://github.com/googleapis/genai-toolbox/issues/617)) ([4827771](https://github.com/googleapis/genai-toolbox/commit/4827771b78dee9a1284a898b749509b472061527)), closes [#475](https://github.com/googleapis/genai-toolbox/issues/475)
-* **mcp:** Support MCP version 2025-03-26 ([#755](https://github.com/googleapis/genai-toolbox/issues/755)) ([474df57](https://github.com/googleapis/genai-toolbox/commit/474df57d62de683079f8d12c31db53396a545fd1))
-* **sources/http:** Support disable SSL verification for HTTP Source ([#674](https://github.com/googleapis/genai-toolbox/issues/674)) ([4055b0c](https://github.com/googleapis/genai-toolbox/commit/4055b0c3569c527560d7ad34262963b3dd4e282d))
-* **tools/bigquery:** Add templateParameters field for bigquery ([#699](https://github.com/googleapis/genai-toolbox/issues/699)) ([f5f771b](https://github.com/googleapis/genai-toolbox/commit/f5f771b0f3d159630ff602ff55c6c66b61981446))
-* **tools/bigtable:** Add templateParameters field for bigtable ([#692](https://github.com/googleapis/genai-toolbox/issues/692)) ([1c06771](https://github.com/googleapis/genai-toolbox/commit/1c067715fac06479eb0060d7067b73dba099ed92))
-* **tools/couchbase:** Add templateParameters field for couchbase ([#723](https://github.com/googleapis/genai-toolbox/issues/723)) ([9197186](https://github.com/googleapis/genai-toolbox/commit/9197186b8bea1ac4ec1b39c9c5c110807c8b2ba9))
-* **tools/http:** Add support for HTTP Tool pathParams ([#726](https://github.com/googleapis/genai-toolbox/issues/726)) ([fd300dc](https://github.com/googleapis/genai-toolbox/commit/fd300dc606d88bf9f7bba689e2cee4e3565537dd))
-* **tools/redis:** Add Redis Source and Tool ([#519](https://github.com/googleapis/genai-toolbox/issues/519)) ([f0aef29](https://github.com/googleapis/genai-toolbox/commit/f0aef29b0c2563e2a00277fbe2784f39f16d2835))
-* **tools/spanner:** Add templateParameters field for spanner ([#691](https://github.com/googleapis/genai-toolbox/issues/691)) ([075dfa4](https://github.com/googleapis/genai-toolbox/commit/075dfa47e1fd92be4847bd0aec63296146b66455))
-* **tools/sqlitesql:** Add templateParameters field for sqlitesql ([#687](https://github.com/googleapis/genai-toolbox/issues/687)) ([75e254c](https://github.com/googleapis/genai-toolbox/commit/75e254c0a4ce690ca5fa4d1741550ce54734b226))
-* **tools/valkey:** Add Valkey Source and Tool ([#532](https://github.com/googleapis/genai-toolbox/issues/532)) ([054ec19](https://github.com/googleapis/genai-toolbox/commit/054ec198b97ba9f36f67dd12b2eff0cc6bc4d080))
-
-
-### Bug Fixes
-
-* **bigquery,mssql:** Fix panic on tools with array param ([#722](https://github.com/googleapis/genai-toolbox/issues/722)) ([7a6644c](https://github.com/googleapis/genai-toolbox/commit/7a6644cf0c5413e5c803955c88a2cfd0a2233ed3))
-* **postgres,mssql,cloudsqlmssql:** Encode source connection url for  sources ([#727](https://github.com/googleapis/genai-toolbox/issues/727)) ([67964d9](https://github.com/googleapis/genai-toolbox/commit/67964d939f27320b63b5759f4b3f3fdaa0c76fbf)), closes [#717](https://github.com/googleapis/genai-toolbox/issues/717)
-* Set default value to field's type during unmarshalling ([#774](https://github.com/googleapis/genai-toolbox/issues/774)) ([fafed24](https://github.com/googleapis/genai-toolbox/commit/fafed2485839cf1acc1350e8a24103d2e6356ee0)), closes [#771](https://github.com/googleapis/genai-toolbox/issues/771)
-* **server/mcp:** Do not listen from port for stdio ([#719](https://github.com/googleapis/genai-toolbox/issues/719)) ([d51dbc7](https://github.com/googleapis/genai-toolbox/commit/d51dbc759ba493021d3ec6f5417fc04c21f7044f)), closes [#711](https://github.com/googleapis/genai-toolbox/issues/711)
-* **tools/mysqlexecutesql:** Handle nil panic and connection leak in Invoke ([#757](https://github.com/googleapis/genai-toolbox/issues/757)) ([7badba4](https://github.com/googleapis/genai-toolbox/commit/7badba42eefb34252be77b852a57d6bd78dd267d))
-* **tools/mysqlsql:** Handle nil panic and connection leak in invoke ([#758](https://github.com/googleapis/genai-toolbox/issues/758)) ([cbb4a33](https://github.com/googleapis/genai-toolbox/commit/cbb4a333517313744800d148840312e56340f3fd))
-
 ## [0.7.0](https://github.com/googleapis/genai-toolbox/compare/v0.6.0...v0.7.0) (2025-06-10)


--- a/README.md
+++ b/README.md
@@ -2,9 +2,7 @@

 # MCP Toolbox for Databases

-[![Docs](https://img.shields.io/badge/docs-MCP_Toolbox-blue)](https://googleapis.github.io/genai-toolbox/)
-[![Discord](https://img.shields.io/badge/Discord-%235865F2.svg?style=flat&logo=discord&logoColor=white)](https://discord.gg/Dmm69peqjh)
-[![Medium](https://img.shields.io/badge/Medium-12100E?style=flat&logo=medium&logoColor=white)](https://medium.com/@mcp_toolbox)
+[![Discord](https://img.shields.io/badge/Discord-%235865F2.svg?style=for-the-badge&logo=discord&logoColor=white)](https://discord.gg/Dmm69peqjh)
 [![Go Report Card](https://goreportcard.com/badge/github.com/googleapis/genai-toolbox)](https://goreportcard.com/report/github.com/googleapis/genai-toolbox)

 > [!NOTE]
@@ -40,7 +38,6 @@ documentation](https://googleapis.github.io/genai-toolbox/).
  - [Toolsets](#toolsets)
 - [Versioning](#versioning)
 - [Contributing](#contributing)
- [Community](#community)

 <!-- /TOC -->

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

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

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

@@ -154,8 +151,6 @@ execute `toolbox` to start the server:
 ```sh
 ./toolbox --tools-file "tools.yaml"
 ```
-> [!NOTE]
-> Toolbox enables dynamic reloading by default. To disable, use the `--disable-reload` flag.

 You can use `toolbox help` for a full list of flags! To stop the server, send a
 terminate signal (`ctrl+c` on most platforms).
@@ -170,12 +165,7 @@ Once your server is up and running, you can load the tools into your
 application. See below the list of Client SDKs for using various frameworks:

 <details open>
-  <summary>Python (<a href="https://github.com/googleapis/mcp-toolbox-sdk-python">Github</a>)</summary>
-  <br>
-  <blockquote>
-
-  <details open>
-    <summary>Core</summary>
+<summary>Core</summary>

 1. Install [Toolbox Core SDK][toolbox-core]:

@@ -201,9 +191,9 @@ For more detailed instructions on using the Toolbox Core SDK, see the
 [toolbox-core]: https://pypi.org/project/toolbox-core/
 [toolbox-core-readme]: https://github.com/googleapis/mcp-toolbox-sdk-python/tree/main/packages/toolbox-core/README.md

-  </details>
-  <details>
-    <summary>LangChain / LangGraph</summary>
+</details>
+<details>
+<summary>LangChain / LangGraph</summary>

 1. Install [Toolbox LangChain SDK][toolbox-langchain]:

@@ -223,15 +213,16 @@ For more detailed instructions on using the Toolbox Core SDK, see the
        tools = client.load_toolset()
    ```

-    For more detailed instructions on using the Toolbox LangChain SDK, see the
-    [project's README][toolbox-langchain-readme].
+For more detailed instructions on using the Toolbox LangChain SDK, see the
+[project's README][toolbox-langchain-readme].

-    [toolbox-langchain]: https://pypi.org/project/toolbox-langchain/
-    [toolbox-langchain-readme]: https://github.com/googleapis/mcp-toolbox-sdk-python/blob/main/packages/toolbox-langchain/README.md
+[toolbox-langchain]: https://pypi.org/project/toolbox-langchain/
+[toolbox-langchain-readme]: https://github.com/googleapis/mcp-toolbox-sdk-python/blob/main/packages/toolbox-langchain/README.md

-  </details>
-  <details>
-    <summary>LlamaIndex</summary>
+</details>
+
+<details>
+<summary>LlamaIndex</summary>

 1. Install [Toolbox Llamaindex SDK][toolbox-llamaindex]:

@@ -251,378 +242,12 @@ For more detailed instructions on using the Toolbox Core SDK, see the
        tools = client.load_toolset()
    ```

-    For more detailed instructions on using the Toolbox Llamaindex SDK, see the
-    [project's README][toolbox-llamaindex-readme].
+For more detailed instructions on using the Toolbox Llamaindex SDK, see the
+[project's README][toolbox-llamaindex-readme].

-    [toolbox-llamaindex]: https://pypi.org/project/toolbox-llamaindex/
-    [toolbox-llamaindex-readme]: https://github.com/googleapis/genai-toolbox-llamaindex-python/blob/main/README.md
+[toolbox-llamaindex]: https://pypi.org/project/toolbox-llamaindex/
+[toolbox-llamaindex-readme]: https://github.com/googleapis/genai-toolbox-llamaindex-python/blob/main/README.md

-  </details>
-</details>
-</blockquote>
-<details>
-  <summary>Javascript/Typescript (<a href="https://github.com/googleapis/mcp-toolbox-sdk-js">Github</a>)</summary>
-  <br>
-  <blockquote>
-
-  <details open>
-    <summary>Core</summary>
-
-1. Install [Toolbox Core SDK][toolbox-core-js]:
-
-    ```bash
-    npm install @toolbox-sdk/core
-    ```
-
-1. Load tools:
-
-    ```javascript
-    import { ToolboxClient } from '@toolbox-sdk/core';
-
-    // update the url to point to your server
-    const URL = 'http://127.0.0.1:5000';
-    let client = new ToolboxClient(URL);
-
-    // these tools can be passed to your application!
-    const tools = await client.loadToolset('toolsetName');
-    ```
-
-    For more detailed instructions on using the Toolbox Core SDK, see the
-    [project's README][toolbox-core-js-readme].
-
-    [toolbox-core-js]: https://www.npmjs.com/package/@toolbox-sdk/core
-    [toolbox-core-js-readme]: https://github.com/googleapis/mcp-toolbox-sdk-js/blob/main/packages/toolbox-core/README.md
-
-  </details>
-  <details>
-    <summary>LangChain / LangGraph</summary>
-
-1. Install [Toolbox Core SDK][toolbox-core-js]:
-
-    ```bash
-    npm install @toolbox-sdk/core
-    ```
-
-2. Load tools:
-
-    ```javascript
-    import { ToolboxClient } from '@toolbox-sdk/core';
-
-    // update the url to point to your server
-    const URL = 'http://127.0.0.1:5000';
-    let client = new ToolboxClient(URL);
-
-    // these tools can be passed to your application!
-    const toolboxTools = await client.loadToolset('toolsetName');
-
-    // Define the basics of the tool: name, description, schema and core logic
-    const getTool = (toolboxTool) => tool(currTool, {
-        name: toolboxTool.getName(),
-        description: toolboxTool.getDescription(),
-        schema: toolboxTool.getParamSchema()
-    });
-
-    // Use these tools in your Langchain/Langraph applications
-    const tools = toolboxTools.map(getTool);
-    ```
-
-  </details>
-  <details>
-    <summary>Genkit</summary>
-
-1. Install [Toolbox Core SDK][toolbox-core-js]:
-
-    ```bash
-    npm install @toolbox-sdk/core
-    ```
-
-2. Load tools:
-
-    ```javascript
-    import { ToolboxClient } from '@toolbox-sdk/core';
-    import { genkit } from 'genkit';
-
-    // Initialise genkit
-    const ai = genkit({
-        plugins: [
-            googleAI({
-                apiKey: process.env.GEMINI_API_KEY || process.env.GOOGLE_API_KEY
-            })
-        ],
-        model: googleAI.model('gemini-2.0-flash'),
-    });
-
-    // update the url to point to your server
-    const URL = 'http://127.0.0.1:5000';
-    let client = new ToolboxClient(URL);
-
-    // these tools can be passed to your application!
-    const toolboxTools = await client.loadToolset('toolsetName');
-
-    // Define the basics of the tool: name, description, schema and core logic
-    const getTool = (toolboxTool) => ai.defineTool({
-        name: toolboxTool.getName(),
-        description: toolboxTool.getDescription(),
-        schema: toolboxTool.getParamSchema()
-    }, toolboxTool)
-
-    // Use these tools in your Genkit applications
-    const tools = toolboxTools.map(getTool);
-    ```
-
-  </details>
-</details>
-</blockquote>
-<details>
-  <summary>Go (<a href="https://github.com/googleapis/mcp-toolbox-sdk-go">Github</a>)</summary>
-  <br>
-  <blockquote>
-
-  <details open>
-    <summary>Core</summary>
-
-1. Install [Toolbox Go SDK][toolbox-go]:
-
-    ```bash
-    go get github.com/googleapis/mcp-toolbox-sdk-go
-    ```
-
-1. Load tools:
-
-    ```go
-    package main
-
-    import (
-      "github.com/googleapis/mcp-toolbox-sdk-go/core"
-      "context"
-    )
-
-    func main() {
-      // Make sure to add the error checks
-      // update the url to point to your server
-      URL := "http://127.0.0.1:5000";
-      ctx := context.Background()
-
-      client, err := core.NewToolboxClient(URL)
-
-      // Framework agnostic tools
-      tools, err := client.LoadToolset("toolsetName", ctx)
-    }
-    ```
-
-    For more detailed instructions on using the Toolbox Go SDK, see the
-    [project's README][toolbox-core-go-readme].
-
-    [toolbox-go]: https://pkg.go.dev/github.com/googleapis/mcp-toolbox-sdk-go/core
-    [toolbox-core-go-readme]: https://github.com/googleapis/mcp-toolbox-sdk-go/blob/main/core/README.md
-
-  </details>
-  <details>
-    <summary>LangChain Go</summary>
-
-1. Install [Toolbox Go SDK][toolbox-go]:
-
-    ```bash
-    go get github.com/googleapis/mcp-toolbox-sdk-go
-    ```
-
-2. Load tools:
-
-    ```go
-    package main
-
-    import (
-      "context"
-      "encoding/json"
-
-      "github.com/googleapis/mcp-toolbox-sdk-go/core"
-      "github.com/tmc/langchaingo/llms"
-    )
-
-    func main() {
-      // Make sure to add the error checks
-      // update the url to point to your server
-      URL := "http://127.0.0.1:5000"
-      ctx := context.Background()
-
-      client, err := core.NewToolboxClient(URL)
-
-      // Framework agnostic tool
-      tool, err := client.LoadTool("toolName", ctx)
-
-      // Fetch the tool's input schema
-      inputschema, err := tool.InputSchema()
-
-      var paramsSchema map[string]any
-      _ = json.Unmarshal(inputschema, &paramsSchema)
-
-      // Use this tool with LangChainGo
-      langChainTool := llms.Tool{
-        Type: "function",
-        Function: &llms.FunctionDefinition{
-          Name:        tool.Name(),
-          Description: tool.Description(),
-          Parameters:  paramsSchema,
-        },
-      }
-    }
-
-    ```
-
-  </details>
-  <details>
-    <summary>Genkit</summary>
-
-1. Install [Toolbox Go SDK][toolbox-go]:
-
-    ```bash
-    go get github.com/googleapis/mcp-toolbox-sdk-go
-    ```
-
-2. Load tools:
-
-    ```go
-    package main
-    import (
-      "context"
-      "encoding/json"
-
-      "github.com/firebase/genkit/go/ai"
-      "github.com/firebase/genkit/go/genkit"
-      "github.com/googleapis/mcp-toolbox-sdk-go/core"
-      "github.com/googleapis/mcp-toolbox-sdk-go/tbgenkit"
-      "github.com/invopop/jsonschema"
-    )
-
-    func main() {
-      // Make sure to add the error checks
-      // Update the url to point to your server
-      URL := "http://127.0.0.1:5000"
-      ctx := context.Background()
-      g, err := genkit.Init(ctx)
-
-      client, err := core.NewToolboxClient(URL)
-
-      // Framework agnostic tool
-      tool, err := client.LoadTool("toolName", ctx)
-
-      // Convert the tool using the tbgenkit package
-      // Use this tool with Genkit Go
-      genkitTool, err := tbgenkit.ToGenkitTool(tool, g)
-  		if err != nil {
-  			log.Fatalf("Failed to convert tool: %v\n", err)
-  		}
-    }
-    ```
-
-  </details>
-  <details>
-    <summary>Go GenAI</summary>
-
-1. Install [Toolbox Go SDK][toolbox-go]:
-
-    ```bash
-    go get github.com/googleapis/mcp-toolbox-sdk-go
-    ```
-
-2. Load tools:
-
-    ```go
-    package main
-
-    import (
-      "context"
-      "encoding/json"
-
-      "github.com/googleapis/mcp-toolbox-sdk-go/core"
-      "google.golang.org/genai"
-    )
-
-    func main() {
-      // Make sure to add the error checks
-      // Update the url to point to your server
-      URL := "http://127.0.0.1:5000"
-      ctx := context.Background()
-
-      client, err := core.NewToolboxClient(URL)
-
-      // Framework agnostic tool
-      tool, err := client.LoadTool("toolName", ctx)
-
-      // Fetch the tool's input schema
-      inputschema, err := tool.InputSchema()
-
-      var schema *genai.Schema
-      _ = json.Unmarshal(inputschema, &schema)
-
-      funcDeclaration := &genai.FunctionDeclaration{
-        Name:        tool.Name(),
-        Description: tool.Description(),
-        Parameters:  schema,
-      }
-
-      // Use this tool with Go GenAI
-      genAITool := &genai.Tool{
-        FunctionDeclarations: []*genai.FunctionDeclaration{funcDeclaration},
-      }
-    }
-    ```
-
-  </details>
-  <details>
-    <summary>OpenAI Go</summary>
-
-1. Install [Toolbox Go SDK][toolbox-go]:
-
-    ```bash
-    go get github.com/googleapis/mcp-toolbox-sdk-go
-    ```
-
-2. Load tools:
-
-    ```go
-    package main
-
-    import (
-      "context"
-      "encoding/json"
-
-      "github.com/googleapis/mcp-toolbox-sdk-go/core"
-      openai "github.com/openai/openai-go"
-    )
-
-    func main() {
-      // Make sure to add the error checks
-      // Update the url to point to your server
-      URL := "http://127.0.0.1:5000"
-      ctx := context.Background()
-
-      client, err := core.NewToolboxClient(URL)
-
-      // Framework agnostic tool
-      tool, err := client.LoadTool("toolName", ctx)
-
-      // Fetch the tool's input schema
-      inputschema, err := tool.InputSchema()
-
-      var paramsSchema openai.FunctionParameters
-      _ = json.Unmarshal(inputschema, &paramsSchema)
-
-      // Use this tool with OpenAI Go
-      openAITool := openai.ChatCompletionToolParam{
-        Function: openai.FunctionDefinitionParam{
-          Name:        tool.Name(),
-          Description: openai.String(tool.Description()),
-          Parameters:  paramsSchema,
-        },
-      }
-
-    }
-    ```
-
-  </details>
-</details>
-</blockquote>
 </details>

 ## Configuration
@@ -721,7 +346,3 @@ to get started.
 Please note that this project is released with a Contributor Code of Conduct.
 By participating in this project you agree to abide by its terms. See
 [Contributor Code of Conduct](CODE_OF_CONDUCT.md) for more information.
-
-## Community
-
-Join our [discord community](https://discord.gg/GQrFB3Ec3W) to connect with our developers!
--- a/cmd/root.go
+++ b/cmd/root.go
@@ -19,26 +19,20 @@ import (
 	_ "embed"
 	"fmt"
 	"io"
-	"maps"
 	"os"
 	"os/signal"
 	"path/filepath"
 	"regexp"
 	"runtime"
-	"slices"
 	"strings"
 	"syscall"
 	"time"

-	"github.com/fsnotify/fsnotify"
 	yaml "github.com/goccy/go-yaml"
-	"github.com/googleapis/genai-toolbox/internal/auth"
 	"github.com/googleapis/genai-toolbox/internal/log"
 	"github.com/googleapis/genai-toolbox/internal/prebuiltconfigs"
 	"github.com/googleapis/genai-toolbox/internal/server"
-	"github.com/googleapis/genai-toolbox/internal/sources"
 	"github.com/googleapis/genai-toolbox/internal/telemetry"
-	"github.com/googleapis/genai-toolbox/internal/tools"
 	"github.com/googleapis/genai-toolbox/internal/util"

 	// Import tool packages for side effect of registration
@@ -52,46 +46,18 @@ import (
 	_ "github.com/googleapis/genai-toolbox/internal/tools/bigtable"
 	_ "github.com/googleapis/genai-toolbox/internal/tools/couchbase"
 	_ "github.com/googleapis/genai-toolbox/internal/tools/dgraph"
-	_ "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/firestorevalidaterules"
 	_ "github.com/googleapis/genai-toolbox/internal/tools/http"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/looker/lookergetdimensions"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/looker/lookergetexplores"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/looker/lookergetfilters"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/looker/lookergetlooks"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/looker/lookergetmeasures"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/looker/lookergetmodels"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/looker/lookergetparameters"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/looker/lookerquery"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/looker/lookerquerysql"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/looker/lookerrunlook"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/mongodb/mongodbaggregate"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/mongodb/mongodbdeletemany"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/mongodb/mongodbdeleteone"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/mongodb/mongodbfind"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/mongodb/mongodbfindone"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/mongodb/mongodbinsertmany"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/mongodb/mongodbinsertone"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/mongodb/mongodbupdatemany"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/mongodb/mongodbupdateone"
 	_ "github.com/googleapis/genai-toolbox/internal/tools/mssql/mssqlexecutesql"
 	_ "github.com/googleapis/genai-toolbox/internal/tools/mssql/mssqlsql"
 	_ "github.com/googleapis/genai-toolbox/internal/tools/mysql/mysqlexecutesql"
 	_ "github.com/googleapis/genai-toolbox/internal/tools/mysql/mysqlsql"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/neo4j/neo4jcypher"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/neo4j/neo4jexecutecypher"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/neo4j"
 	_ "github.com/googleapis/genai-toolbox/internal/tools/postgres/postgresexecutesql"
 	_ "github.com/googleapis/genai-toolbox/internal/tools/postgres/postgressql"
 	_ "github.com/googleapis/genai-toolbox/internal/tools/redis"
 	_ "github.com/googleapis/genai-toolbox/internal/tools/spanner/spannerexecutesql"
 	_ "github.com/googleapis/genai-toolbox/internal/tools/spanner/spannersql"
 	_ "github.com/googleapis/genai-toolbox/internal/tools/sqlitesql"
-	_ "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"

 	"github.com/spf13/cobra"
@@ -104,10 +70,7 @@ import (
 	_ "github.com/googleapis/genai-toolbox/internal/sources/cloudsqlpg"
 	_ "github.com/googleapis/genai-toolbox/internal/sources/couchbase"
 	_ "github.com/googleapis/genai-toolbox/internal/sources/dgraph"
-	_ "github.com/googleapis/genai-toolbox/internal/sources/firestore"
 	_ "github.com/googleapis/genai-toolbox/internal/sources/http"
-	_ "github.com/googleapis/genai-toolbox/internal/sources/looker"
-	_ "github.com/googleapis/genai-toolbox/internal/sources/mongodb"
 	_ "github.com/googleapis/genai-toolbox/internal/sources/mssql"
 	_ "github.com/googleapis/genai-toolbox/internal/sources/mysql"
 	_ "github.com/googleapis/genai-toolbox/internal/sources/neo4j"
@@ -213,9 +176,8 @@ 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.")
-	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', 'firestore', 'postgres', 'spanner', 'spanner-postgres'.")
+	flags.StringVar(&cmd.prebuiltConfig, "prebuilt", "", "Use a prebuilt tool configuration by source type. Cannot be used with --tools-file. Allowed: 'alloydb-postgres', 'bigquery', 'cloud-sql-mysql', 'cloud-sql-postgres', 'cloud-sql-mssql', '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.")

 	// wrap RunE command so that we have access to original Command object
 	cmd.RunE = func(*cobra.Command, []string) error { return run(cmd) }
@@ -385,7 +347,7 @@ func loadAndMergeToolsFolder(ctx context.Context, folderPath string) (ToolsFile,

 	// Combine both file lists
 	allFiles := append(yamlFiles, ymlFiles...)
-
+	
 	if len(allFiles) == 0 {
 		return ToolsFile{}, fmt.Errorf("no YAML files found in directory %q", folderPath)
 	}
@@ -394,178 +356,6 @@ func loadAndMergeToolsFolder(ctx context.Context, folderPath string) (ToolsFile,
 	return loadAndMergeToolsFiles(ctx, allFiles)
 }

-func handleDynamicReload(ctx context.Context, toolsFile ToolsFile, s *server.Server) error {
-	logger, err := util.LoggerFromContext(ctx)
-	if err != nil {
-		panic(err)
-	}
-
-	sourcesMap, authServicesMap, toolsMap, toolsetsMap, err := validateReloadEdits(ctx, toolsFile)
-	if err != nil {
-		errMsg := fmt.Errorf("unable to validate reloaded edits: %w", err)
-		logger.WarnContext(ctx, errMsg.Error())
-		return err
-	}
-
-	s.ResourceMgr.SetResources(sourcesMap, authServicesMap, toolsMap, toolsetsMap)
-
-	return nil
-}
-
-// validateReloadEdits checks that the reloaded tools file configs can initialized without failing
-func validateReloadEdits(
-	ctx context.Context, toolsFile ToolsFile,
-) (map[string]sources.Source, map[string]auth.AuthService, map[string]tools.Tool, map[string]tools.Toolset, error,
-) {
-	logger, err := util.LoggerFromContext(ctx)
-	if err != nil {
-		panic(err)
-	}
-
-	instrumentation, err := util.InstrumentationFromContext(ctx)
-	if err != nil {
-		panic(err)
-	}
-
-	logger.DebugContext(ctx, "Attempting to parse and validate reloaded tools file.")
-
-	ctx, span := instrumentation.Tracer.Start(ctx, "toolbox/server/reload")
-	defer span.End()
-
-	reloadedConfig := server.ServerConfig{
-		Version:            versionString,
-		SourceConfigs:      toolsFile.Sources,
-		AuthServiceConfigs: toolsFile.AuthServices,
-		ToolConfigs:        toolsFile.Tools,
-		ToolsetConfigs:     toolsFile.Toolsets,
-	}
-
-	sourcesMap, authServicesMap, toolsMap, toolsetsMap, err := server.InitializeConfigs(ctx, reloadedConfig)
-	if err != nil {
-		errMsg := fmt.Errorf("unable to initialize reloaded configs: %w", err)
-		logger.WarnContext(ctx, errMsg.Error())
-		return nil, nil, nil, nil, err
-	}
-
-	return sourcesMap, authServicesMap, toolsMap, toolsetsMap, nil
-}
-
-// watchChanges checks for changes in the provided yaml tools file(s) or folder.
-func watchChanges(ctx context.Context, watchDirs map[string]bool, watchedFiles map[string]bool, s *server.Server) {
-	logger, err := util.LoggerFromContext(ctx)
-	if err != nil {
-		panic(err)
-	}
-
-	w, err := fsnotify.NewWatcher()
-	if err != nil {
-		logger.WarnContext(ctx, "error setting up new watcher %s", err)
-		return
-	}
-
-	defer w.Close()
-
-	watchingFolder := false
-	var folderToWatch string
-
-	// if watchedFiles is empty, indicates that user passed entire folder instead
-	if len(watchedFiles) == 0 {
-		watchingFolder = true
-
-		// validate that watchDirs only has single element
-		if len(watchDirs) > 1 {
-			logger.WarnContext(ctx, "error setting watcher, expected single tools folder if no file(s) are defined.")
-			return
-		}
-
-		for onlyKey := range watchDirs {
-			folderToWatch = onlyKey
-			break
-		}
-	}
-
-	for dir := range watchDirs {
-		err := w.Add(dir)
-		if err != nil {
-			logger.WarnContext(ctx, fmt.Sprintf("Error adding path %s to watcher: %s", dir, err))
-			break
-		}
-		logger.DebugContext(ctx, fmt.Sprintf("Added directory %s to watcher.", dir))
-	}
-
-	// debounce timer is used to prevent multiple writes triggering multiple reloads
-	debounceDelay := 100 * time.Millisecond
-	debounce := time.NewTimer(1 * time.Minute)
-	debounce.Stop()
-
-	for {
-		select {
-		case <-ctx.Done():
-			logger.DebugContext(ctx, "file watcher context cancelled")
-			return
-		case err, ok := <-w.Errors:
-			if !ok {
-				logger.WarnContext(ctx, "file watcher was closed unexpectedly")
-				return
-			}
-			if err != nil {
-				logger.WarnContext(ctx, "file watcher error %s", err)
-				return
-			}
-
-		case e, ok := <-w.Events:
-			if !ok {
-				logger.WarnContext(ctx, "file watcher already closed")
-				return
-			}
-
-			// only check for events which indicate user saved a new tools file
-			// multiple operations checked due to various file update methods across editors
-			if !e.Has(fsnotify.Write | fsnotify.Create | fsnotify.Rename) {
-				continue
-			}
-
-			cleanedFilename := filepath.Clean(e.Name)
-			logger.DebugContext(ctx, fmt.Sprintf("%s event detected in %s", e.Op, cleanedFilename))
-
-			folderChanged := watchingFolder &&
-				(strings.HasSuffix(cleanedFilename, ".yaml") || strings.HasSuffix(cleanedFilename, ".yml"))
-
-			if folderChanged || watchedFiles[cleanedFilename] {
-				// indicates the write event is on a relevant file
-				debounce.Reset(debounceDelay)
-			}
-
-		case <-debounce.C:
-			debounce.Stop()
-			var reloadedToolsFile ToolsFile
-
-			if watchingFolder {
-				logger.DebugContext(ctx, "Reloading tools folder.")
-				reloadedToolsFile, err = loadAndMergeToolsFolder(ctx, folderToWatch)
-				if err != nil {
-					logger.WarnContext(ctx, "error loading tools folder %s", err)
-					continue
-				}
-			} else {
-				logger.DebugContext(ctx, "Reloading tools file(s).")
-				reloadedToolsFile, err = loadAndMergeToolsFiles(ctx, slices.Collect(maps.Keys(watchedFiles)))
-				if err != nil {
-					logger.WarnContext(ctx, "error loading tools files %s", err)
-					continue
-				}
-			}
-
-			err = handleDynamicReload(ctx, reloadedToolsFile, s)
-			if err != nil {
-				errMsg := fmt.Errorf("unable to parse reloaded tools file at %q: %w", reloadedToolsFile, err)
-				logger.WarnContext(ctx, errMsg.Error())
-				continue
-			}
-		}
-	}
-}
-
 // updateLogLevel checks if Toolbox have to update the existing log level set by users.
 // stdio doesn't support "debug" and "info" logs.
 func updateLogLevel(stdio bool, logLevel string) bool {
@@ -580,33 +370,6 @@ func updateLogLevel(stdio bool, logLevel string) bool {
 	return false
 }

-func resolveWatcherInputs(toolsFile string, toolsFiles []string, toolsFolder string) (map[string]bool, map[string]bool) {
-	var relevantFiles []string
-
-	// map for efficiently checking if a file is relevant
-	watchedFiles := make(map[string]bool)
-
-	// dirs that will be added to watcher (fsnotify prefers watching directory then filtering for file)
-	watchDirs := make(map[string]bool)
-
-	if len(toolsFiles) > 0 {
-		relevantFiles = toolsFiles
-	} else if toolsFolder != "" {
-		watchDirs[filepath.Clean(toolsFolder)] = true
-	} else {
-		relevantFiles = []string{toolsFile}
-	}
-
-	// extract parent dir for relevant files and dedup
-	for _, f := range relevantFiles {
-		cleanFile := filepath.Clean(f)
-		watchedFiles[cleanFile] = true
-		watchDirs[filepath.Dir(cleanFile)] = true
-	}
-
-	return watchDirs, watchedFiles
-}
-
 func run(cmd *Command) error {
 	if updateLogLevel(cmd.cfg.Stdio, cmd.cfg.LogLevel.String()) {
 		cmd.cfg.LogLevel = server.StringLevel(log.Warn)
@@ -703,7 +466,6 @@ func run(cmd *Command) error {
 			cmd.logger.ErrorContext(ctx, errMsg.Error())
 			return errMsg
 		}
-
 		// Use multiple tools files
 		cmd.logger.InfoContext(ctx, fmt.Sprintf("Loading and merging %d tool configuration files", len(cmd.tools_files)))
 		var err error
@@ -719,7 +481,6 @@ func run(cmd *Command) error {
 			cmd.logger.ErrorContext(ctx, errMsg.Error())
 			return errMsg
 		}
-
 		// Use tools folder
 		cmd.logger.InfoContext(ctx, fmt.Sprintf("Loading and merging all YAML files from directory: %s", cmd.tools_folder))
 		var err error
@@ -733,7 +494,6 @@ func run(cmd *Command) error {
 		if cmd.tools_file == "" {
 			cmd.tools_file = "tools.yaml"
 		}
-
 		// Read single tool file contents
 		buf, err := os.ReadFile(cmd.tools_file)
 		if err != nil {
@@ -757,17 +517,8 @@ func run(cmd *Command) error {
 		cmd.cfg.AuthServiceConfigs = authSourceConfigs
 	}

-	instrumentation, err := telemetry.CreateTelemetryInstrumentation(versionString)
-	if err != nil {
-		errMsg := fmt.Errorf("unable to create telemetry instrumentation: %w", err)
-		cmd.logger.ErrorContext(ctx, errMsg.Error())
-		return errMsg
-	}
-
-	ctx = util.WithInstrumentation(ctx, instrumentation)
-
 	// start server
-	s, err := server.NewServer(ctx, cmd.cfg)
+	s, err := server.NewServer(ctx, cmd.cfg, cmd.logger)
 	if err != nil {
 		errMsg := fmt.Errorf("toolbox failed to initialize: %w", err)
 		cmd.logger.ErrorContext(ctx, errMsg.Error())
@@ -802,13 +553,6 @@ func run(cmd *Command) error {
 		}()
 	}

-	watchDirs, watchedFiles := resolveWatcherInputs(cmd.tools_file, cmd.tools_files, cmd.tools_folder)
-
-	if !cmd.cfg.DisableReload {
-		// start watching the file(s) or folder for changes to trigger dynamic reloading
-		go watchChanges(ctx, watchDirs, watchedFiles, s)
-	}
-
 	// wait for either the server to error out or the command's context to be canceled
 	select {
 	case err := <-srvErr:
--- a/cmd/root_test.go
+++ b/cmd/root_test.go
@@ -16,33 +16,23 @@ package cmd

 import (
 	"bytes"
-	"context"
 	_ "embed"
-	"fmt"
-	"io"
 	"os"
-	"path"
-	"path/filepath"
-	"regexp"
 	"runtime"
 	"strings"
 	"testing"
-	"time"

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

 	"github.com/googleapis/genai-toolbox/internal/auth/google"
-	"github.com/googleapis/genai-toolbox/internal/log"
 	"github.com/googleapis/genai-toolbox/internal/prebuiltconfigs"
 	"github.com/googleapis/genai-toolbox/internal/server"
 	cloudsqlpgsrc "github.com/googleapis/genai-toolbox/internal/sources/cloudsqlpg"
 	httpsrc "github.com/googleapis/genai-toolbox/internal/sources/http"
-	"github.com/googleapis/genai-toolbox/internal/telemetry"
 	"github.com/googleapis/genai-toolbox/internal/testutils"
 	"github.com/googleapis/genai-toolbox/internal/tools"
 	"github.com/googleapis/genai-toolbox/internal/tools/http"
 	"github.com/googleapis/genai-toolbox/internal/tools/postgres/postgressql"
-	"github.com/googleapis/genai-toolbox/internal/util"
 	"github.com/spf13/cobra"
 )

@@ -184,13 +174,6 @@ func TestServerConfigFlags(t *testing.T) {
 				Stdio: true,
 			}),
 		},
-		{
-			desc: "disable reload",
-			args: []string{"--disable-reload"},
-			want: withDefaults(server.ServerConfig{
-				DisableReload: true,
-			}),
-		},
 	}
 	for _, tc := range tcs {
 		t.Run(tc.desc, func(t *testing.T) {
@@ -982,193 +965,12 @@ func TestEnvVarReplacement(t *testing.T) {

 }

-// normalizeFilepaths is a helper function to allow same filepath formats for Mac and Windows.
-// this prevents needing multiple "want" cases for TestResolveWatcherInputs
-func normalizeFilepaths(m map[string]bool) map[string]bool {
-	newMap := make(map[string]bool)
-	for k, v := range m {
-		newMap[filepath.ToSlash(k)] = v
-	}
-	return newMap
-}
-
-func TestResolveWatcherInputs(t *testing.T) {
-	tcs := []struct {
-		description      string
-		toolsFile        string
-		toolsFiles       []string
-		toolsFolder      string
-		wantWatchDirs    map[string]bool
-		wantWatchedFiles map[string]bool
-	}{
-		{
-			description:      "single tools file",
-			toolsFile:        "tools_folder/example_tools.yaml",
-			toolsFiles:       []string{},
-			toolsFolder:      "",
-			wantWatchDirs:    map[string]bool{"tools_folder": true},
-			wantWatchedFiles: map[string]bool{"tools_folder/example_tools.yaml": true},
-		},
-		{
-			description:      "default tools file (root dir)",
-			toolsFile:        "tools.yaml",
-			toolsFiles:       []string{},
-			toolsFolder:      "",
-			wantWatchDirs:    map[string]bool{".": true},
-			wantWatchedFiles: map[string]bool{"tools.yaml": true},
-		},
-		{
-			description:   "multiple files in different folders",
-			toolsFile:     "",
-			toolsFiles:    []string{"tools_folder/example_tools.yaml", "tools_folder2/example_tools.yaml"},
-			toolsFolder:   "",
-			wantWatchDirs: map[string]bool{"tools_folder": true, "tools_folder2": true},
-			wantWatchedFiles: map[string]bool{
-				"tools_folder/example_tools.yaml":  true,
-				"tools_folder2/example_tools.yaml": true,
-			},
-		},
-		{
-			description:   "multiple files in same folder",
-			toolsFile:     "",
-			toolsFiles:    []string{"tools_folder/example_tools.yaml", "tools_folder/example_tools2.yaml"},
-			toolsFolder:   "",
-			wantWatchDirs: map[string]bool{"tools_folder": true},
-			wantWatchedFiles: map[string]bool{
-				"tools_folder/example_tools.yaml":  true,
-				"tools_folder/example_tools2.yaml": true,
-			},
-		},
-		{
-			description: "multiple files in different levels",
-			toolsFile:   "",
-			toolsFiles: []string{
-				"tools_folder/example_tools.yaml",
-				"tools_folder/special_tools/example_tools2.yaml"},
-			toolsFolder:   "",
-			wantWatchDirs: map[string]bool{"tools_folder": true, "tools_folder/special_tools": true},
-			wantWatchedFiles: map[string]bool{
-				"tools_folder/example_tools.yaml":                true,
-				"tools_folder/special_tools/example_tools2.yaml": true,
-			},
-		},
-		{
-			description:      "tools folder",
-			toolsFile:        "",
-			toolsFiles:       []string{},
-			toolsFolder:      "tools_folder",
-			wantWatchDirs:    map[string]bool{"tools_folder": true},
-			wantWatchedFiles: map[string]bool{},
-		},
-	}
-	for _, tc := range tcs {
-		t.Run(tc.description, func(t *testing.T) {
-			gotWatchDirs, gotWatchedFiles := resolveWatcherInputs(tc.toolsFile, tc.toolsFiles, tc.toolsFolder)
-
-			normalizedGotWatchDirs := normalizeFilepaths(gotWatchDirs)
-			normalizedGotWatchedFiles := normalizeFilepaths(gotWatchedFiles)
-
-			if diff := cmp.Diff(tc.wantWatchDirs, normalizedGotWatchDirs); diff != "" {
-				t.Errorf("incorrect watchDirs: diff %v", diff)
-			}
-			if diff := cmp.Diff(tc.wantWatchedFiles, normalizedGotWatchedFiles); diff != "" {
-				t.Errorf("incorrect watchedFiles: diff %v", diff)
-			}
-
-		})
-	}
-}
-
-// helper function for testing file detection in dynamic reloading
-func tmpFileWithCleanup(content []byte) (string, func(), error) {
-	f, err := os.CreateTemp("", "*")
-	if err != nil {
-		return "", nil, err
-	}
-	cleanup := func() { os.Remove(f.Name()) }
-
-	if _, err := f.Write(content); err != nil {
-		cleanup()
-		return "", nil, err
-	}
-	if err := f.Close(); err != nil {
-		cleanup()
-		return "", nil, err
-	}
-	return f.Name(), cleanup, err
-}
-
-func TestSingleEdit(t *testing.T) {
-	ctx, cancelCtx := context.WithTimeout(context.Background(), time.Minute)
-	defer cancelCtx()
-
-	pr, pw := io.Pipe()
-	defer pw.Close()
-	defer pr.Close()
-
-	fileToWatch, cleanup, err := tmpFileWithCleanup([]byte("initial content"))
-	if err != nil {
-		t.Fatalf("error editing tools file %s", err)
-	}
-	defer cleanup()
-
-	logger, err := log.NewStdLogger(pw, pw, "DEBUG")
-	if err != nil {
-		t.Fatalf("failed to setup logger %s", err)
-	}
-	ctx = util.WithLogger(ctx, logger)
-
-	instrumentation, err := telemetry.CreateTelemetryInstrumentation(versionString)
-	if err != nil {
-		t.Fatalf("failed to setup instrumentation %s", err)
-	}
-	ctx = util.WithInstrumentation(ctx, instrumentation)
-
-	mockServer := &server.Server{}
-
-	cleanFileToWatch := filepath.Clean(fileToWatch)
-	watchDir := filepath.Dir(cleanFileToWatch)
-
-	watchedFiles := map[string]bool{cleanFileToWatch: true}
-	watchDirs := map[string]bool{watchDir: true}
-
-	go watchChanges(ctx, watchDirs, watchedFiles, mockServer)
-
-	// escape backslash so regex doesn't fail on windows filepaths
-	regexEscapedPathFile := strings.ReplaceAll(cleanFileToWatch, `\`, `\\\\*\\`)
-	regexEscapedPathFile = path.Clean(regexEscapedPathFile)
-
-	regexEscapedPathDir := strings.ReplaceAll(watchDir, `\`, `\\\\*\\`)
-	regexEscapedPathDir = path.Clean(regexEscapedPathDir)
-
-	begunWatchingDir := regexp.MustCompile(fmt.Sprintf(`DEBUG "Added directory %s to watcher."`, regexEscapedPathDir))
-	_, err = testutils.WaitForString(ctx, begunWatchingDir, pr)
-	if err != nil {
-		t.Fatalf("timeout or error waiting for watcher to start: %s", err)
-	}
-
-	err = os.WriteFile(fileToWatch, []byte("modification"), 0777)
-	if err != nil {
-		t.Fatalf("error writing to file: %v", err)
-	}
-
-	// only check substring of DEBUG message due to some OS/editors firing different operations
-	detectedFileChange := regexp.MustCompile(fmt.Sprintf(`event detected in %s"`, regexEscapedPathFile))
-	_, err = testutils.WaitForString(ctx, detectedFileChange, pr)
-	if err != nil {
-		t.Fatalf("timeout or error waiting for file to detect write: %s", err)
-	}
-}
-
 func TestPrebuiltTools(t *testing.T) {
-	alloydb_admin_config, _ := prebuiltconfigs.Get("alloydb-postgres-admin")
 	alloydb_config, _ := prebuiltconfigs.Get("alloydb-postgres")
 	bigquery_config, _ := prebuiltconfigs.Get("bigquery")
 	cloudsqlpg_config, _ := prebuiltconfigs.Get("cloud-sql-postgres")
 	cloudsqlmysql_config, _ := prebuiltconfigs.Get("cloud-sql-mysql")
 	cloudsqlmssql_config, _ := prebuiltconfigs.Get("cloud-sql-mssql")
-	firestoreconfig, _ := prebuiltconfigs.Get("firestore")
-	looker_config, _ := prebuiltconfigs.Get("looker")
 	postgresconfig, _ := prebuiltconfigs.Get("postgres")
 	spanner_config, _ := prebuiltconfigs.Get("spanner")
 	spannerpg_config, _ := prebuiltconfigs.Get("spanner-postgres")
@@ -1181,16 +983,6 @@ func TestPrebuiltTools(t *testing.T) {
 		in          []byte
 		wantToolset server.ToolsetConfigs
 	}{
-		{
-			name: "alloydb postgres admin prebuilt tools",
-			in:   alloydb_admin_config,
-			wantToolset: server.ToolsetConfigs{
-				"alloydb-postgres-admin-tools": tools.ToolsetConfig{
-					Name:      "alloydb-postgres-admin-tools",
-					ToolNames: []string{"alloydb-create-cluster", "alloydb-operations-get", "alloydb-create-instance"},
-				},
-			},
-		},
 		{
 			name: "alloydb prebuilt tools",
 			in:   alloydb_config,
@@ -1241,26 +1033,6 @@ func TestPrebuiltTools(t *testing.T) {
 				},
 			},
 		},
-		{
-			name: "firestore prebuilt tools",
-			in:   firestoreconfig,
-			wantToolset: server.ToolsetConfigs{
-				"firestore-database-tools": tools.ToolsetConfig{
-					Name:      "firestore-database-tools",
-					ToolNames: []string{"firestore-get-documents", "firestore-list-collections", "firestore-delete-documents", "firestore-query-collection", "firestore-get-rules", "firestore-validate-rules"},
-				},
-			},
-		},
-		{
-			name: "looker prebuilt tools",
-			in:   looker_config,
-			wantToolset: server.ToolsetConfigs{
-				"looker-tools": tools.ToolsetConfig{
-					Name:      "looker-tools",
-					ToolNames: []string{"get_models", "get_explores", "get_dimensions", "get_measures", "get_filters", "get_parameters", "query", "query_sql", "get_looks", "run_look"},
-				},
-			},
-		},
 		{
 			name: "postgres prebuilt tools",
 			in:   postgresconfig,
--- a/cmd/version.txt
+++ b/cmd/version.txt
@@ -1 +1 @@
-0.9.0
+0.7.0
--- a/docs/en/getting-started/colab_quickstart.ipynb
+++ b/docs/en/getting-started/colab_quickstart.ipynb
@@ -190,18 +190,6 @@
        "!sudo lsof -i :5432"
      ]
    },
-    {
-      "cell_type": "markdown",
-      "metadata": {},
-      "source": [
-        "## Optional: Enable Vertex AI API for Google Cloud\n",
-        "\n",
-        "If you're using a model hosted on **Vertex AI**, run the following command to enable the API:\n",
-        "\n",
-        "```bash\n",
-        "!gcloud services enable aiplatform.googleapis.com\n"
-      ]
-    },
    {
      "cell_type": "markdown",
      "metadata": {
@@ -234,7 +222,7 @@
      },
      "outputs": [],
      "source": [
-        "version = \"0.9.0\" # x-release-please-version\n",
+        "version = \"0.7.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
@@ -1,7 +1,7 @@
 ---
 title: "Configuration"
 type: docs
-weight: 6
+weight: 4
 description: >
  How to configure Toolbox's tools.yaml file.
 ---
--- 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.9.0
+export VERSION=0.7.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.9.0
+export VERSION=0.7.0
 docker pull us-central1-docker.pkg.dev/database-toolbox/toolbox/toolbox:$VERSION
 ```

@@ -108,7 +108,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.9.0
+go install github.com/googleapis/genai-toolbox@v0.7.0
 ```

 {{% /tab %}}
@@ -123,9 +123,6 @@ execute `toolbox` to start the server:
 ```sh
 ./toolbox --tools-file "tools.yaml"
 ```
-{{< notice note >}}
-Toolbox enables dynamic reloading by default. To disable, use the `--disable-reload` flag.
-{{< /notice >}}

 You can use `toolbox help` for a full list of flags! To stop the server, send a
 terminate signal (`ctrl+c` on most platforms).
@@ -138,7 +135,6 @@ out the resources in the [How-to section](../../how-to/_index.md)
 Once your server is up and running, you can load the tools into your
 application. See below the list of Client SDKs for using various frameworks:

-#### Python
 {{< tabpane text=true persist=header >}}
 {{% tab header="Core" lang="en" %}}

@@ -205,364 +201,3 @@ For more detailed instructions on using the Toolbox Llamaindex SDK, see the

 {{% /tab %}}
 {{< /tabpane >}}
-
-#### Javascript/Typescript
-
-Once you've installed the [Toolbox Core
-SDK](https://www.npmjs.com/package/@toolbox-sdk/core), you can load
-tools:
-
-{{< tabpane text=true persist=header >}}
-{{% tab header="Core" lang="en" %}}
-
-{{< highlight javascript >}}
-import { ToolboxClient } from '@toolbox-sdk/core';
-
-// update the url to point to your server
-const URL = 'http://127.0.0.1:5000';
-let client = new ToolboxClient(URL);
-
-// these tools can be passed to your application!
-const toolboxTools = await client.loadToolset('toolsetName');
-{{< /highlight >}}
-
-{{% /tab %}}
-{{% tab header="LangChain/Langraph" lang="en" %}}
-
-{{< highlight javascript >}}
-import { ToolboxClient } from '@toolbox-sdk/core';
-
-// update the url to point to your server
-const URL = 'http://127.0.0.1:5000';
-let client = new ToolboxClient(URL);
-
-// these tools can be passed to your application!
-const toolboxTools = await client.loadToolset('toolsetName');
-
-// Define the basics of the tool: name, description, schema and core logic
-const getTool = (toolboxTool) => tool(currTool, {
-    name: toolboxTool.getName(),
-    description: toolboxTool.getDescription(),
-    schema: toolboxTool.getParamSchema()
-});
-
-// Use these tools in your Langchain/Langraph applications
-const tools = toolboxTools.map(getTool);
-{{< /highlight >}}
-
-{{% /tab %}}
-{{% tab header="Genkit" lang="en" %}}
-
-{{< highlight javascript >}}
-import { ToolboxClient } from '@toolbox-sdk/core';
-import { genkit } from 'genkit';
-
-// Initialise genkit
-const ai = genkit({
-    plugins: [
-        googleAI({
-            apiKey: process.env.GEMINI_API_KEY || process.env.GOOGLE_API_KEY
-        })
-    ],
-    model: googleAI.model('gemini-2.0-flash'),
-});
-
-// update the url to point to your server
-const URL = 'http://127.0.0.1:5000';
-let client = new ToolboxClient(URL);
-
-// these tools can be passed to your application!
-const toolboxTools = await client.loadToolset('toolsetName');
-
-// Define the basics of the tool: name, description, schema and core logic
-const getTool = (toolboxTool) => ai.defineTool({
-    name: toolboxTool.getName(),
-    description: toolboxTool.getDescription(),
-    schema: toolboxTool.getParamSchema()
-}, toolboxTool)
-
-// Use these tools in your Genkit applications
-const tools = toolboxTools.map(getTool);
-{{< /highlight >}}
-
-{{% /tab %}}
-{{% tab header="LlamaIndex" lang="en" %}}
-
-{{< highlight javascript >}}
-import { ToolboxClient } from '@toolbox-sdk/core';
-import { tool } from "llamaindex";
-
-// update the url to point to your server
-const URL = 'http://127.0.0.1:5000';
-let client = new ToolboxClient(URL);
-
-// these tools can be passed to your application!
-const toolboxTools = await client.loadToolset('toolsetName');
-
-// Define the basics of the tool: name, description, schema and core logic
-const getTool = (toolboxTool) => tool({
-    name: toolboxTool.getName(),
-    description: toolboxTool.getDescription(),
-    parameters: toolboxTool.getParams(),
-    execute: toolboxTool
-});;
-
-// Use these tools in your LlamaIndex applications
-const tools = toolboxTools.map(getTool);
-
-{{< /highlight >}}
-
-{{% /tab %}}
-{{< /tabpane >}}
-
-For more detailed instructions on using the Toolbox Core SDK, see the
-[project's README](https://github.com/googleapis/mcp-toolbox-sdk-js/blob/main/packages/toolbox-core/README.md).
-
-#### Go
-
-Once you've installed the [Toolbox Go
-SDK](https://pkg.go.dev/github.com/googleapis/mcp-toolbox-sdk-go/core), you can load
-tools:
-
-{{< tabpane text=true persist=header >}}
-{{% tab header="Core" lang="en" %}}
-
-{{< highlight go >}}
-package main
-
-import (
-	"context"
-	"log"
-
-	"github.com/googleapis/mcp-toolbox-sdk-go/core"
-)
-
-func main() {
-	// update the url to point to your server
-	URL := "http://127.0.0.1:5000"
-	ctx := context.Background()
-
-	client, err := core.NewToolboxClient(URL)
-	if err != nil {
-		log.Fatalf("Failed to create Toolbox client: %v", err)
-	}
-
-	// Framework agnostic tools
-	tools, err := client.LoadToolset("toolsetName", ctx)
-	if err != nil {
-		log.Fatalf("Failed to load tools: %v", err)
-	}
-}
-{{< /highlight >}}
-
-{{% /tab %}}
-{{% tab header="LangChain Go" lang="en" %}}
-
-{{< highlight go >}}
-package main
-
-import (
-	"context"
-	"encoding/json"
-	"log"
-
-	"github.com/googleapis/mcp-toolbox-sdk-go/core"
-	"github.com/tmc/langchaingo/llms"
-)
-
-func main() {
-	// Make sure to add the error checks
-	// update the url to point to your server
-	URL := "http://127.0.0.1:5000"
-	ctx := context.Background()
-
-	client, err := core.NewToolboxClient(URL)
-	if err != nil {
-		log.Fatalf("Failed to create Toolbox client: %v", err)
-	}
-
-	// Framework agnostic tool
-	tool, err := client.LoadTool("toolName", ctx)
-	if err != nil {
-		log.Fatalf("Failed to load tools: %v", err)
-	}
-
-	// Fetch the tool's input schema
-	inputschema, err := tool.InputSchema()
-	if err != nil {
-		log.Fatalf("Failed to fetch inputSchema: %v", err)
-	}
-
-	var paramsSchema map[string]any
-	_ = json.Unmarshal(inputschema, &paramsSchema)
-
-	// Use this tool with LangChainGo
-	langChainTool := llms.Tool{
-		Type: "function",
-		Function: &llms.FunctionDefinition{
-			Name:        tool.Name(),
-			Description: tool.Description(),
-			Parameters:  paramsSchema,
-		},
-	}
-}
-{{< /highlight >}}
-
-{{% /tab %}}
-{{% tab header="Genkit Go" lang="en" %}}
-
-{{< highlight go >}}
-package main
-import (
-	"context"
-	"encoding/json"
-	"log"
-
-	"github.com/firebase/genkit/go/ai"
-	"github.com/firebase/genkit/go/genkit"
-	"github.com/googleapis/mcp-toolbox-sdk-go/core"
-	"github.com/googleapis/mcp-toolbox-sdk-go/tbgenkit"
-	"github.com/invopop/jsonschema"
-)
-
-func main() {
-	// Make sure to add the error checks
-	// Update the url to point to your server
-	URL := "http://127.0.0.1:5000"
-	ctx := context.Background()
-	g, err := genkit.Init(ctx)
-
-	client, err := core.NewToolboxClient(URL)
-	if err != nil {
-		log.Fatalf("Failed to create Toolbox client: %v", err)
-	}
-
-	// Framework agnostic tool
-	tool, err := client.LoadTool("toolName", ctx)
-	if err != nil {
-		log.Fatalf("Failed to load tools: %v", err)
-	}
-
-	// Convert the tool using the tbgenkit package
- 	// Use this tool with Genkit Go
-	genkitTool, err := tbgenkit.ToGenkitTool(tool, g)
-	if err != nil {
-		log.Fatalf("Failed to convert tool: %v\n", err)
-	}
-}
-{{< /highlight >}}
-
-{{% /tab %}}
-{{% tab header="Go GenAI" lang="en" %}}
-
-{{< highlight go >}}
-package main
-
-import (
-	"context"
-	"encoding/json"
-	"log"
-
-	"github.com/googleapis/mcp-toolbox-sdk-go/core"
-	"google.golang.org/genai"
-)
-
-func main() {
-	// Make sure to add the error checks
-	// Update the url to point to your server
-	URL := "http://127.0.0.1:5000"
-	ctx := context.Background()
-
-	client, err := core.NewToolboxClient(URL)
-	if err != nil {
-		log.Fatalf("Failed to create Toolbox client: %v", err)
-	}
-
-	// Framework agnostic tool
-	tool, err := client.LoadTool("toolName", ctx)
-	if err != nil {
-		log.Fatalf("Failed to load tools: %v", err)
-	}
-
-	// Fetch the tool's input schema
-	inputschema, err := tool.InputSchema()
-	if err != nil {
-		log.Fatalf("Failed to fetch inputSchema: %v", err)
-	}
-
-	var schema *genai.Schema
-	_ = json.Unmarshal(inputschema, &schema)
-
-	funcDeclaration := &genai.FunctionDeclaration{
-		Name:        tool.Name(),
-		Description: tool.Description(),
-		Parameters:  schema,
-	}
-
-	// Use this tool with Go GenAI
-	genAITool := &genai.Tool{
-		FunctionDeclarations: []*genai.FunctionDeclaration{funcDeclaration},
-	}
-}
-{{< /highlight >}}
-
-{{% /tab %}}
-
-{{% tab header="OpenAI Go" lang="en" %}}
-
-{{< highlight go >}}
-package main
-
-import (
-	"context"
-	"encoding/json"
-	"log"
-
-	"github.com/googleapis/mcp-toolbox-sdk-go/core"
-	openai "github.com/openai/openai-go"
-)
-
-func main() {
-	// Make sure to add the error checks
-	// Update the url to point to your server
-	URL := "http://127.0.0.1:5000"
-	ctx := context.Background()
-
-	client, err := core.NewToolboxClient(URL)
-	if err != nil {
-		log.Fatalf("Failed to create Toolbox client: %v", err)
-	}
-
-	// Framework agnostic tool
-	tool, err := client.LoadTool("toolName", ctx)
-	if err != nil {
-		log.Fatalf("Failed to load tools: %v", err)
-	}
-
-	// Fetch the tool's input schema
-	inputschema, err := tool.InputSchema()
-	if err != nil {
-		log.Fatalf("Failed to fetch inputSchema: %v", err)
-	}
-
-	var paramsSchema openai.FunctionParameters
-	_ = json.Unmarshal(inputschema, &paramsSchema)
-
-	// Use this tool with OpenAI Go
-	openAITool := openai.ChatCompletionToolParam{
-		Function: openai.FunctionDefinitionParam{
-			Name:        tool.Name(),
-			Description: openai.String(tool.Description()),
-			Parameters:  paramsSchema,
-		},
-	}
-}
-{{< /highlight >}}
-
-{{% /tab %}}
-{{< /tabpane >}}
-
-For more detailed instructions on using the Toolbox Go SDK, see the
-[project's README](https://github.com/googleapis/mcp-toolbox-sdk-go/blob/main/core/README.md).
-
-For end-to-end samples on using the Toolbox Go SDK with orchestration frameworks, see the [project's samples](https://github.com/googleapis/mcp-toolbox-sdk-go/tree/main/core/samples)
--- a/docs/en/getting-started/local_quickstart.md
+++ b/docs/en/getting-started/local_quickstart.md
@@ -1,9 +1,9 @@
 ---
-title: "Python Quickstart (Local)"
+title: "Quickstart (Local)"
 type: docs
 weight: 2
 description: >
-  How to get started running Toolbox locally with [Python](https://github.com/googleapis/mcp-toolbox-sdk-python), PostgreSQL, and  [Agent Development Kit](https://google.github.io/adk-docs/),
+  How to get started running Toolbox locally with Python, PostgreSQL, and  [Agent Development Kit](https://google.github.io/adk-docs/),
  [LangGraph](https://www.langchain.com/langgraph), [LlamaIndex](https://www.llamaindex.ai/) or [GoogleGenAI](https://pypi.org/project/google-genai/).
 ---

@@ -14,21 +14,8 @@ description: >
 This guide assumes you have already done the following:

 1. Installed [Python 3.9+][install-python] (including [pip][install-pip] and
-   your preferred virtual environment tool for managing dependencies e.g. [venv][install-venv]).
-1. Installed [PostgreSQL 16+ and the `psql` client][install-postgres].
-
-### Cloud Setup (Optional)
-
-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
-    ```
+   your preferred virtual environment tool for managing dependencies e.g. [venv][install-venv])
+1. Installed [PostgreSQL 16+ and the `psql` client][install-postgres]

 [install-python]: https://wiki.python.org/moin/BeginnersGuide/Download
 [install-pip]: https://pip.pypa.io/en/stable/installation/
@@ -154,7 +141,6 @@ postgres` and a password next time.
    \q
    ```

-
 ## Step 2: Install and configure Toolbox

 In this section, we will download Toolbox, configure our tools in a
@@ -170,7 +156,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.9.0/$OS/toolbox
+    curl -O https://storage.googleapis.com/genai-toolbox/v0.7.0/$OS/toolbox
    ```
    <!-- {x-release-please-end} -->

@@ -271,9 +257,6 @@ In this section, we will download Toolbox, configure our tools in a
    ```bash
    ./toolbox --tools-file "tools.yaml"
    ```
-    {{< notice note >}}
-    Toolbox enables dynamic reloading by default. To disable, use the `--disable-reload` flag.
-    {{< /notice >}}

 ## Step 3: Connect your agent to Toolbox

@@ -646,7 +629,7 @@ asyncio.run(run_application())
 {{< /tab >}}
 {{< /tabpane >}}

-    {{< tabpane text=true persist=header >}}
+  {{< tabpane text=true persist=header >}}
 {{% tab header="ADK" lang="en" %}}
 To learn more about Agent Development Kit, check out the [ADK
 documentation.](https://google.github.io/adk-docs/)
@@ -672,7 +655,3 @@ Documentation](https://github.com/googleapis/python-genai?tab=readme-ov-file#man
    ```sh
    python hotel_agent.py
    ```
-
-{{< notice info >}}
-For more information, visit the [Python SDK repo](https://github.com/googleapis/mcp-toolbox-sdk-python).
-{{</ notice >}}
--- a/docs/en/getting-started/local_quickstart_go.md
+++ b/docs/en/getting-started/local_quickstart_go.md
@@ -1,921 +0,0 @@
---
-title: "Go Quickstart (Local)"
-type: docs
-weight: 4
-description: >
-  How to get started running Toolbox locally with [Go](https://github.com/googleapis/mcp-toolbox-sdk-go), PostgreSQL, and orchestration frameworks such as [LangChain Go](https://tmc.github.io/langchaingo/docs/), [GenkitGo](https://genkit.dev/go/docs/get-started-go/), [Go GenAI](https://github.com/googleapis/go-genai) and [OpenAI Go](https://github.com/openai/openai-go).
---
-
-## Before you begin
-
-This guide assumes you have already done the following:
-
-1. Installed [Go (v1.24.2 or higher)].
-1. Installed [PostgreSQL 16+ and the `psql` client][install-postgres].
-
-### Cloud Setup (Optional)
-
-If you plan to use **Google Cloud’s Vertex AI** with your agent (e.g., using Gemini or PaLM models), follow these one-time setup steps:
-
-1. [Install the Google Cloud CLI]
-1. [Set up Application Default Credentials (ADC)]
-1. Set your project and enable Vertex AI
-
-    ```bash
-    gcloud config set project YOUR_PROJECT_ID
-    gcloud services enable aiplatform.googleapis.com
-    ```
-
-[Go (v1.24.2 or higher)]: https://go.dev/doc/install
-[install-postgres]: https://www.postgresql.org/download/
-[Install the Google Cloud CLI]: https://cloud.google.com/sdk/docs/install
-[Set up Application Default Credentials (ADC)]: https://cloud.google.com/docs/authentication/set-up-adc-local-dev-environment
-
-
-## Step 1: Set up your database
-
-In this section, we will create a database, insert some data that needs to be
-accessed by our agent, and create a database user for Toolbox to connect with.
-
-1. Connect to postgres using the `psql` command:
-
-    ```bash
-    psql -h 127.0.0.1 -U postgres
-    ```
-
-    Here, `postgres` denotes the default postgres superuser.
-
-    {{< notice info >}}
-
-#### **Having trouble connecting?**
-
-* **Password Prompt:** If you are prompted for a password for the `postgres`
-  user and do not know it (or a blank password doesn't work), your PostgreSQL
-  installation might require a password or a different authentication method.
-* **`FATAL: role "postgres" does not exist`:** This error means the default
-  `postgres` superuser role isn't available under that name on your system.
-* **`Connection refused`:** Ensure your PostgreSQL server is actually running.
-  You can typically check with `sudo systemctl status postgresql` and start it
-  with `sudo systemctl start postgresql` on Linux systems.
-
-<br/>
-
-#### **Common Solution**
-
-For password issues or if the `postgres` role seems inaccessible directly, try
-switching to the `postgres` operating system user first. This user often has
-permission to connect without a password for local connections (this is called
-peer authentication).
-
-```bash
-sudo -i -u postgres
-psql -h 127.0.0.1
-```
-
-Once you are in the `psql` shell using this method, you can proceed with the
-database creation steps below. Afterwards, type `\q` to exit `psql`, and then
-`exit` to return to your normal user shell.
-
-If desired, once connected to `psql` as the `postgres` OS user, you can set a
-password for the `postgres` *database* user using: `ALTER USER postgres WITH
-PASSWORD 'your_chosen_password';`. This would allow direct connection with `-U
-postgres` and a password next time.
-    {{< /notice >}}
-
-1. Create a new database and a new user:
-
-    {{< notice tip >}}
-  For a real application, it's best to follow the principle of least permission
-  and only grant the privileges your application needs.
-    {{< /notice >}}
-
-    ```sql
-      CREATE USER toolbox_user WITH PASSWORD 'my-password';
-
-      CREATE DATABASE toolbox_db;
-      GRANT ALL PRIVILEGES ON DATABASE toolbox_db TO toolbox_user;
-
-      ALTER DATABASE toolbox_db OWNER TO toolbox_user;
-    ```
-
-1. End the database session:
-
-    ```bash
-    \q
-    ```
-
-    (If you used `sudo -i -u postgres` and then `psql`, remember you might also
-    need to type `exit` after `\q` to leave the `postgres` user's shell
-    session.)
-
-1. Connect to your database with your new user:
-
-    ```bash
-    psql -h 127.0.0.1 -U toolbox_user -d toolbox_db
-    ```
-
-1. Create 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
-    ```
-
-## Step 2: Install and 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.9.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 >}}
-
-## Step 3: Connect your agent to Toolbox
-
-In this section, we will write and run an agent that will load the Tools
-from Toolbox.
-
-1. Initialize a go module:
-
-    ```bash
-    go mod init main
-    ```
-
-1. In a new terminal, install the [SDK](https://pkg.go.dev/github.com/googleapis/mcp-toolbox-sdk-go).
-
-    ```bash
-    go get github.com/googleapis/mcp-toolbox-sdk-go
-    ```
-
-1. Create a new file named `hotelagent.go` and copy the following code to create an agent:
-
-    {{< tabpane persist=header >}}
-{{< tab header="LangChain Go" lang="go" >}}
-
-package main
-
-import (
-	"context"
-	"encoding/json"
-	"fmt"
-	"log"
-	"os"
-
-	"github.com/googleapis/mcp-toolbox-sdk-go/core"
-	"github.com/tmc/langchaingo/llms"
-	"github.com/tmc/langchaingo/llms/googleai"
-)
-
-// ConvertToLangchainTool converts a generic core.ToolboxTool into a LangChainGo llms.Tool.
-func ConvertToLangchainTool(toolboxTool *core.ToolboxTool) llms.Tool {
-
-	// Fetch the tool's input schema
-	inputschema, err := toolboxTool.InputSchema()
-	if err != nil {
-		return llms.Tool{}
-	}
-
-	var paramsSchema map[string]any
-	_ = json.Unmarshal(inputschema, &paramsSchema)
-
-	// Convert into LangChain's llms.Tool
-	return llms.Tool{
-		Type: "function",
-		Function: &llms.FunctionDefinition{
-			Name:        toolboxTool.Name(),
-			Description: toolboxTool.Description(),
-			Parameters:  paramsSchema,
-		},
-	}
-}
-
-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.
-`
-
-var queries = []string{
-	"Find hotels in Basel with Basel in its name.",
-	"Can you book the hotel Hilton Basel for me?",
-	"Oh wait, this is too expensive. Please cancel it.",
-	"Please book the Hyatt Regency instead.",
-	"My check in dates would be from April 10, 2024 to April 19, 2024.",
-}
-
-func main() {
-	genaiKey := os.Getenv("GOOGLE_API_KEY")
-	toolboxURL := "http://localhost:5000"
-	ctx := context.Background()
-
-	// Initialize the Google AI client (LLM).
-	llm, err := googleai.New(ctx, googleai.WithAPIKey(genaiKey), googleai.WithDefaultModel("gemini-1.5-flash"))
-	if err != nil {
-		log.Fatalf("Failed to create Google AI client: %v", err)
-	}
-
-	// Initialize the MCP Toolbox client.
-	toolboxClient, err := core.NewToolboxClient(toolboxURL)
-	if err != nil {
-		log.Fatalf("Failed to create Toolbox client: %v", err)
-	}
-
-	// Load the tool using the MCP Toolbox SDK.
-	tools, err := toolboxClient.LoadToolset("my-toolset", ctx)
-	if err != nil {
-		log.Fatalf("Failed to load tools: %v\nMake sure your Toolbox server is running and the tool is configured.", err)
-	}
-
-	toolsMap := make(map[string]*core.ToolboxTool, len(tools))
-
-	langchainTools := make([]llms.Tool, len(tools))
-	// Convert the loaded ToolboxTools into the format LangChainGo requires.
-	for i, tool := range tools {
-		langchainTools[i] = ConvertToLangchainTool(tool)
-		toolsMap[tool.Name()] = tool
-	}
-
-	// Start the conversation history.
-	messageHistory := []llms.MessageContent{
-		llms.TextParts(llms.ChatMessageTypeSystem, systemPrompt),
-	}
-
-	for _, query := range queries {
-		messageHistory = append(messageHistory, llms.TextParts(llms.ChatMessageTypeHuman, query))
-
-		// Make the first call to the LLM, making it aware of the tool.
-		resp, err := llm.GenerateContent(ctx, messageHistory, llms.WithTools(langchainTools))
-		if err != nil {
-			log.Fatalf("LLM call failed: %v", err)
-		}
-		respChoice := resp.Choices[0]
-
-		assistantResponse := llms.TextParts(llms.ChatMessageTypeAI, respChoice.Content)
-		for _, tc := range respChoice.ToolCalls {
-			assistantResponse.Parts = append(assistantResponse.Parts, tc)
-		}
-		messageHistory = append(messageHistory, assistantResponse)
-
-		// Process each tool call requested by the model.
-		for _, tc := range respChoice.ToolCalls {
-			toolName := tc.FunctionCall.Name
-			tool := toolsMap[toolName]
-			var args map[string]any
-			if err := json.Unmarshal([]byte(tc.FunctionCall.Arguments), &args); err != nil {
-				log.Fatalf("Failed to unmarshal arguments for tool '%s': %v", toolName, err)
-			}
-			toolResult, err := tool.Invoke(ctx, args)
-			if err != nil {
-				log.Fatalf("Failed to execute tool '%s': %v", toolName, err)
-			}
-			if toolResult == "" || toolResult == nil {
-				toolResult = "Operation completed successfully with no specific return value."
-			}
-
-			// Create the tool call response message and add it to the history.
-			toolResponse := llms.MessageContent{
-				Role: llms.ChatMessageTypeTool,
-				Parts: []llms.ContentPart{
-					llms.ToolCallResponse{
-						Name:    toolName,
-						Content: fmt.Sprintf("%v", toolResult),
-					},
-				},
-			}
-			messageHistory = append(messageHistory, toolResponse)
-		}
-		finalResp, err := llm.GenerateContent(ctx, messageHistory)
-		if err != nil {
-			log.Fatalf("Final LLM call failed after tool execution: %v", err)
-		}
-
-		// Add the final textual response from the LLM to the history
-		messageHistory = append(messageHistory, llms.TextParts(llms.ChatMessageTypeAI, finalResp.Choices[0].Content))
-
-		fmt.Println(finalResp.Choices[0].Content)
-
-	}
-
-}
-
-{{< /tab >}}
-
-{{< tab header="Genkit Go" lang="go" >}}
-
-package main
-
-import (
-	"context"
-	"fmt"
-	"log"
-
-	"github.com/googleapis/mcp-toolbox-sdk-go/core"
-	"github.com/googleapis/mcp-toolbox-sdk-go/tbgenkit"
-
-	"github.com/firebase/genkit/go/ai"
-	"github.com/firebase/genkit/go/genkit"
-	"github.com/firebase/genkit/go/plugins/googlegenai"
-)
-
-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.
-`
-
-var queries = []string{
-	"Find hotels in Basel with Basel in its name.",
-	"Can you book the hotel 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.",
-}
-
-func main() {
-	ctx := context.Background()
-
-	// Create Toolbox Client
-	toolboxClient, err := core.NewToolboxClient("http://127.0.0.1:5000")
-	if err != nil {
-		log.Fatalf("Failed to create Toolbox client: %v", err)
-	}
-
-	// Load the tools using the MCP Toolbox SDK.
-	tools, err := toolboxClient.LoadToolset("my-toolset", ctx)
-	if err != nil {
-		log.Fatalf("Failed to load tools: %v\nMake sure your Toolbox server is running and the tool is configured.", err)
-	}
-
-	// Initialize Genkit
-	g, err := genkit.Init(ctx,
-		genkit.WithPlugins(&googlegenai.GoogleAI{}),
-		genkit.WithDefaultModel("googleai/gemini-1.5-flash"),
-	)
-	if err != nil {
-		log.Fatalf("Failed to init genkit: %v\n", err)
-	}
-
-	// Create a conversation history
-	conversationHistory := []*ai.Message{
-		ai.NewSystemTextMessage(systemPrompt),
-	}
-
-	// Convert your tool to a Genkit tool.
-	genkitTools := make([]ai.Tool, len(tools))
-	for i, tool := range tools {
-		newTool, err := tbgenkit.ToGenkitTool(tool, g)
-		if err != nil {
-			log.Fatalf("Failed to convert tool: %v\n", err)
-		}
-		genkitTools[i] = newTool
-	}
-
-	toolRefs := make([]ai.ToolRef, len(genkitTools))
-
-	for i, tool := range genkitTools {
-		toolRefs[i] = tool
-	}
-
-	for _, query := range queries {
-		conversationHistory = append(conversationHistory, ai.NewUserTextMessage(query))
-		response, err := genkit.Generate(ctx, g,
-			ai.WithMessages(conversationHistory...),
-			ai.WithTools(toolRefs...),
-			ai.WithReturnToolRequests(true),
-		)
-
-		if err != nil {
-			log.Fatalf("%v\n", err)
-		}
-		conversationHistory = append(conversationHistory, response.Message)
-
-		parts := []*ai.Part{}
-
-		for _, req := range response.ToolRequests() {
-			tool := genkit.LookupTool(g, req.Name)
-			if tool == nil {
-				log.Fatalf("tool %q not found", req.Name)
-			}
-
-			output, err := tool.RunRaw(ctx, req.Input)
-			if err != nil {
-				log.Fatalf("tool %q execution failed: %v", tool.Name(), err)
-			}
-
-			parts = append(parts,
-				ai.NewToolResponsePart(&ai.ToolResponse{
-					Name:   req.Name,
-					Ref:    req.Ref,
-					Output: output,
-				}))
-
-		}
-
-		if len(parts) > 0 {
-			resp, err := genkit.Generate(ctx, g,
-				ai.WithMessages(append(response.History(), ai.NewMessage(ai.RoleTool, nil, parts...))...),
-				ai.WithTools(toolRefs...),
-			)
-			if err != nil {
-				log.Fatal(err)
-			}
-			fmt.Println("\n", resp.Text())
-			conversationHistory = append(conversationHistory, resp.Message)
-		} else {
-			fmt.Println("\n", response.Text())
-		}
-
-	}
-
-}
-
-{{< /tab >}}
-
-{{< tab header="Go GenAI" lang="go" >}}
-
-package main
-
-import (
-	"context"
-	"encoding/json"
-	"fmt"
-	"log"
-	"os"
-
-	"github.com/googleapis/mcp-toolbox-sdk-go/core"
-	"google.golang.org/genai"
-)
-
-// ConvertToGenaiTool translates a ToolboxTool into the genai.FunctionDeclaration format.
-func ConvertToGenaiTool(toolboxTool *core.ToolboxTool) *genai.Tool {
-
-	inputschema, err := toolboxTool.InputSchema()
-	if err != nil {
-		return &genai.Tool{}
-	}
-
-	var paramsSchema *genai.Schema
-	_ = json.Unmarshal(inputschema, &paramsSchema)
-	// First, create the function declaration.
-	funcDeclaration := &genai.FunctionDeclaration{
-		Name:        toolboxTool.Name(),
-		Description: toolboxTool.Description(),
-		Parameters:  paramsSchema,
-	}
-
-	// Then, wrap the function declaration in a genai.Tool struct.
-	return &genai.Tool{
-		FunctionDeclarations: []*genai.FunctionDeclaration{funcDeclaration},
-	}
-}
-
-func printResponse(resp *genai.GenerateContentResponse) {
-	for _, cand := range resp.Candidates {
-		if cand.Content != nil {
-			for _, part := range cand.Content.Parts {
-				fmt.Println(part.Text)
-			}
-		}
-	}
-}
-
-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.
-`
-
-var queries = []string{
-	"Find hotels in Basel with Basel in its name.",
-	"Can you book the hotel Hilton Basel for me?",
-	"Oh wait, this is too expensive. Please cancel it.",
-	"Please book the Hyatt Regency instead.",
-	"My check in dates would be from April 10, 2024 to April 19, 2024.",
-}
-
-func main() {
-	// Setup
-	ctx := context.Background()
-	apiKey := os.Getenv("GOOGLE_API_KEY")
-	toolboxURL := "http://localhost:5000"
-
-	// Initialize the Google GenAI client using the explicit ClientConfig.
-	client, err := genai.NewClient(ctx, &genai.ClientConfig{
-		APIKey: apiKey,
-	})
-	if err != nil {
-		log.Fatalf("Failed to create Google GenAI client: %v", err)
-	}
-
-	// Initialize the MCP Toolbox client.
-	toolboxClient, err := core.NewToolboxClient(toolboxURL)
-	if err != nil {
-		log.Fatalf("Failed to create Toolbox client: %v", err)
-	}
-
-	// Load the tool using the MCP Toolbox SDK.
-	tools, err := toolboxClient.LoadToolset("my-toolset", ctx)
-	if err != nil {
-		log.Fatalf("Failed to load tools: %v\nMake sure your Toolbox server is running and the tool is configured.", err)
-	}
-
-	genAITools := make([]*genai.Tool, len(tools))
-	toolsMap := make(map[string]*core.ToolboxTool, len(tools))
-
-	for i, tool := range tools {
-		genAITools[i] = ConvertToGenaiTool(tool)
-		toolsMap[tool.Name()] = tool
-	}
-
-	// Set up the generative model with the available tool.
-	modelName := "gemini-2.0-flash"
-
-	// Create the initial content prompt for the model.
-	messageHistory := []*genai.Content{
-		genai.NewContentFromText(systemPrompt, genai.RoleUser),
-	}
-	config := &genai.GenerateContentConfig{
-		Tools: genAITools,
-		ToolConfig: &genai.ToolConfig{
-			FunctionCallingConfig: &genai.FunctionCallingConfig{
-				Mode: genai.FunctionCallingConfigModeAny,
-			},
-		},
-	}
-
-	for _, query := range queries {
-
-		messageHistory = append(messageHistory, genai.NewContentFromText(query, genai.RoleUser))
-
-		genContentResp, err := client.Models.GenerateContent(ctx, modelName, messageHistory, config)
-		if err != nil {
-			log.Fatalf("LLM call failed for query '%s': %v", query, err)
-		}
-
-		if len(genContentResp.Candidates) > 0 && genContentResp.Candidates[0].Content != nil {
-			messageHistory = append(messageHistory, genContentResp.Candidates[0].Content)
-		}
-
-		functionCalls := genContentResp.FunctionCalls()
-
-		toolResponseParts := []*genai.Part{}
-
-		for _, fc := range functionCalls {
-
-			toolToInvoke, found := toolsMap[fc.Name]
-			if !found {
-				log.Fatalf("Tool '%s' not found in loaded tools map. Check toolset configuration.", fc.Name)
-			}
-
-			toolResult, invokeErr := toolToInvoke.Invoke(ctx, fc.Args)
-			if invokeErr != nil {
-				log.Fatalf("Failed to execute tool '%s': %v", fc.Name, invokeErr)
-			}
-
-			// Enhanced Tool Result Handling (retained to prevent nil issues)
-			toolResultString := ""
-			if toolResult != nil {
-				jsonBytes, marshalErr := json.Marshal(toolResult)
-				if marshalErr == nil {
-					toolResultString = string(jsonBytes)
-				} else {
-					toolResultString = fmt.Sprintf("%v", toolResult)
-				}
-			}
-
-			responseMap := map[string]any{"result": toolResultString}
-
-			toolResponseParts = append(toolResponseParts, genai.NewPartFromFunctionResponse(fc.Name, responseMap))
-		}
-		// Add all accumulated tool responses for this turn to the message history.
-		toolResponseContent := genai.NewContentFromParts(toolResponseParts, "function")
-		messageHistory = append(messageHistory, toolResponseContent)
-
-		finalResponse, err := client.Models.GenerateContent(ctx, modelName, messageHistory, &genai.GenerateContentConfig{})
-		if err != nil {
-			log.Fatalf("Error calling GenerateContent (with function result): %v", err)
-		}
-
-		printResponse(finalResponse)
-		// Add the final textual response from the LLM to the history
-		if len(finalResponse.Candidates) > 0 && finalResponse.Candidates[0].Content != nil {
-			messageHistory = append(messageHistory, finalResponse.Candidates[0].Content)
-		}
-	}
-}
-
-{{< /tab >}}
-
-{{< tab header="OpenAI Go" lang="go" >}}
-
-package main
-
-import (
-	"context"
-	"encoding/json"
-	"log"
-
-	"github.com/googleapis/mcp-toolbox-sdk-go/core"
-	openai "github.com/openai/openai-go"
-)
-
-// ConvertToOpenAITool converts a ToolboxTool into the go-openai library's Tool format.
-func ConvertToOpenAITool(toolboxTool *core.ToolboxTool) openai.ChatCompletionToolParam {
-	// Get the input schema
-	jsonSchemaBytes, err := toolboxTool.InputSchema()
-	if err != nil {
-		return openai.ChatCompletionToolParam{}
-	}
-
-	// Unmarshal the JSON bytes into FunctionParameters
-	var paramsSchema openai.FunctionParameters
-	if err := json.Unmarshal(jsonSchemaBytes, &paramsSchema); err != nil {
-		return openai.ChatCompletionToolParam{}
-	}
-
-	// Create and return the final tool parameter struct.
-	return openai.ChatCompletionToolParam{
-		Function: openai.FunctionDefinitionParam{
-			Name:        toolboxTool.Name(),
-			Description: openai.String(toolboxTool.Description()),
-			Parameters:  paramsSchema,
-		},
-	}
-}
-
-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.
-`
-
-var queries = []string{
-	"Find hotels in Basel with Basel in its name.",
-	"Can you book the hotel 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.",
-}
-
-func main() {
-	// Setup
-	ctx := context.Background()
-	toolboxURL := "http://localhost:5000"
-	openAIClient := openai.NewClient()
-
-	// Initialize the MCP Toolbox client.
-	toolboxClient, err := core.NewToolboxClient(toolboxURL)
-	if err != nil {
-		log.Fatalf("Failed to create Toolbox client: %v", err)
-	}
-
-	// Load the tools using the MCP Toolbox SDK.
-	tools, err := toolboxClient.LoadToolset("my-toolset", ctx)
-	if err != nil {
-		log.Fatalf("Failed to load tool : %v\nMake sure your Toolbox server is running and the tool is configured.", err)
-	}
-
-	openAITools := make([]openai.ChatCompletionToolParam, len(tools))
-	toolsMap := make(map[string]*core.ToolboxTool, len(tools))
-
-	for i, tool := range tools {
-		// Convert the Toolbox tool into the openAI FunctionDeclaration format.
-		openAITools[i] = ConvertToOpenAITool(tool)
-		// Add tool to a map for lookup later
-		toolsMap[tool.Name()] = tool
-
-	}
-
-	params := openai.ChatCompletionNewParams{
-		Messages: []openai.ChatCompletionMessageParamUnion{
-			openai.SystemMessage(systemPrompt),
-		},
-		Tools: openAITools,
-		Seed:  openai.Int(0),
-		Model: openai.ChatModelGPT4o,
-	}
-
-	for _, query := range queries {
-
-		params.Messages = append(params.Messages, openai.UserMessage(query))
-
-		// Make initial chat completion request
-		completion, err := openAIClient.Chat.Completions.New(ctx, params)
-		if err != nil {
-			panic(err)
-		}
-
-		toolCalls := completion.Choices[0].Message.ToolCalls
-
-		// Return early if there are no tool calls
-		if len(toolCalls) == 0 {
-			log.Println("No function call")
-		}
-
-		// If there is a was a function call, continue the conversation
-		params.Messages = append(params.Messages, completion.Choices[0].Message.ToParam())
-		for _, toolCall := range toolCalls {
-
-			toolName := toolCall.Function.Name
-			toolToInvoke := toolsMap[toolName]
-
-			var args map[string]any
-			err := json.Unmarshal([]byte(toolCall.Function.Arguments), &args)
-			if err != nil {
-				panic(err)
-			}
-
-			result, err := toolToInvoke.Invoke(ctx, args)
-			if err != nil {
-				log.Fatal("Could not invoke tool", err)
-			}
-
-			params.Messages = append(params.Messages, openai.ToolMessage(result.(string), toolCall.ID))
-		}
-
-		completion, err = openAIClient.Chat.Completions.New(ctx, params)
-		if err != nil {
-			panic(err)
-		}
-
-		params.Messages = append(params.Messages, openai.AssistantMessage(query))
-
-		println("\n", completion.Choices[0].Message.Content)
-
-	}
-
-}
-
-{{< /tab >}}
-{{< /tabpane >}}
-
-1. Ensure all dependencies are installed:
-
-    ```sh
-    go mod tidy
-    ```
-
-1. Run your agent, and observe the results:
-
-    ```sh
-    go run hotelagent.go
-    ```
-
-{{< notice info >}}
-For more information, visit the [Go SDK repo](https://github.com/googleapis/mcp-toolbox-sdk-go).
-{{</ notice >}}
--- a/docs/en/getting-started/local_quickstart_js.md
+++ b/docs/en/getting-started/local_quickstart_js.md
@@ -1,578 +0,0 @@
---
-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/), and [LlamaIndex](https://ts.llamaindex.ai/).
---
-
-## Before you begin
-
-This guide assumes you have already done the following:
-
-1. Installed [Node.js (v18 or higher)].
-1. Installed [PostgreSQL 16+ and the `psql` client][install-postgres].
-
-### Cloud Setup (Optional)
-
-If you plan to use **Google Cloud’s Vertex AI** with your agent (e.g., using Gemini or PaLM models), follow these one-time setup steps:
-
-1. [Install the Google Cloud CLI]
-1. [Set up Application Default Credentials (ADC)]
-1. Set your project and enable Vertex AI
-
-    ```bash
-    gcloud config set project YOUR_PROJECT_ID
-    gcloud services enable aiplatform.googleapis.com
-    ```
-
-[Node.js (v18 or higher)]: https://nodejs.org/
-[install-postgres]: https://www.postgresql.org/download/
-[Install the Google Cloud CLI]: https://cloud.google.com/sdk/docs/install
-[Set up Application Default Credentials (ADC)]: https://cloud.google.com/docs/authentication/set-up-adc-local-dev-environment
-
-
-## Step 1: Set up your database
-
-In this section, we will create a database, insert some data that needs to be
-accessed by our agent, and create a database user for Toolbox to connect with.
-
-1. Connect to postgres using the `psql` command:
-
-    ```bash
-    psql -h 127.0.0.1 -U postgres
-    ```
-
-    Here, `postgres` denotes the default postgres superuser.
-
-    {{< notice info >}}
-
-#### **Having trouble connecting?**
-
-* **Password Prompt:** If you are prompted for a password for the `postgres`
-  user and do not know it (or a blank password doesn't work), your PostgreSQL
-  installation might require a password or a different authentication method.
-* **`FATAL: role "postgres" does not exist`:** This error means the default
-  `postgres` superuser role isn't available under that name on your system.
-* **`Connection refused`:** Ensure your PostgreSQL server is actually running.
-  You can typically check with `sudo systemctl status postgresql` and start it
-  with `sudo systemctl start postgresql` on Linux systems.
-
-<br/>
-
-#### **Common Solution**
-
-For password issues or if the `postgres` role seems inaccessible directly, try
-switching to the `postgres` operating system user first. This user often has
-permission to connect without a password for local connections (this is called
-peer authentication).
-
-```bash
-sudo -i -u postgres
-psql -h 127.0.0.1
-```
-
-Once you are in the `psql` shell using this method, you can proceed with the
-database creation steps below. Afterwards, type `\q` to exit `psql`, and then
-`exit` to return to your normal user shell.
-
-If desired, once connected to `psql` as the `postgres` OS user, you can set a
-password for the `postgres` *database* user using: `ALTER USER postgres WITH
-PASSWORD 'your_chosen_password';`. This would allow direct connection with `-U
-postgres` and a password next time.
-    {{< /notice >}}
-
-1. Create a new database and a new user:
-
-    {{< notice tip >}}
-  For a real application, it's best to follow the principle of least permission
-  and only grant the privileges your application needs.
-    {{< /notice >}}
-
-    ```sql
-      CREATE USER toolbox_user WITH PASSWORD 'my-password';
-
-      CREATE DATABASE toolbox_db;
-      GRANT ALL PRIVILEGES ON DATABASE toolbox_db TO toolbox_user;
-
-      ALTER DATABASE toolbox_db OWNER TO toolbox_user;
-    ```
-
-1. End the database session:
-
-    ```bash
-    \q
-    ```
-
-    (If you used `sudo -i -u postgres` and then `psql`, remember you might also
-    need to type `exit` after `\q` to leave the `postgres` user's shell
-    session.)
-
-1. Connect to your database with your new user:
-
-    ```bash
-    psql -h 127.0.0.1 -U toolbox_user -d toolbox_db
-    ```
-
-1. Create 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
-    ```
-
-## Step 2: Install and 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.9.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 >}}
-
-## Step 3: Connect your agent to Toolbox
-
-In this section, we will write and run an agent that will load the Tools
-from Toolbox.
-
-1. (Optional) Initialize a Node.js project:
-
-    ```bash
-    npm init -y
-    ```
-
-1. In a new terminal, install the [SDK](https://www.npmjs.com/package/@toolbox-sdk/core).
-
-    ```bash
-    npm install @toolbox-sdk/core
-    ```
-
-1. Install other required dependencies
-
-   {{< tabpane persist=header >}}
-{{< tab header="LangChain" lang="bash" >}}
-npm install langchain @langchain/google-vertexai
-{{< /tab >}}
-{{< tab header="GenkitJS" lang="bash" >}}
-npm install genkit @genkit-ai/vertexai
-{{< /tab >}}
-{{< tab header="LlamaIndex" lang="bash" >}}
-npm install llamaindex @llamaindex/google @llamaindex/workflow
-{{< /tab >}}
-{{< /tabpane >}}
-
-1. Create a new file named `hotelAgent.js` and copy the following code to create an agent:
-
-    {{< tabpane persist=header >}}
-{{< tab header="LangChain" lang="js" >}}
-
-import { ChatVertexAI } from "@langchain/google-vertexai";
-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 ChatVertexAI({
-    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" >}}
-
-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" >}}
-
-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();
-
-{{< /tab >}}
-
-{{< /tabpane >}}
-
-1. Run your agent, and observe the results:
-
-    ```sh
-    node hotelAgent.js
-    ```
-
-{{< notice info >}}
-For more information, visit the [JS SDK repo](https://github.com/googleapis/mcp-toolbox-sdk-js).
-{{</ notice >}}
--- a/docs/en/getting-started/mcp_quickstart/_index.md
+++ b/docs/en/getting-started/mcp_quickstart/_index.md
@@ -1,9 +1,9 @@
 ---
 title: "Quickstart (MCP)"
 type: docs
-weight: 5
+weight: 3
 description: >
-  How to get started running Toolbox locally with MCP Inspector.
+  How to get started running Toolbox locally with MCP Inspector. 
 ---

 ## Overview
@@ -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.9.0/$OS/toolbox
+    curl -O https://storage.googleapis.com/genai-toolbox/v0.7.0/$OS/toolbox
    ```
    <!-- {x-release-please-end} -->

@@ -218,25 +218,17 @@ In this section, we will download Toolbox, configure our tools in a

 1. Type `y` when it asks to install the inspector package.

-1. It should show the following when the MCP Inspector is up and running (please take note of `<YOUR_SESSION_TOKEN>`):
+1. It should show the following when the MCP Inspector is up and running:

    ```bash
-    Starting MCP inspector...
-    ⚙️ Proxy server listening on localhost:6277
-    🔑 Session token: <YOUR_SESSION_TOKEN>
-       Use this token to authenticate requests or set DANGEROUSLY_OMIT_AUTH=true to disable auth
-
-    🚀 MCP Inspector is up and running at:
-       http://localhost:6274/?MCP_PROXY_AUTH_TOKEN=<YOUR_SESSION_TOKEN>
+    🔍 MCP Inspector is up and running at http://127.0.0.1:5173 🚀
    ```

 1. Open the above link in your browser.

-1. For `Transport Type`, select `Streamable HTTP`.
+1. For `Transport Type`, select `SSE`.

-1. For `URL`, type in `http://127.0.0.1:5000/mcp`.
-
-1. For `Configuration` -> `Proxy Session Token`, make sure `<YOUR_SESSION_TOKEN>` is present.
+1. For `URL`, type in `http://127.0.0.1:5000/mcp/sse`.

 1. Click Connect.

@@ -246,4 +238,4 @@ In this section, we will download Toolbox, configure our tools in a

    ![inspector_tools](./inspector_tools.png)

-1. Test out your tools here!
+1. Test out your tools here!
--- a/docs/en/getting-started/mcp_quickstart/inspector.png
+++ b/docs/en/getting-started/mcp_quickstart/inspector.png
--- a/docs/en/how-to/connect-ide/looker_mcp.md
+++ b/docs/en/how-to/connect-ide/looker_mcp.md
@@ -1,298 +0,0 @@
---
-title: "Looker using MCP"
-type: docs
-weight: 2
-description: >
-  Connect your IDE to Looker using Toolbox.
---
-
-[Model Context Protocol (MCP)](https://modelcontextprotocol.io/introduction) is
-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:
-
-* [Cursor][cursor]
-* [Windsurf][windsurf] (Codium)
-* [Visual Studio Code][vscode] (Copilot)
-* [Cline][cline] (VS Code extension)
-* [Claude desktop][claudedesktop]
-* [Claude code][claudecode]
-
-[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
-
-## Set up Looker
-
-1. Get a Looker Client ID and Client Secret. Follow the directions
-   [here](https://cloud.google.com/looker/docs/api-auth#authentication_with_an_sdk).
-
-1. Have the base URL of your Looker instance available. It is likely
-   something like `https://looker.example.com`. In some cases the API is
-   listening at a different port, and you will need to use
-   `https://looker.example.com:19999` instead.
-
-## 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.10.0/linux/amd64/toolbox>
-{{< /tab >}}
-
-{{< tab header="darwin/arm64" lang="bash" >}}
-curl -O <https://storage.googleapis.com/genai-toolbox/v0.10.0/darwin/arm64/toolbox>
-{{< /tab >}}
-
-{{< tab header="darwin/amd64" lang="bash" >}}
-curl -O <https://storage.googleapis.com/genai-toolbox/v0.10.0/darwin/amd64/toolbox>
-{{< /tab >}}
-
-{{< tab header="windows/amd64" lang="bash" >}}
-curl -O <https://storage.googleapis.com/genai-toolbox/v0.10.0/windows/amd64/toolbox.exe>
-{{< /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": {
-        "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. 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": {
-        "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. 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": {
-        "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. 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": {
-        "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. Open [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": {
-        "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"
-          }
-        }
-      }
-    }
-    ```
-
-{{% /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": {
-        "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"
-          }
-        }
-      }
-    }
-
-    ```
-
-{{% /tab %}}
-{{< /tabpane >}}
-
-## Use Tools
-
-Your AI tool is now connected to Looker using MCP. Try asking your AI
-assistant to list models, explores, dimensions, and measures. Run a
-query, retrieve the SQL for a query, and run a saved Look.
-
-The following tools are available to the LLM:
-
-1. **get_models**: list the LookML models in Looker
-1. **get_explores**: list the explores in a given model
-1. **get_dimensions**: list the dimensions in a given explore
-1. **get_measures**: list the measures in a given explore
-1. **get_filters**: list the filters in a given explore
-1. **get_parameters**: list the parameters in a given explore
-1. **query**: Run a query
-1. **query_sql**: Return the SQL generated by Looker for a query
-1. **get_looks**: Return the saved Looks that match a title or description
-1. **run_look**: Run a saved Look and return the data
-
-{{< 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/postgres_mcp.md
+++ b/docs/en/how-to/connect-ide/postgres_mcp.md
@@ -52,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.9.0/linux/amd64/toolbox>
+curl -O <https://storage.googleapis.com/genai-toolbox/v0.7.0/linux/amd64/toolbox>
 {{< /tab >}}

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

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

 {{< tab header="windows/amd64" lang="bash" >}}
-curl -O <https://storage.googleapis.com/genai-toolbox/v0.9.0/windows/amd64/toolbox>
+curl -O <https://storage.googleapis.com/genai-toolbox/v0.7.0/windows/amd64/toolbox>
 {{< /tab >}}
 {{< /tabpane >}}
    <!-- {x-release-please-end} -->
--- a/docs/en/how-to/connect_via_mcp.md
+++ b/docs/en/how-to/connect_via_mcp.md
@@ -20,16 +20,18 @@ The native SDKs can be combined with MCP clients in many cases.

 Toolbox currently supports the following versions of MCP specification:

-* [2025-06-18](https://modelcontextprotocol.io/specification/2025-06-18)
-* [2025-03-26](https://modelcontextprotocol.io/specification/2025-03-26)
-* [2024-11-05](https://modelcontextprotocol.io/specification/2024-11-05)
+* [2024-11-05](https://spec.modelcontextprotocol.io/specification/2024-11-05/)

-### Toolbox AuthZ/AuthN Not Supported by MCP
+### Features Not Supported by MCP

-The auth implementation in Toolbox is not supported in MCP's auth specification.
-This includes:
+Toolbox has several features that are not yet supported in the MCP specification:
+
+* **AuthZ/AuthN:** There are no auth implementation in the `2024-11-05`
+  specification. This includes:
  * [Authenticated Parameters](../resources/tools/_index.md#authenticated-parameters)
  * [Authorized Invocations](../resources/tools/_index.md#authorized-invocations)
+* **Notifications:** Currently, editing Toolbox Tools requires a server restart.
+  Clients should reload tools on disconnect to get the latest version.

 ## Connecting to Toolbox with an MCP client

@@ -61,15 +63,11 @@ When running with stdio, Toolbox will listen via stdio instead of acting as a
 remote HTTP server. Logs will be set to the `warn` level by default. `debug` and
 `info` logs are not supported with stdio.

-{{< notice note >}}
-Toolbox enables dynamic reloading by default. To disable, use the `--disable-reload` flag.
-{{< /notice >}}
-
 ### Connecting via HTTP

 Toolbox supports the HTTP transport protocol with and without SSE.

-{{< tabpane text=true >}} {{% tab header="HTTP with SSE (deprecated)" lang="en" %}}
+{{< tabpane text=true >}} {{% tab header="HTTP with SSE" lang="en" %}}
 Add the following configuration to your MCP client configuration:

 ```bash
@@ -85,25 +83,11 @@ Add the following configuration to your MCP client configuration:

 If you would like to connect to a specific toolset, replace `url` with
 `"http://127.0.0.1:5000/mcp/{toolset_name}/sse"`.
+{{% /tab %}} {{% tab header="HTTP POST" lang="en" %}}
+Connect to Toolbox HTTP POST via `http://127.0.0.1:5000/mcp`.

-HTTP with SSE is only supported in version `2024-11-05` and is currently
-deprecated.
-{{% /tab %}} {{% tab header="Streamable HTTP" lang="en" %}}
-Add the following configuration to your MCP client configuration:
-
-```bash
-{
-  "mcpServers": {
-    "toolbox": {
-      "type": "http",
-      "url": "http://127.0.0.1:5000/mcp",
-    }
-  }
-}
-```
-
-If you would like to connect to a specific toolset, replace `url` with
-`"http://127.0.0.1:5000/mcp/{toolset_name}"`.
+If you would like to connect to a specific toolset, connect via
+`http://127.0.0.1:5000/mcp/{toolset_name}`.
 {{% /tab %}} {{< /tabpane >}}

 ### Using the MCP Inspector with Toolbox
@@ -130,7 +114,7 @@ testing and debugging Toolbox server.
 1. Click the `Connect` button. It might take awhile to spin up Toolbox. Voila!
   You should be able to inspect your toolbox tools!
 {{% /tab %}}
-{{% tab header="HTTP with SSE (deprecated)" lang="en" %}}
+{{% tab header="HTTP with SSE" lang="en" %}}
 1. [Run Toolbox](../getting-started/introduction/_index.md#running-the-server).

 1. In a separate terminal, run Inspector directly through `npx`:
@@ -144,23 +128,6 @@ testing and debugging Toolbox server.
 1. For `URL`, type in `http://127.0.0.1:5000/mcp/sse` to use all tool or
   `http//127.0.0.1:5000/mcp/{toolset_name}/sse` to use a specific toolset.

-1. Click the `Connect` button. Voila! You should be able to inspect your toolbox
-   tools!
-{{% /tab %}}
-{{% tab header="Streamable HTTP" lang="en" %}}
-1. [Run Toolbox](../getting-started/introduction/_index.md#running-the-server).
-
-1. In a separate terminal, run Inspector directly through `npx`:
-
-    ```bash
-    npx @modelcontextprotocol/inspector
-    ```
-
-1. For `Transport Type` dropdown menu, select `Streamable HTTP`.
-
-1. For `URL`, type in `http://127.0.0.1:5000/mcp` to use all tool or
-   `http//127.0.0.1:5000/mcp/{toolset_name}` to use a specific toolset.
-
 1. Click the `Connect` button. Voila! You should be able to inspect your toolbox
   tools!
 {{% /tab %}} {{< /tabpane >}}
--- a/docs/en/how-to/deploy_toolbox.md
+++ b/docs/en/how-to/deploy_toolbox.md
@@ -79,7 +79,7 @@ database are in the same VPC network.

 Create a `tools.yaml` file that contains your configuration for Toolbox. For
 details, see the
-[configuration](https://googleapis.github.io/genai-toolbox/resources/sources/)
+[configuration](https://github.com/googleapis/genai-toolbox/blob/main/README.md#configuration)
 section.

 ## Deploy to Cloud Run
@@ -133,16 +133,22 @@ section.

 ## Connecting with Toolbox Client SDK

-You can connect to Toolbox Cloud Run instances directly through the SDK.
+You can connect to Toolbox Cloud Run instances directly through the SDK

 1. [Set up `Cloud Run Invoker` role
   access](https://cloud.google.com/run/docs/securing/managing-access#service-add-principals)
   to your Cloud Run service.

-1. (Only for local runs) Set up [Application Default
+1. Set up [Application Default
   Credentials](https://cloud.google.com/docs/authentication/set-up-adc-local-dev-environment)
   for the principle you set up the `Cloud Run Invoker` role access to.

+    {{< notice tip >}}
+  If you're working in some other environment than local, set up [environment
+    specific Default
+    Credentials](https://cloud.google.com/docs/authentication/provide-credentials-adc).
+    {{< /notice >}}
+
 1. Run the following to retrieve a non-deterministic URL for the cloud run service:

    ```bash
@@ -154,11 +160,9 @@ You can connect to Toolbox Cloud Run instances directly through the SDK.
    ```python
    from toolbox_core import ToolboxClient, auth_methods

+    auth_token_provider = auth_methods.aget_google_id_token # can also use sync method
+
    # Replace with the Cloud Run service URL generated in the previous step.
-    URL = "https://cloud-run-url.app"
-
-    auth_token_provider = auth_methods.aget_google_id_token(URL) # can also use sync method
-
    async with ToolboxClient(
        URL,
        client_headers={"Authorization": auth_token_provider},
--- a/docs/en/resources/sources/alloydb-pg.md
+++ b/docs/en/resources/sources/alloydb-pg.md
@@ -22,17 +22,6 @@ cluster][alloydb-free-trial].
 [alloydb-docs]: https://cloud.google.com/alloydb/docs
 [alloydb-free-trial]: https://cloud.google.com/alloydb/docs/create-free-trial-cluster

-## Available Tools
-
- [`alloydb-ai-nl`](../tools/alloydbainl/alloydb-ai-nl.md)  
-  Use natural language queries on AlloyDB, powered by AlloyDB AI.
-
- [`postgres-sql`](../tools/postgres/postgres-sql.md)  
-  Execute SQL queries as prepared statements in AlloyDB Postgres.
-
- [`postgres-execute-sql`](../tools/postgres/postgres-execute-sql.md)  
-  Run parameterized SQL statements in AlloyDB Postgres.
-
 ## Requirements

 ### IAM Permissions
--- a/docs/en/resources/sources/bigquery.md
+++ b/docs/en/resources/sources/bigquery.md
@@ -34,26 +34,6 @@ avoiding full table scans or complex filters.
 [bigquery-quickstart-cli]: https://cloud.google.com/bigquery/docs/quickstarts/quickstart-command-line
 [bigquery-googlesql]: https://cloud.google.com/bigquery/docs/reference/standard-sql/

-## Available Tools
-
- [`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-get-dataset-info`](../tools/bigquery/bigquery-get-dataset-info.md)  
-  Retrieve metadata for a specific dataset.
-
- [`bigquery-get-table-info`](../tools/bigquery/bigquery-get-table-info.md)  
-  Retrieve metadata for a specific table.
-
- [`bigquery-list-dataset-ids`](../tools/bigquery/bigquery-list-dataset-ids.md)  
-  List available dataset IDs.
-
- [`bigquery-list-table-ids`](../tools/bigquery/bigquery-list-table-ids.md)  
-  List tables in a given dataset.
-
 ## Requirements

 ### IAM Permissions
--- a/docs/en/resources/sources/bigtable.md
+++ b/docs/en/resources/sources/bigtable.md
@@ -32,11 +32,6 @@ such as avoiding full table scans or complex filters.
 [bigtable-googlesql]:
    https://cloud.google.com/bigtable/docs/googlesql-overview

-## Available Tools
-
- [`bigtable-sql`](../tools/bigtable/bigtable-sql.md)
-  Run SQL-like queries over Bigtable rows.
-
 ## Requirements

 ### IAM Permissions
--- a/docs/en/resources/sources/cloud-sql-mssql.md
+++ b/docs/en/resources/sources/cloud-sql-mssql.md
@@ -19,14 +19,6 @@ to a database by following these instructions][csql-mssql-connect].
 [csql-mssql-docs]: https://cloud.google.com/sql/docs/sqlserver
 [csql-mssql-connect]: https://cloud.google.com/sql/docs/sqlserver/connect-overview

-## Available Tools
-
- [`mssql-sql`](../tools/mssql/mssql-sql.md)  
-  Execute pre-defined SQL Server queries with placeholder parameters.
-
- [`mssql-execute-sql`](../tools/mssql/mssql-execute-sql.md)  
-  Run parameterized SQL Server queries in Cloud SQL for SQL Server.
-
 ## Requirements

 ### IAM Permissions
--- a/docs/en/resources/sources/cloud-sql-mysql.md
+++ b/docs/en/resources/sources/cloud-sql-mysql.md
@@ -20,14 +20,6 @@ to a database by following these instructions][csql-mysql-quickstart].
 [csql-mysql-docs]: https://cloud.google.com/sql/docs/mysql
 [csql-mysql-quickstart]: https://cloud.google.com/sql/docs/mysql/connect-instance-local-computer

-## Available Tools
-
- [`mysql-sql`](../tools/mysql/mysql-sql.md)  
-  Execute pre-defined prepared SQL queries in MySQL.
-
- [`mysql-execute-sql`](../tools/mysql/mysql-execute-sql.md)  
-  Run parameterized SQL queries in Cloud SQL for MySQL.
-
 ## Requirements

 ### IAM Permissions
--- a/docs/en/resources/sources/cloud-sql-pg.md
+++ b/docs/en/resources/sources/cloud-sql-pg.md
@@ -20,14 +20,6 @@ to a database by following these instructions][csql-pg-quickstart].
 [csql-pg-docs]: https://cloud.google.com/sql/docs/postgres
 [csql-pg-quickstart]: https://cloud.google.com/sql/docs/postgres/connect-instance-local-computer

-## Available Tools
-
- [`postgres-sql`](../tools/postgres/postgres-sql.md)  
-  Execute SQL queries as prepared statements in PostgreSQL.
-
- [`postgres-execute-sql`](../tools/postgres/postgres-execute-sql.md)  
-  Run parameterized SQL statements in PostgreSQL.
-
 ## Requirements

 ### IAM Permissions
--- a/docs/en/resources/sources/couchbase.md
+++ b/docs/en/resources/sources/couchbase.md
@@ -11,11 +11,6 @@ description: >
 A `couchbase` source establishes a connection to a Couchbase database cluster,
 allowing tools to execute SQL queries against it.

-## Available Tools
-
- [`couchbase-sql`](../tools/couchbase/couchbase-sql.md)  
-  Run SQL++ statements on Couchbase with parameterized input.
-
 ## Example

 ```yaml
--- a/docs/en/resources/sources/dgraph.md
+++ b/docs/en/resources/sources/dgraph.md
@@ -21,11 +21,6 @@ Dgraph Cloud. If you're new to Dgraph, the fastest way to get started is to
 [dgraph-docs]: https://dgraph.io/docs
 [dgraph-login]: https://cloud.dgraph.io/login

-## Available Tools
-
- [`dgraph-dql`](../tools/dgraph/dgraph-dql.md)  
-  Run DQL (Dgraph Query Language) queries.
-
 ## Requirements

 ### Database User
--- a/docs/en/resources/sources/firestore.md
+++ b/docs/en/resources/sources/firestore.md
@@ -1,70 +0,0 @@
---
-title: "Firestore"
-type: docs
-weight: 1
-description: >
-  Firestore is a NoSQL document database built for automatic scaling, high performance, and ease of application development. It's a fully managed, serverless database that supports mobile, web, and server development.
-
---
-
-# Firestore Source
-
-[Firestore][firestore-docs] is a NoSQL document database built for automatic
-scaling, high performance, and ease of application development. While the
-Firestore interface has many of the same features as traditional databases,
-as a NoSQL database it differs from them in the way it describes relationships
-between data objects.
-
-If you are new to Firestore, you can [create a database and learn the
-basics][firestore-quickstart].
-
-[firestore-docs]: https://cloud.google.com/firestore/docs
-[firestore-quickstart]: https://cloud.google.com/firestore/docs/quickstart-servers
-
-## Requirements
-
-### IAM Permissions
-
-Firestore uses [Identity and Access Management (IAM)][iam-overview] to control
-user and group access to Firestore resources. Toolbox will use your [Application
-Default Credentials (ADC)][adc] to authorize and authenticate when interacting
-with [Firestore][firestore-docs].
-
-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 accessing
-Firestore. Common roles include:
- `roles/datastore.user` - Read and write access to Firestore
- `roles/datastore.viewer` - Read-only access to Firestore
-
-See [Firestore access control][firestore-iam] for more information on
-applying IAM permissions and roles to an identity.
-
-[iam-overview]: https://cloud.google.com/firestore/docs/security/iam
-[adc]: https://cloud.google.com/docs/authentication#adc
-[set-adc]: https://cloud.google.com/docs/authentication/provide-credentials-adc
-[firestore-iam]: https://cloud.google.com/firestore/docs/security/iam
-
-### Database Selection
-
-Firestore allows you to create multiple databases within a single project. Each
-database is isolated from the others and has its own set of documents and
-collections. If you don't specify a database in your configuration, the default
-database named `(default)` will be used.
-
-## Example
-
-```yaml
-sources:
-  my-firestore-source:
-    kind: "firestore"
-    project: "my-project-id"
-    # database: "my-database"  # Optional, defaults to "(default)"
-```
-
-## Reference
-
-| **field** | **type** | **required** | **description**                                                                                          |
-|-----------|:--------:|:------------:|----------------------------------------------------------------------------------------------------------|
-| 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
@@ -13,11 +13,6 @@ The HTTP Source allows Toolbox to retrieve data from arbitrary HTTP
 endpoints. This enables Generative AI applications to access data from web APIs
 and other HTTP-accessible resources.

-## Available Tools
-
- [`http`](../tools/http/http.md)  
-  Make HTTP requests to REST APIs or other web services.
-
 ## Example

 ```yaml
--- a/docs/en/resources/sources/looker.md
+++ b/docs/en/resources/sources/looker.md
@@ -1,64 +0,0 @@
---
-title: "Looker"
-type: docs
-weight: 1
-description: >
-  Looker is a business intelligence tool that also provides a semantic layer.
---
-
-## About
-
-[Looker][looker-docs] is a web based business intelligence and data management
-tool that provides a semantic layer to facilitate querying. It can be deployed
-in the cloud, on GCP, or on premises.
-
-[looker-docs]: https://cloud.google.com/looker/docs
-
-## Requirements
-
-### Database User
-
-This source only uses API authentication. You will need to
-[create an API user][looker-user] to login to Looker.
-
-[looker-user]: https://cloud.google.com/looker/docs/api-auth#authentication_with_an_sdk
-
-## Example
-
-```yaml
-sources:
-    my-looker-source:
-        kind: looker
-        base_url: http://looker.example.com
-        client_id: ${LOOKER_CLIENT_ID}
-        client_secret: ${LOOKER_CLIENT_SECRET}
-        verify_ssl: true
-        timeout: 600s
-```
-
-The Looker base url will look like "https://looker.example.com", don't include a
-trailing "/". In some cases, especially if your Looker is deployed on-premises,
-you may need to add the API port numner like "https://looker.example.com:19999".
-
-Verify ssl should almost always be "true" (all lower case) unless you are using
-a self-signed ssl certificate for the Looker server. Anything other than "true"
-will be interpretted as false.
-
-The client id and client secret are seemingly random character sequences
-assigned by the looker server.
-
-{{< notice tip >}}
-Use environment variable replacement with the format ${ENV_NAME}
-instead of hardcoding your secrets into the configuration file.
-{{< /notice >}}
-
-## Reference
-
-| **field**     | **type** | **required** | **description**                                                                           |
-| ------------- | :------: | :----------: | ----------------------------------------------------------------------------------------- |
-| kind          |  string  |     true     | Must be "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
@@ -1,34 +0,0 @@
---
-title: "MongoDB"
-type: docs
-weight: 1
-description: >
-  MongoDB is a no-sql data platform that can not only serve general purpose data requirements also perform VectorSearch where both operational data and embeddings used of search can reside in same document.
-
---
-
-## About
-
-[MongoDB][mongodb-docs] is a leading nosql database that can not only cater your operational data needs but also perform vector search.
-
-[mongodb-docs]: https://www.mongodb.com/docs/atlas/atlas-vector-search/vector-search-overview/
-
-## Example
-
-```yaml
-sources:
-    my-mongodb:
-        kind: mongodb
-        uri: "mongodb+srv://username:password@host.mongodb.net"
-        database: sample_mflix
-        
-```
-
-
-## Reference
-
-| **field** | **type** | **required** | **description**                                                   |
-|-----------|:--------:|:------------:|-------------------------------------------------------------------|
-| 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
@@ -15,14 +15,6 @@ amount of data through a structured format.

 [mssql-docs]: https://www.microsoft.com/en-us/sql-server

-## Available Tools
-
- [`mssql-sql`](../tools/mssql/mssql-sql.md)  
-  Execute pre-defined SQL Server queries with placeholder parameters.
-
- [`mssql-execute-sql`](../tools/mssql/mssql-execute-sql.md)  
-  Run parameterized SQL Server queries in SQL Server.
-
 ## Requirements

 ### Database User
--- a/docs/en/resources/sources/mysql.md
+++ b/docs/en/resources/sources/mysql.md
@@ -4,6 +4,7 @@ type: docs
 weight: 1
 description: >
  MySQL is a relational database management system that stores and manages data.
+
 ---

 ## About
@@ -14,14 +15,6 @@ reliability, performance, and ease of use.

 [mysql-docs]: https://www.mysql.com/

-## Available Tools
-
- [`mysql-sql`](../tools/mysql/mysql-sql.md)  
-  Execute pre-defined prepared SQL queries in MySQL.
-
- [`mysql-execute-sql`](../tools/mysql/mysql-execute-sql.md)  
-  Run parameterized SQL queries in MySQL.
-
 ## Requirements

 ### Database User
@@ -42,7 +35,6 @@ sources:
        database: my_db
        user: ${USER_NAME}
        password: ${PASSWORD}
-        queryTimeout: 30s # Optional: query timeout duration
 ```

 {{< notice tip >}}
@@ -52,12 +44,11 @@ instead of hardcoding your secrets into the configuration file.

 ## Reference

-| **field**    | **type** | **required** | **description**                                                                                 |
-| ------------ | :------: | :----------: | ----------------------------------------------------------------------------------------------- |
-| kind         |  string  |     true     | Must be "mysql".                                                                                |
-| host         |  string  |     true     | IP address to connect to (e.g. "127.0.0.1").                                                    |
-| port         |  string  |     true     | Port to connect to (e.g. "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. |
+| **field** | **type** | **required** | **description**                                                                             |
+|-----------|:--------:|:------------:|---------------------------------------------------------------------------------------------|
+| kind      |  string  |     true     | Must be "mysql".                                                                            |
+| host      |  string  |     true     | IP address to connect to (e.g. "127.0.0.1").                                                |
+| port      |  string  |     true     | Port to connect to (e.g. "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").                                            |
--- a/docs/en/resources/sources/neo4j.md
+++ b/docs/en/resources/sources/neo4j.md
@@ -7,19 +7,12 @@ description: >

 ---

-## About
-
 [Neo4j][neo4j-docs] is a powerful, open source graph database system with over
 15 years of active development that has earned it a strong reputation for
 reliability, feature robustness, and performance.

 [neo4j-docs]: https://neo4j.com/docs

-## Available Tools
-
- [`neo4j-cypher`](../tools/neo4j/neo4j-cypher.md)  
-  Run Cypher queries against your Neo4j graph database.
-
 ## Requirements

 ### Database User
--- a/docs/en/resources/sources/postgres.md
+++ b/docs/en/resources/sources/postgres.md
@@ -15,14 +15,6 @@ reputation for reliability, feature robustness, and performance.

 [pg-docs]: https://www.postgresql.org/

-## Available Tools
-
- [`postgres-sql`](../tools/postgres/postgres-sql.md)  
-  Execute SQL queries as prepared statements in PostgreSQL.
-
- [`postgres-execute-sql`](../tools/postgres/postgres-execute-sql.md)  
-  Run parameterized SQL statements in PostgreSQL.
-
 ## Requirements

 ### Database User
--- a/docs/en/resources/sources/redis.md
+++ b/docs/en/resources/sources/redis.md
@@ -18,11 +18,6 @@ geospatial indexes with radius queries.
 If you are new to Redis, you can find installation and getting started guides on
 the [official Redis website](https://redis.io/docs/getting-started/).

-## Available Tools
-
- [`redis`](../tools/redis/redis.md)  
-  Run Redis commands and interact with key-value pairs.
-
 ## Requirements

 ### Redis
@@ -38,7 +33,7 @@ sources:
    my-redis-instance:
     kind: redis
     address:
-       - 127.0.0.1:6379
+       - 127.0.0.1
     username: ${MY_USER_NAME}
     password: ${MY_AUTH_STRING} # Omit this field if you don't have a password.
     # database: 0
@@ -63,7 +58,7 @@ sources:
    my-redis-cluster-instance:
     kind: memorystore-redis
     address:
-       - 127.0.0.1:6379
+       - 127.0.0.1
     password: ${MY_AUTH_STRING}
     # useGCPIAM: false
     # clusterEnabled: false
@@ -79,8 +74,7 @@ using IAM authentication:
 sources:
    my-redis-cluster-instance:
     kind: memorystore-redis
-     address:
-       - 127.0.0.1:6379
+     address: 127.0.0.1
     useGCPIAM: true
     clusterEnabled: true
 ```
--- a/docs/en/resources/sources/spanner.md
+++ b/docs/en/resources/sources/spanner.md
@@ -23,14 +23,6 @@ the Google Cloud console][spanner-quickstart].
 [spanner-quickstart]:
    https://cloud.google.com/spanner/docs/create-query-database-console

-## Available Tools
-
- [`spanner-sql`](../tools/spanner/spanner-sql.md)  
-  Execute SQL on Google Cloud Spanner.
-
- [`spanner-execute-sql`](../tools/spanner/spanner-execute-sql.md)  
-  Run structured and parameterized queries on Spanner.
-
 ## Requirements

 ### IAM Permissions
--- a/docs/en/resources/sources/sqlite.md
+++ b/docs/en/resources/sources/sqlite.md
@@ -22,11 +22,6 @@ SQLite has the following notable characteristics:
 - Zero-configuration - no setup or administration needed
 - Transactional with ACID properties

-## Available Tools
-
- [`sqlite-sql`](../tools/sqlite/sqlite-sql.md)  
-  Run SQL queries against a local SQLite database.
-
 ## Requirements

 ### Database File
--- a/docs/en/resources/sources/valkey.md
+++ b/docs/en/resources/sources/valkey.md
@@ -17,12 +17,7 @@ sets, sorted sets with range queries, bitmaps, hyperloglogs, and geospatial
 indexes with radius queries.

 If you're new to Valkey, you can find installation and getting started guides on
-the [official Valkey website](https://valkey.io/topics/quickstart/).
-
-## Available Tools
-
- [`valkey`](../tools/valkey/valkey.md)  
-  Issue Valkey (Redis-compatible) commands.
+the [official Valkey website](https://valkey.io/docs/getting-started/).

 ## Example

@@ -31,7 +26,7 @@ sources:
    my-valkey-instance:
     kind: valkey
     address:
-       - 127.0.0.1:6379
+       - 127.0.0.1
     username: ${YOUR_USERNAME}
     password: ${YOUR_PASSWORD}
     # database: 0
@@ -55,7 +50,7 @@ sources:
    my-valkey-instance:
     kind: valkey
     address:
-       - 127.0.0.1:6379
+       - 127.0.0.1
     useGCPIAM: true
 ```

--- a/docs/en/resources/tools/_index.md
+++ b/docs/en/resources/tools/_index.md
@@ -81,9 +81,8 @@ the parameter.
 |-------------|:---------------:|:------------:|-----------------------------------------------------------------------------|
 | name        |  string         |     true     | Name of the parameter.                                                      |
 | type        |  string         |     true     | Must be one of "string", "integer", "float", "boolean" "array"              |
+| default     |  parameter type |     false    | Default value of the parameter. If provided, the parameter is not required. |
 | description |  string         |     true     | Natural language description of the parameter to describe it to the agent.  |
-| default     |  parameter type |     false    | Default value of the parameter. If provided, `required` will be `false`.    |
-| required    |  bool           |     false    | Indicate if the parameter is required. Default to `true`.                   |

 ### Array Parameters

@@ -108,47 +107,14 @@ in the list using the items field:
 |-------------|:----------------:|:------------:|-----------------------------------------------------------------------------|
 | name        |      string      |     true     | Name of the parameter.                                                      |
 | type        |      string      |     true     | Must be "array"                                                             |
+| default     |  parameter type  |     false    | Default value of the parameter. If provided, the parameter is not required. |
 | description |      string      |     true     | Natural language description of the parameter to describe it to the agent.  |
-| default     |  parameter type |     false    | Default value of the parameter. If provided, `required` will be `false`.     |
-| required    |  bool           |     false    | Indicate if the parameter is required. Default to `true`.                    |
 | items       | parameter object |     true     | Specify a Parameter object for the type of the values in the array.         |

 {{< notice note >}}
-Items in array should not have a `default` or `required` value. If provided, it will be ignored.
+Items in array should not have a default value. If provided, it will be ignored.
 {{< /notice >}}

-### Map Parameters
-
-The map type is a collection of key-value pairs. It can be configured in two ways:
-
- Generic Map: By default, it accepts values of any primitive type (string, integer, float, boolean), allowing for mixed data.
- Typed Map: By setting the valueType field, you can enforce that all values
-  within the map must be of the same specified type.
-
-#### Generic Map (Mixed Value Types)
-
-This is the default behavior when valueType is omitted. It's useful for passing a flexible group of settings.
-
-```yaml
-    parameters:
-          - name: execution_context
-            type: map
-            description: A flexible set of key-value pairs for the execution environment.
-```
-
-#### Typed Map
-
-Specify valueType to ensure all values in the map are of the same type. An error
-will be thrown in case of value type mismatch.
-
-```yaml
- parameters:
-      - name: user_scores
-        type: map
-        description: A map of user IDs to their scores. All scores must be integers.
-        valueType: integer # This enforces the value type for all entries.
-```
-
 ### Authenticated Parameters

 Authenticated parameters are automatically populated with user
--- a/docs/en/resources/tools/bigquery/bigquery-get-dataset-info.md
+++ b/docs/en/resources/tools/bigquery/bigquery-get-dataset-info.md
@@ -15,10 +15,8 @@ It's compatible with the following sources:

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

-`bigquery-get-dataset-info` takes a `dataset` parameter to specify the dataset
-on the given source. It also optionally accepts a `project` parameter to 
-define the Google Cloud project ID. If the `project` parameter is not provided,
-the tool defaults to using the project defined in the source configuration.
+bigquery-get-dataset-info takes a dataset parameter to specify the dataset
+on the given source.

 ## Example

--- a/docs/en/resources/tools/bigquery/bigquery-get-table-info.md
+++ b/docs/en/resources/tools/bigquery/bigquery-get-table-info.md
@@ -15,10 +15,8 @@ It's compatible with the following sources:

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

-`bigquery-get-table-info` takes `dataset` and `table` parameters to specify
-the target table. It also optionally accepts a `project` parameter to define 
-the Google Cloud project ID. If the `project` parameter is not provided, the 
-tool defaults to using the project defined in the source configuration.
+bigquery-get-table-info takes dataset and table parameters to specify
+the target table.

 ## Example

--- a/docs/en/resources/tools/bigquery/bigquery-list-dataset-ids.md
+++ b/docs/en/resources/tools/bigquery/bigquery-list-dataset-ids.md
@@ -15,9 +15,8 @@ It's compatible with the following sources:

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

-`bigquery-list-dataset-ids` optionally accepts a `project` parameter to define 
-the Google Cloud project ID. If the `project` parameter is not provided, the 
-tool defaults to using the project defined in the source configuration.
+bigquery-list-dataset-ids requires no input parameters beyond the configured
+source.

 ## Example

--- a/docs/en/resources/tools/bigquery/bigquery-list-table-ids.md
+++ b/docs/en/resources/tools/bigquery/bigquery-list-table-ids.md
@@ -15,10 +15,8 @@ It's compatible with the following sources:

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

-`bigquery-get-dataset-info` takes a required `dataset` parameter to specify the dataset
-from which to list table IDs. It also optionally accepts a `project` parameter to 
-define the Google Cloud project ID. If the `project` parameter is not provided, the 
-tool defaults to using the project defined in the source configuration.
+bigquery-get-dataset-info takes a dataset parameter to specify the dataset
+from which to list table IDs.

 ## Example

--- a/docs/en/resources/tools/bigtable/bigtable-sql.md
+++ b/docs/en/resources/tools/bigtable/bigtable-sql.md
@@ -20,11 +20,8 @@ instance. It's compatible with any of the following sources:

 Bigtable supports SQL queries. The integration with Toolbox supports `googlesql`
 dialect, the specified SQL statement is executed as a [data manipulation
-language (DML)][bigtable-googlesql] statements, and specified parameters will inserted according to their name: e.g. `@name`.
-
-{{<notice note>}}
-  Bigtable's GoogleSQL support for DML statements might be limited to certain query types. For detailed information on supported DML statements and use cases, refer to the [Bigtable GoogleSQL use cases](https://cloud.google.com/bigtable/docs/googlesql-overview#use-cases).
-{{</notice>}}
+language (DML)][bigtable-googlesql] statements, and specified parameters will
+inserted according to their name: e.g. `@name`.

 [bigtable-googlesql]: https://cloud.google.com/bigtable/docs/googlesql-overview

--- a/docs/en/resources/tools/firestore/_index.md
+++ b/docs/en/resources/tools/firestore/_index.md
@@ -1,7 +0,0 @@
---
-title: "Firestore"
-type: docs
-weight: 1
-description: > 
-  Tools that work with Firestore Sources.
---
--- a/docs/en/resources/tools/firestore/firestore-delete-documents.md
+++ b/docs/en/resources/tools/firestore/firestore-delete-documents.md
@@ -1,38 +0,0 @@
---
-title: "firestore-delete-documents"
-type: docs
-weight: 1
-description: > 
-  A "firestore-delete-documents" tool deletes multiple documents from Firestore by their paths.
-aliases:
- /resources/tools/firestore-delete-documents
---
-
-## About
-
-A `firestore-delete-documents` tool deletes multiple documents from Firestore by their paths.
-It's compatible with the following sources:
-
- [firestore](../sources/firestore.md)
-
-`firestore-delete-documents` takes one input parameter `documentPaths` which is an array of 
-document paths to delete. The tool uses Firestore's BulkWriter for efficient batch deletion
-and returns the success status for each document.
-
-## Example
-
-```yaml
-tools:
-  delete_user_documents:
-    kind: firestore-delete-documents
-    source: my-firestore-source
-    description: Use this tool to delete multiple documents from Firestore.
-```
-
-## Reference
-
-| **field**   |                  **type**                  | **required** | **description**                                                                                  |
-|-------------|:------------------------------------------:|:------------:|--------------------------------------------------------------------------------------------------|
-| 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
@@ -1,38 +0,0 @@
---
-title: "firestore-get-documents"
-type: docs
-weight: 1
-description: > 
-  A "firestore-get-documents" tool retrieves multiple documents from Firestore by their paths.
-aliases:
- /resources/tools/firestore-get-documents
---
-
-## About
-
-A `firestore-get-documents` tool retrieves multiple documents from Firestore by their paths.
-It's compatible with the following sources:
-
- [firestore](../sources/firestore.md)
-
-`firestore-get-documents` takes one input parameter `documentPaths` which is an array of 
-document paths, and returns the documents' data along with metadata such as existence status,
-creation time, update time, and read time.
-
-## Example
-
-```yaml
-tools:
-  get_user_documents:
-    kind: firestore-get-documents
-    source: my-firestore-source
-    description: Use this tool to retrieve multiple documents from Firestore.
-```
-
-## Reference
-
-| **field**   |                  **type**                  | **required** | **description**                                                                                  |
-|-------------|:------------------------------------------:|:------------:|--------------------------------------------------------------------------------------------------|
-| 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
@@ -1,37 +0,0 @@
---
-title: "firestore-get-rules"
-type: docs
-weight: 1
-description: > 
-  A "firestore-get-rules" tool retrieves the active Firestore security rules for the current project.
-aliases:
- /resources/tools/firestore-get-rules
---
-
-## About
-
-A `firestore-get-rules` tool retrieves the active [Firestore security rules](https://firebase.google.com/docs/firestore/security/get-started) for the current project.
-It's compatible with the following sources:
-
- [firestore](../sources/firestore.md)
-
-`firestore-get-rules` takes no input parameters and returns the security rules content along with metadata 
-such as the ruleset name, and timestamps.
-
-## Example
-
-```yaml
-tools:
-  get_firestore_rules:
-    kind: firestore-get-rules
-    source: my-firestore-source
-    description: Use this tool to retrieve the active Firestore security rules.
-```
-
-## Reference
-
-| **field**   |                  **type**                  | **required** | **description**                                                                                  |
-|-------------|:------------------------------------------:|:------------:|--------------------------------------------------------------------------------------------------|
-| 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
@@ -1,38 +0,0 @@
---
-title: "firestore-list-collections"
-type: docs
-weight: 1
-description: > 
-  A "firestore-list-collections" tool lists collections in Firestore, either at the root level or as subcollections of a document.
-aliases:
- /resources/tools/firestore-list-collections
---
-
-## About
-
-A `firestore-list-collections` tool lists [collections](https://firebase.google.com/docs/firestore/data-model#collections) in Firestore, either at the root level or as [subcollections](https://firebase.google.com/docs/firestore/data-model#subcollections) of a specific document.
-It's compatible with the following sources:
-
- [firestore](../sources/firestore.md)
-
-`firestore-list-collections` takes an optional `parentPath` parameter to specify a document
-path. If provided, it lists all subcollections of that document. If not provided, it lists
-all root-level collections in the database.
-
-## Example
-
-```yaml
-tools:
-  list_firestore_collections:
-    kind: firestore-list-collections
-    source: my-firestore-source
-    description: Use this tool to list collections in Firestore.
-```
-
-## Reference
-
-| **field**   |                  **type**                  | **required** | **description**                                                                                  |
-|-------------|:------------------------------------------:|:------------:|--------------------------------------------------------------------------------------------------|
-| 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-query-collection.md
+++ b/docs/en/resources/tools/firestore/firestore-query-collection.md
@@ -1,198 +0,0 @@
-# firestore-query-collection
-
-The `firestore-query-collection` tool allows you to query Firestore collections with filters, ordering, and limit capabilities.
-
-## Configuration
-
-To use this tool, you need to configure it in your YAML configuration file:
-
-```yaml
-sources:
-  my-firestore:
-    kind: firestore
-    config:
-      project: my-gcp-project
-      database: "(default)"
-
-tools:
-  query_collection:
-    kind: firestore-query-collection
-    source: my-firestore
-    description: Query Firestore collections with advanced filtering
-```
-
-## Parameters
-
-| Parameter | Type | Required | Default | Description |
-|-----------|------|----------|---------|-------------|
-| `collectionPath` | string | Yes | - | The path to the Firestore collection to query |
-| `filters` | array | No | - | Array of filter objects (as JSON strings) to apply to the query |
-| `orderBy` | string | No | - | JSON string specifying field and direction to order results |
-| `limit` | integer | No | 100 | Maximum number of documents to return |
-| `analyzeQuery` | boolean | No | false | If true, returns query explain metrics including execution statistics |
-
-### Filter Format
-
-Each filter in the `filters` array should be a JSON string with the following structure:
-
-```json
-{
-  "field": "fieldName",
-  "op": "operator",
-  "value": "compareValue"
-}
-```
-
-Supported operators:
- `<` - Less than
- `<=` - Less than or equal to
- `>` - Greater than
- `>=` - Greater than or equal to
- `==` - Equal to
- `!=` - Not equal to
- `array-contains` - Array contains a specific value
- `array-contains-any` - Array contains any of the specified values
- `in` - Field value is in the specified array
- `not-in` - Field value is not in the specified array
-
-Value types supported:
- String: `"value": "text"`
- Number: `"value": 123` or `"value": 45.67`
- Boolean: `"value": true` or `"value": false`
- Array: `"value": ["item1", "item2"]` (for `in`, `not-in`, `array-contains-any` operators)
-
-### OrderBy Format
-
-The `orderBy` parameter should be a JSON string with the following structure:
-
-```json
-{
-  "field": "fieldName",
-  "direction": "ASCENDING"
-}
-```
-
-Direction values:
- `ASCENDING`
- `DESCENDING`
-
-## Example Usage
-
-### Query with filters
-
-```json
-{
-  "collectionPath": "users",
-  "filters": [
-    "{\"field\": \"age\", \"op\": \">\", \"value\": 18}",
-    "{\"field\": \"status\", \"op\": \"==\", \"value\": \"active\"}"
-  ],
-  "orderBy": "{\"field\": \"createdAt\", \"direction\": \"DESCENDING\"}",
-  "limit": 50
-}
-```
-
-### Query with array contains filter
-
-```json
-{
-  "collectionPath": "products",
-  "filters": [
-    "{\"field\": \"categories\", \"op\": \"array-contains\", \"value\": \"electronics\"}",
-    "{\"field\": \"price\", \"op\": \"<\", \"value\": 1000}"
-  ],
-  "orderBy": "{\"field\": \"price\", \"direction\": \"ASCENDING\"}",
-  "limit": 20
-}
-```
-
-### Query with IN operator
-
-```json
-{
-  "collectionPath": "orders",
-  "filters": [
-    "{\"field\": \"status\", \"op\": \"in\", \"value\": [\"pending\", \"processing\"]}"
-  ],
-  "limit": 100
-}
-```
-
-### Query with explain metrics
-
-```json
-{
-  "collectionPath": "users",
-  "filters": [
-    "{\"field\": \"age\", \"op\": \">=\", \"value\": 21}",
-    "{\"field\": \"active\", \"op\": \"==\", \"value\": true}"
-  ],
-  "orderBy": "{\"field\": \"lastLogin\", \"direction\": \"DESCENDING\"}",
-  "limit": 25,
-  "analyzeQuery": true
-}
-```
-
-## Response Format
-
-### Standard Response (analyzeQuery = false)
-
-The tool returns an array of documents, where each document includes:
-
-```json
-{
-  "id": "documentId",
-  "path": "collection/documentId",
-  "data": {
-    // Document fields
-  },
-  "createTime": "2025-01-07T12:00:00Z",
-  "updateTime": "2025-01-07T12:00:00Z",
-  "readTime": "2025-01-07T12:00:00Z"
-}
-```
-
-### Response with Query Analysis (analyzeQuery = true)
-
-When `analyzeQuery` is set to true, the tool returns a single object containing documents and explain metrics:
-
-```json
-{
-  "documents": [
-    // Array of document objects as shown above
-  ],
-  "explainMetrics": {
-    "planSummary": {
-      "indexesUsed": [
-        {
-          "query_scope": "Collection",
-          "properties": "(field ASC, __name__ ASC)"
-        }
-      ]
-    },
-    "executionStats": {
-      "resultsReturned": 50,
-      "readOperations": 50,
-      "executionDuration": "120ms",
-      "debugStats": {
-        "indexes_entries_scanned": "1000",
-        "documents_scanned": "50",
-        "billing_details": {
-          "documents_billable": "50",
-          "index_entries_billable": "1000",
-          "min_query_cost": "0"
-        }
-      }
-    }
-  }
-}
-```
-
-## Error Handling
-
-The tool will return errors for:
- Invalid collection path
- Malformed filter JSON
- Unsupported operators
- Query execution failures
- Invalid orderBy format
--- a/docs/en/resources/tools/firestore/firestore-validate-rules.md
+++ b/docs/en/resources/tools/firestore/firestore-validate-rules.md
@@ -1,115 +0,0 @@
---
-title: firestore-validate-rules
-weight: 6
-date: 2025-01-07
---
-
-## Overview
-
-The `firestore-validate-rules` tool validates Firestore security rules syntax and semantic correctness without deploying them. It provides detailed error reporting with source positions and code snippets.
-
-## Configuration
-
-```yaml
-tools:
-  firestore-validate-rules:
-    kind: firestore-validate-rules
-    source: <firestore-source-name>
-    description: "Checks the provided Firestore Rules source for syntax and validation errors"
-```
-
-## Authentication
-
-This tool requires authentication if the source requires authentication.
-
-## Parameters
-
-| Parameter | Type   | Required | Description |
-|-----------|--------|----------|-------------|
-| source    | string | Yes      | The Firestore Rules source code to validate |
-
-## Response
-
-The tool returns a `ValidationResult` object containing:
-
-```json
-{
-  "valid": boolean,           // Whether the rules are valid
-  "issueCount": number,       // Number of issues found
-  "formattedIssues": string,  // Human-readable formatted issues
-  "rawIssues": [              // Array of raw issue objects
-    {
-      "sourcePosition": {
-        "fileName": string,
-        "line": number,
-        "column": number,
-        "currentOffset": number,
-        "endOffset": number
-      },
-      "description": string,
-      "severity": string      // e.g., "ERROR", "WARNING"
-    }
-  ]
-}
-```
-
-## Example Usage
-
-### Validate simple rules
-
-```json
-{
-  "source": "rules_version = '2';\nservice cloud.firestore {\n  match /databases/{database}/documents {\n    match /{document=**} {\n      allow read, write: if true;\n    }\n  }\n}"
-}
-```
-
-### Example response for valid rules
-
-```json
-{
-  "valid": true,
-  "issueCount": 0,
-  "formattedIssues": "✓ No errors detected. Rules are valid."
-}
-```
-
-### Example response with errors
-
-```json
-{
-  "valid": false,
-  "issueCount": 1,
-  "formattedIssues": "Found 1 issue(s) in rules source:\n\nERROR: Unexpected token ';' [Ln 4, Col 32]\n```\n      allow read, write: if true;;\n                               ^\n```",
-  "rawIssues": [
-    {
-      "sourcePosition": {
-        "line": 4,
-        "column": 32,
-        "currentOffset": 105,
-        "endOffset": 106
-      },
-      "description": "Unexpected token ';'",
-      "severity": "ERROR"
-    }
-  ]
-}
-```
-
-## Error Handling
-
-The tool will return errors for:
- Missing or empty `source` parameter
- API errors when calling the Firebase Rules service
- Network connectivity issues
-
-## Use Cases
-
-1. **Pre-deployment validation**: Validate rules before deploying to production
-2. **CI/CD integration**: Integrate rules validation into your build pipeline
-3. **Development workflow**: Quickly check rules syntax while developing
-4. **Error debugging**: Get detailed error locations with code snippets
-
-## Related Tools
-
- [firestore-get-rules]({{< ref "firestore-get-rules" >}}): Retrieve current active rules
- [firestore-query-collection]({{< ref "firestore-query-collection" >}}): Test rules by querying collections
--- a/docs/en/resources/tools/looker/_index.md
+++ b/docs/en/resources/tools/looker/_index.md
@@ -1,7 +0,0 @@
---
-title: "Looker"
-type: docs
-weight: 1
-description: >
-  Tools that work with Looker Sources.
---
--- a/docs/en/resources/tools/looker/looker_get_dimensions.md
+++ b/docs/en/resources/tools/looker/looker_get_dimensions.md
@@ -1,44 +0,0 @@
---
-title: "looker-get-dimensions"
-type: docs
-weight: 1
-description: >
-  A "looker-get-dimensions" tool returns all the dimensions from a given explore
-  in a given model in the source.
-aliases:
- /resources/tools/looker-get-dimensions
---
-
-## About
-
-A `looker-get-dimensions` tool returns all the dimensions from a given explore
-in a given mode in the source.
-
-It's compatible with the following sources:
-
- [looker](../sources/looker.md)
-
-`looker-get-dimensions` accepts two parameters, the `model` and the `explore`.
-
-## Example
-
-```yaml
-tools:
-    get_dimensions:
-        kind: looker-get-dimensions
-        source: looker-source
-        description: |
-          The get_dimensions tool retrieves the list of dimensions defined in
-          an explore.
-
-          It takes two parameters, the model_name looked up from get_models and the
-          explore_name looked up from get_explores.
-```
-
-## Reference
-
-| **field**   |                  **type**                  | **required** | **description**                                                                                  |
-|-------------|:------------------------------------------:|:------------:|--------------------------------------------------------------------------------------------------|
-| kind        |                   string                   |     true     | Must be "looker-get-dimensions".                                                                 |
-| source      |                   string                   |     true     | Name of the source the SQL should execute on.                                                    |
-| description |                   string                   |     true     | Description of the tool that is passed to the LLM.                                               |
--- a/docs/en/resources/tools/looker/looker_get_explores.md
+++ b/docs/en/resources/tools/looker/looker_get_explores.md
@@ -1,44 +0,0 @@
---
-title: "looker-get-explores"
-type: docs
-weight: 1
-description: >
-  A "looker-get-explores" tool returns all explores
-  for the given model from the source.
-aliases:
- /resources/tools/looker-get-explores
---
-
-## About
-
-A `looker-get-explores` tool returns all explores
-for a given model from the source.
-
-It's compatible with the following sources:
-
- [looker](../sources/looker.md)
-
-`looker-get-explores` accepts one parameter, the
-`model` id.
-
-## Example
-
-```yaml
-tools:
-    get_explores:
-        kind: looker-get-explores
-        source: looker-source
-        description: |
-          The get_explores tool retrieves the list of explores defined in a LookML model
-          in the Looker system.
-
-          It takes one parameter, the model_name looked up from get_models.
-```
-
-## Reference
-
-| **field**   |                  **type**                  | **required** | **description**                                                                                  |
-|-------------|:------------------------------------------:|:------------:|--------------------------------------------------------------------------------------------------|
-| kind        |                   string                   |     true     | Must be "looker-get-explores".                                                                   |
-| source      |                   string                   |     true     | Name of the source the SQL should execute on.                                                    |
-| description |                   string                   |     true     | Description of the tool that is passed to the LLM.                                               |
--- a/docs/en/resources/tools/looker/looker_get_filters.md
+++ b/docs/en/resources/tools/looker/looker_get_filters.md
@@ -1,44 +0,0 @@
---
-title: "looker-get-filters"
-type: docs
-weight: 1
-description: >
-  A "looker-get-filters" tool returns all the filters from a given explore
-  in a given model in the source.
-aliases:
- /resources/tools/looker-get-filters
---
-
-## About
-
-A `looker-get-filters` tool returns all the filters from a given explore
-in a given mode in the source.
-
-It's compatible with the following sources:
-
- [looker](../sources/looker.md)
-
-`looker-get-filters` accepts two parameters, the `model` and the `explore`.
-
-## Example
-
-```yaml
-tools:
-    get_dimensions:
-        kind: looker-get-filters
-        source: looker-source
-        description: |
-          The get_filters tool retrieves the list of filters defined in
-          an explore.
-
-          It takes two parameters, the model_name looked up from get_models and the
-          explore_name looked up from get_explores.
-```
-
-## Reference
-
-| **field**   |                  **type**                  | **required** | **description**                                                                                  |
-|-------------|:------------------------------------------:|:------------:|--------------------------------------------------------------------------------------------------|
-| kind        |                   string                   |     true     | Must be "looker-get-filters".                                                                    |
-| source      |                   string                   |     true     | Name of the source the SQL should execute on.                                                    |
-| description |                   string                   |     true     | Description of the tool that is passed to the LLM.                                               |
--- a/docs/en/resources/tools/looker/looker_get_looks.md
+++ b/docs/en/resources/tools/looker/looker_get_looks.md
@@ -1,60 +0,0 @@
---
-title: "looker-get-looks"
-type: docs
-weight: 1
-description: >
-  "looker-get-looks" searches for saved Looks in a Looker
-  source.
-aliases:
- /resources/tools/looker-get-looks
---
-
-## About
-
-The `looker-get-looks` tool searches for a saved Look by
-name or description.
-
-It's compatible with the following sources:
-
- [looker](../sources/looker.md)
-
-`looker-get-looks` takes four parameters, the `title`, `desc`, `limit`
-and `offset`.
-
-Title and description use SQL style wildcards and are case insensitive.
-
-Limit and offset are used to page through a larger set of matches and
-default to 100 and 0.
-
-## Example
-
-```yaml
-tools:
-    get_looks:
-        kind: looker-get-looks
-        source: looker-source
-        description: |
-          get_looks Tool
-
-          This tool is used to search for saved looks in a Looker instance.
-          String search params use case-insensitive matching. String search
-          params can contain % and '_' as SQL LIKE pattern match wildcard
-          expressions. example="dan%" will match "danger" and "Danzig" but
-          not "David" example="D_m%" will match "Damage" and "dump".
-
-          Most search params can accept "IS NULL" and "NOT NULL" as special
-          expressions to match or exclude (respectively) rows where the
-          column is null.
-
-          The limit and offset are used to paginate the results.
-
-          The result of the get_looks tool is a list of json objects.
-```
-
-## Reference
-
-| **field**   |                  **type**                  | **required** | **description**                                                                                  |
-|-------------|:------------------------------------------:|:------------:|--------------------------------------------------------------------------------------------------|
-| kind        |                   string                   |     true     | Must be "looker-get-looks"                                                                       |
-| source      |                   string                   |     true     | Name of the source the SQL should execute on.                                                    |
-| description |                   string                   |     true     | Description of the tool that is passed to the LLM.                                               |
--- a/docs/en/resources/tools/looker/looker_get_measures.md
+++ b/docs/en/resources/tools/looker/looker_get_measures.md
@@ -1,44 +0,0 @@
---
-title: "looker-get-measures"
-type: docs
-weight: 1
-description: > 
-  A "looker-get-measures" tool returns all the measures from a given explore
-  in a given model in the source.
-aliases:
- /resources/tools/looker-get-measures
---
-
-## About
-
-A `looker-get-measures` tool returns all the measures from a given explore
-in a given mode in the source.
-
-It's compatible with the following sources:
-
- [looker](../sources/looker.md)
-
-`looker-get-measures` accepts two parameters, the `model` and the `explore`.
-
-## Example
-
-```yaml
-tools:
-    get_measures:
-        kind: looker-get-measures
-        source: looker-source
-        description: |
-          The get_measures tool retrieves the list of measures defined in
-          an explore.
-
-          It takes two parameters, the model_name looked up from get_models and the
-          explore_name looked up from get_explores.
-```
-
-## Reference
-
-| **field**   |                  **type**                  | **required** | **description**                                                                                  |
-|-------------|:------------------------------------------:|:------------:|--------------------------------------------------------------------------------------------------|
-| kind        |                   string                   |     true     | Must be "looker-get-measures".                                                                   |
-| source      |                   string                   |     true     | Name of the source the SQL should execute on.                                                    |
-| description |                   string                   |     true     | Description of the tool that is passed to the LLM.                                               |
--- a/docs/en/resources/tools/looker/looker_get_models.md
+++ b/docs/en/resources/tools/looker/looker_get_models.md
@@ -1,40 +0,0 @@
---
-title: "looker-get-models"
-type: docs
-weight: 1
-description: > 
-  A "looker-get-models" tool returns all the models in the source.
-aliases:
- /resources/tools/looker-get-models
---
-
-## About
-
-A `looker-get-models` tool returns all the models the source.
-
-It's compatible with the following sources:
-
- [looker](../sources/looker.md)
-
-`looker-get-models` accepts no parameters.
-
-## Example
-
-```yaml
-tools:
-    get_models:
-        kind: looker-get-models
-        source: looker-source
-        description: |
-          The get_models tool retrieves the list of LookML models in the Looker system.
-
-          It takes no parameters.
-```
-
-## Reference
-
-| **field**   |                  **type**                  | **required** | **description**                                                                                  |
-|-------------|:------------------------------------------:|:------------:|--------------------------------------------------------------------------------------------------|
-| kind        |                   string                   |     true     | Must be "looker-get-models".                                                                     |
-| source      |                   string                   |     true     | Name of the source the SQL should execute on.                                                    |
-| description |                   string                   |     true     | Description of the tool that is passed to the LLM.                                               |
--- a/docs/en/resources/tools/looker/looker_get_parameters.md
+++ b/docs/en/resources/tools/looker/looker_get_parameters.md
@@ -1,44 +0,0 @@
---
-title: "looker-get-parameters"
-type: docs
-weight: 1
-description: > 
-  A "looker-get-parameters" tool returns all the parameters from a given explore
-  in a given model in the source.
-aliases:
- /resources/tools/looker-get-parameters
---
-
-## About
-
-A `looker-get-parameters` tool returns all the parameters from a given explore
-in a given mode in the source.
-
-It's compatible with the following sources:
-
- [looker](../sources/looker.md)
-
-`looker-get-parameters` accepts two parameters, the `model` and the `explore`.
-
-## Example
-
-```yaml
-tools:
-    get_parameters:
-        kind: looker-get-parameters
-        source: looker-source
-        description: |
-          The get_parameters tool retrieves the list of parameters defined in
-          an explore.
-
-          It takes two parameters, the model_name looked up from get_models and the
-          explore_name looked up from get_explores.
-```
-
-## Reference
-
-| **field**   |                  **type**                  | **required** | **description**                                                                                  |
-|-------------|:------------------------------------------:|:------------:|--------------------------------------------------------------------------------------------------|
-| kind        |                   string                   |     true     | Must be "looker-get-parameters".                                                                   |
-| source      |                   string                   |     true     | Name of the source the SQL should execute on.                                                    |
-| description |                   string                   |     true     | Description of the tool that is passed to the LLM.                                               |
--- a/docs/en/resources/tools/looker/looker_query.md
+++ b/docs/en/resources/tools/looker/looker_query.md
@@ -1,79 +0,0 @@
---
-title: "looker-query"
-type: docs
-weight: 1
-description: >
-  "looker-query" runs an inline query using the Looker
-  semantic model.
-aliases:
- /resources/tools/looker-query
---
-
-## About
-
-The `looker-query` tool runs a query using the Looker
-semantic model.
-
-It's compatible with the following sources:
-
- [looker](../sources/looker.md)
-
-`looker-query` takes eight parameters:
-1. the `model`
-2. the `explore`
-3. the `fields` list
-4. an optional set of `filters`
-5. an optional set of `pivots`
-6. an optional set of `sorts`
-7. an optional `limit`
-8. an optional `tz`
-
-## Example
-
-```yaml
-tools:
-    query:
-        kind: looker-query
-        source: looker-source
-        description: |
-          Query Tool
-
-          This tool is used to run a query against the LookML model. The
-          model, explore, and fields list must be specified. Pivots,
-          filters and sorts are optional.
-
-          The model can be found from the get_models tool. The explore
-          can be found from the get_explores tool passing in the model.
-          The fields can be found from the get_dimensions, get_measures,
-          get_filters, and get_parameters tools, passing in the model
-          and the explore.
-
-          Provide a model_id and explore_name, then a list
-          of fields. Optionally a list of pivots can be provided.
-          The pivots must also be included in the fields list.
-
-          Filters are provided as a map of {"field.id": "condition",
-          "field.id2": "condition2", ...}. Do not put the field.id in
-          quotes. Filter expressions can be found at
-          https://cloud.google.com/looker/docs/filter-expressions.
-
-          Sorts can be specified like [ "field.id desc 0" ].
-
-          An optional row limit can be added. If not provided the limit
-          will default to 500. "-1" can be specified for unlimited.
-
-          An optional query timezone can be added. The query_timezone to
-          will default to that of the workstation where this MCP server
-          is running, or Etc/UTC if that can't be determined. Not all
-          models support custom timezones.
-
-          The result of the query tool is JSON
-```
-
-## Reference
-
-| **field**   |                  **type**                  | **required** | **description**                                                                                  |
-|-------------|:------------------------------------------:|:------------:|--------------------------------------------------------------------------------------------------|
-| kind        |                   string                   |     true     | Must be "looker-query"                                                                           |
-| source      |                   string                   |     true     | Name of the source the SQL should execute on.                                                    |
-| description |                   string                   |     true     | Description of the tool that is passed to the LLM.                                               |
--- a/docs/en/resources/tools/looker/looker_query_sql.md
+++ b/docs/en/resources/tools/looker/looker_query_sql.md
@@ -1,79 +0,0 @@
---
-title: "looker-query-sql"
-type: docs
-weight: 1
-description: >
-  "looker-query-sql" generates a sql query using the Looker
-  semantic model.
-aliases:
- /resources/tools/looker-query-sql
---
-
-## About
-
-The `looker-query-sql` generates a sql query using the Looker
-semantic model.
-
-It's compatible with the following sources:
-
- [looker](../sources/looker.md)
-
-`looker-query-sql` takes eight parameters:
-1. the `model`
-2. the `explore`
-3. the `fields` list
-4. an optional set of `filters`
-5. an optional set of `pivots`
-6. an optional set of `sorts`
-7. an optional `limit`
-8. an optional `tz`
-
-## Example
-
-```yaml
-tools:
-    query_sql:
-        kind: looker-query-sql
-        source: looker-source
-        description: |
-          Query SQL Tool
-
-          This tool is used to generate a sql query against the LookML model. The
-          model, explore, and fields list must be specified. Pivots,
-          filters and sorts are optional.
-
-          The model can be found from the get_models tool. The explore
-          can be found from the get_explores tool passing in the model.
-          The fields can be found from the get_dimensions, get_measures,
-          get_filters, and get_parameters tools, passing in the model
-          and the explore.
-
-          Provide a model_id and explore_name, then a list
-          of fields. Optionally a list of pivots can be provided.
-          The pivots must also be included in the fields list.
-
-          Filters are provided as a map of {"field.id": "condition",
-          "field.id2": "condition2", ...}. Do not put the field.id in
-          quotes. Filter expressions can be found at
-          https://cloud.google.com/looker/docs/filter-expressions.
-
-          Sorts can be specified like [ "field.id desc 0" ].
-
-          An optional row limit can be added. If not provided the limit
-          will default to 500. "-1" can be specified for unlimited.
-
-          An optional query timezone can be added. The query_timezone to
-          will default to that of the workstation where this MCP server
-          is running, or Etc/UTC if that can't be determined. Not all
-          models support custom timezones.
-
-          The result of the query tool is the sql string.
-```
-
-## Reference
-
-| **field**   |                  **type**                  | **required** | **description**                                                                                  |
-|-------------|:------------------------------------------:|:------------:|--------------------------------------------------------------------------------------------------|
-| kind        |                   string                   |     true     | Must be "looker-query-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/looker/looker_run_look.md
+++ b/docs/en/resources/tools/looker/looker_run_look.md
@@ -1,43 +0,0 @@
---
-title: "looker-run-look"
-type: docs
-weight: 1
-description: >
-  "looker-run-look" runs the query associated with a saved Look.
-aliases:
- /resources/tools/looker-run-look
---
-
-## About
-
-The `looker-run-look` tool runs the query associated with a
-saved Look.
-
-It's compatible with the following sources:
-
- [looker](../sources/looker.md)
-
-`looker-run-look` takes one parameter, the `look_id`.
-
-## Example
-
-```yaml
-tools:
-    run_look:
-        kind: looker-run-look
-        source: looker-source
-        description: |
-          run_look Tool
-
-          This tool runs the query associated with a look and returns
-          the data in a JSON structure. It accepts the look_id as the
-          parameter.
-```
-
-## Reference
-
-| **field**   |                  **type**                  | **required** | **description**                                                                                  |
-|-------------|:------------------------------------------:|:------------:|--------------------------------------------------------------------------------------------------|
-| kind        |                   string                   |     true     | Must be "looker-run-look"                                                                        |
-| 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/neo4j/neo4j-execute-cypher.md
+++ b/docs/en/resources/tools/neo4j/neo4j-execute-cypher.md
@@ -1,53 +0,0 @@
---
-title: "neo4j-execute-cypher"
-type: docs
-weight: 1
-description: > 
-  A "neo4j-execute-cypher" tool executes any arbitrary Cypher statement against a Neo4j
-  database.
-aliases:
- /resources/tools/neo4j-execute-cypher
---
-
-## About
-
-A `neo4j-execute-cypher` tool executes an arbitrary Cypher query provided as a string parameter against a Neo4j database. It's designed to be a flexible tool for interacting with the database when a pre-defined query is not sufficient. This tool is compatible with any of the following sources:
-
- [neo4j](../sources/neo4j.md)
-
-For security, the tool can be configured to be read-only. If the `readOnly` flag is set to `true`, the tool will analyze the incoming Cypher query and reject any write operations (like `CREATE`, `MERGE`, `DELETE`, etc.) before execution.
-
-The Cypher query uses standard [Neo4j Cypher](https://neo4j.com/docs/cypher-manual/current/queries/) syntax and supports all Cypher features, including pattern matching, filtering, and aggregation.
-
-`neo4j-execute-cypher` takes one input parameter `cypher` and run the cypher query 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:
-  query_neo4j:
-    kind: neo4j-execute-cypher
-    source: my-neo4j-prod-db
-    readOnly: true
-    description: |
-      Use this tool to execute a Cypher query against the production database.
-      Only read-only queries are allowed.
-      Takes a single 'cypher' parameter containing the full query string.
-      Example:
-      {{
-          "cypher": "MATCH (m:Movie {title: 'The Matrix'}) RETURN m.released"
-      }}
-```
-
-## Reference
-
-| **field**   |                  **type**                  | **required** | **description**                                                                                 |
-|-------------|:------------------------------------------:|:------------:|-------------------------------------------------------------------------------------------------|
-| kind        |                   string                   |     true     | Must be "neo4j-cypher".                                                                         |
-| source      |                   string                   |     true     | Name of the source the Cypher query should execute on.                                          |
-| description |                   string                   |     true     | Description of the tool that is passed to the LLM.                                              |
-| readOnly    |                   boolean                  |     false    | If set to `true`, the tool will reject any write operations in the Cypher query. Default is `false`. |
-
--- a/docs/en/resources/tools/utility/alloydbwaitforoperation.md
+++ b/docs/en/resources/tools/utility/alloydbwaitforoperation.md
@@ -1,47 +0,0 @@
---
-title: "alloydb-wait-for-operation"
-type: docs
-weight: 10
-description: >
-  Wait for a long-running AlloyDB operation to complete.
---
-
-The `alloydb-wait-for-operation` tool is a utility tool that waits for a long-running AlloyDB operation to complete. It does this by polling the AlloyDB Admin API operation status endpoint until the operation is finished, using exponential backoff.
-
-{{< notice info >}}
-This tool is intended for developer assistant workflows with human-in-the-loop and shouldn't be used for production agents.
-{{< /notice >}}
-
-## Example
-
-```yaml
-sources:
-  alloydb-api-source:
-    kind: http
-    baseUrl: https://alloydb.googleapis.com
-    headers:
-      Authorization: Bearer ${API_KEY}
-      Content-Type: application/json
-
-tools:
-  alloydb-operations-get:
-    kind: alloydb-wait-for-operation
-    source: alloydb-api-source
-    description: "This will poll on operations API until the operation is done. For checking operation status we need projectId, locationID and operationId. Once instance is created give follow up steps on how to use the variables to bring data plane MCP server up in local and remote setup."
-    delay: 1s
-    maxDelay: 4m
-    multiplier: 2
-    maxRetries: 10
-```
-
-## Reference
-
-| **field**   | **type** | **required** | **description**                                                                                                  |
-| ----------- | :------: | :----------: | ---------------------------------------------------------------------------------------------------------------- |
-| kind        |  string  |     true     | Must be "alloydb-wait-for-operation".                                                                            |
-| source      |  string  |     true     | Name of the source the HTTP request should be sent to.                                                           |
-| description |  string  |    true     | A description of the tool.                                                                                       |
-| delay       | duration |    false     | The initial delay between polling requests (e.g., `3s`). Defaults to 3 seconds.                                  |
-| maxDelay    | duration |    false     | The maximum delay between polling requests (e.g., `4m`). Defaults to 4 minutes.                                  |
-| multiplier  |  float   |    false     | The multiplier for the polling delay. The delay is multiplied by this value after each request. Defaults to 2.0. |
-| maxRetries  |   int    |    false     | The maximum number of polling attempts before giving up. Defaults to 10.                                         |
--- a/docs/en/resources/tools/utility/wait.md
+++ b/docs/en/resources/tools/utility/wait.md
@@ -1,37 +0,0 @@
---
-title: "wait"
-type: docs
-weight: 1
-description: > 
-  A "wait" tool pauses execution for a specified duration.
-aliases:
- /resources/tools/utility/wait
---
-
-## About
-
-A `wait` tool pauses execution for a specified duration. This can be useful in workflows where a delay is needed between steps.
-
-`wait` takes one input parameter `duration` which is a string representing the time to wait (e.g., "10s", "2m", "1h").
-
-{{% notice info %}} 
-This tool is intended for developer assistant workflows with human-in-the-loop and shouldn't be used for production agents.
-{{% /notice %}}
-
-## Example
-
-```yaml
-tools:
-  wait_for_tool:
-    kind: wait
-    description: Use this tool to pause execution for a specified duration.
-    timeout: 30s
-```
-
-## Reference
-
-| **field**   |                  **type**                  | **required** | **description**                                                                                  |
-|-------------|:------------------------------------------:|:------------:|--------------------------------------------------------------------------------------------------|
-| kind        |                   string                   |     true     | Must be "wait".                                                                     |
-| description |                   string                   |     true     | Description of the tool that is passed to the LLM.                                               |
-| timeout     |                   string                   |     true     | The default duration the tool can wait for.                                                      |
--- a/docs/en/samples/bigquery/colab_quickstart_bigquery.ipynb
+++ b/docs/en/samples/bigquery/colab_quickstart_bigquery.ipynb
@@ -220,7 +220,7 @@
      },
      "outputs": [],
      "source": [
-        "version = \"0.9.0\" # x-release-please-version\n",
+        "version = \"0.7.0\" # x-release-please-version\n",
        "! curl -O https://storage.googleapis.com/genai-toolbox/v{version}/linux/amd64/toolbox\n",
        "\n",
        "# Make the binary executable\n",
--- a/docs/en/samples/bigquery/local_quickstart.md
+++ b/docs/en/samples/bigquery/local_quickstart.md
@@ -179,7 +179,7 @@ to use BigQuery, and then run the Toolbox server.
    <!-- {x-release-please-start-version} -->
    ```bash
    export OS="linux/amd64" # one of linux/amd64, darwin/arm64, darwin/amd64, or windows/amd64
-    curl -O https://storage.googleapis.com/genai-toolbox/v0.9.0/$OS/toolbox
+    curl -O https://storage.googleapis.com/genai-toolbox/v0.7.0/$OS/toolbox
    ```
    <!-- {x-release-please-end} -->

@@ -292,9 +292,6 @@ to use BigQuery, and then run the Toolbox server.
    ```bash
    ./toolbox --tools-file "tools.yaml"
    ```
-    {{< notice note >}}
-    Toolbox enables dynamic reloading by default. To disable, use the `--disable-reload` flag.
-    {{< /notice >}}

 ## Step 3: Connect your agent to Toolbox

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

@@ -208,25 +208,17 @@ In this section, we will download Toolbox, configure our tools in a

 1. Type `y` when it asks to install the inspector package.

-1. It should show the following when the MCP Inspector is up and running (please take note of `<YOUR_SESSION_TOKEN>`):
+1. It should show the following when the MCP Inspector is up and running:

    ```bash
-    Starting MCP inspector...
-    ⚙️ Proxy server listening on localhost:6277
-    🔑 Session token: <YOUR_SESSION_TOKEN>
-       Use this token to authenticate requests or set DANGEROUSLY_OMIT_AUTH=true to disable auth
-
-    🚀 MCP Inspector is up and running at:
-       http://localhost:6274/?MCP_PROXY_AUTH_TOKEN=<YOUR_SESSION_TOKEN>
+    🔍 MCP Inspector is up and running at http://127.0.0.1:5173 🚀
    ```

 1. Open the above link in your browser.

-1. For `Transport Type`, select `Streamable HTTP`.
+1. For `Transport Type`, select `SSE`.

-1. For `URL`, type in `http://127.0.0.1:5000/mcp`.
-
-1. For `Configuration` -> `Proxy Session Token`, make sure `<YOUR_SESSION_TOKEN>` is present.
+1. For `URL`, type in `http://127.0.0.1:5000/mcp/sse`.

 1. Click Connect.

@@ -236,4 +228,4 @@ In this section, we will download Toolbox, configure our tools in a

    ![inspector_tools](./inspector_tools.png)

-1. Test out your tools here!
+1. Test out your tools here!
--- a/docs/en/samples/bigquery/mcp_quickstart/inspector.png
+++ b/docs/en/samples/bigquery/mcp_quickstart/inspector.png
--- a/docs/en/samples/looker/_index.md
+++ b/docs/en/samples/looker/_index.md
@@ -1,7 +0,0 @@
---
-title: "Looker"
-type: docs
-weight: 1
-description: >
-  How to get started with Toolbox using Looker.
---
--- a/docs/en/samples/looker/inspector.png
+++ b/docs/en/samples/looker/inspector.png
--- a/docs/en/samples/looker/inspector_tools.png
+++ b/docs/en/samples/looker/inspector_tools.png
--- a/docs/en/samples/looker/looker_gemini.md
+++ b/docs/en/samples/looker/looker_gemini.md
@@ -1,108 +0,0 @@
---
-title: "Quickstart (MCP with Looker and Gemini-CLI)"
-type: docs
-weight: 2
-description: >
-  How to get started running Toolbox with Gemini-CLI and Looker as the source.
---
-
-## Overview
-
-[Model Context Protocol](https://modelcontextprotocol.io) is an open protocol
-that standardizes how applications provide context to LLMs. Check out this page
-on how to [connect to Toolbox via MCP](../../how-to/connect_via_mcp.md).
-
-## Step 1: Get a Looker Client ID and Client Secret
-
-The Looker Client ID and Client Secret can be obtained from the Users page of
-your Looker instance. Refer to the documentation
-[here](https://cloud.google.com/looker/docs/api-auth#authentication_with_an_sdk).
-You may need to ask an administrator to get the Client ID and Client Secret
-for you.
-
-## Step 2: Install and configure Toolbox
-
-In this section, we will download Toolbox and 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.10.0/$OS/toolbox
-    ```
-    <!-- {x-release-please-end} -->
-
-1. Make the binary executable:
-
-    ```bash
-    chmod +x toolbox
-    ```
-
-1. Edit the file `~/.gemini/settings.json` and add the following
-   to the list of mcpServers. Use the Client Id and Client Secret
-   you obtained earlier.
-
-   ```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"
-          }
-        }
-      }
-   ```
-
-   In some instances you may need to append `:19999` to
-   the LOOKER_BASE_URL.
-
-## Step 3: Start Gemini-CLI
-
-1. Run Gemini-CLI:
-
-    ```bash
-    npx https://github.com/google-gemini/gemini-cli
-    ```
-
-1. Type `y` when it asks to download.
-
-1. Log into Gemini-CLI
-
-1. Enter the command `/mcp` and you should see a list of
-   available tools like
-
-   ```
-    ℹ Configured MCP servers:
-
-      🟢 looker-toolbox - Ready (10 tools)
-        - looker-toolbox__get_models
-        - looker-toolbox__query
-        - looker-toolbox__get_looks
-        - looker-toolbox__get_measures
-        - looker-toolbox__get_filters
-        - looker-toolbox__get_parameters
-        - looker-toolbox__get_explores
-        - looker-toolbox__query_sql
-        - looker-toolbox__get_dimensions
-        - looker-toolbox__run_look
-    ```
-1. Start exploring your Looker instance with commands like
-   `Find an explore to see orders` or `show me my current
-   inventory broken down by item category`.
-
-1. Gemini will prompt you for your approval before using
-   a tool. You can approve all the tools.
--- a/docs/en/samples/looker/looker_mcp_inspector.md
+++ b/docs/en/samples/looker/looker_mcp_inspector.md
@@ -1,103 +0,0 @@
---
-title: "Quickstart (MCP with Looker)"
-type: docs
-weight: 2
-description: >
-  How to get started running Toolbox with MCP Inspector and Looker as the source.
---
-
-## Overview
-
-[Model Context Protocol](https://modelcontextprotocol.io) is an open protocol
-that standardizes how applications provide context to LLMs. Check out this page
-on how to [connect to Toolbox via MCP](../../how-to/connect_via_mcp.md).
-
-## Step 1: Get a Looker Client ID and Client Secret
-
-The Looker Client ID and Client Secret can be obtained from the Users page of
-your Looker instance. Refer to the documentation
-[here](https://cloud.google.com/looker/docs/api-auth#authentication_with_an_sdk).
-You may need to ask an administrator to get the Client ID and Client Secret
-for you.
-
-## Step 2: Install and configure Toolbox
-
-In this section, we will download Toolbox and 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.10.0/$OS/toolbox
-    ```
-    <!-- {x-release-please-end} -->
-
-1. Make the binary executable:
-
-    ```bash
-    chmod +x toolbox
-    ```
-
-1. Create a file `looker_env` with the settings for your
-   Looker instance. Use the Client ID and Client Secret
-   you obtained earlier.
-
-   ```bash
-    export LOOKER_BASE_URL=https://looker.example.com
-    export LOOKER_VERIFY_SSL=true
-    export LOOKER_CLIENT_ID=Q7ynZkRkvj9S9FHPm4Wj
-    export LOOKER_CLIENT_SECRET=P5JvZstFnhpkhCYy2yNSfJ6x
-   ```
-
-   In some instances you may need to append `:19999` to
-   the LOOKER_BASE_URL.
-
-1. Load the looker_env file into your environment.
-
-   ```bash
-   source looker_env
-   ```
-
-1. Run the Toolbox server using the prebuilt Looker tools.
-
-    ```bash
-    ./toolbox --prebuilt looker
-    ```
-
-## Step 3: Connect to MCP Inspector
-
-1. Run the MCP Inspector:
-
-    ```bash
-    npx @modelcontextprotocol/inspector
-    ```
-
-1. Type `y` when it asks to install the inspector package.
-
-1. It should show the following when the MCP Inspector is up and running:
-
-    ```bash
-    🔍 MCP Inspector is up and running at http://127.0.0.1:5173 🚀
-    ```
-
-1. Open the above link in your browser.
-
-1. For `Transport Type`, select `SSE`.
-
-1. For `URL`, type in `http://127.0.0.1:5000/mcp/sse`.
-
-1. Click Connect.
-
-    ![inspector](./inspector.png)
-
-1. Select `List Tools`, you will see a list of tools.
-
-    ![inspector_tools](./inspector_tools.png)
-
-1. Test out your tools here!
--- a/docs/en/sdks/_index.md
+++ b/docs/en/sdks/_index.md
@@ -1,7 +0,0 @@
---
-title: "SDKs"
-type: docs
-weight: 6
-description: >
-  Client SDKs to connect to the MCP Toolbox server.
---
--- a/docs/en/sdks/go-sdk.md
+++ b/docs/en/sdks/go-sdk.md
@@ -1,15 +0,0 @@
---
-title: "Go SDK"
-weight: 2
-description: Go lang client SDK
-icon: fa-brands fa-golang
-manualLink: "https://github.com/googleapis/mcp-toolbox-sdk-go"
-manualLinkTarget: _blank
---
-
-<html>
-  <head>
-    <link rel="canonical" href="https://github.com/googleapis/mcp-toolbox-sdk-go"/>
-    <meta http-equiv="refresh" content="0;url=https://github.com/googleapis/mcp-toolbox-sdk-go"/>
-  </head>
-</html>
--- a/docs/en/sdks/js-sdk.md
+++ b/docs/en/sdks/js-sdk.md
@@ -1,15 +0,0 @@
---
-title: "JS SDK"
-weight: 2
-description: Javascript client SDK
-icon: fa-brands fa-node-js
-manualLink: "https://github.com/googleapis/mcp-toolbox-sdk-js"
-manualLinkTarget: _blank
---
-
-<html>
-  <head>
-    <link rel="canonical" href="https://github.com/googleapis/mcp-toolbox-sdk-js"/>
-    <meta http-equiv="refresh" content="0;url=https://github.com/googleapis/mcp-toolbox-sdk-js"/>
-  </head>
-</html>
--- a/docs/en/sdks/python-sdk.md
+++ b/docs/en/sdks/python-sdk.md
@@ -1,15 +0,0 @@
---
-title: "Python SDK"
-weight: 2
-description: Python client SDK
-icon: fa-brands fa-python
-manualLink: "https://github.com/googleapis/mcp-toolbox-sdk-python"
-manualLinkTarget: _blank
---
-
-<html>
-  <head>
-    <link rel="canonical" href="https://github.com/googleapis/mcp-toolbox-sdk-python"/>
-    <meta http-equiv="refresh" content="0;url=hhttps://github.com/googleapis/mcp-toolbox-sdk-python"/>
-  </head>
-</html>
--- a/go.mod
+++ b/go.mod
@@ -2,48 +2,43 @@ module github.com/googleapis/genai-toolbox

 go 1.23.8

-toolchain go1.24.5
+toolchain go1.24.4

 require (
-	cloud.google.com/go/alloydbconn v1.15.4
+	cloud.google.com/go/alloydbconn v1.15.3
 	cloud.google.com/go/bigquery v1.69.0
-	cloud.google.com/go/bigtable v1.38.0
-	cloud.google.com/go/cloudsqlconn v1.17.3
-	cloud.google.com/go/firestore v1.18.0
+	cloud.google.com/go/bigtable v1.37.0
+	cloud.google.com/go/cloudsqlconn v1.17.2
 	cloud.google.com/go/spanner v1.83.0
 	github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.53.0
 	github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.29.0
-	github.com/couchbase/gocb/v2 v2.10.1
+	github.com/couchbase/gocb/v2 v2.10.0
 	github.com/couchbase/tools-common/http v1.0.9
-	github.com/fsnotify/fsnotify v1.9.0
 	github.com/go-chi/chi/v5 v5.2.2
 	github.com/go-chi/httplog/v2 v2.1.1
 	github.com/go-chi/render v1.0.3
-	github.com/go-playground/validator/v10 v10.27.0
+	github.com/go-playground/validator/v10 v10.26.0
 	github.com/go-sql-driver/mysql v1.9.3
 	github.com/goccy/go-yaml v1.18.0
 	github.com/google/go-cmp v0.7.0
 	github.com/google/uuid v1.6.0
 	github.com/jackc/pgx/v5 v5.7.5
 	github.com/json-iterator/go v1.1.12
-	github.com/looker-open-source/sdk-codegen/go v0.25.10
 	github.com/microsoft/go-mssqldb v1.9.2
 	github.com/neo4j/neo4j-go-driver/v5 v5.28.1
 	github.com/redis/go-redis/v9 v9.11.0
 	github.com/spf13/cobra v1.9.1
-	github.com/thlib/go-timezone-local v0.0.7
-	github.com/valkey-io/valkey-go v1.0.63
-	go.mongodb.org/mongo-driver v1.17.4
-	go.opentelemetry.io/contrib/propagators/autoprop v0.62.0
-	go.opentelemetry.io/otel v1.37.0
-	go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.37.0
-	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.37.0
-	go.opentelemetry.io/otel/metric v1.37.0
-	go.opentelemetry.io/otel/sdk v1.37.0
-	go.opentelemetry.io/otel/sdk/metric v1.37.0
-	go.opentelemetry.io/otel/trace v1.37.0
+	github.com/valkey-io/valkey-go v1.0.62
+	go.opentelemetry.io/contrib/propagators/autoprop v0.61.0
+	go.opentelemetry.io/otel v1.36.0
+	go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.36.0
+	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.36.0
+	go.opentelemetry.io/otel/metric v1.36.0
+	go.opentelemetry.io/otel/sdk v1.36.0
+	go.opentelemetry.io/otel/sdk/metric v1.36.0
+	go.opentelemetry.io/otel/trace v1.36.0
 	golang.org/x/oauth2 v0.30.0
-	google.golang.org/api v0.243.0
+	google.golang.org/api v0.239.0
 	modernc.org/sqlite v1.38.0
 )

@@ -52,8 +47,8 @@ require golang.org/x/exp v0.0.0-20250408133849-7e4ce0ab07d0 // indirect
 require (
 	cel.dev/expr v0.23.0 // indirect
 	cloud.google.com/go v0.121.2 // indirect
-	cloud.google.com/go/alloydb v1.18.0 // indirect
-	cloud.google.com/go/auth v0.16.3 // indirect
+	cloud.google.com/go/alloydb v1.16.1 // indirect
+	cloud.google.com/go/auth v0.16.2 // indirect
 	cloud.google.com/go/auth/oauth2adapt v0.2.8 // indirect
 	cloud.google.com/go/compute/metadata v0.7.0 // indirect
 	cloud.google.com/go/iam v1.5.2 // indirect
@@ -69,7 +64,7 @@ require (
 	github.com/cenkalti/backoff/v5 v5.0.2 // indirect
 	github.com/cespare/xxhash/v2 v2.3.0 // indirect
 	github.com/cncf/xds/go v0.0.0-20250326154945-ae57f3c0d45f // indirect
-	github.com/couchbase/gocbcore/v10 v10.7.1 // indirect
+	github.com/couchbase/gocbcore/v10 v10.7.0 // indirect
 	github.com/couchbase/gocbcoreps v0.1.3 // indirect
 	github.com/couchbase/goprotostellar v1.0.2 // indirect
 	github.com/couchbase/tools-common/errors v1.0.0 // indirect
@@ -93,10 +88,10 @@ require (
 	github.com/google/flatbuffers v23.5.26+incompatible // indirect
 	github.com/google/s2a-go v0.1.9 // indirect
 	github.com/googleapis/enterprise-certificate-proxy v0.3.6 // indirect
-	github.com/googleapis/gax-go/v2 v2.15.0 // indirect
+	github.com/googleapis/gax-go/v2 v2.14.2 // indirect
 	github.com/gorilla/websocket v1.5.3 // indirect
 	github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 // indirect
-	github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.1 // indirect
+	github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.3 // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
 	github.com/jackc/pgpassfile v1.0.0 // indirect
 	github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect
@@ -107,16 +102,12 @@ require (
 	github.com/mattn/go-isatty v0.0.20 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
-	github.com/montanaflynn/stats v0.7.1 // indirect
 	github.com/ncruces/go-strftime v0.1.9 // indirect
 	github.com/pierrec/lz4/v4 v4.1.18 // indirect
 	github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 // indirect
 	github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
 	github.com/spf13/pflag v1.0.6 // indirect
 	github.com/spiffe/go-spiffe/v2 v2.5.0 // indirect
-	github.com/xdg-go/pbkdf2 v1.0.0 // indirect
-	github.com/xdg-go/scram v1.1.2 // indirect
-	github.com/xdg-go/stringprep v1.0.4 // indirect
 	github.com/youmark/pkcs8 v0.0.0-20240726163527-a2c0da244d78 // indirect
 	github.com/zeebo/errs v1.4.0 // indirect
 	github.com/zeebo/xxh3 v1.0.2 // indirect
@@ -125,29 +116,28 @@ require (
 	go.opentelemetry.io/contrib/detectors/gcp v1.36.0 // indirect
 	go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.61.0 // indirect
 	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.61.0 // indirect
-	go.opentelemetry.io/contrib/propagators/aws v1.37.0 // indirect
-	go.opentelemetry.io/contrib/propagators/b3 v1.37.0 // indirect
-	go.opentelemetry.io/contrib/propagators/jaeger v1.37.0 // indirect
-	go.opentelemetry.io/contrib/propagators/ot v1.37.0 // indirect
-	go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.37.0 // indirect
-	go.opentelemetry.io/proto/otlp v1.7.0 // indirect
+	go.opentelemetry.io/contrib/propagators/aws v1.36.0 // indirect
+	go.opentelemetry.io/contrib/propagators/b3 v1.36.0 // indirect
+	go.opentelemetry.io/contrib/propagators/jaeger v1.36.0 // indirect
+	go.opentelemetry.io/contrib/propagators/ot v1.36.0 // indirect
+	go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.36.0 // indirect
+	go.opentelemetry.io/proto/otlp v1.6.0 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
 	go.uber.org/zap v1.27.0 // indirect
-	golang.org/x/crypto v0.40.0 // indirect
+	golang.org/x/crypto v0.39.0 // indirect
 	golang.org/x/mod v0.25.0 // indirect
-	golang.org/x/net v0.42.0 // indirect
-	golang.org/x/sync v0.16.0 // indirect
-	golang.org/x/sys v0.34.0 // indirect
-	golang.org/x/text v0.27.0 // indirect
+	golang.org/x/net v0.41.0 // indirect
+	golang.org/x/sync v0.15.0 // indirect
+	golang.org/x/sys v0.33.0 // indirect
+	golang.org/x/text v0.26.0 // indirect
 	golang.org/x/time v0.12.0 // indirect
-	golang.org/x/tools v0.34.0 // indirect
+	golang.org/x/tools v0.33.0 // indirect
 	golang.org/x/xerrors v0.0.0-20240903120638-7835f813f4da // indirect
-	google.golang.org/genproto v0.0.0-20250603155806-513f23925822 // indirect
+	google.golang.org/genproto v0.0.0-20250505200425-f936aa4a68b2 // indirect
 	google.golang.org/genproto/googleapis/api v0.0.0-20250603155806-513f23925822 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20250715232539-7130f93afb79 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20250603155806-513f23925822 // indirect
 	google.golang.org/grpc v1.73.0 // indirect
 	google.golang.org/protobuf v1.36.6 // indirect
-	gopkg.in/ini.v1 v1.67.0 // indirect
 	modernc.org/libc v1.65.10 // indirect
 	modernc.org/mathutil v1.7.1 // indirect
 	modernc.org/memory v1.11.0 // indirect
--- a/go.sum
+++ b/go.sum
@@ -53,10 +53,10 @@ cloud.google.com/go/aiplatform v1.27.0/go.mod h1:Bvxqtl40l0WImSb04d0hXFU7gDOiq9j
 cloud.google.com/go/aiplatform v1.35.0/go.mod h1:7MFT/vCaOyZT/4IIFfxH4ErVg/4ku6lKv3w0+tFTgXQ=
 cloud.google.com/go/aiplatform v1.36.1/go.mod h1:WTm12vJRPARNvJ+v6P52RDHCNe4AhvjcIZ/9/RRHy/k=
 cloud.google.com/go/aiplatform v1.37.0/go.mod h1:IU2Cv29Lv9oCn/9LkFiiuKfwrRTq+QQMbW+hPCxJGZw=
-cloud.google.com/go/alloydb v1.18.0 h1:P+s1oek+sF3MlcumZuOj2ueUlusVwr3IT0R0vUbMA88=
-cloud.google.com/go/alloydb v1.18.0/go.mod h1:iB/PmQYLHwDXCGCc0weeL5ORP6GadFjXJlRZ9pE0vSY=
-cloud.google.com/go/alloydbconn v1.15.4 h1:RvtwKVq0YxYQFTKaW5jQWGPAVSvxO3ebqKj2oyl009A=
-cloud.google.com/go/alloydbconn v1.15.4/go.mod h1:m5Db60PJv75Hz9uIaIIJR7ZPQazVC4VGxlhxNqYCBjk=
+cloud.google.com/go/alloydb v1.16.1 h1:pW4D0O2jAfAjoOEI1bgChPwMHWE8X8BjwSO0tfWkWvk=
+cloud.google.com/go/alloydb v1.16.1/go.mod h1:zeZuGJ5mEaQE70FMXEvZIp5hQLR9yrGnHo1YUOncWRY=
+cloud.google.com/go/alloydbconn v1.15.3 h1:j0Y0+LpVjdyUguX0uwsaeTtq4tQUZiFvsO52AH+yusY=
+cloud.google.com/go/alloydbconn v1.15.3/go.mod h1:9yrNzUeMr3wR/D4gTJrh5ph2VDW/19tAMV7TlNuyRfM=
 cloud.google.com/go/analytics v0.11.0/go.mod h1:DjEWCu41bVbYcKyvlws9Er60YE4a//bK6mnhWvQeFNI=
 cloud.google.com/go/analytics v0.12.0/go.mod h1:gkfj9h6XRf9+TS4bmuhPEShsh3hH8PAZzm/41OOhQd4=
 cloud.google.com/go/analytics v0.17.0/go.mod h1:WXFa3WSym4IZ+JiKmavYdJwGG/CvpqiqczmL59bTD9M=
@@ -105,8 +105,8 @@ cloud.google.com/go/assuredworkloads v1.7.0/go.mod h1:z/736/oNmtGAyU47reJgGN+KVo
 cloud.google.com/go/assuredworkloads v1.8.0/go.mod h1:AsX2cqyNCOvEQC8RMPnoc0yEarXQk6WEKkxYfL6kGIo=
 cloud.google.com/go/assuredworkloads v1.9.0/go.mod h1:kFuI1P78bplYtT77Tb1hi0FMxM0vVpRC7VVoJC3ZoT0=
 cloud.google.com/go/assuredworkloads v1.10.0/go.mod h1:kwdUQuXcedVdsIaKgKTp9t0UJkE5+PAVNhdQm4ZVq2E=
-cloud.google.com/go/auth v0.16.3 h1:kabzoQ9/bobUmnseYnBO6qQG7q4a/CffFRlJSxv2wCc=
-cloud.google.com/go/auth v0.16.3/go.mod h1:NucRGjaXfzP1ltpcQ7On/VTZ0H4kWB5Jy+Y9Dnm76fA=
+cloud.google.com/go/auth v0.16.2 h1:QvBAGFPLrDeoiNjyfVunhQ10HKNYuOwZ5noee0M5df4=
+cloud.google.com/go/auth v0.16.2/go.mod h1:sRBas2Y1fB1vZTdurouM0AzuYQBMZinrUYL8EufhtEA=
 cloud.google.com/go/auth/oauth2adapt v0.2.8 h1:keo8NaayQZ6wimpNSmW5OPc283g65QNIiLpZnkHRbnc=
 cloud.google.com/go/auth/oauth2adapt v0.2.8/go.mod h1:XQ9y31RkqZCcwJWNSx2Xvric3RrU88hAYYbjDWYDL+c=
 cloud.google.com/go/automl v1.5.0/go.mod h1:34EjfoFGMZ5sgJ9EoLsRtdPSNZLcfflJR39VbVNS2M0=
@@ -139,8 +139,8 @@ cloud.google.com/go/bigquery v1.49.0/go.mod h1:Sv8hMmTFFYBlt/ftw2uN6dFdQPzBlREY9
 cloud.google.com/go/bigquery v1.50.0/go.mod h1:YrleYEh2pSEbgTBZYMJ5SuSr0ML3ypjRB1zgf7pvQLU=
 cloud.google.com/go/bigquery v1.69.0 h1:rZvHnjSUs5sHK3F9awiuFk2PeOaB8suqNuim21GbaTc=
 cloud.google.com/go/bigquery v1.69.0/go.mod h1:TdGLquA3h/mGg+McX+GsqG9afAzTAcldMjqhdjHTLew=
-cloud.google.com/go/bigtable v1.38.0 h1:L/PnUXRtAzFfa7qMULJHt4cXa/O2dqPJEkzYNGA4hfo=
-cloud.google.com/go/bigtable v1.38.0/go.mod h1:o/lntJarF3Y5C0XYLMJLjLYwxaRbcrtM0BiV57ymXbI=
+cloud.google.com/go/bigtable v1.37.0 h1:Q+x7y04lQ0B+WXp03wc1/FLhFt4CwcQdkwWT0M4Jp3w=
+cloud.google.com/go/bigtable v1.37.0/go.mod h1:HXqddP6hduwzrtiTCqZPpj9ij4hGZb4Zy1WF/dT+yaU=
 cloud.google.com/go/billing v1.4.0/go.mod h1:g9IdKBEFlItS8bTtlrZdVLWSSdSyFUZKXNS02zKMOZY=
 cloud.google.com/go/billing v1.5.0/go.mod h1:mztb1tBc3QekhjSgmpf/CV4LzWXLzCArwpLmP2Gm88s=
 cloud.google.com/go/billing v1.6.0/go.mod h1:WoXzguj+BeHXPbKfNWkqVtDdzORazmCjraY+vrxcyvI=
@@ -167,8 +167,8 @@ cloud.google.com/go/cloudbuild v1.9.0/go.mod h1:qK1d7s4QlO0VwfYn5YuClDGg2hfmLZEb
 cloud.google.com/go/clouddms v1.3.0/go.mod h1:oK6XsCDdW4Ib3jCCBugx+gVjevp2TMXFtgxvPSee3OM=
 cloud.google.com/go/clouddms v1.4.0/go.mod h1:Eh7sUGCC+aKry14O1NRljhjyrr0NFC0G2cjwX0cByRk=
 cloud.google.com/go/clouddms v1.5.0/go.mod h1:QSxQnhikCLUw13iAbffF2CZxAER3xDGNHjsTAkQJcQA=
-cloud.google.com/go/cloudsqlconn v1.17.3 h1:dAEgQmhj9NHVRqven4elTBCbOWOtFPSNjAqBoznJSpc=
-cloud.google.com/go/cloudsqlconn v1.17.3/go.mod h1:5AHAXT4hbs2+EbzNDBxPu9QU+tJwRZyWNPwwiE8MzRs=
+cloud.google.com/go/cloudsqlconn v1.17.2 h1:SxSt6ujMxK1KyxKAI2Z5raT2n3geN7ipu6bA8f7iR7E=
+cloud.google.com/go/cloudsqlconn v1.17.2/go.mod h1:l7NymuoD+hycOo+92SJEyETPtE05oRG4oXjcH3swftw=
 cloud.google.com/go/cloudtasks v1.5.0/go.mod h1:fD92REy1x5woxkKEkLdvavGnPJGEn8Uic9nWuLzqCpY=
 cloud.google.com/go/cloudtasks v1.6.0/go.mod h1:C6Io+sxuke9/KNRkbQpihnW93SWDU3uXt92nu85HkYI=
 cloud.google.com/go/cloudtasks v1.7.0/go.mod h1:ImsfdYWwlWNJbdgPIIGJWC+gemEGTBK/SunNQQNCAb4=
@@ -293,8 +293,6 @@ cloud.google.com/go/filestore v1.4.0/go.mod h1:PaG5oDfo9r224f8OYXURtAsY+Fbyq/bLY
 cloud.google.com/go/filestore v1.5.0/go.mod h1:FqBXDWBp4YLHqRnVGveOkHDf8svj9r5+mUDLupOWEDs=
 cloud.google.com/go/filestore v1.6.0/go.mod h1:di5unNuss/qfZTw2U9nhFqo8/ZDSc466dre85Kydllg=
 cloud.google.com/go/firestore v1.9.0/go.mod h1:HMkjKHNTtRyZNiMzu7YAsLr9K3X2udY2AMwDaMEQiiE=
-cloud.google.com/go/firestore v1.18.0 h1:cuydCaLS7Vl2SatAeivXyhbhDEIR8BDmtn4egDhIn2s=
-cloud.google.com/go/firestore v1.18.0/go.mod h1:5ye0v48PhseZBdcl0qbl3uttu7FIEwEYVaWm0UIEOEU=
 cloud.google.com/go/functions v1.6.0/go.mod h1:3H1UA3qiIPRWD7PeZKLvHZ9SaQhR26XIJcC0A5GbvAk=
 cloud.google.com/go/functions v1.7.0/go.mod h1:+d+QBcWM+RsrgZfV9xo6KfA1GlzJfxcfZcRPEhDDfzg=
 cloud.google.com/go/functions v1.8.0/go.mod h1:RTZ4/HsQjIqIYP9a9YPbU+QFoQsAlYgrwOXJWHn1POY=
@@ -712,10 +710,10 @@ github.com/cncf/xds/go v0.0.0-20230105202645-06c439db220b/go.mod h1:eXthEFrGJvWH
 github.com/cncf/xds/go v0.0.0-20230607035331-e9ce68804cb4/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
 github.com/cncf/xds/go v0.0.0-20250326154945-ae57f3c0d45f h1:C5bqEmzEPLsHm9Mv73lSE9e9bKV23aB1vxOsmZrkl3k=
 github.com/cncf/xds/go v0.0.0-20250326154945-ae57f3c0d45f/go.mod h1:W+zGtBO5Y1IgJhy4+A9GOqVhqLpfZi+vwmdNXUehLA8=
-github.com/couchbase/gocb/v2 v2.10.1 h1:5r1jngGxw3dTZdtq6Xmjq3pdU6hOwRvynvbVIp58T64=
-github.com/couchbase/gocb/v2 v2.10.1/go.mod h1:GGEJuYjrfnPHCQLcxTcIco+Puy63PS2p8QQd8FRw66I=
-github.com/couchbase/gocbcore/v10 v10.7.1 h1:6jsNDtqyfoQ8Xg6kv99rzccc3CrHbp7FjeY+ahWXTF4=
-github.com/couchbase/gocbcore/v10 v10.7.1/go.mod h1:Q8JWVenMCEOuRgrDQKApHbzzPif38HzefGgRVe9apAI=
+github.com/couchbase/gocb/v2 v2.10.0 h1:NNxZ4okToU1Ylqp6F8tE41CEJQPhb2WjufryAkeubOk=
+github.com/couchbase/gocb/v2 v2.10.0/go.mod h1:OSbMfQkP7ltbKiDZhsT2mGDhkQNmvGXxptKcxAUJQ2Y=
+github.com/couchbase/gocbcore/v10 v10.7.0 h1:lAEi0PNeEGKOu8pWrPUdtLOT2oGr1J/UTdGHVPC3r/0=
+github.com/couchbase/gocbcore/v10 v10.7.0/go.mod h1:Q8JWVenMCEOuRgrDQKApHbzzPif38HzefGgRVe9apAI=
 github.com/couchbase/gocbcoreps v0.1.3 h1:fILaKGCjxFIeCgAUG8FGmRDSpdrRggohOMKEgO9CUpg=
 github.com/couchbase/gocbcoreps v0.1.3/go.mod h1:hBFpDNPnRno6HH5cRXExhqXYRmTsFJlFHQx7vztcXPk=
 github.com/couchbase/goprotostellar v1.0.2 h1:yoPbAL9sCtcyZ5e/DcU5PRMOEFaJrF9awXYu3VPfGls=
@@ -767,8 +765,6 @@ github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2
 github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
 github.com/fogleman/gg v1.2.1-0.20190220221249-0403632d5b90/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k=
 github.com/fogleman/gg v1.3.0/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k=
-github.com/fsnotify/fsnotify v1.9.0 h1:2Ml+OJNzbYCTzsxtv8vKSFD9PbJjmhYF14k/jKC7S9k=
-github.com/fsnotify/fsnotify v1.9.0/go.mod h1:8jBTzvmWwFyi3Pb8djgCCO5IBqzKJ/Jwo8TRcHyHii0=
 github.com/gabriel-vasile/mimetype v1.4.8 h1:FfZ3gj38NjllZIeJAmMhr+qKL8Wu+nOoI3GqacKw1NM=
 github.com/gabriel-vasile/mimetype v1.4.8/go.mod h1:ByKUIKGjh1ODkGM1asKUbQZOLGrPjydw3hYPU2YU9t8=
 github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
@@ -805,8 +801,8 @@ github.com/go-playground/locales v0.14.1 h1:EWaQ/wswjilfKLTECiXz7Rh+3BjFhfDFKv/o
 github.com/go-playground/locales v0.14.1/go.mod h1:hxrqLVvrK65+Rwrd5Fc6F2O76J/NuW9t0sjnWqG1slY=
 github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJnYK9S473LQFuzCbDbfSFY=
 github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY=
-github.com/go-playground/validator/v10 v10.27.0 h1:w8+XrWVMhGkxOaaowyKH35gFydVHOvC0/uWoy2Fzwn4=
-github.com/go-playground/validator/v10 v10.27.0/go.mod h1:I5QpIEbmr8On7W0TktmJAumgzX4CA1XNl4ZmDuVHKKo=
+github.com/go-playground/validator/v10 v10.26.0 h1:SP05Nqhjcvz81uJaRfEV0YBSSSGMc/iMaVtFbr3Sw2k=
+github.com/go-playground/validator/v10 v10.26.0/go.mod h1:I5QpIEbmr8On7W0TktmJAumgzX4CA1XNl4ZmDuVHKKo=
 github.com/go-sql-driver/mysql v1.9.3 h1:U/N249h2WzJ3Ukj8SowVFjdtZKfu9vlLZxjPXV1aweo=
 github.com/go-sql-driver/mysql v1.9.3/go.mod h1:qn46aNg1333BRMNU69Lq93t8du/dwxI64Gl8i5p1WMU=
 github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
@@ -940,8 +936,8 @@ github.com/googleapis/gax-go/v2 v2.5.1/go.mod h1:h6B0KMMFNtI2ddbGJn3T3ZbwkeT6yqE
 github.com/googleapis/gax-go/v2 v2.6.0/go.mod h1:1mjbznJAPHFpesgE5ucqfYEscaz5kMdcIDwU/6+DDoY=
 github.com/googleapis/gax-go/v2 v2.7.0/go.mod h1:TEop28CZZQ2y+c0VxMUmu1lV+fQx57QpBWsYpwqHJx8=
 github.com/googleapis/gax-go/v2 v2.7.1/go.mod h1:4orTrqY6hXxxaUL4LHIPl6lGo8vAE38/qKbhSAKP6QI=
-github.com/googleapis/gax-go/v2 v2.15.0 h1:SyjDc1mGgZU5LncH8gimWo9lW1DtIfPibOG81vgd/bo=
-github.com/googleapis/gax-go/v2 v2.15.0/go.mod h1:zVVkkxAQHa1RQpg9z2AUCMnKhi0Qld9rcmyfL1OZhoc=
+github.com/googleapis/gax-go/v2 v2.14.2 h1:eBLnkZ9635krYIPD+ag1USrOAI0Nr0QYF3+/3GqO0k0=
+github.com/googleapis/gax-go/v2 v2.14.2/go.mod h1:ON64QhlJkhVtSqp4v1uaK92VyZ2gmvDQsweuyLV+8+w=
 github.com/googleapis/go-type-adapters v1.0.0/go.mod h1:zHW75FOG2aur7gAO2B+MLby+cLsWGBF62rFAi7WjWO4=
 github.com/googleapis/google-cloud-go-testing v0.0.0-20200911160855-bcd43fbb19e8/go.mod h1:dvDLG8qkwmyD9a/MJJN3XJcT3xFxOKAvTZGvuZmac9g=
 github.com/gorilla/websocket v1.5.3 h1:saDtZ6Pbx/0u+bgYQ3q96pZgCzfhKXGPqt7kZ72aNNg=
@@ -951,8 +947,8 @@ github.com/grpc-ecosystem/go-grpc-middleware v1.4.0/go.mod h1:g5qyo/la0ALbONm6Vb
 github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw=
 github.com/grpc-ecosystem/grpc-gateway/v2 v2.7.0/go.mod h1:hgWBS7lorOAVIJEQMi4ZsPv9hVvWI6+ch50m39Pf2Ks=
 github.com/grpc-ecosystem/grpc-gateway/v2 v2.11.3/go.mod h1:o//XUCC/F+yRGJoPO/VU0GSB0f8Nhgmxx0VIRUvaC0w=
-github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.1 h1:X5VWvz21y3gzm9Nw/kaUeku/1+uBhcekkmy4IkffJww=
-github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.1/go.mod h1:Zanoh4+gvIgluNqcfMVTJueD4wSS5hT7zTt4Mrutd90=
+github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.3 h1:5ZPtiqj0JL5oKWmcsq4VMaAW5ukBEgSGXEN89zeH1Jo=
+github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.3/go.mod h1:ndYquD05frm2vACXE1nsccT4oJzjhw2arTS2cpUD1PI=
 github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
 github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
 github.com/iancoleman/strcase v0.2.0/go.mod h1:iwCmte+B7n89clKwxIoIXy/HfoL7AsD47ZCWhYzw7ho=
@@ -1010,8 +1006,6 @@ github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0
 github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw=
 github.com/leodido/go-urn v1.4.0 h1:WT9HwE9SGECu3lg4d/dIA+jxlljEa1/ffXKmRjqdmIQ=
 github.com/leodido/go-urn v1.4.0/go.mod h1:bvxc+MVxLKB4z00jd1z+Dvzr47oO32F/QSNjSBOlFxI=
-github.com/looker-open-source/sdk-codegen/go v0.25.10 h1:ltBbwkwZrQEHEIKrE5QbF+EtBlweKN0RZpQR0w2GIqo=
-github.com/looker-open-source/sdk-codegen/go v0.25.10/go.mod h1:YM/IYSsTPk7I54j4l6PduNJYgXyOShuaMi7mD6xic8E=
 github.com/lyft/protoc-gen-star v0.6.0/go.mod h1:TGAoBVkt8w7MPG72TrKIu85MIdXwDuzJYeZuUPFPNwA=
 github.com/lyft/protoc-gen-star v0.6.1/go.mod h1:TGAoBVkt8w7MPG72TrKIu85MIdXwDuzJYeZuUPFPNwA=
 github.com/lyft/protoc-gen-star/v2 v2.0.1/go.mod h1:RcCdONR2ScXaYnQC5tUzxzlpA3WVYF7/opLeUgcQs/o=
@@ -1029,8 +1023,6 @@ github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
 github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M=
 github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
-github.com/montanaflynn/stats v0.7.1 h1:etflOAAHORrCC44V+aR6Ftzort912ZU+YLiSTuV8eaE=
-github.com/montanaflynn/stats v0.7.1/go.mod h1:etXPPgVO6n31NxCd9KQUMvCM+ve0ruNzt6R8Bnaayow=
 github.com/ncruces/go-strftime v0.1.9 h1:bY0MQC28UADQmHmaF5dgpLmImcShSi2kHU9XLdhx/f4=
 github.com/ncruces/go-strftime v0.1.9/go.mod h1:Fwc5htZGVVkseilnfgOVb9mKy6w1naJmn9CehxcKcls=
 github.com/neo4j/neo4j-go-driver/v5 v5.28.1 h1:RKWQW7wTgYAY2fU9S+9LaJ9OwRPbRc0I17tlT7nDmAY=
@@ -1100,16 +1092,8 @@ github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o
 github.com/stretchr/testify v1.8.3/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
 github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
 github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
-github.com/thlib/go-timezone-local v0.0.7 h1:fX8zd3aJydqLlTs/TrROrIIdztzsdFV23OzOQx31jII=
-github.com/thlib/go-timezone-local v0.0.7/go.mod h1:/Tnicc6m/lsJE0irFMA0LfIwTBo4QP7A8IfyIv4zZKI=
-github.com/valkey-io/valkey-go v1.0.63 h1:LNlDTcUxy9jxrmGHSvd0s/NsgEmQbvREYvvBAHCIir0=
-github.com/valkey-io/valkey-go v1.0.63/go.mod h1:bHmwjIEOrGq/ubOJfh5uMRs7Xj6mV3mQ/ZXUbmqpjqY=
-github.com/xdg-go/pbkdf2 v1.0.0 h1:Su7DPu48wXMwC3bs7MCNG+z4FhcyEuz5dlvchbq0B0c=
-github.com/xdg-go/pbkdf2 v1.0.0/go.mod h1:jrpuAogTd400dnrH08LKmI/xc1MbPOebTwRqcT5RDeI=
-github.com/xdg-go/scram v1.1.2 h1:FHX5I5B4i4hKRVRBCFRxq1iQRej7WO3hhBuJf+UUySY=
-github.com/xdg-go/scram v1.1.2/go.mod h1:RT/sEzTbU5y00aCK8UOx6R7YryM0iF1N2MOmC3kKLN4=
-github.com/xdg-go/stringprep v1.0.4 h1:XLI/Ng3O1Atzq0oBs3TWm+5ZVgkq2aqdlvP9JtoZ6c8=
-github.com/xdg-go/stringprep v1.0.4/go.mod h1:mPGuuIYwz7CmR2bT9j4GbQqutWS1zV24gijq1dTyGkM=
+github.com/valkey-io/valkey-go v1.0.62 h1:oQdPlQGRyxcQWL8fnu6J3SCaQwayc/hRZifjJIaJqu0=
+github.com/valkey-io/valkey-go v1.0.62/go.mod h1:bHmwjIEOrGq/ubOJfh5uMRs7Xj6mV3mQ/ZXUbmqpjqY=
 github.com/youmark/pkcs8 v0.0.0-20240726163527-a2c0da244d78 h1:ilQV1hzziu+LLM3zUTJ0trRztfwgjqKnBWNtSRkbmwM=
 github.com/youmark/pkcs8 v0.0.0-20240726163527-a2c0da244d78/go.mod h1:aL8wCCfTfSfmXjznFBSZNN13rSJjlIOI1fUNAtF7rmI=
 github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
@@ -1125,8 +1109,6 @@ github.com/zeebo/errs v1.4.0 h1:XNdoD/RRMKP7HD0UhJnIzUy74ISdGGxURlYG8HSWSfM=
 github.com/zeebo/errs v1.4.0/go.mod h1:sgbWHsvVuTPHcqJJGQ1WhI5KbWlHYz+2+2C/LSEtCw4=
 github.com/zeebo/xxh3 v1.0.2 h1:xZmwmqxHZA8AI603jOQ0tMqmBr9lPeFwGg6d+xy9DC0=
 github.com/zeebo/xxh3 v1.0.2/go.mod h1:5NWz9Sef7zIDm2JHfFlcQvNekmcEl9ekUZQQKCYaDcA=
-go.mongodb.org/mongo-driver v1.17.4 h1:jUorfmVzljjr0FLzYQsGP8cgN/qzzxlY9Vh0C9KFXVw=
-go.mongodb.org/mongo-driver v1.17.4/go.mod h1:Hy04i7O2kC4RS06ZrhPRqj/u4DTYkFDAAccj+rVKqgQ=
 go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
 go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8=
 go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
@@ -1144,37 +1126,37 @@ go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.6
 go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.61.0/go.mod h1:snMWehoOh2wsEwnvvwtDyFCxVeDAODenXHtn5vzrKjo=
 go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.61.0 h1:F7Jx+6hwnZ41NSFTO5q4LYDtJRXBf2PD0rNBkeB/lus=
 go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.61.0/go.mod h1:UHB22Z8QsdRDrnAtX4PntOl36ajSxcdUMt1sF7Y6E7Q=
-go.opentelemetry.io/contrib/propagators/autoprop v0.62.0 h1:1+EHlhAe/tukctfePZRrDruB9vn7MdwyC+rf36nUSPM=
-go.opentelemetry.io/contrib/propagators/autoprop v0.62.0/go.mod h1:skzESZBY3IYcqJgImc+fwXQWflvVe+jZxoA/uw60NaI=
-go.opentelemetry.io/contrib/propagators/aws v1.37.0 h1:cp8AFiM/qjBm10C/ATIRnEDXpD5MBknrA0ANw4T2/ss=
-go.opentelemetry.io/contrib/propagators/aws v1.37.0/go.mod h1:Cy8Hk2E2iSGEbsLnPUdeigrexaAOAGIAmBFK919EQs0=
-go.opentelemetry.io/contrib/propagators/b3 v1.37.0 h1:0aGKdIuVhy5l4GClAjl72ntkZJhijf2wg1S7b5oLoYA=
-go.opentelemetry.io/contrib/propagators/b3 v1.37.0/go.mod h1:nhyrxEJEOQdwR15zXrCKI6+cJK60PXAkJ/jRyfhr2mg=
-go.opentelemetry.io/contrib/propagators/jaeger v1.37.0 h1:pW+qDVo0jB0rLsNeaP85xLuz20cvsECUcN7TE+D8YTM=
-go.opentelemetry.io/contrib/propagators/jaeger v1.37.0/go.mod h1:x7bd+t034hxLTve1hF9Yn9qQJlO/pP8H5pWIt7+gsFM=
-go.opentelemetry.io/contrib/propagators/ot v1.37.0 h1:tVjnBF6EiTDMXoq2Xuc2vK0I7MTbEs05II/0j9mMK+E=
-go.opentelemetry.io/contrib/propagators/ot v1.37.0/go.mod h1:MQjyNXtxAC8PGN9gzPtO4GY5zuP+RI3XX53uWbCTvEQ=
-go.opentelemetry.io/otel v1.37.0 h1:9zhNfelUvx0KBfu/gb+ZgeAfAgtWrfHJZcAqFC228wQ=
-go.opentelemetry.io/otel v1.37.0/go.mod h1:ehE/umFRLnuLa/vSccNq9oS1ErUlkkK71gMcN34UG8I=
-go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.37.0 h1:9PgnL3QNlj10uGxExowIDIZu66aVBwWhXmbOp1pa6RA=
-go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.37.0/go.mod h1:0ineDcLELf6JmKfuo0wvvhAVMuxWFYvkTin2iV4ydPQ=
-go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.37.0 h1:Ahq7pZmv87yiyn3jeFz/LekZmPLLdKejuO3NcK9MssM=
-go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.37.0/go.mod h1:MJTqhM0im3mRLw1i8uGHnCvUEeS7VwRyxlLC78PA18M=
-go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.37.0 h1:bDMKF3RUSxshZ5OjOTi8rsHGaPKsAt76FaqgvIUySLc=
-go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.37.0/go.mod h1:dDT67G/IkA46Mr2l9Uj7HsQVwsjASyV9SjGofsiUZDA=
-go.opentelemetry.io/otel/metric v1.37.0 h1:mvwbQS5m0tbmqML4NqK+e3aDiO02vsf/WgbsdpcPoZE=
-go.opentelemetry.io/otel/metric v1.37.0/go.mod h1:04wGrZurHYKOc+RKeye86GwKiTb9FKm1WHtO+4EVr2E=
-go.opentelemetry.io/otel/sdk v1.37.0 h1:ItB0QUqnjesGRvNcmAcU0LyvkVyGJ2xftD29bWdDvKI=
-go.opentelemetry.io/otel/sdk v1.37.0/go.mod h1:VredYzxUvuo2q3WRcDnKDjbdvmO0sCzOvVAiY+yUkAg=
-go.opentelemetry.io/otel/sdk/metric v1.37.0 h1:90lI228XrB9jCMuSdA0673aubgRobVZFhbjxHHspCPc=
-go.opentelemetry.io/otel/sdk/metric v1.37.0/go.mod h1:cNen4ZWfiD37l5NhS+Keb5RXVWZWpRE+9WyVCpbo5ps=
-go.opentelemetry.io/otel/trace v1.37.0 h1:HLdcFNbRQBE2imdSEgm/kwqmQj1Or1l/7bW6mxVK7z4=
-go.opentelemetry.io/otel/trace v1.37.0/go.mod h1:TlgrlQ+PtQO5XFerSPUYG0JSgGyryXewPGyayAWSBS0=
+go.opentelemetry.io/contrib/propagators/autoprop v0.61.0 h1:cxOVDJ30qfzV27G5p9WMtJUB/3cXC0iL+u9EV1fSOws=
+go.opentelemetry.io/contrib/propagators/autoprop v0.61.0/go.mod h1:Y+xiUbWetg65vAroDZcIzJ5wyPNWRH32EoIV9rIaa0g=
+go.opentelemetry.io/contrib/propagators/aws v1.36.0 h1:Txhy/1LZIbbnutftc5pdU8Y9vOQuAkuIOFXuLsdDejs=
+go.opentelemetry.io/contrib/propagators/aws v1.36.0/go.mod h1:M3A0491jGFPNHU8b3zEW7r/gtsMpGOsFUO3WL+SZ1xw=
+go.opentelemetry.io/contrib/propagators/b3 v1.36.0 h1:xrAb/G80z/l5JL6XlmUMSD1i6W8vXkWrLfmkD3w/zZo=
+go.opentelemetry.io/contrib/propagators/b3 v1.36.0/go.mod h1:UREJtqioFu5awNaCR8aEx7MfJROFlAWb6lPaJFbHaG0=
+go.opentelemetry.io/contrib/propagators/jaeger v1.36.0 h1:SoCgXYF4ISDtNyfLUzsGDaaudZVTx2yJhOyBO0+/GYk=
+go.opentelemetry.io/contrib/propagators/jaeger v1.36.0/go.mod h1:VHu48l0YTRKSObdPQ+Sb8xMZvdnJlN7yhHuHoPgNqHM=
+go.opentelemetry.io/contrib/propagators/ot v1.36.0 h1:UBoZjbx483GslNKYK2YpfvePTJV4BHGeFd8+b7dexiM=
+go.opentelemetry.io/contrib/propagators/ot v1.36.0/go.mod h1:adDDRry19/n9WoA7mSCMjoVJcmzK/bZYzX9SR+g2+W4=
+go.opentelemetry.io/otel v1.36.0 h1:UumtzIklRBY6cI/lllNZlALOF5nNIzJVb16APdvgTXg=
+go.opentelemetry.io/otel v1.36.0/go.mod h1:/TcFMXYjyRNh8khOAO9ybYkqaDBb/70aVwkNML4pP8E=
+go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.36.0 h1:gAU726w9J8fwr4qRDqu1GYMNNs4gXrU+Pv20/N1UpB4=
+go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.36.0/go.mod h1:RboSDkp7N292rgu+T0MgVt2qgFGu6qa1RpZDOtpL76w=
+go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.36.0 h1:dNzwXjZKpMpE2JhmO+9HsPl42NIXFIFSUSSs0fiqra0=
+go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.36.0/go.mod h1:90PoxvaEB5n6AOdZvi+yWJQoE95U8Dhhw2bSyRqnTD0=
+go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.36.0 h1:nRVXXvf78e00EwY6Wp0YII8ww2JVWshZ20HfTlE11AM=
+go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.36.0/go.mod h1:r49hO7CgrxY9Voaj3Xe8pANWtr0Oq916d0XAmOoCZAQ=
+go.opentelemetry.io/otel/metric v1.36.0 h1:MoWPKVhQvJ+eeXWHFBOPoBOi20jh6Iq2CcCREuTYufE=
+go.opentelemetry.io/otel/metric v1.36.0/go.mod h1:zC7Ks+yeyJt4xig9DEw9kuUFe5C3zLbVjV2PzT6qzbs=
+go.opentelemetry.io/otel/sdk v1.36.0 h1:b6SYIuLRs88ztox4EyrvRti80uXIFy+Sqzoh9kFULbs=
+go.opentelemetry.io/otel/sdk v1.36.0/go.mod h1:+lC+mTgD+MUWfjJubi2vvXWcVxyr9rmlshZni72pXeY=
+go.opentelemetry.io/otel/sdk/metric v1.36.0 h1:r0ntwwGosWGaa0CrSt8cuNuTcccMXERFwHX4dThiPis=
+go.opentelemetry.io/otel/sdk/metric v1.36.0/go.mod h1:qTNOhFDfKRwX0yXOqJYegL5WRaW376QbB7P4Pb0qva4=
+go.opentelemetry.io/otel/trace v1.36.0 h1:ahxWNuqZjpdiFAyrIoQ4GIiAIhxAunQR6MUoKrsNd4w=
+go.opentelemetry.io/otel/trace v1.36.0/go.mod h1:gQ+OnDZzrybY4k4seLzPAWNwVBBVlF2szhehOBB/tGA=
 go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI=
 go.opentelemetry.io/proto/otlp v0.15.0/go.mod h1:H7XAot3MsfNsj7EXtrA2q5xSNQ10UqI405h3+duxN4U=
 go.opentelemetry.io/proto/otlp v0.19.0/go.mod h1:H7XAot3MsfNsj7EXtrA2q5xSNQ10UqI405h3+duxN4U=
-go.opentelemetry.io/proto/otlp v1.7.0 h1:jX1VolD6nHuFzOYso2E73H85i92Mv8JQYk0K9vz09os=
-go.opentelemetry.io/proto/otlp v1.7.0/go.mod h1:fSKjH6YJ7HDlwzltzyMj036AJ3ejJLCgCSHGj4efDDo=
+go.opentelemetry.io/proto/otlp v1.6.0 h1:jQjP+AQyTf+Fe7OKj/MfkDrmK4MNVtw2NpXsf9fefDI=
+go.opentelemetry.io/proto/otlp v1.6.0/go.mod h1:cicgGehlFuNdgZkcALOCh3VE6K/u2tAjzlRhDwmVpZc=
 go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
 go.uber.org/goleak v1.1.10/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A=
 go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
@@ -1194,8 +1176,8 @@ golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPh
 golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4=
 golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
-golang.org/x/crypto v0.40.0 h1:r4x+VvoG5Fm+eJcxMaY8CQM7Lb0l1lsmjGBQ6s8BfKM=
-golang.org/x/crypto v0.40.0/go.mod h1:Qr1vMER5WyS2dfPHAlsOj01wgLbsyWtFn/aY+5+ZdxY=
+golang.org/x/crypto v0.39.0 h1:SHs+kF4LP+f+p14esP5jAoDpHU8Gu/v9lFRK6IT5imM=
+golang.org/x/crypto v0.39.0/go.mod h1:L+Xg3Wf6HoL4Bn4238Z6ft6KfEpN0tJGo53AAPC632U=
 golang.org/x/exp v0.0.0-20180321215751-8460e604b9de/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20180807140117-3d87b88a115f/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
@@ -1314,8 +1296,8 @@ golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
 golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
 golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc=
 golang.org/x/net v0.9.0/go.mod h1:d48xBJpPfHeWQsugry2m+kC02ZBRGRgulfHnEXEuWns=
-golang.org/x/net v0.42.0 h1:jzkYrhi3YQWD6MLBJcsklgQsoAcw89EcZbJw8Z614hs=
-golang.org/x/net v0.42.0/go.mod h1:FF1RA5d3u7nAYA4z2TkclSCKh68eSXtiFwcWQpPXdt8=
+golang.org/x/net v0.41.0 h1:vBTly1HeNPEn3wtREYfy4GZ/NECgw2Cnl+nK6Nz3uvw=
+golang.org/x/net v0.41.0/go.mod h1:B/K4NNqkfmg07DQYrbwvSluqCJOOXwUjeb/5lOisjbA=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -1363,8 +1345,8 @@ golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJ
 golang.org/x/sync v0.0.0-20220819030929-7fc1605a5dde/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20220929204114-8fcdb60fdcc0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.16.0 h1:ycBJEhp9p4vXvUZNszeOq0kGTPghopOL8q0fq3vstxw=
-golang.org/x/sync v0.16.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
+golang.org/x/sync v0.15.0 h1:KWH3jNZsfyT6xfAfKiz6MRNmd46ByHDYaZ7KSkCtdW8=
+golang.org/x/sync v0.15.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -1416,7 +1398,6 @@ golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20210806184541-e5e7981a1069/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210816183151-1e6c022a8912/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210823070655-63515b42dcdf/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210831042530-f4d43177bf5e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210908233432-aa78b53d3365/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20211007075335-d3039528d8ac/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20211019181941-9d821ace8654/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
@@ -1445,8 +1426,8 @@ golang.org/x/sys v0.4.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.34.0 h1:H5Y5sJ2L2JRdyv7ROF1he/lPdvFsd0mJHFw2ThKHxLA=
-golang.org/x/sys v0.34.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
+golang.org/x/sys v0.33.0 h1:q3i8TbbEz+JRD9ywIRlyRAQbM0qF7hu24q3teo2hbuw=
+golang.org/x/sys v0.33.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc=
@@ -1471,8 +1452,8 @@ golang.org/x/text v0.6.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
 golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
-golang.org/x/text v0.27.0 h1:4fGWRpyh641NLlecmyl4LOe6yDdfaYNrGb2zdfo4JV4=
-golang.org/x/text v0.27.0/go.mod h1:1D28KMCvyooCX9hBiosv5Tz/+YLxj0j7XhWjpSUF7CU=
+golang.org/x/text v0.26.0 h1:P42AVeLghgTYr4+xUnTRKDMqpar+PtX7KWuNQL21L8M=
+golang.org/x/text v0.26.0/go.mod h1:QK15LZJUUQVJxhz7wXgxSy/CJaTFjd0G+YLonydOVQA=
 golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
@@ -1545,8 +1526,8 @@ golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc
 golang.org/x/tools v0.3.0/go.mod h1:/rWhSS2+zyEVwoJf8YAX6L2f0ntZ7Kn/mGgAWcipA5k=
 golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
 golang.org/x/tools v0.7.0/go.mod h1:4pg6aUX35JBAogB10C9AtvVL+qowtN4pT3CGSQex14s=
-golang.org/x/tools v0.34.0 h1:qIpSLOxeCYGg9TrcJokLBG4KFA6d795g0xkBkiESGlo=
-golang.org/x/tools v0.34.0/go.mod h1:pAP9OwEaY1CAW3HOmg3hLZC5Z0CCmzjAF2UQMSqNARg=
+golang.org/x/tools v0.33.0 h1:4qz2S3zmRxbGIhDIAgjxvFutSvH5EfnsYrRBj0UI0bc=
+golang.org/x/tools v0.33.0/go.mod h1:CIJMaWEY88juyUfo7UbgPqbC8rU2OqfAV1h2Qp0oMYI=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
@@ -1624,8 +1605,8 @@ google.golang.org/api v0.108.0/go.mod h1:2Ts0XTHNVWxypznxWOYUeI4g3WdP9Pk2Qk58+a/
 google.golang.org/api v0.110.0/go.mod h1:7FC4Vvx1Mooxh8C5HWjzZHcavuS2f6pmJpZx60ca7iI=
 google.golang.org/api v0.111.0/go.mod h1:qtFHvU9mhgTJegR31csQ+rwxyUTHOKFqCKWp1J0fdw0=
 google.golang.org/api v0.114.0/go.mod h1:ifYI2ZsFK6/uGddGfAD5BMxlnkBqCmqHSDUVi45N5Yg=
-google.golang.org/api v0.243.0 h1:sw+ESIJ4BVnlJcWu9S+p2Z6Qq1PjG77T8IJ1xtp4jZQ=
-google.golang.org/api v0.243.0/go.mod h1:GE4QtYfaybx1KmeHMdBnNnyLzBZCVihGBXAmJu/uUr8=
+google.golang.org/api v0.239.0 h1:2hZKUnFZEy81eugPs4e2XzIJ5SOwQg0G82bpXD65Puo=
+google.golang.org/api v0.239.0/go.mod h1:cOVEm2TpdAGHL2z+UwyS+kmlGr3bVWQQ6sYEqkKje50=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
@@ -1766,12 +1747,12 @@ google.golang.org/genproto v0.0.0-20230323212658-478b75c54725/go.mod h1:UUQDJDOl
 google.golang.org/genproto v0.0.0-20230330154414-c0448cd141ea/go.mod h1:UUQDJDOlWu4KYeJZffbWgBkS1YFobzKbLVfK69pe0Ak=
 google.golang.org/genproto v0.0.0-20230331144136-dcfb400f0633/go.mod h1:UUQDJDOlWu4KYeJZffbWgBkS1YFobzKbLVfK69pe0Ak=
 google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1/go.mod h1:nKE/iIaLqn2bQwXBg8f1g2Ylh6r5MN5CmZvuzZCgsCU=
-google.golang.org/genproto v0.0.0-20250603155806-513f23925822 h1:rHWScKit0gvAPuOnu87KpaYtjK5zBMLcULh7gxkCXu4=
-google.golang.org/genproto v0.0.0-20250603155806-513f23925822/go.mod h1:HubltRL7rMh0LfnQPkMH4NPDFEWp0jw3vixw7jEM53s=
+google.golang.org/genproto v0.0.0-20250505200425-f936aa4a68b2 h1:1tXaIXCracvtsRxSBsYDiSBN0cuJvM7QYW+MrpIRY78=
+google.golang.org/genproto v0.0.0-20250505200425-f936aa4a68b2/go.mod h1:49MsLSx0oWMOZqcpB3uL8ZOkAh1+TndpJ8ONoCBWiZk=
 google.golang.org/genproto/googleapis/api v0.0.0-20250603155806-513f23925822 h1:oWVWY3NzT7KJppx2UKhKmzPq4SRe0LdCijVRwvGeikY=
 google.golang.org/genproto/googleapis/api v0.0.0-20250603155806-513f23925822/go.mod h1:h3c4v36UTKzUiuaOKQ6gr3S+0hovBtUrXzTG/i3+XEc=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20250715232539-7130f93afb79 h1:1ZwqphdOdWYXsUHgMpU/101nCtf/kSp9hOrcvFsnl10=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20250715232539-7130f93afb79/go.mod h1:qQ0YXyHHx3XkvlzUtpXDkS29lDSafHMZBAZDc03LQ3A=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20250603155806-513f23925822 h1:fc6jSaCT0vBduLYZHYrBBNY4dsWuvgyff9noRNDdBeE=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20250603155806-513f23925822/go.mod h1:qQ0YXyHHx3XkvlzUtpXDkS29lDSafHMZBAZDc03LQ3A=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38=
 google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM=
@@ -1839,9 +1820,6 @@ gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
 gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
-gopkg.in/ini.v1 v1.61.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
-gopkg.in/ini.v1 v1.67.0 h1:Dgnx+6+nfE+IfzjUEISNeydPJh9AXNNsWbGP9KzCsOA=
-gopkg.in/ini.v1 v1.67.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
--- a/internal/prebuiltconfigs/prebuiltconfigs_test.go
+++ b/internal/prebuiltconfigs/prebuiltconfigs_test.go
@@ -23,14 +23,11 @@ import (
 func TestLoadPrebuiltToolYAMLs(t *testing.T) {
 	test_name := "test load prebuilt configs"
 	expectedKeys := []string{
-		"alloydb-postgres-admin",
 		"alloydb-postgres",
 		"bigquery",
 		"cloud-sql-mssql",
 		"cloud-sql-mysql",
 		"cloud-sql-postgres",
-		"firestore",
-		"looker",
 		"postgres",
 		"spanner-postgres",
 		"spanner",
@@ -66,19 +63,14 @@ func TestLoadPrebuiltToolYAMLs(t *testing.T) {
 }

 func TestGetPrebuiltTool(t *testing.T) {
-	alloydb_admin_config, _ := Get("alloydb-postgres-admin")
 	alloydb_config, _ := Get("alloydb-postgres")
 	bigquery_config, _ := Get("bigquery")
 	cloudsqlpg_config, _ := Get("cloud-sql-postgres")
 	cloudsqlmysql_config, _ := Get("cloud-sql-mysql")
 	cloudsqlmssql_config, _ := Get("cloud-sql-mssql")
-	firestoreconfig, _ := Get("firestore")
 	postgresconfig, _ := Get("postgres")
 	spanner_config, _ := Get("spanner")
 	spannerpg_config, _ := Get("spanner-postgres")
-	if len(alloydb_admin_config) <= 0 {
-		t.Fatalf("unexpected error: could not fetch alloydb prebuilt tools yaml")
-	}
 	if len(alloydb_config) <= 0 {
 		t.Fatalf("unexpected error: could not fetch alloydb prebuilt tools yaml")
 	}
@@ -94,9 +86,6 @@ func TestGetPrebuiltTool(t *testing.T) {
 	if len(cloudsqlmssql_config) <= 0 {
 		t.Fatalf("unexpected error: could not fetch cloud sql mssql prebuilt tools yaml")
 	}
-	if len(firestoreconfig) <= 0 {
-		t.Fatalf("unexpected error: could not fetch firestore prebuilt tools yaml")
-	}
 	if len(postgresconfig) <= 0 {
 		t.Fatalf("unexpected error: could not fetch postgres prebuilt tools yaml")
 	}
--- a/internal/prebuiltconfigs/tools/alloydb-postgres-admin.yaml
+++ b/internal/prebuiltconfigs/tools/alloydb-postgres-admin.yaml
@@ -1,123 +0,0 @@
-sources:
-  alloydb-api-source:
-    kind: http
-    baseUrl: https://alloydb.googleapis.com
-    headers:
-      Authorization: Bearer ${API_KEY}
-      Content-Type: application/json
-tools:
-  alloydb-create-cluster:
-    kind: http
-    source: alloydb-api-source
-    method: POST
-    path: /v1/projects/{{.projectId}}/locations/{{.locationId}}/clusters
-    description: "Create a new AlloyDB cluster. This is a long-running operation, but the API call returns quickly. This will return operation id to be used by get operations tool. Take all parameters from user in one go."
-    pathParams:
-      - name: projectId
-        type: string
-        description: "The dynamic path parameter for project id provided by user."
-      - name: locationId
-        type: string
-        description: "The dynamic path parameter for location. The default value is us-central1. If quota is exhausted then use other regions."
-        default: us-central1
-    queryParams:
-      - name: clusterId
-        type: string
-        description: "A unique ID for the AlloyDB cluster."
-    requestBody: |
-      {
-        "networkConfig": {
-          "network": "projects/{{.project}}/global/networks/{{.network}}"
-        },
-        "initialUser": {
-          "password": "{{.password}}",
-          "user": "{{.user}}"
-        }
-      }
-    bodyParams:
-      - name: project
-        type: string
-        description: "The dynamic path parameter for project id."
-      - name: network
-        type: string
-        description: "The name of the VPC network to connect the cluster to (e.g., 'default')."
-        default: default
-      - name: password
-        type: string
-        description: "A secure password for the initial 'postgres' user or the custom user provided."
-      - name: user
-        type: string
-        description: "The name for the initial superuser. If not provided, it defaults to 'postgres'. The initial database will always be named 'postgres'."
-  alloydb-operations-get:
-    kind: alloydb-wait-for-operation
-    source: alloydb-api-source
-    description: "This will poll on operations API until the operation is done. For checking operation status we need projectId, locationID and operationId. Once instance is created give follow up steps on how to use the variables to bring data plane MCP server up in local and remote setup."
-    delay: 1s
-    maxDelay: 4m
-    multiplier: 2
-    maxRetries: 10
-  alloydb-create-instance:
-    kind: http
-    source: alloydb-api-source
-    method: POST
-    path: /v1/projects/{{.projectId}}/locations/{{.locationId}}/clusters/{{.clusterId}}/instances
-    description: "Creates a new AlloyDB instance (PRIMARY, READ_POOL, or SECONDARY) within a cluster. This is a long-running operation. Take all parameters from user in one go. This will return operation id to be used by get operations tool."
-    pathParams:
-      - name: projectId
-        type: string
-        description: "The GCP project ID."
-      - name: locationId
-        type: string
-        description: "The location of the cluster (e.g., 'us-central1')."
-        default: us-central1
-      - name: clusterId
-        type: string
-        description: "The ID of the cluster to create the instance in."
-    queryParams:
-      - name: instanceId
-        type: string
-        description: "A unique ID for the new AlloyDB instance."
-    requestBody: |
-      {
-        "instanceType": "{{.instanceType}}",
-        {{- if .displayName }}
-        "displayName": "{{.displayName}}",
-        {{- end }}
-        {{- if eq .instanceType "READ_POOL" }}
-        "readPoolConfig": {
-          "nodeCount": {{.nodeCount}}
-        },
-        {{- end }}
-        {{- if eq .instanceType "SECONDARY" }}
-        "secondaryConfig": {
-          "primaryClusterName": "{{.primaryClusterName}}"
-        },
-        {{- end }}
-        "networkConfig": {
-          "enablePublicIp": true
-        },
-        "databaseFlags": {
-          "password.enforce_complexity": "on"
-        }
-      }
-    bodyParams:
-      - name: instanceType
-        type: string
-        description: "The type of instance to create. Required. Valid values are: PRIMARY, READ_POOL, SECONDARY."
-      - name: displayName
-        type: string
-        description: "An optional, user-friendly name for the instance."
-      - name: nodeCount
-        type: integer
-        description: "The number of nodes in the read pool. Required only if instanceType is READ_POOL. Default is 1."
-        default: 1
-      - name: primaryClusterName
-        type: string
-        description: "The full resource name of the primary cluster for a SECONDARY instance. Required only if instanceType is SECONDARY. Otherwise don't ask"
-        default: ""
-
-toolsets:
-  alloydb-postgres-admin-tools:
-    - alloydb-create-cluster
-    - alloydb-operations-get
-    - alloydb-create-instance
--- a/internal/prebuiltconfigs/tools/cloud-sql-mssql.yaml
+++ b/internal/prebuiltconfigs/tools/cloud-sql-mssql.yaml
@@ -11,7 +11,7 @@ sources:
 tools:
    execute_sql:
        kind: mssql-execute-sql
-        source: cloudsql-mssql-source
+        source: cloud-sql-mssql-source
        description: Use this tool to execute SQL.

    list_tables:
--- a/internal/prebuiltconfigs/tools/cloud-sql-mysql.yaml
+++ b/internal/prebuiltconfigs/tools/cloud-sql-mysql.yaml
@@ -154,10 +154,9 @@ tools:
          ) USING utf8mb4) AS object_details
      FROM
          INFORMATION_SCHEMA.TABLES T
-      CROSS JOIN (SELECT @table_names := ?) AS variables
      WHERE
          T.TABLE_SCHEMA NOT IN ('mysql', 'information_schema', 'performance_schema', 'sys')
-          AND (NULLIF(TRIM(@table_names), '') IS NULL OR FIND_IN_SET(T.TABLE_NAME, @table_names))
+          AND (NULLIF(TRIM(?), '') IS NULL OR FIND_IN_SET(T.TABLE_NAME, ?))
          AND T.TABLE_TYPE = 'BASE TABLE'
      ORDER BY
          T.TABLE_SCHEMA, T.TABLE_NAME;
@@ -165,7 +164,6 @@ tools:
      - name: table_names
        type: string
        description: "Optional: A comma-separated list of table names. If empty, details for all tables in user-accessible schemas will be listed."
-        default: ""
 toolsets:
  cloud-sql-mysql-database-tools:
    - execute_sql
--- a/internal/prebuiltconfigs/tools/firestore.yaml
+++ b/internal/prebuiltconfigs/tools/firestore.yaml
@@ -1,42 +0,0 @@
-sources:
-  firestore-source:
-    kind: firestore
-    project: ${FIRESTORE_PROJECT}
-    database: ${FIRESTORE_DATABASE}
-
-tools:
-  firestore-get-documents:
-    kind: firestore-get-documents
-    source: firestore-source
-    description: Gets multiple documents from Firestore by their paths
-  firestore-list-collections:
-    kind: firestore-list-collections
-    source: firestore-source
-    description: List Firestore collections for a given parent path
-  firestore-delete-documents:
-    kind: firestore-delete-documents
-    source: firestore-source
-    description: Delete multiple documents from Firestore
-  firestore-query-collection:
-    kind: firestore-query-collection
-    source: firestore-source
-    description: | 
-      Retrieves one or more Firestore documents from a collection in a database in the current project by a collection with a full document path. 
-      Use this if you know the exact path of a collection and the filtering clause you would like for the document.
-  firestore-get-rules:
-    kind: firestore-get-rules
-    source: firestore-source
-    description: Retrieves the active Firestore security rules for the current project
-  firestore-validate-rules:
-    kind: firestore-validate-rules
-    source: firestore-source
-    description: Checks the provided Firestore Rules source for syntax and validation errors. Provide the source code to validate.
-
-toolsets:
-  firestore-database-tools:
-    - firestore-get-documents
-    - firestore-list-collections
-    - firestore-delete-documents
-    - firestore-query-collection
-    - firestore-get-rules
-    - firestore-validate-rules
--- a/internal/prebuiltconfigs/tools/looker.yaml
+++ b/internal/prebuiltconfigs/tools/looker.yaml
@@ -1,158 +0,0 @@
-sources:
-    looker-source:
-        kind: looker
-        base_url: ${LOOKER_BASE_URL}
-        client_id: ${LOOKER_CLIENT_ID}
-        client_secret: ${LOOKER_CLIENT_SECRET}
-        verify_ssl: ${LOOKER_VERIFY_SSL}
-        timeout: 600s
-
-tools:
-    get_models:
-        kind: looker-get-models
-        source: looker-source
-        description: |
-          The get_models tool retrieves the list of LookML models in the Looker system.
-
-          It takes no parameters.
-
-    get_explores:
-        kind: looker-get-explores
-        source: looker-source
-        description: |
-          The get_explores tool retrieves the list of explores defined in a LookML model
-          in the Looker system.
-
-          It takes one parameter, the model_name looked up from get_models.
-
-    get_dimensions:
-        kind: looker-get-dimensions
-        source: looker-source
-        description: |
-          The get_dimensions tool retrieves the list of dimensions defined in
-          an explore.
-
-          It takes two parameters, the model_name looked up from get_models and the
-          explore_name looked up from get_explores.
-
-    get_measures:
-        kind: looker-get-measures
-        source: looker-source
-        description: |
-          The get_measures tool retrieves the list of measures defined in
-          an explore.
-
-          It takes two parameters, the model_name looked up from get_models and the
-          explore_name looked up from get_explores.
-
-    get_filters:
-        kind: looker-get-filters
-        source: looker-source
-        description: |
-          The get_filters tool retrieves the list of filters defined in
-          an explore.
-
-          It takes two parameters, the model_name looked up from get_models and the
-          explore_name looked up from get_explores.
-
-    get_parameters:
-        kind: looker-get-parameters
-        source: looker-source
-        description: |
-          The get_parameters tool retrieves the list of parameters defined in
-          an explore.
-
-          It takes two parameters, the model_name looked up from get_models and the
-          explore_name looked up from get_explores.
-
-    query:
-        kind: looker-query
-        source: looker-source
-        description: |
-          Query Tool
-
-          This tool is used to run a query against the LookML model. The
-          model, explore, and fields list must be specified. Pivots,
-          filters and sorts are optional.
-
-          The model can be found from the get_models tool. The explore
-          can be found from the get_explores tool passing in the model.
-          The fields can be found from the get_dimensions, get_measures,
-          get_filters, and get_parameters tools, passing in the model
-          and the explore.
-
-          Provide a model_id and explore_name, then a list
-          of fields. Optionally a list of pivots can be provided.
-          The pivots must also be included in the fields list.
-
-          Filters are provided as a map of {"field.id": "condition",
-          "field.id2": "condition2", ...}. Do not put the field.id in
-          quotes. Filter expressions can be found at
-          https://cloud.google.com/looker/docs/filter-expressions.
-
-          Sorts can be specified like [ "field.id desc 0" ].
-
-          An optional row limit can be added. If not provided the limit
-          will default to 500. "-1" can be specified for unlimited.
-
-          An optional query timezone can be added. The query_timezone to
-          will default to that of the workstation where this MCP server
-          is running, or Etc/UTC if that can't be determined. Not all
-          models support custom timezones.
-
-          The result of the query tool is JSON
-
-    query_sql:
-        kind: looker-query-sql
-        source: looker-source
-        description: |
-          Query SQL Tool
-
-          This tool is used to generate the SQL that Looker would
-          run against the underlying database. The parameters are
-          the same as the query tool.
-
-          The result of the query sql tool is SQL text.
-
-    get_looks:
-        kind: looker-get-looks
-        source: looker-source
-        description: |
-          get_looks Tool
-
-          This tool is used to search for saved looks in a Looker instance.
-          String search params use case-insensitive matching. String search
-          params can contain % and '_' as SQL LIKE pattern match wildcard
-          expressions. example="dan%" will match "danger" and "Danzig" but
-          not "David" example="D_m%" will match "Damage" and "dump".
-
-          Most search params can accept "IS NULL" and "NOT NULL" as special
-          expressions to match or exclude (respectively) rows where the
-          column is null.
-
-          The limit and offset are used to paginate the results.
-
-          The result of the get_looks tool is a list of json objects.
-
-    run_look:
-        kind: looker-run-look
-        source: looker-source
-        description: |
-          run_look Tool
-
-          This tool runs the query associated with a look and returns
-          the data in a JSON structure. It accepts the look_id as the
-          parameter.
-
-toolsets:
-    looker-tools:
-        - get_models
-        - get_explores
-        - get_dimensions
-        - get_measures
-        - get_filters
-        - get_parameters
-        - query
-        - query_sql
-        - get_looks
-        - run_look
--- a/internal/server/api.go
+++ b/internal/server/api.go
@@ -75,7 +75,7 @@ func toolsetHandler(s *Server, w http.ResponseWriter, r *http.Request) {
 		)
 	}()

-	toolset, ok := s.ResourceMgr.GetToolset(toolsetName)
+	toolset, ok := s.toolsets[toolsetName]
 	if !ok {
 		err = fmt.Errorf("toolset %q does not exist", toolsetName)
 		s.logger.DebugContext(ctx, err.Error())
@@ -111,7 +111,7 @@ func toolGetHandler(s *Server, w http.ResponseWriter, r *http.Request) {
 			metric.WithAttributes(attribute.String("toolbox.operation.status", status)),
 		)
 	}()
-	tool, ok := s.ResourceMgr.GetTool(toolName)
+	tool, ok := s.tools[toolName]
 	if !ok {
 		err = fmt.Errorf("invalid tool name: tool with name %q does not exist", toolName)
 		s.logger.DebugContext(ctx, err.Error())
@@ -133,7 +133,6 @@ func toolGetHandler(s *Server, w http.ResponseWriter, r *http.Request) {
 func toolInvokeHandler(s *Server, w http.ResponseWriter, r *http.Request) {
 	ctx, span := s.instrumentation.Tracer.Start(r.Context(), "toolbox/server/tool/invoke")
 	r = r.WithContext(ctx)
-	ctx = util.WithLogger(r.Context(), s.logger)

 	toolName := chi.URLParam(r, "toolName")
 	s.logger.DebugContext(ctx, fmt.Sprintf("tool name: %s", toolName))
@@ -157,7 +156,7 @@ func toolInvokeHandler(s *Server, w http.ResponseWriter, r *http.Request) {
 		)
 	}()

-	tool, ok := s.ResourceMgr.GetTool(toolName)
+	tool, ok := s.tools[toolName]
 	if !ok {
 		err = fmt.Errorf("invalid tool name: tool with name %q does not exist", toolName)
 		s.logger.DebugContext(ctx, err.Error())
@@ -168,7 +167,7 @@ func toolInvokeHandler(s *Server, w http.ResponseWriter, r *http.Request) {
 	// Tool authentication
 	// claimsFromAuth maps the name of the authservice to the claims retrieved from it.
 	claimsFromAuth := make(map[string]map[string]any)
-	for _, aS := range s.ResourceMgr.GetAuthServiceMap() {
+	for _, aS := range s.authServices {
 		claims, err := aS.GetClaimsFromHeader(ctx, r.Header)
 		if err != nil {
 			s.logger.DebugContext(ctx, err.Error())
--- a/internal/server/common_test.go
+++ b/internal/server/common_test.go
@@ -42,7 +42,7 @@ type MockTool struct {
 	manifest    tools.Manifest
 }

-func (t MockTool) Invoke(context.Context, tools.ParamValues) (any, error) {
+func (t MockTool) Invoke(context.Context, tools.ParamValues) ([]any, error) {
 	mock := []any{t.Name}
 	return mock, nil
 }
@@ -147,23 +147,14 @@ func setUpServer(t *testing.T, router string, tools map[string]tools.Tool, tools
 		t.Fatalf("unable to setup otel: %s", err)
 	}

-	instrumentation, err := telemetry.CreateTelemetryInstrumentation(fakeVersionString)
+	instrumentation, err := CreateTelemetryInstrumentation(fakeVersionString)
 	if err != nil {
 		t.Fatalf("unable to create custom metrics: %s", err)
 	}

 	sseManager := newSseManager(ctx)

-	resourceManager := NewResourceManager(nil, nil, tools, toolsets)
-
-	server := Server{
-		version:         fakeVersionString,
-		logger:          testLogger,
-		instrumentation: instrumentation,
-		sseManager:      sseManager,
-		ResourceMgr:     resourceManager,
-	}
-
+	server := Server{version: fakeVersionString, logger: testLogger, instrumentation: instrumentation, sseManager: sseManager, tools: tools, toolsets: toolsets}
 	var r chi.Router
 	switch router {
 	case "api":
--- a/internal/server/config.go
+++ b/internal/server/config.go
@@ -53,8 +53,6 @@ type ServerConfig struct {
 	TelemetryServiceName string
 	// Stdio indicates if Toolbox is listening via MCP stdio.
 	Stdio bool
-	// DisableReload indicates if the user has disabled dynamic reloading for Toolbox.
-	DisableReload bool
 }

 type logFormat string
--- a/internal/telemetry/instrumentation.go
+++ b/internal/telemetry/instrumentation.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.

-package telemetry
+package server

 import (
 	"fmt"
--- a/internal/server/mcp.go
+++ b/internal/server/mcp.go
@@ -357,17 +357,6 @@ func httpHandler(s *Server, w http.ResponseWriter, r *http.Request) {
 		protocolVersion = v20250326.PROTOCOL_VERSION
 	}

-	// check if client have `MCP-Protocol-Version` header
-	headerProtocolVersion := r.Header.Get("MCP-Protocol-Version")
-	if headerProtocolVersion != "" {
-		if !mcp.VerifyProtocolVersion(headerProtocolVersion) {
-			err := fmt.Errorf("invalid protocol version: %s", headerProtocolVersion)
-			_ = render.Render(w, r, newErrResponse(err, http.StatusBadRequest))
-			return
-		}
-		protocolVersion = headerProtocolVersion
-	}
-
 	toolsetName := chi.URLParam(r, "toolsetName")
 	s.logger.DebugContext(ctx, fmt.Sprintf("toolset name: %s", toolsetName))
 	span.SetAttributes(attribute.String("toolset_name", toolsetName))
@@ -398,7 +387,6 @@ func httpHandler(s *Server, w http.ResponseWriter, r *http.Request) {
 		id := uuid.New().String()
 		s.logger.DebugContext(ctx, err.Error())
 		render.JSON(w, r, jsonrpc.NewError(id, jsonrpc.PARSE_ERROR, err.Error(), nil))
-		return
 	}

 	v, res, err := processMcpMessage(ctx, body, s, protocolVersion, toolsetName)
@@ -443,6 +431,10 @@ func processMcpMessage(ctx context.Context, body []byte, s *Server, protocolVers
 		return "", jsonrpc.NewError("", jsonrpc.INTERNAL_ERROR, err.Error(), nil), err
 	}

+	if protocolVersion == "" {
+		protocolVersion = v20241105.PROTOCOL_VERSION
+	}
+
 	// Generic baseMessage could either be a JSONRPCNotification or JSONRPCRequest
 	var baseMessage jsonrpc.BaseMessage
 	if err = util.DecodeJSON(bytes.NewBuffer(body), &baseMessage); err != nil {
@@ -487,12 +479,12 @@ func processMcpMessage(ctx context.Context, body []byte, s *Server, protocolVers
 		}
 		return v, res, err
 	default:
-		toolset, ok := s.ResourceMgr.GetToolset(toolsetName)
+		toolset, ok := s.toolsets[toolsetName]
 		if !ok {
 			err = fmt.Errorf("toolset does not exist")
 			return "", jsonrpc.NewError(baseMessage.Id, jsonrpc.INVALID_REQUEST, err.Error(), nil), err
 		}
-		res, err := mcp.ProcessMethod(ctx, protocolVersion, baseMessage.Id, baseMessage.Method, toolset, s.ResourceMgr.GetToolsMap(), body)
+		res, err := mcp.ProcessMethod(ctx, protocolVersion, baseMessage.Id, baseMessage.Method, toolset, s.tools, body)
 		return "", res, err
 	}
 }
--- a/Show More
+++ b/Show More
@@ -1 +1 @@
 .9.0
 .7.0