draft

feat: Add Valkey Source and Tool (#532 )
feat: Add Redis Source and Tool (#519 )
2026-01-11 16:38:15 -05:00 · 2025-06-12 16:38:16 -04:00 · 2025-06-11 23:17:32 -04:00 · 2025-06-11 22:47:27 -04:00 · 2025-06-11 23:54:13 +00:00 · 2025-06-11 21:40:22 +00:00
244 changed files with 21183 additions and 2446 deletions
--- a/.ci/continuous.release.cloudbuild.yaml
+++ b/.ci/continuous.release.cloudbuild.yaml
@@ -17,7 +17,7 @@ steps:
    waitFor: ['-']
    script: |
        #!/usr/bin/env bash
-        docker buildx build --build-arg METADATA_TAGS=$(git rev-parse HEAD) -t ${_DOCKER_URI}:$REF_NAME .
+        docker buildx build --build-arg COMMIT_SHA=$(git rev-parse HEAD) -t ${_DOCKER_URI}:$REF_NAME .

  - id: "push-docker"
    name: "gcr.io/cloud-builders/docker"
@@ -50,7 +50,7 @@ steps:
    script: |
        #!/usr/bin/env bash
        CGO_ENABLED=0 GOOS=linux GOARCH=amd64 \
-          go build -ldflags "-X github.com/googleapis/genai-toolbox/cmd.metadataString=binary.linux.amd64.$REF_NAME" -o toolbox.linux.amd64
+          go build -ldflags "-X github.com/googleapis/genai-toolbox/cmd.commitSha=$(git rev-parse HEAD)" -o toolbox.linux.amd64

  - id: "store-linux-amd64"
    name: "gcr.io/cloud-builders/gcloud:latest"
@@ -72,7 +72,7 @@ steps:
    script: |
        #!/usr/bin/env bash
        CGO_ENABLED=0 GOOS=darwin GOARCH=arm64 \
-          go build -ldflags "-X github.com/googleapis/genai-toolbox/cmd.metadataString=binary.darwin.arm64.$REF_NAME" -o toolbox.darwin.arm64
+          go build -ldflags "-X github.com/googleapis/genai-toolbox/cmd.commitSha=$(git rev-parse HEAD)" -o toolbox.darwin.arm64

  - id: "store-darwin-arm64"
    name: "gcr.io/cloud-builders/gcloud:latest"
@@ -94,7 +94,7 @@ steps:
    script: |
        #!/usr/bin/env bash
        CGO_ENABLED=0 GOOS=darwin GOARCH=amd64 \
-          go build -ldflags "-X github.com/googleapis/genai-toolbox/cmd.metadataString=binary.darwin.amd64.$REF_NAME" -o toolbox.darwin.amd64
+          go build -ldflags "-X github.com/googleapis/genai-toolbox/cmd.commitSha=$(git rev-parse HEAD)" -o toolbox.darwin.amd64

  - id: "store-darwin-amd64"
    name: "gcr.io/cloud-builders/gcloud:latest"
@@ -116,7 +116,7 @@ steps:
    script: |
        #!/usr/bin/env bash
        CGO_ENABLED=0 GOOS=windows GOARCH=amd64 \
-          go build -ldflags "-X github.com/googleapis/genai-toolbox/cmd.metadataString=binary.windows.amd64.$REF_NAME" -o toolbox.windows.amd64
+          go build -ldflags "-X github.com/googleapis/genai-toolbox/cmd.commitSha=$(git rev-parse HEAD)" -o toolbox.windows.amd64

  - id: "store-windows-amd64"
    name: "gcr.io/cloud-builders/gcloud:latest"
@@ -124,7 +124,7 @@ steps:
      - "build-windows-amd64"
    script: |
        #!/usr/bin/env bash
-        gcloud storage cp toolbox.windows.amd64 gs://$_BUCKET_NAME/$REF_NAME/windows/amd64/toolbox
+        gcloud storage cp toolbox.windows.amd64 gs://$_BUCKET_NAME/$REF_NAME/windows/amd64/toolbox.exe

 options:
  automapSubstitutions: true
--- a/.ci/generate_release_table.sh
+++ b/.ci/generate_release_table.sh
@@ -11,20 +11,37 @@ fi
 FILES=("linux.amd64" "darwin.arm64" "darwin.amd64" "windows.amd64")
 output_string=""

+# Define the descriptions - ensure this array's order matches FILES
+DESCRIPTIONS=(
+    "For **Linux** systems running on **Intel/AMD 64-bit processors**."
+    "For **macOS** systems running on **Apple Silicon** (M1, M2, M3, etc.) processors."
+    "For **macOS** systems running on **Intel processors**."
+    "For **Windows** systems running on **Intel/AMD 64-bit processors**."
+)
+
 # Write the table header
-ROW_FMT="| %-93s | %73s |"
-output_string+=$(printf "$ROW_FMT" "**os/arch**" "**sha256**")$'\n'
-output_string+=$(printf "$ROW_FMT" $(printf -- '-%0.s' {1..93}) $(printf -- '-%0.s' {1..73}))$'\n'
+ROW_FMT="| %-105s | %-120s | %-67s |\n"
+output_string+=$(printf "$ROW_FMT" "**OS/Architecture**" "**Description**" "**SHA256 Hash**")$'\n'
+output_string+=$(printf "$ROW_FMT" "$(printf -- '-%0.s' {1..105})" "$(printf -- '-%0.s' {1..120})" "$(printf -- '-%0.s' {1..67})")$'\n'
+

 # Loop through all files matching the pattern "toolbox.*.*"
-for file in "${FILES[@]}"
+for i in "${!FILES[@]}"
 do
+    file_key="${FILES[$i]}" # e.g., "linux.amd64"
+    description_text="${DESCRIPTIONS[$i]}"
+
    # Extract OS and ARCH from the filename
-    OS=$(echo "$file" | cut -d '.' -f 1)
-    ARCH=$(echo "$file" | cut -d '.' -f 2)
+    OS=$(echo "$file_key" | cut -d '.' -f 1)
+    ARCH=$(echo "$file_key" | cut -d '.' -f 2)

    # Get release URL
-    URL=https://storage.googleapis.com/genai-toolbox/$VERSION/$OS/$ARCH/toolbox
+    if [ "$OS" = 'windows' ];
+    then
+        URL="https://storage.googleapis.com/genai-toolbox/$VERSION/$OS/$ARCH/toolbox.exe"
+    else
+        URL="https://storage.googleapis.com/genai-toolbox/$VERSION/$OS/$ARCH/toolbox"
+    fi

    curl "$URL" --fail --output toolbox || exit 1

@@ -32,10 +49,10 @@ do
    SHA256=$(shasum -a 256 toolbox | awk '{print $1}')

    # Write the table row
-    # output_string+="| [$OS/$ARCH]($URL)   | $SHA256 |\n"
-    output_string+=$(printf "$ROW_FMT" "[$OS/$ARCH]($URL)" "$SHA256")$'\n'
+    output_string+=$(printf "$ROW_FMT" "[$OS/$ARCH]($URL)" "$description_text" "$SHA256")$'\n'

    rm toolbox
 done
+
 printf "$output_string\n"

--- a/.ci/integration.cloudbuild.yaml
+++ b/.ci/integration.cloudbuild.yaml
@@ -24,9 +24,20 @@ steps:
    script: |
      go get -d ./...

-  - id: "cloud-sql-pg"
+  - id: "compile-test-binary"
    name: golang:1
    waitFor: ["install-dependencies"]
+    env:
+      - "GOPATH=/gopath"
+    volumes:
+      - name: "go"
+        path: "/gopath"
+    script: |
+      go test -c -cover -coverprofile=coverage.out -race ./tests/...
+
+  - id: "cloud-sql-pg"
+    name: golang:1
+    waitFor: ["compile-test-binary"]
    entrypoint: /bin/bash
    env:
      - "GOPATH=/gopath"
@@ -43,11 +54,11 @@ steps:
    args:
      - -c
      - |
-        go test -race -v -tags=integration,cloudsqlpg ./tests
+        ./cloudsqlpg.test -test.v

  - id: "alloydb-pg"
    name: golang:1
-    waitFor: ["install-dependencies"]
+    waitFor: ["compile-test-binary"]
    entrypoint: /bin/bash
    env:
      - "GOPATH=/gopath"
@@ -64,11 +75,11 @@ steps:
    args:
      - -c
      - |
-        go test -race -v -tags=integration,alloydb ./tests
+        ./alloydbpg.test -test.v -test.coverprofile=coverage.out

  - id: "alloydb-ai-nl"
    name: golang:1
-    waitFor: ["install-dependencies"]
+    waitFor: ["compile-test-binary"]
    entrypoint: /bin/bash
    env:
      - "GOPATH=/gopath"
@@ -85,11 +96,47 @@ steps:
    args:
      - -c
      - |
-        go test -race -v -tags=integration,alloydb_ai_nl ./tests
+        ./alloydbainl.test -test.v
+
+  - id: "bigtable"
+    name: golang:1
+    waitFor: ["compile-test-binary"]
+    entrypoint: /bin/bash
+    env:
+      - "GOPATH=/gopath"
+      - "BIGTABLE_PROJECT=$PROJECT_ID"
+      - "BIGTABLE_INSTANCE=$_BIGTABLE_INSTANCE"
+      - "SERVICE_ACCOUNT_EMAIL=$SERVICE_ACCOUNT_EMAIL"
+    secretEnv:
+      ["CLIENT_ID"]
+    volumes:
+      - name: "go"
+        path: "/gopath"
+    args:
+      - -c
+      - |
+        ./bigtable.test -test.v
+
+  - id: "bigquery"
+    name: golang:1
+    waitFor: ["compile-test-binary"]
+    entrypoint: /bin/bash
+    env:
+      - "GOPATH=/gopath"
+      - "BIGQUERY_PROJECT=$PROJECT_ID"
+      - "SERVICE_ACCOUNT_EMAIL=$SERVICE_ACCOUNT_EMAIL"
+    secretEnv: ["CLIENT_ID"]
+    volumes:
+      - name: "go"
+        path: "/gopath"
+    args:
+      - -c
+      - |
+        ./bigquery.test -test.v

  - id: "postgres"
    name: golang:1
-    waitFor: ["install-dependencies"]
+    waitFor: ["compile-test-binary"]
    entrypoint: /bin/bash
    env:
      - "GOPATH=/gopath"
@@ -104,28 +151,30 @@ steps:
    args:
      - -c
      - |
-        go test -race -v -tags=integration,postgres ./tests
+        ./postgres.test -test.v

  - id: "spanner"
    name: golang:1
-    waitFor: ["install-dependencies"]
+    waitFor: ["compile-test-binary"]
    entrypoint: /bin/bash
    env:
      - "GOPATH=/gopath"
      - "SPANNER_PROJECT=$PROJECT_ID"
      - "SPANNER_DATABASE=$_DATABASE_NAME"
      - "SPANNER_INSTANCE=$_SPANNER_INSTANCE"
+      - "SERVICE_ACCOUNT_EMAIL=$SERVICE_ACCOUNT_EMAIL"
+    secretEnv: ["CLIENT_ID"]
    volumes:
      - name: "go"
        path: "/gopath"
    args:
      - -c
      - |
-        go test -race -v -tags=integration,spanner ./tests
+        ./spanner.test -test.v

  - id: "neo4j"
    name: golang:1
-    waitFor: ["install-dependencies"]
+    waitFor: ["compile-test-binary"]
    entrypoint: /bin/bash
    env:
      - "GOPATH=/gopath"
@@ -138,11 +187,11 @@ steps:
    args:
      - -c
      - |
-        go test -race -v -tags=integration,neo4j ./tests
+        ./neo4j.test -test.v

  - id: "cloud-sql-mssql"
    name: golang:1
-    waitFor: ["install-dependencies"]
+    waitFor: ["compile-test-binary"]
    entrypoint: /bin/bash
    env:
      - "GOPATH=/gopath"
@@ -159,11 +208,11 @@ steps:
    args:
      - -c
      - |
-        go test -race -v -tags=integration,cloudsqlmssql ./tests
+        ./cloudsqlmssql.test -test.v

  - id: "cloud-sql-mysql"
    name: golang:1
-    waitFor: ["install-dependencies"]
+    waitFor: ["compile-test-binary"]
    entrypoint: /bin/bash
    env:
      - "GOPATH=/gopath"
@@ -180,11 +229,11 @@ steps:
    args:
      - -c
      - |
-        go test -race -v -tags=integration,cloudsqlmysql ./tests
+        ./cloudsqlmysql.test -test.v

  - id: "mysql"
    name: golang:1
-    waitFor: ["install-dependencies"]
+    waitFor: ["compile-test-binary"]
    entrypoint: /bin/bash
    env:
      - "GOPATH=/gopath"
@@ -199,11 +248,11 @@ steps:
    args:
      - -c
      - |
-        go test -race -v -tags=integration,mysql ./tests
+        ./mysql.test -test.v

  - id: "mssql"
    name: golang:1
-    waitFor: ["install-dependencies"]
+    waitFor: ["compile-test-binary"]
    entrypoint: /bin/bash
    env:
      - "GOPATH=/gopath"
@@ -218,11 +267,11 @@ steps:
    args:
      - -c
      - |
-        go test -race -v -tags=integration,mssql ./tests
+        ./mssql.test -test.v

  - id: "dgraph"
    name: golang:1
-    waitFor: ["install-dependencies"]
+    waitFor: ["compile-test-binary"]
    entrypoint: /bin/bash
    env:
      - "GOPATH=/gopath"
@@ -233,11 +282,11 @@ steps:
    args:
      - -c
      - |
-        go test -race -v -tags=integration,dgraph ./tests
+        ./dgraph.test -test.v

  - id: "http"
    name: golang:1
-    waitFor: ["install-dependencies"]
+    waitFor: ["compile-test-binary"]
    entrypoint: /bin/bash
    env:
      - "GOPATH=/gopath"
@@ -248,7 +297,75 @@ steps:
    args:
      - -c
      - |
-        go test -race -v -tags=integration,http ./tests
+        ./http.test -test.v
+
+  - id: "sqlite"
+    name: golang:1
+    waitFor: ["compile-test-binary"]
+    entrypoint: /bin/bash
+    env:
+      - "GOPATH=/gopath"
+      - "SERVICE_ACCOUNT_EMAIL=$SERVICE_ACCOUNT_EMAIL"
+    volumes:
+      - name: "go"
+        path: "/gopath"
+    secretEnv: ["CLIENT_ID"]
+    args:
+      - -c
+      - |
+        ./sqlite.test -test.v
+
+  - id: "couchbase"
+    name : golang:1
+    waitFor: ["compile-test-binary"]
+    entrypoint: /bin/bash
+    env:
+      - "GOPATH=/gopath"
+      - "COUCHBASE_SCOPE=$_COUCHBASE_SCOPE"
+      - "COUCHBASE_BUCKET=$_COUCHBASE_BUCKET"
+      - "SERVICE_ACCOUNT_EMAIL=$SERVICE_ACCOUNT_EMAIL"
+    secretEnv: ["COUCHBASE_CONNECTION", "COUCHBASE_USER", "COUCHBASE_PASS", "CLIENT_ID"]
+    volumes:
+      - name: "go"
+        path: "/gopath"
+    args:
+      - -c
+      - |
+        ./couchbase.test -test.v
+
+  - id: "redis"
+    name : golang:1
+    waitFor: ["compile-test-binary"]
+    entrypoint: /bin/bash
+    env:
+      - "GOPATH=/gopath"
+      - "SERVICE_ACCOUNT_EMAIL=$SERVICE_ACCOUNT_EMAIL"
+    secretEnv: ["REDIS_ADDRESS", "REDIS_PASS", "CLIENT_ID"]
+    volumes:
+      - name: "go"
+        path: "/gopath"
+    args:
+      - -c
+      - |
+        ./redis.test -test.v
+        
+  - id: "valkey"
+    name : golang:1
+    waitFor: ["compile-test-binary"]
+    entrypoint: /bin/bash
+    env:
+      - "GOPATH=/gopath"
+      - "VALKEY_DATABASE=$_VALKEY_DATABASE"
+      - "SERVICE_ACCOUNT_EMAIL=$SERVICE_ACCOUNT_EMAIL"
+    secretEnv: ["VALKEY_ADDRESS", "CLIENT_ID"]
+    volumes:
+      - name: "go"
+        path: "/gopath"
+    args:
+      - -c
+      - |
+        ./valkey.test -test.v
+    

 availableSecrets:
  secretManager:
@@ -290,6 +407,18 @@ availableSecrets:
      env: MSSQL_USER 
    - versionName: projects/$PROJECT_ID/secrets/mssql_pass/versions/latest
      env: MSSQL_PASS
+    - versionName: projects/$PROJECT_ID/secrets/couchbase_connection/versions/latest
+      env: COUCHBASE_CONNECTION
+    - versionName: projects/$PROJECT_ID/secrets/couchbase_user/versions/latest
+      env: COUCHBASE_USER
+    - versionName: projects/$PROJECT_ID/secrets/couchbase_pass/versions/latest
+      env: COUCHBASE_PASS
+    - versionName: projects/$PROJECT_ID/secrets/memorystore_redis_address/versions/latest
+      env: REDIS_ADDRESS
+    - versionName: projects/$PROJECT_ID/secrets/memorystore_redis_pass/versions/latest
+      env: REDIS_PASS
+    - versionName: projects/$PROJECT_ID/secrets/memorystore_valkey_address/versions/latest
+      env: VALKEY_ADDRESS


 options:
@@ -308,6 +437,7 @@ substitutions:
  _ALLOYDB_POSTGRES_INSTANCE: "alloydb-pg-testing-instance"
  _ALLOYDB_AI_NL_CLUSTER: "alloydb-ai-nl-testing"
  _ALLOYDB_AI_NL_INSTANCE: "alloydb-ai-nl-testing-instance"
+  _BIGTABLE_INSTANCE: "bigtable-testing-instance"
  _POSTGRES_HOST: 127.0.0.1
  _POSTGRES_PORT: "5432"
  _SPANNER_INSTANCE: "spanner-testing"
@@ -319,3 +449,5 @@ substitutions:
  _MSSQL_HOST: 127.0.0.1
  _MSSQL_PORT: "1433"
  _DGRAPHURL: "https://play.dgraph.io"
+  _COUCHBASE_BUCKET: "couchbase-bucket"
+  _COUCHBASE_SCOPE: "couchbase-scope"
--- a/.ci/versioned.release.cloudbuild.yaml
+++ b/.ci/versioned.release.cloudbuild.yaml
@@ -18,7 +18,7 @@ steps:
    script: |
        #!/usr/bin/env bash
        export VERSION=$(cat ./cmd/version.txt)
-        docker buildx build --build-arg METADATA_TAGS=$(git rev-parse HEAD) -t ${_DOCKER_URI}:$VERSION -t ${_DOCKER_URI}:latest .
+        docker buildx build --build-arg BUILD_TYPE=container.release --build-arg COMMIT_SHA=$(git rev-parse HEAD) -t ${_DOCKER_URI}:$VERSION -t ${_DOCKER_URI}:latest .

  - id: "push-docker"
    name: "gcr.io/cloud-builders/docker"
@@ -56,7 +56,7 @@ steps:
        #!/usr/bin/env bash
        export VERSION=$(cat ./cmd/version.txt)
        CGO_ENABLED=0 GOOS=linux GOARCH=amd64 \
-          go build -ldflags "-X github.com/googleapis/genai-toolbox/cmd.metadataString=binary.linux.amd64.$VERSION.$(git rev-parse HEAD)" -o toolbox.linux.amd64
+          go build -ldflags "-X github.com/googleapis/genai-toolbox/cmd.buildType=binary -X github.com/googleapis/genai-toolbox/cmd.commitSha=$(git rev-parse HEAD)" -o toolbox.linux.amd64

  - id: "store-linux-amd64"
    name: "gcr.io/cloud-builders/gcloud:latest"
@@ -80,7 +80,7 @@ steps:
        #!/usr/bin/env bash
        export VERSION=$(cat ./cmd/version.txt)
        CGO_ENABLED=0 GOOS=darwin GOARCH=arm64 \
-          go build -ldflags "-X github.com/googleapis/genai-toolbox/cmd.metadataString=binary.darwin.arm64.$VERSION.$(git rev-parse HEAD)" -o toolbox.darwin.arm64
+          go build -ldflags "-X github.com/googleapis/genai-toolbox/cmd.buildType=binary -X github.com/googleapis/genai-toolbox/cmd.commitSha=$(git rev-parse HEAD)" -o toolbox.darwin.arm64

  - id: "store-darwin-arm64"
    name: "gcr.io/cloud-builders/gcloud:latest"
@@ -104,7 +104,7 @@ steps:
        #!/usr/bin/env bash
        export VERSION=$(cat ./cmd/version.txt)
        CGO_ENABLED=0 GOOS=darwin GOARCH=amd64 \
-          go build -ldflags "-X github.com/googleapis/genai-toolbox/cmd.metadataString=binary.darwin.amd64.$VERSION.$(git rev-parse HEAD)" -o toolbox.darwin.amd64
+          go build -ldflags "-X github.com/googleapis/genai-toolbox/cmd.buildType=binary -X github.com/googleapis/genai-toolbox/cmd.commitSha=$(git rev-parse HEAD)" -o toolbox.darwin.amd64

  - id: "store-darwin-amd64"
    name: "gcr.io/cloud-builders/gcloud:latest"
@@ -128,7 +128,7 @@ steps:
        #!/usr/bin/env bash
        export VERSION=$(cat ./cmd/version.txt)
        CGO_ENABLED=0 GOOS=windows GOARCH=amd64 \
-          go build -ldflags "-X github.com/googleapis/genai-toolbox/cmd.metadataString=binary.windows.amd64.$VERSION.$(git rev-parse HEAD)" -o toolbox.windows.amd64
+          go build -ldflags "-X github.com/googleapis/genai-toolbox/cmd.buildType=binary -X github.com/googleapis/genai-toolbox/cmd.commitSha=$(git rev-parse HEAD)" -o toolbox.windows.amd64

  - id: "store-windows-amd64"
    name: "gcr.io/cloud-builders/gcloud:latest"
@@ -137,7 +137,7 @@ steps:
    script: |
        #!/usr/bin/env bash
        export VERSION=v$(cat ./cmd/version.txt)
-        gcloud storage cp toolbox.windows.amd64 gs://$_BUCKET_NAME/$VERSION/windows/amd64/toolbox
+        gcloud storage cp toolbox.windows.amd64 gs://$_BUCKET_NAME/$VERSION/windows/amd64/toolbox.exe

 options:
  automapSubstitutions: true
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -0,0 +1,119 @@
+# Copyright 2025 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+name: 🐞 Bug Report
+description: File a report for unexpected or undesired behavior.
+title: "<brief summary of what bug or error was observed>"
+labels: ["type: bug"]
+type: "bug"
+
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for helping us improve! 🙏 Please answer these questions and provide as much information as possible about your problem.
+  
+  - id: preamble
+    type: checkboxes
+    attributes:
+      label: Prerequisites
+      description: |
+        Please run through the following list and make sure you've tried the usual "quick fixes":
+        - Search the [current open issues](https://github.com/googleapis/genai-toolbox/issues)
+        - Update to the [latest version of Toolbox](https://github.com/googleapis/genai-toolbox/releases)
+      options: 
+        - label: "I've searched the current open issues"
+          required: true
+        - label: "I've updated to the latest version of Toolbox"
+
+  - type: input
+    id: version
+    attributes:
+      label: Toolbox version
+      description: |
+        What version of Toolbox are you using (`toolbox --version`)? e.g.
+        - toolbox version 0.3.0 
+        - us-central1-docker.pkg.dev/database-toolbox/toolbox/toolbox:0.3.0
+      placeholder: ex. toolbox version 0.3.0 
+    validations:
+      required: true
+
+  - type: textarea
+    id: environment
+    attributes:
+      label: Environment
+      description: "Let us know some details about the environment in which you are seeing the bug!"
+      value: |
+        1. OS type and version: (output of `uname -a`)
+        2. How are you running Toolbox: 
+          - As a downloaded binary (e.g. from `curl -O https://storage.googleapis.com/genai-toolbox/v$VERSION/linux/amd64/toolbox`)
+          - As a container (e.g. from `us-central1-docker.pkg.dev/database-toolbox/toolbox/toolbox:$VERSION`)
+          - Compiled from source (include the command used to build)
+
+  - type: textarea
+    id: client
+    attributes:
+      label: Client 
+      description: "How are you connecting to Toolbox?"
+      value: |
+        1. Client: <name and link to the client are you using>
+        2. Version: <what exact version of the client are you using> 
+        3. Example: If possible, please include your code of configuration:
+        
+        ```python
+        # Code goes here! 
+        ```
+
+  - id: expected-behavior
+    type: textarea
+    attributes:
+      label: Expected Behavior
+      description: |
+        Please enter a detailed description of the behavior you expected, and any information about what behavior you 
+        noticed and why it is defective or unintentional.
+    validations:
+      required: true
+
+  - id: current-behavior
+    type: textarea
+    attributes:
+      label: Current Behavior
+      description: "Please enter a detailed description of the behavior you encountered instead."
+    validations:
+      required: true
+
+  - type: textarea
+    id: repro
+    attributes:
+      label: Steps to reproduce?
+      description: |
+        How can we reproduce this bug? Please walk us through it step by step,
+        with as much relevant detail as possible. A 'minimal' reproduction is
+        preferred, which means removing as much of the examples as possible so
+        only the minimum required to run and reproduce the bug is left. 
+      value: |
+        1. ?
+        2. ?
+        3. ?
+        ...
+    validations:
+      required: true
+
+  - type: textarea
+    id: additional-details
+    attributes:
+      label: Additional Details
+      description: |
+        Any other information you want us to know? Things such as tools config,
+        server logs, etc. can be included here.
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1,5 @@
+blank_issues_enabled: false
+contact_links:
+  - name: Google Cloud Support
+    url: https://cloud.google.com/support/
+    about: If you have a support contract with Google, please both open an issue here and open Google Cloud Support portal with a link to the issue.
--- a/.github/ISSUE_TEMPLATE/feature_request.yml
+++ b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -0,0 +1,60 @@
+# Copyright 2025 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+name: ✨ Feature Request
+description: Suggest an idea for new or improved behavior.
+title: "<brief summary of the proposed feature>"
+labels: ["type: feature request"]
+type: feature
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for helping us improve! 🙏 Please answer these questions and provide as much information as possible about your feature request. 
+  
+  - id: preamble
+    type: checkboxes
+    attributes:
+      label: Prerequisites
+      description: |
+        Please run through the following list and make sure you've tried the usual "quick fixes":
+      options:
+        - label: "Search the [current open issues](https://github.com/googleapis/genai-toolbox/issues)"
+          required: true
+
+  - type: textarea
+    id: use-case
+    attributes:
+      label: What are you trying to do that currently feels hard or impossible? 
+      description: "A clear and concise description of what the end goal for the feature should be -- avoid generalizing and try to provide a specific use-case."
+    validations:
+      required: true
+
+  - type: textarea
+    id: suggested-solution
+    attributes:
+      label: Suggested Solution(s)
+      description: "If you have a suggestion for how this use-case can be solved, please feel free to include it."
+
+  - type: textarea
+    id: alternatives-considered
+    attributes:
+      label: Alternatives Considered
+      description: "Are there any workaround or third party tools to replicate this behavior? Why would adding this feature be preferred over them?"
+
+  - type: textarea
+    id: additional-details
+    attributes:
+      label: Additional Details
+      description: "Any additional information we should know? Please reference it here (issues, PRs, descriptions, or screenshots)"
--- a/.github/ISSUE_TEMPLATE/question.yml
+++ b/.github/ISSUE_TEMPLATE/question.yml
@@ -0,0 +1,55 @@
+# Copyright 2025 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+name: 💬 Question
+description: Questions on how something works or the best way to do something?
+title: "<brief summary of the question>"
+labels: ["type: question"]
+
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for helping us improve! 🙏 Please provide as much information as possible about your question. 
+  
+  - id: preamble
+    type: checkboxes
+    attributes:
+      label: Prerequisites
+      description: |
+        Please run through the following list and make sure you've tried the usual "quick fixes":
+      options:
+        - label: "Search the [current open issues](https://github.com/googleapis/genai-toolbox/issues)"
+          required: true
+
+  - type: textarea
+    id: question
+    attributes:
+      label: Question
+      description: "What's your question? Please provide as much relevant information as possible to reduce turnaround time. Include information like what environment, language, or framework you are using."
+      placeholder: "Example: How do I connect using private IP with the AlloyDB source?"
+    validations:
+      required: true
+
+  - type: textarea
+    id: code
+    attributes:
+      label: Code
+      description: "Please paste any useful application code that might be relevant to your question. (if your code is in a public repo, feel free to paste a link!)"
+      
+  - type: textarea
+    id: additional-details
+    attributes:
+      label: Additional Details
+      description: "Any other information you want us to know that might be helpful in answering your question? (link issues, PRs, descriptions, or screenshots)."
--- a/.github/label-sync.yml
+++ b/.github/label-sync.yml
@@ -0,0 +1,2 @@
+---
+ignored: true
--- a/.github/labels.yaml
+++ b/.github/labels.yaml
@@ -68,3 +68,19 @@
 - 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: contribution welcome'
+  color: 8befd7
+  description: Status - Contributions welcome.
+
+- name: 'status: awaiting response'
+  color: 8befd7
+  description: Status - Awaiting response from author.
+
+- name: 'status: awaiting codeowners'
+  color: 8befd7
+  description: Status - Awaiting response from code owners.
--- a/.github/release-please.yml
+++ b/.github/release-please.yml
@@ -21,5 +21,15 @@ extraFiles: [
    "docs/en/getting-started/introduction/_index.md",
    "docs/en/getting-started/local_quickstart.md",
    "docs/en/getting-started/mcp_quickstart/_index.md",
-    "docs/en/how-to/deploy_gke.md",
+    "docs/en/samples/bigquery/local_quickstart.md",
+    "docs/en/samples/bigquery/mcp_quickstart/_index.md",
+    "docs/en/getting-started/colab_quickstart.ipynb",
+    "docs/en/samples/bigquery/colab_quickstart_bigquery.ipynb",
+    "docs/en/how-to/connect-ide/bigquery_mcp.md",
+    "docs/en/how-to/connect-ide/spanner_mcp.md",
+    "docs/en/how-to/connect-ide/alloydb_pg_mcp.md",
+    "docs/en/how-to/connect-ide/cloud_sql_mysql_mcp.md",
+    "docs/en/how-to/connect-ide/cloud_sql_pg_mcp.md",
+    "docs/en/how-to/connect-ide/postgres_mcp.md",
+    "docs/en/how-to/connect-ide/cloud_sql_mssql_mcp.md",
 ]
--- a/.github/renovate.json5
+++ b/.github/renovate.json5
@@ -1,7 +1,7 @@
 {
  extends: [
    'config:recommended',
-    ':semanticCommits',
+    ':semanticCommitTypeAll(chore)',
    ':ignoreUnstable',
    ':separateMajorReleases',
    ':prConcurrentLimitNone',
--- a/.github/workflows/docs_deploy.yaml
+++ b/.github/workflows/docs_deploy.yaml
@@ -24,14 +24,14 @@ on:
    paths:
      - 'docs/**'
      - 'github/workflows/docs**'
-      - '.hugo'
+      - '.hugo/**'

  # Allow triggering manually.
  workflow_dispatch:

 jobs:
  deploy:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
    defaults:
      run:
        working-directory: .hugo
@@ -46,11 +46,11 @@ jobs:
      - name: Setup Hugo
        uses: peaceiris/actions-hugo@75d2e84710de30f6ff7268e08f310b60ef14033f # v3
        with:
-          hugo-version: "latest"
+          hugo-version: "0.145.0"
          extended: true

      - name: Setup Node
-        uses: actions/setup-node@cdca7365b2dadb8aad0a33bc7601856ffabcc48e # v4
+        uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4
        with:
          node-version: "22"

@@ -76,4 +76,4 @@ jobs:
          # Do not delete previews on each production deploy.
          # CSS or JS changes will require manual clean-up.
          keep_files: true
-          commit_message: "deploy: ${{ github.event.head_commit.message }}"
+          commit_message: "deploy: ${{ github.event.head_commit.message }}"
--- a/.github/workflows/docs_preview_deploy.yaml
+++ b/.github/workflows/docs_preview_deploy.yaml
@@ -17,7 +17,7 @@ name: "docs"
 permissions:
  contents: write
  pull-requests: write
-
+  
 # This Workflow depends on 'github.event.number',
 # not compatible with branch or manual triggers.
 on:
@@ -26,10 +26,20 @@ on:
    paths:
      - 'docs/**'
      - 'github/workflows/docs**'
-      - '.hugo'
+      - '.hugo/**'
+  pull_request_target:
+    types: [labeled]
+    paths:
+      - 'docs/**'
+      - 'github/workflows/docs**'
+      - '.hugo/**'

 jobs:
  preview:
+    # run job on proper workflow event triggers (skip job for pull_request event
+    # from forks and only run pull_request_target for "docs: deploy-preview"
+    # label)
+    if: "${{ (github.event.action != 'labeled' && github.event.pull_request.head.repo.full_name == github.event.pull_request.base.repo.full_name) || github.event.label.name == 'docs: deploy-preview' }}"
    runs-on: ubuntu-24.04
    defaults:
      run:
@@ -46,11 +56,11 @@ jobs:
      - name: Setup Hugo
        uses: peaceiris/actions-hugo@75d2e84710de30f6ff7268e08f310b60ef14033f # v3
        with:
-          hugo-version: "latest"
+          hugo-version: "0.145.0"
          extended: true

      - name: Setup Node
-        uses: actions/setup-node@cdca7365b2dadb8aad0a33bc7601856ffabcc48e # v4
+        uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4
        with:
          node-version: "22"

@@ -70,8 +80,6 @@ jobs:
          HUGO_RELATIVEURLS: false

      - name: Deploy
-        # If run from a fork, GitHub write operations will fail.
-        if: ${{ !github.event.pull_request.head.repo.fork }}
        uses: peaceiris/actions-gh-pages@4f9cc6602d3f66b9c108549d475ec49e8ef4d45e # v4
        with:
          github_token: ${{ secrets.GITHUB_TOKEN }}
@@ -80,8 +88,6 @@ jobs:
          commit_message: "stage: PR-${{ github.event.number }}: ${{ github.event.head_commit.message }}"

      - name: Comment
-        # If run from a fork, GitHub write operations will fail.
-        if: ${{ !github.event.pull_request.head.repo.fork }}
        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7
        with:
          script: |
@@ -90,4 +96,4 @@ jobs:
              owner: context.repo.owner,
              repo: context.repo.repo,
              body: "🔎 Preview at https://${{ github.repository_owner }}.github.io/${{ github.event.repository.name }}/previews/PR-${{ github.event.number }}/"
-            })
+            })
--- a/.github/workflows/lint.yaml
+++ b/.github/workflows/lint.yaml
@@ -51,7 +51,7 @@ jobs:
              console.log('Failed to remove label. Another job may have already removed it!');
            }
      - name: Setup Go
-        uses: actions/setup-go@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b # v5.4.0
+        uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
        with:
          go-version: "1.22"
      - name: Checkout code
@@ -66,7 +66,7 @@ jobs:
        run: |
          go mod tidy && git diff --exit-code
      - name: golangci-lint
-        uses: golangci/golangci-lint-action@55c2c1448f86e01eaae002a5a3a9624417608d84 # v6.5.2
+        uses: golangci/golangci-lint-action@4afd733a84b1f43292c63897423277bb7f4313a9 # v8.0.0
        with:
          version: latest
          args: --timeout 3m
--- a/.github/workflows/tests.yaml
+++ b/.github/workflows/tests.yaml
@@ -58,7 +58,7 @@ jobs:
            }

      - name: Setup Go
-        uses: actions/setup-go@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b # v5.4.0
+        uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
        with:
          go-version: "1.22"

@@ -80,12 +80,16 @@ jobs:
          source_dir="./internal/sources/*"
          tool_dir="./internal/tools/*"
          auth_dir="./internal/auth/*"
-          included_packages=$(go list ./... | grep -v -e "$source_dir" -e "$tool_dir" -e "$auth_dir")
+          int_test_dir="./tests/*"
+          included_packages=$(go list ./... | grep -v -e "$source_dir" -e "$tool_dir" -e "$auth_dir" -e "$int_test_dir")
          go test -race -cover -coverprofile=coverage.out -v $included_packages
          go test -race -v ./internal/sources/... ./internal/tools/... ./internal/auth/...

      - name: Check coverage
        run: |
+          FILE_TO_EXCLUDE="github.com/googleapis/genai-toolbox/internal/server/config.go"
+          ESCAPED_PATH=$(echo "$FILE_TO_EXCLUDE" | sed 's/\//\\\//g; s/\./\\\./g')
+          sed -i "/^${ESCAPED_PATH}:/d" coverage.out
          total_coverage=$(go tool cover -func=coverage.out | grep "total:" | awk '{print $3}')
          echo "Total coverage: $total_coverage"
          coverage_numeric=$(echo "$total_coverage" | sed 's/%//')
--- a/.gitignore
+++ b/.gitignore
@@ -13,4 +13,4 @@ node_modules
 .hugo_build.lock

 # coverage
-.coverage
+.coverage
--- a/.golangci.yaml
+++ b/.golangci.yaml
@@ -12,36 +12,26 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.

+version: "2"
 linters:
  enable:
    - errcheck
-    - goimports
-    - gosimple
    - govet
    - ineffassign
    - staticcheck
    - unused
-linters-settings:
-  gofmt:
-    rewrite-rules:
-      - pattern: 'interface{}'
-        replacement: 'any'
-      - pattern: 'a[b:len(a)]'
-        replacement: 'a[b:]'
+  exclusions:
+    presets:
+      - std-error-handling
 issues:
  fix: true
-run:
-  build-tags:
-    - integration
-    - cloudsqlpg
-    - postgres
-    - alloydb
-    - spanner
-    - cloudsqlmssql
-    - cloudsqlmysql
-    - neo4j
-    - dgraph
-    - mssql
-    - mysql
-    - http
-    - alloydb_ai_nl
+formatters:
+  enable:
+    - goimports
+  settings:
+    gofmt:
+      rewrite-rules:
+        - pattern: interface{}
+          replacement: any
+        - pattern: a[b:len(a)]
+          replacement: a[b:]
--- a/.hugo/hugo.toml
+++ b/.hugo/hugo.toml
@@ -1,8 +1,7 @@
-title = 'Gen AI Toolbox for Databases'
+title = 'MCP Toolbox for Databases'
 relativeURLs = true

 languageCode = 'en-us'
-contentDir = "../docs/en"
 defaultContentLanguage = "en"
 defaultContentLanguageInSubdir = false

@@ -18,7 +17,10 @@ enableRobotsTXT = true
  proxy = "direct"
  [module.hugoVersion]
    extended = true
-    min = "0.73.0"
+    min = "0.146.0"
+  [[module.mounts]]
+    source = "../docs/en"
+    target = 'content'
  [[module.imports]]
    path = "github.com/google/docsy"
    disable = false
@@ -26,6 +28,7 @@ enableRobotsTXT = true
    path = "github.com/martignoni/hugo-notice"

 [params]
+  description = "MCP Toolbox for Databases is an open source MCP server for databases. It enables you to develop tools easier, faster, and more securely by handling the complexities such as connection pooling, authentication, and more."
  copyright = "Google LLC"
  github_repo = "https://github.com/googleapis/genai-toolbox"
  github_project_repo = "https://github.com/googleapis/genai-toolbox"
@@ -45,4 +48,19 @@ enableRobotsTXT = true
  pre = "<i class='fa-brands fa-github'></i>"

 [markup.goldmark.renderer]
-  unsafe= true 
+  unsafe= true 
+
+[outputFormats]
+  [outputFormats.LLMS]
+    mediaType = "text/plain"
+    baseName = "llms"
+    isPlainText = true
+    root = true
+  [outputFormats.LLMS-FULL]
+    mediaType = "text/plain"
+    baseName = "llms-full"
+    isPlainText = true
+    root = true
+
+[outputs]
+  home = ["HTML", "RSS", "LLMS", "LLMS-FULL"]
--- a/.hugo/layouts/_default/_markup/render-heading.html
+++ b/.hugo/layouts/_default/_markup/render-heading.html
@@ -1 +0,0 @@
-{{ template "_default/_markup/td-render-heading.html" . }}
--- a/.hugo/layouts/index.llms-full.txt
+++ b/.hugo/layouts/index.llms-full.txt
@@ -0,0 +1,14 @@
+{{ .Site.Params.description }}
+
+{{ range .Site.Sections }}
+# {{ .Title }}
+{{ .Description }}
+{{ range .Pages }}
+# {{ .Title }}
+{{ .Description }}
+{{ .RawContent }}
+{{ range .Pages }}
+# {{ .Title }}
+{{ .Description }}
+{{ .RawContent }}
+{{end }}{{ end }}{{ end }}
--- a/.hugo/layouts/index.llms.txt
+++ b/.hugo/layouts/index.llms.txt
@@ -0,0 +1,9 @@
+# {{ .Site.Title }}
+
+> {{ .Site.Params.description }}
+
+## Docs
+{{ range .Site.Sections }}
+### {{ .Title }}
+
+{{ .Description }}{{ range .Pages }}- [{{ .Title }}]({{ .Permalink }}): {{ .Description }}{{ range .Pages }}  - [{{ .Title }}]({{ .Permalink }}): {{ .Description }}{{end }}{{ end }}{{ end }}
--- a/.hugo/layouts/partials/page-meta-links.html
+++ b/.hugo/layouts/partials/page-meta-links.html
@@ -0,0 +1,52 @@
+{{/* cSpell:ignore querify subdir */ -}}
+{{/* Class names ending with `--KIND` are deprecated in favor of `__KIND`, but we're keeping them for a few releases after 0.9.0 */ -}}
+
+{{ if .File -}}
+{{ $path := urls.JoinPath $.Language.Lang $.File.Path -}}
+{{ $gh_repo := $.Param "github_repo" -}}
+{{ $gh_url := $.Param "github_url" -}}
+{{ $gh_subdir := $.Param "github_subdir" | default "" -}}
+{{ $gh_project_repo := $.Param "github_project_repo" -}}
+{{ $gh_branch := $.Param "github_branch" | default "main" -}}
+<div class="td-page-meta ms-2 pb-1 pt-2 mb-0">
+{{ if $gh_url -}}
+  {{ warnf "Warning: use of `github_url` is deprecated. For details, see https://www.docsy.dev/docs/adding-content/repository-links/#github_url-optional" -}}
+  <a href="{{ $gh_url }}" target="_blank"><i class="fa-solid fa-pen-to-square fa-fw"></i> {{ T "post_edit_this" }}</a>
+{{ else if $gh_repo -}}
+
+  {{/* Adjust $path based on path_base_for_github_subdir */ -}}
+  {{ $ghs_base := $.Param "path_base_for_github_subdir" -}}
+  {{ $ghs_rename := "" -}}
+  {{ if reflect.IsMap $ghs_base -}}
+    {{ $ghs_rename = $ghs_base.to -}}
+    {{ $ghs_base = $ghs_base.from -}}
+  {{ end -}}
+  {{ with $ghs_base -}}
+    {{ $path = replaceRE . $ghs_rename $path -}}
+  {{ end -}}
+
+  {{ $gh_repo_path := printf "%s/%s/%s" $gh_branch $gh_subdir $path -}}
+  {{ $gh_repo_path = replaceRE "//+" "/" $gh_repo_path -}}
+
+  {{ $viewURL := printf "%s/tree/%s" $gh_repo $gh_repo_path -}}
+  {{ $editURL := printf "%s/edit/%s" $gh_repo $gh_repo_path -}}
+  {{ $issuesURL := printf "%s/issues/new?title=%s" $gh_repo (safeURL $.Title ) -}}
+  {{ $newPageStub := resources.Get "stubs/new-page-template.md" -}}
+  {{ $newPageQS := querify "value" $newPageStub.Content "filename" "change-me.md" | safeURL -}}
+  {{ $newPageURL := printf "%s/new/%s?%s" $gh_repo (path.Dir $gh_repo_path) $newPageQS -}}
+
+  <a href="{{ $viewURL }}" class="td-page-meta--view td-page-meta__view" target="_blank" rel="noopener"><i class="fa-solid fa-file-lines fa-fw"></i> {{ T "post_view_this" }}</a>
+  <a href="{{ $editURL }}" class="td-page-meta--edit td-page-meta__edit" target="_blank" rel="noopener"><i class="fa-solid fa-pen-to-square fa-fw"></i> {{ T "post_edit_this" }}</a>
+  <a href="{{ $newPageURL }}" class="td-page-meta--child td-page-meta__child" target="_blank" rel="noopener"><i class="fa-solid fa-pen-to-square fa-fw"></i> {{ T "post_create_child_page" }}</a>
+  <a href="{{ $issuesURL }}" class="td-page-meta--issue td-page-meta__issue" target="_blank" rel="noopener"><i class="fa-solid fa-list-check fa-fw"></i> {{ T "post_create_issue" }}</a>
+  {{ with $gh_project_repo -}}
+    {{ $project_issueURL := printf "%s/issues/new" . -}}
+    <a href="{{ $project_issueURL }}" class="td-page-meta--project td-page-meta__project-issue" target="_blank" rel="noopener"><i class="fa-solid fa-list-check fa-fw"></i> {{ T "post_create_project_issue" }}</a>
+  {{ end -}}
+
+{{ end -}}
+{{ with .CurrentSection.AlternativeOutputFormats.Get "print" -}}
+  <a id="print" href="{{ .RelPermalink | safeURL }}"><i class="fa-solid fa-print fa-fw"></i> {{ T "print_entire_section" }}</a>
+{{ end }}
+</div>
+{{ end -}}
--- a/.hugo/layouts/partials/td/render-heading.html
+++ b/.hugo/layouts/partials/td/render-heading.html
@@ -0,0 +1 @@
+{{ template "partials/td/render-heading.html" . }}
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,74 @@
 # Changelog

+## [0.7.0](https://github.com/googleapis/genai-toolbox/compare/v0.6.0...v0.7.0) (2025-06-10)
+
+
+### Features
+
+* Add templateParameters field for mssqlsql ([#671](https://github.com/googleapis/genai-toolbox/issues/671)) ([b81fc6a](https://github.com/googleapis/genai-toolbox/commit/b81fc6aa6ccdfbc15676fee4d87041d9ad9682fa))
+* Add templateParameters field for mysqlsql ([#663](https://github.com/googleapis/genai-toolbox/issues/663)) ([0a08d2c](https://github.com/googleapis/genai-toolbox/commit/0a08d2c15dcbec18bb556f4dc49792ba0c69db46))
+* **metrics:** Add user agent for prebuilt tools ([#669](https://github.com/googleapis/genai-toolbox/issues/669)) ([29aa0a7](https://github.com/googleapis/genai-toolbox/commit/29aa0a70da3c2eb409a38993b3782da8bec7cb85))
+* **tools/postgressql:** Add templateParameters field ([#615](https://github.com/googleapis/genai-toolbox/issues/615)) ([b763469](https://github.com/googleapis/genai-toolbox/commit/b76346993f298b4f7493a51405d0a287bacce05f))
+
+
+### Bug Fixes
+
+* Improve versionString ([#658](https://github.com/googleapis/genai-toolbox/issues/658)) ([cf96f4c](https://github.com/googleapis/genai-toolbox/commit/cf96f4c249f0692e3eb19fc56c794ca6a3079307))
+* **server/stdio:** Notifications should not return a response ([#638](https://github.com/googleapis/genai-toolbox/issues/638)) ([69d047a](https://github.com/googleapis/genai-toolbox/commit/69d047af46f1ec00f236db8a978a7a7627217fd2))
+* **tools/mysqlsql:** Handled the null value for string case in mysqlsql tools ([#641](https://github.com/googleapis/genai-toolbox/issues/641)) ([ef94648](https://github.com/googleapis/genai-toolbox/commit/ef94648455c3b20adda4f8cff47e70ddccac8c06))
+* Update path library ([#678](https://github.com/googleapis/genai-toolbox/issues/678)) ([4998f82](https://github.com/googleapis/genai-toolbox/commit/4998f8285287b5daddd0043540f2cf871e256db5)), closes [#662](https://github.com/googleapis/genai-toolbox/issues/662)
+
+## [0.6.0](https://github.com/googleapis/genai-toolbox/compare/v0.5.0...v0.6.0) (2025-05-28)
+
+
+### Features
+
+* Add Execute sql tool for SQL Server(MSSQL) ([#585](https://github.com/googleapis/genai-toolbox/issues/585)) ([6083a22](https://github.com/googleapis/genai-toolbox/commit/6083a224aa650caf4e132b4a704323c5f18c4986))
+* Add mysql-execute-sql tool ([#577](https://github.com/googleapis/genai-toolbox/issues/577)) ([8590061](https://github.com/googleapis/genai-toolbox/commit/8590061ae4908da0e4b1bd6f7cf7ee8d972fa5ba))
+* Add new BigQuery tools: execute_sql, list_datatset_ids, list_table_ids, get_dataset_info, get_table_info ([0fd88b5](https://github.com/googleapis/genai-toolbox/commit/0fd88b574b4ab0d3bee4585999b814675d3b74ed))
+* Add spanner-execute-sql tool ([#576](https://github.com/googleapis/genai-toolbox/issues/576)) ([d65747a](https://github.com/googleapis/genai-toolbox/commit/d65747a2dcf3022f22c86a1524ee28c8229f7c20))
+* Add support for read-only in Spanner tool ([#563](https://github.com/googleapis/genai-toolbox/issues/563)) ([6512704](https://github.com/googleapis/genai-toolbox/commit/6512704e77088d92fea53a85c6e6cbf4b99c988d))
+* Adding support for the --prebuilt flag ([#604](https://github.com/googleapis/genai-toolbox/issues/604)) ([a29c800](https://github.com/googleapis/genai-toolbox/commit/a29c80012eec4729187c12968b53051d20b263a7))
+* Support MCP stdio transport protocol ([#607](https://github.com/googleapis/genai-toolbox/issues/607)) ([1702ce1](https://github.com/googleapis/genai-toolbox/commit/1702ce1e00a52170a4271ac999caf534ba00196f))
+
+
+### Bug Fixes
+
+* Explicitly set query location for BigQuery queries ([#586](https://github.com/googleapis/genai-toolbox/issues/586)) ([eb52b66](https://github.com/googleapis/genai-toolbox/commit/eb52b66d82aaa11be6b1489335f49cba8168099b))
+* Fix spellings in comments ([#561](https://github.com/googleapis/genai-toolbox/issues/561)) ([b58bf76](https://github.com/googleapis/genai-toolbox/commit/b58bf76ddaba407e3fd995dfe86d00a09484e14a))
+* Prevent tool calls through MCP when auth is required ([#544](https://github.com/googleapis/genai-toolbox/issues/544)) ([e747b6e](https://github.com/googleapis/genai-toolbox/commit/e747b6e289730c17f68be8dec0c6fa6021bb23bd))
+* Reinitialize required slice if nil ([#571](https://github.com/googleapis/genai-toolbox/issues/571)) ([04dcf47](https://github.com/googleapis/genai-toolbox/commit/04dcf4791272e1dd034b9a03664dd8dbe77fdddd)), closes [#564](https://github.com/googleapis/genai-toolbox/issues/564)
+
+## [0.5.0](https://github.com/googleapis/genai-toolbox/compare/v0.4.0...v0.5.0) (2025-05-06)
+
+
+### Features
+
+* Add Couchbase as Source and Tool ([#307](https://github.com/googleapis/genai-toolbox/issues/307)) ([d7390b0](https://github.com/googleapis/genai-toolbox/commit/d7390b06b7bcb15411388e9a4dbcfe75afcca1ee))
+* Add postgres-execute-sql tool ([#490](https://github.com/googleapis/genai-toolbox/issues/490)) ([11ea7bc](https://github.com/googleapis/genai-toolbox/commit/11ea7bc584aa4ca8e8b0e7a355f6666ccbea2883))
+
+
+## [0.4.0](https://github.com/googleapis/genai-toolbox/compare/v0.3.0...v0.4.0) (2025-04-23)
+
+
+### Features
+
+* Add `AuthRequired` to Neo4j & Dgraph Tools ([#434](https://github.com/googleapis/genai-toolbox/issues/434)) ([afbf4b2](https://github.com/googleapis/genai-toolbox/commit/afbf4b2daeb01119a22ce18469bffb9e9f57d2f8))
+* Add `AuthRequired` to tool manifest ([#433](https://github.com/googleapis/genai-toolbox/issues/433)) ([d9388ad](https://github.com/googleapis/genai-toolbox/commit/d9388ad57e832570aab56b9b357c1fb0ba994852))
+* Add BigQuery source and tool ([#463](https://github.com/googleapis/genai-toolbox/issues/463)) ([8055aa5](https://github.com/googleapis/genai-toolbox/commit/8055aa519fe6e7993ba524f8f7e684fbfdecc1b9))
+* Add Bigtable source and tool ([#418](https://github.com/googleapis/genai-toolbox/issues/418)) ([ae53b8e](https://github.com/googleapis/genai-toolbox/commit/ae53b8eeff9d0e9ec14d9c6d4286c856cc8f1811))
+* Add IAM AuthN to AlloyDB Source ([#399](https://github.com/googleapis/genai-toolbox/issues/399)) ([e8ed447](https://github.com/googleapis/genai-toolbox/commit/e8ed447d9153c60a1d6321285587e6e4ca930f87))
+* Add IAM AuthN to Cloud SQL Sources ([#414](https://github.com/googleapis/genai-toolbox/issues/414)) ([be85b82](https://github.com/googleapis/genai-toolbox/commit/be85b820785dbce79133b0cf8788bde75ff25fee))
+* Add toolset feature to mcp ([#425](https://github.com/googleapis/genai-toolbox/issues/425)) ([e307857](https://github.com/googleapis/genai-toolbox/commit/e307857085ac4c8c2ee8292c914daa5534ba74bf)), closes [#403](https://github.com/googleapis/genai-toolbox/issues/403)
+* Add SQLite source and tool ([#438](https://github.com/googleapis/genai-toolbox/issues/438)) ([fc14cbf](https://github.com/googleapis/genai-toolbox/commit/fc14cbfd078d465591e4fefb80542759e82a2731))
+* Support env replacement for tools.yaml ([#462](https://github.com/googleapis/genai-toolbox/issues/462)) ([eadb678](https://github.com/googleapis/genai-toolbox/commit/eadb678a7bd4ce74a3b1160f5ed8966ffbb13c61))
+
+
+### Bug Fixes
+
+* [#419](https://github.com/googleapis/genai-toolbox/issues/419) TLS https URL for SSE endpoint ([#420](https://github.com/googleapis/genai-toolbox/issues/420)) ([0a7d3ff](https://github.com/googleapis/genai-toolbox/commit/0a7d3ff06b88051c752b6d53bc964ed6e6be400e))
+* **docs:** Fix link 'Edit this page' ([#454](https://github.com/googleapis/genai-toolbox/issues/454)) ([969065e](https://github.com/googleapis/genai-toolbox/commit/969065e561f28ddb9755d99bbe0b288040198296)), closes [#427](https://github.com/googleapis/genai-toolbox/issues/427)
+* Update http error code from invocation ([#468](https://github.com/googleapis/genai-toolbox/issues/468)) ([ff7c0ff](https://github.com/googleapis/genai-toolbox/commit/ff7c0ffc65172a335e8d3321e5a6b92d38dc7e6d)), closes [#465](https://github.com/googleapis/genai-toolbox/issues/465)

 ## [0.3.0](https://github.com/googleapis/genai-toolbox/compare/v0.2.1...v0.3.0) (2025-04-04)

--- a/DEVELOPER.md
+++ b/DEVELOPER.md
@@ -17,9 +17,7 @@

 ### Run Toolbox from local source

-1. Open a local connection to your database by starting the [Cloud SQL Auth Proxy][cloudsql-proxy].
-
-1. You should already have a `tools.yaml` created with your [sources and tools configurations](./README.md#Configuration).
+1. Create a `tools.yaml` file with your [sources and tools configurations](./README.md#Configuration).

 1. You can specify flags for the Toolbox server. Execute the following to list the possible CLI flags:

@@ -41,20 +39,85 @@
    curl http://127.0.0.1:5000
    ```

-### Run tests locally
+### Testing

-1. Run lint with the following:
+- Run the lint check:

    ```bash
    golangci-lint run --fix
    ```

-1. Run all tests with the following:
+- Run unit tests locally:

    ```bash
    go test -race -v ./...
    ```

+- Run integration tests locally:
+    1. Set required environment variables. For a complete lists of required
+    vairables for each source, check out the [Cloud Build testing
+    configuration](./.ci/integration.cloudbuild.yaml).
+        - Use your own GCP email as the `SERVICE_ACCOUNT_EMAIL`.
+        - Use the Google Cloud SDK application Client ID as the `CLIENT_ID`. Ask the
+        Toolbox maintainers if you don't know it already.
+
+    2. Run the integration test for your target source with the required Go
+    build tags specified at the top of each integration test file:
+
+        ```shell
+            go test -race -v ./tests/<YOUR_TEST_DIR>
+        ```
+
+        For example, to run the AlloyDB integration test, run:
+
+        ```shell
+            go test -race -v ./tests/alloydbpg
+        ```
+
+- Run integration tests on your PR:
+
+    For internal contributors, the testing workflows should trigger
+    automatically. For external contributors, ask the Toolbox
+    maintainers to trigger the testing workflows on your PR.
+
+## Developing Documentation
+
+Follow these steps to run a Hugo server for local preview:
+
+1. [Install Hugo](https://gohugo.io/installation/macos/) version 0.146.0+.
+1. Move into the `.hugo` directory
+
+    ```bash
+    cd .hugo
+    ```
+
+1. Install dependencies
+
+    ```bash
+    npm ci
+    ```
+
+1. Run the server
+
+    ```bash
+    hugo server
+    ```
+
+### PR documentation preview
+
+- For contributors:
+
+  - Ask a repo owner to run the preview deployment workflow on your PR. The preview link
+    will be commented under your PR automatically.
+
+- For maintainers:
+
+  - Inspect the proposed changes in the PR and ensure that it does not contain
+    malicious code changes. You should be especially alert to any proposed changes in the
+    `.github/workflows/` directory that affect workflow files.
+  - After you make sure the changes are safe, apply the `docs: deploy-preview`
+    label to the PR to deploy documentation preview.
+
 ## Compile the app locally

 ### Compile Toolbox binary
@@ -107,11 +170,9 @@

 ## Developing Toolbox SDKs

-Please refer to the [SDK developer guide](https://github.com/googleapis/genai-toolbox-langchain-python/blob/main/DEVELOPER.md)
+Please refer to the [SDK developer guide](https://github.com/googleapis/mcp-toolbox-sdk-python/blob/main/DEVELOPER.md)

-## CI/CD Details
-
-Cloud Build is used to run tests against Google Cloud resources in test project.
+## (Optional) Maintainer Information

 ### Releasing

@@ -143,23 +204,22 @@ Integration and unit tests are automatically triggered via CloudBuild during eac

 Create a Cloud Build trigger via the UI or `gcloud` with the following specs:

-* Event: Pull request
-* Region:
-    * global - for default worker pools
-* Source:
-  * Generation: 1st gen
-  * Repo: googleapis/genai-toolbox (GitHub App)
-  * Base branch: `^main$`
-* Comment control: Required except for owners and collaborators
-* Filters: add directory filter
-* Config: Cloud Build configuration file
-  * Location: Repository (add path to file)
-* Service account: set for demo service to enable ID token creation to use to authenticated services
+- Event: Pull request
+- Region:
+  - global - for default worker pools
+- Source:
+  - Generation: 1st gen
+  - Repo: googleapis/genai-toolbox (GitHub App)
+  - Base branch: `^main$`
+- Comment control: Required except for owners and collaborators
+- Filters: add directory filter
+- Config: Cloud Build configuration file
+  - Location: Repository (add path to file)
+- Service account: set for demo service to enable ID token creation to use to authenticated services

 ### Trigger
-To run tests on GitHub from external contributors, ie RenovateBot:

-* Cloud Build tests: comment `/gcbrun`
-* Unit tests: add `tests:run` label
+Trigger the PR tests on PRs from external contributors:

-[cloudsql-proxy]: https://cloud.google.com/sql/docs/mysql/sql-proxy
+- Cloud Build tests: comment `/gcbrun`
+- Unit tests: add `tests:run` label
--- a/5
+++ b/5
@@ -20,11 +20,12 @@ COPY . .

 ARG TARGETOS
 ARG TARGETARCH
-ARG METADATA_TAGS=dev
+ARG BUILD_TYPE="container.dev"
+ARG COMMIT_SHA=""

 RUN go get ./...
 RUN CGO_ENABLED=0 GOOS=${TARGETOS} GOARCH=${TARGETARCH} \
-    go build -ldflags "-X github.com/googleapis/genai-toolbox/cmd.metadataString=container.${METADATA_TAGS}"
+    go build -ldflags "-X github.com/googleapis/genai-toolbox/cmd.buildType=container.${BUILD_TYPE} -X github.com/googleapis/genai-toolbox/cmd.commitSha=${COMMIT_SHA}"

 # Final Stage
 FROM gcr.io/distroless/static:nonroot
--- a/README.md
+++ b/README.md
@@ -1,19 +1,27 @@
-
 ![logo](./logo.png)
-# Gen AI Toolbox for Databases

-> [!NOTE] 
-> Gen AI Toolbox for Databases is currently in beta, and may see breaking 
+# MCP Toolbox for Databases
+
+[![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]
+> MCP Toolbox for Databases is currently in beta, and may see breaking
 > changes until the first stable release (v1.0).

-Gen AI Toolbox for Databases is an open source server that makes it easier to
-build Gen AI tools for interacting with databases. It enables you to develop
-tools easier, faster, and more securely by handling the complexities such as
-connection pooling, authentication, and more.
+MCP Toolbox for Databases is an open source MCP server for databases. It enables
+you to develop tools easier, faster, and more securely by handling the complexities
+such as connection pooling, authentication, and more.

 This README provides a brief overview. For comprehensive details, see the [full
 documentation](https://googleapis.github.io/genai-toolbox/).

+
+> [!NOTE]
+> This solution was originally named “Gen AI Toolbox for Databases” as
+> its initial development predated MCP, but was renamed to align with recently
+> added MCP compatibility.
+
 <!-- TOC ignore:true -->
 ## Table of Contents

@@ -49,6 +57,21 @@ database. Toolbox provides:
  support for OpenTelemetry.


+**⚡ Supercharge Your Workflow with an AI Database Assistant ⚡**
+
+Stop context-switching and let your AI assistant become a true co-developer. By [connecting your IDE to your databases with MCP Toolbox][connect-ide], you can delegate complex and time-consuming database tasks, allowing you to build faster and focus on what matters. This isn't just about code completion; it's about giving your AI the context it needs to handle the entire development lifecycle.
+
+Here’s how it will save you time:
+
+* **Query in Plain English**: Interact with your data using natural language right from your IDE. Ask complex questions like, *"How many orders were delivered in 2024, and what items were in them?"* without writing any SQL.
+* **Automate Database Management**: Simply describe your data needs, and let the AI assistant manage your database for you. It can handle generating queries, creating tables, adding indexes, and more.
+* **Generate Context-Aware Code**: Empower your AI assistant to generate application code and tests with a deep understanding of your real-time database schema.  This accelerates the development cycle by ensuring the generated code is directly usable.
+* **Slash Development Overhead**: Radically reduce the time spent on manual setup and boilerplate. MCP Toolbox helps streamline lengthy database configurations, repetitive code, and error-prone schema migrations.
+
+Learn [how to connect your AI tools (IDEs) to Toolbox using MCP][connect-ide].
+
+[connect-ide]: https://googleapis.github.io/genai-toolbox/how-to/connect-ide/
+
 ## General Architecture

 Toolbox sits between your application's orchestration framework and your
@@ -76,7 +99,7 @@ To install Toolbox as a binary:
 <!-- {x-release-please-start-version} -->
 ```sh
 # see releases page for other versions
-export VERSION=0.3.0
+export VERSION=0.7.0
 curl -O https://storage.googleapis.com/genai-toolbox/v$VERSION/linux/amd64/toolbox
 chmod +x toolbox
 ```
@@ -89,7 +112,7 @@ You can also install Toolbox as a container:

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

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

@@ -114,7 +137,7 @@ go install github.com/googleapis/genai-toolbox@v0.3.0
 execute `toolbox` to start the server:

 ```sh
-./toolbox --tools_file "tools.yaml"
+./toolbox --tools-file "tools.yaml"
 ```

 You can use `toolbox help` for a full list of flags! To stop the server, send a
@@ -130,6 +153,31 @@ 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>Core</summary>
+
+1. Install [Toolbox Core SDK][toolbox-core]:
+    ```bash
+    pip install toolbox-core
+    ```
+1. Load tools:
+    ```python
+    from toolbox_core import ToolboxClient
+
+    # update the url to point to your server
+    async with ToolboxClient("http://127.0.0.1:5000") as client:
+
+        # these tools can be passed to your application!
+        tools = await client.load_toolset("toolset_name")
+    ```
+
+For more detailed instructions on using the Toolbox Core SDK, see the
+[project's README][toolbox-core-readme].
+
+[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>

 1. Install [Toolbox LangChain SDK][toolbox-langchain]:
@@ -141,17 +189,17 @@ application. See below the list of Client SDKs for using various frameworks:
    from toolbox_langchain import ToolboxClient

    # update the url to point to your server
-    client = ToolboxClient("http://127.0.0.1:5000")
+    async with ToolboxClient("http://127.0.0.1:5000") as client:

-    # these tools can be passed to your application! 
-    tools = client.load_toolset()
+        # these tools can be passed to your application!
+        tools = client.load_toolset()
    ```

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

-[toolbox-langchain]: https://github.com/googleapis/genai-toolbox-langchain-python
-[toolbox-langchain-readme]: https://github.com/googleapis/genai-toolbox-langchain-python/blob/main/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>

@@ -167,16 +215,16 @@ For more detailed instructions on using the Toolbox LangChain SDK, see the
    from toolbox_llamaindex import ToolboxClient

    # update the url to point to your server
-    client = ToolboxClient("http://127.0.0.1:5000")
+    async with ToolboxClient("http://127.0.0.1:5000") as client:

-    # these tools can be passed to your application! 
-    tools = client.load_toolset()
+        # these tools can be passed to your application!
+        tools = client.load_toolset()
    ```

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

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

 </details>
@@ -184,7 +232,7 @@ For more detailed instructions on using the Toolbox Llamaindex SDK, see the
 ## Configuration

 The primary way to configure Toolbox is through the `tools.yaml` file. If you
-have multiple files, you can tell toolbox which to load with the `--tools_file
+have multiple files, you can tell toolbox which to load with the `--tools-file
 tools.yaml` flag.

 You can find more detailed reference documentation to all resource types in the
@@ -211,9 +259,8 @@ For more details on configuring different types of sources, see the

 ### Tools

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

 ```yaml
 tools:
@@ -268,7 +315,7 @@ This project uses [semantic versioning](https://semver.org/), including a
 - PATCH version when we make backward compatible bug fixes

 The public API that this applies to is the CLI associated with Toolbox, the
-interactions with official SDKs, and the definitions in the `tools.yaml` file. 
+interactions with official SDKs, and the definitions in the `tools.yaml` file.

 ## Contributing

--- a/cmd/root.go
+++ b/cmd/root.go
@@ -21,24 +21,75 @@ import (
 	"io"
 	"os"
 	"os/signal"
+	"regexp"
+	"runtime"
 	"strings"
 	"syscall"
 	"time"

 	yaml "github.com/goccy/go-yaml"
 	"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/telemetry"
 	"github.com/googleapis/genai-toolbox/internal/util"
+
+	// Import tool packages for side effect of registration
+	_ "github.com/googleapis/genai-toolbox/internal/tools/alloydbainl"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/bigquery"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/bigqueryexecutesql"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/bigquerygetdatasetinfo"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/bigquerygettableinfo"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/bigquerylistdatasetids"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/bigquerylisttableids"
+	_ "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/http"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/mssqlexecutesql"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/mssqlsql"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/mysqlexecutesql"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/mysqlsql"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/neo4j"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/postgresexecutesql"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/postgressql"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/redis"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/spanner"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/spannerexecutesql"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/sqlitesql"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/valkey"
+
 	"github.com/spf13/cobra"
+
+	_ "github.com/googleapis/genai-toolbox/internal/sources/alloydbpg"
+	_ "github.com/googleapis/genai-toolbox/internal/sources/bigquery"
+	_ "github.com/googleapis/genai-toolbox/internal/sources/bigtable"
+	_ "github.com/googleapis/genai-toolbox/internal/sources/cloudsqlmssql"
+	_ "github.com/googleapis/genai-toolbox/internal/sources/cloudsqlmysql"
+	_ "github.com/googleapis/genai-toolbox/internal/sources/cloudsqlpg"
+	_ "github.com/googleapis/genai-toolbox/internal/sources/couchbase"
+	_ "github.com/googleapis/genai-toolbox/internal/sources/dgraph"
+	_ "github.com/googleapis/genai-toolbox/internal/sources/http"
+	_ "github.com/googleapis/genai-toolbox/internal/sources/mssql"
+	_ "github.com/googleapis/genai-toolbox/internal/sources/mysql"
+	_ "github.com/googleapis/genai-toolbox/internal/sources/neo4j"
+	_ "github.com/googleapis/genai-toolbox/internal/sources/postgres"
+	_ "github.com/googleapis/genai-toolbox/internal/sources/redis"
+	_ "github.com/googleapis/genai-toolbox/internal/sources/spanner"
+	_ "github.com/googleapis/genai-toolbox/internal/sources/sqlite"
+	_ "github.com/googleapis/genai-toolbox/internal/sources/valkey"
 )

 var (
-	// versionString indicates the version of this library.
-	//go:embed version.txt
+	// versionString stores the full semantic version, including build metadata.
 	versionString string
+	// versionNum indicates the numerical part fo the version
+	//go:embed version.txt
+	versionNum string
 	// metadataString indicates additional build or distribution metadata.
-	metadataString string
+	buildType string = "dev" // should be one of "dev", "binary", or "container"
+	// commitSha is the git commit it was built from
+	commitSha string
 )

 func init() {
@@ -47,10 +98,11 @@ func init() {

 // semanticVersion returns the version of the CLI including a compile-time metadata.
 func semanticVersion() string {
-	v := strings.TrimSpace(versionString)
-	if metadataString != "" {
-		v += "+" + metadataString
+	metadataStrings := []string{buildType, runtime.GOOS, runtime.GOARCH}
+	if commitSha != "" {
+		metadataStrings = append(metadataStrings, commitSha)
 	}
+	v := strings.TrimSpace(versionNum) + "+" + strings.Join(metadataStrings, ".")
 	return v
 }

@@ -67,15 +119,18 @@ func Execute() {
 type Command struct {
 	*cobra.Command

-	cfg        server.ServerConfig
-	logger     log.Logger
-	tools_file string
-	outStream  io.Writer
-	errStream  io.Writer
+	cfg            server.ServerConfig
+	logger         log.Logger
+	tools_file     string
+	prebuiltConfig string
+	inStream       io.Reader
+	outStream      io.Writer
+	errStream      io.Writer
 }

 // NewCommand returns a Command object representing an invocation of the CLI.
 func NewCommand(opts ...Option) *Command {
+	in := os.Stdin
 	out := os.Stdout
 	err := os.Stderr

@@ -86,6 +141,7 @@ func NewCommand(opts ...Option) *Command {
 	}
 	cmd := &Command{
 		Command:   baseCmd,
+		inStream:  in,
 		outStream: out,
 		errStream: err,
 	}
@@ -97,7 +153,8 @@ func NewCommand(opts ...Option) *Command {
 	// Set server version
 	cmd.cfg.Version = versionString

-	// set baseCmd out and err the same as cmd.
+	// set baseCmd in, out and err the same as cmd.
+	baseCmd.SetIn(cmd.inStream)
 	baseCmd.SetOut(cmd.outStream)
 	baseCmd.SetErr(cmd.errStream)

@@ -105,15 +162,17 @@ func NewCommand(opts ...Option) *Command {
 	flags.StringVarP(&cmd.cfg.Address, "address", "a", "127.0.0.1", "Address of the interface the server will listen on.")
 	flags.IntVarP(&cmd.cfg.Port, "port", "p", 5000, "Port the server will listen on.")

-	flags.StringVar(&cmd.tools_file, "tools_file", "tools.yaml", "File path specifying the tool configuration.")
+	flags.StringVar(&cmd.tools_file, "tools_file", "", "File path specifying the tool configuration. Cannot be used with --prebuilt.")
 	// deprecate tools_file
 	_ = flags.MarkDeprecated("tools_file", "please use --tools-file instead")
-	flags.StringVar(&cmd.tools_file, "tools-file", "tools.yaml", "File path specifying the tool configuration.")
+	flags.StringVar(&cmd.tools_file, "tools-file", "", "File path specifying the tool configuration. Cannot be used with --prebuilt.")
 	flags.Var(&cmd.cfg.LogLevel, "log-level", "Specify the minimum level logged. Allowed: 'DEBUG', 'INFO', 'WARN', 'ERROR'.")
 	flags.Var(&cmd.cfg.LoggingFormat, "logging-format", "Specify logging format to use. Allowed: 'standard' or 'JSON'.")
 	flags.BoolVar(&cmd.cfg.TelemetryGCP, "telemetry-gcp", false, "Enable exporting directly to Google Cloud Monitoring.")
 	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', '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.")

 	// wrap RunE command so that we have access to original Command object
 	cmd.RunE = func(*cobra.Command, []string) error { return run(cmd) }
@@ -129,9 +188,31 @@ type ToolsFile struct {
 	Toolsets     server.ToolsetConfigs     `yaml:"toolsets"`
 }

+// parseEnv replaces environment variables ${ENV_NAME} with their values.
+func parseEnv(input string) string {
+	re := regexp.MustCompile(`\$\{(\w+)\}`)
+
+	return re.ReplaceAllStringFunc(input, func(match string) string {
+		parts := re.FindStringSubmatch(match)
+		if len(parts) < 2 {
+			// technically shouldn't happen
+			return match
+		}
+
+		// extract the variable name
+		variableName := parts[1]
+		if value, found := os.LookupEnv(variableName); found {
+			return value
+		}
+		return match
+	})
+}
+
 // parseToolsFile parses the provided yaml into appropriate configs.
 func parseToolsFile(ctx context.Context, raw []byte) (ToolsFile, error) {
 	var toolsFile ToolsFile
+	// Replace environment variables if found
+	raw = []byte(parseEnv(string(raw)))
 	// Parse contents
 	err := yaml.UnmarshalContext(ctx, raw, &toolsFile, yaml.Strict())
 	if err != nil {
@@ -140,7 +221,25 @@ func parseToolsFile(ctx context.Context, raw []byte) (ToolsFile, error) {
 	return toolsFile, nil
 }

+// 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 {
+	if stdio {
+		switch strings.ToUpper(logLevel) {
+		case log.Debug, log.Info:
+			return true
+		default:
+			return false
+		}
+	}
+	return false
+}
+
 func run(cmd *Command) error {
+	if updateLogLevel(cmd.cfg.Stdio, cmd.cfg.LogLevel.String()) {
+		cmd.cfg.LogLevel = server.StringLevel(log.Warn)
+	}
+
 	ctx, cancel := context.WithCancel(cmd.Context())
 	defer cancel()

@@ -179,13 +278,13 @@ func run(cmd *Command) error {
 		}
 		cmd.logger = logger
 	default:
-		return fmt.Errorf("logging format invalid.")
+		return fmt.Errorf("logging format invalid")
 	}

 	ctx = util.WithLogger(ctx, cmd.logger)

 	// Set up OpenTelemetry
-	otelShutdown, err := telemetry.SetupOTel(ctx, cmd.Command.Version, cmd.cfg.TelemetryOTLP, cmd.cfg.TelemetryGCP, cmd.cfg.TelemetryServiceName)
+	otelShutdown, err := telemetry.SetupOTel(ctx, cmd.Version, cmd.cfg.TelemetryOTLP, cmd.cfg.TelemetryGCP, cmd.cfg.TelemetryServiceName)
 	if err != nil {
 		errMsg := fmt.Errorf("error setting up OpenTelemetry: %w", err)
 		cmd.logger.ErrorContext(ctx, errMsg.Error())
@@ -199,13 +298,39 @@ func run(cmd *Command) error {
 		}
 	}()

-	// Read tool file contents
-	buf, err := os.ReadFile(cmd.tools_file)
-	if err != nil {
-		errMsg := fmt.Errorf("unable to read tool file at %q: %w", cmd.tools_file, err)
-		cmd.logger.ErrorContext(ctx, errMsg.Error())
-		return errMsg
+	var buf []byte
+
+	if cmd.prebuiltConfig != "" {
+		// Make sure --prebuilt and --tools-file flags are mutually exclusive
+		if cmd.tools_file != "" {
+			errMsg := fmt.Errorf("--prebuilt and --tools-file flags cannot be used simultaneously")
+			cmd.logger.ErrorContext(ctx, errMsg.Error())
+			return errMsg
+		}
+		// Use prebuilt tools
+		buf, err = prebuiltconfigs.Get(cmd.prebuiltConfig)
+		if err != nil {
+			cmd.logger.ErrorContext(ctx, err.Error())
+			return err
+		}
+		logMsg := fmt.Sprint("Using prebuilt tool configuration for ", cmd.prebuiltConfig)
+		cmd.logger.InfoContext(ctx, logMsg)
+		// Append prebuilt.source to Version string for the User Agent
+		cmd.cfg.Version += "+prebuilt." + cmd.prebuiltConfig
+	} else {
+		// Set default value of tools-file flag to tools.yaml
+		if cmd.tools_file == "" {
+			cmd.tools_file = "tools.yaml"
+		}
+		// Read tool file contents
+		buf, err = os.ReadFile(cmd.tools_file)
+		if err != nil {
+			errMsg := fmt.Errorf("unable to read tool file at %q: %w", cmd.tools_file, err)
+			cmd.logger.ErrorContext(ctx, errMsg.Error())
+			return errMsg
+		}
 	}
+
 	toolsFile, err := parseToolsFile(ctx, buf)
 	cmd.cfg.SourceConfigs, cmd.cfg.AuthServiceConfigs, cmd.cfg.ToolConfigs, cmd.cfg.ToolsetConfigs = toolsFile.Sources, toolsFile.AuthServices, toolsFile.Tools, toolsFile.Toolsets
 	authSourceConfigs := toolsFile.AuthSources
@@ -239,9 +364,16 @@ func run(cmd *Command) error {
 	srvErr := make(chan error)
 	go func() {
 		defer close(srvErr)
-		err = s.Serve()
-		if err != nil {
-			srvErr <- err
+		if cmd.cfg.Stdio {
+			err = s.ServeStdio(ctx, cmd.inStream, cmd.outStream)
+			if err != nil {
+				srvErr <- err
+			}
+		} else {
+			err = s.Serve(ctx)
+			if err != nil {
+				srvErr <- err
+			}
 		}
 	}()

@@ -259,7 +391,7 @@ func run(cmd *Command) error {
 		cmd.logger.WarnContext(shutdownContext, "Shutting down gracefully...")
 		err := s.Shutdown(shutdownContext)
 		if err == context.DeadlineExceeded {
-			return fmt.Errorf("graceful shutdown timed out... forcing exit.")
+			return fmt.Errorf("graceful shutdown timed out... forcing exit")
 		}
 	}

--- a/cmd/root_test.go
+++ b/cmd/root_test.go
@@ -18,23 +18,29 @@ import (
 	"bytes"
 	_ "embed"
 	"os"
+	"runtime"
 	"strings"
 	"testing"

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

 	"github.com/googleapis/genai-toolbox/internal/auth/google"
+	"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/testutils"
 	"github.com/googleapis/genai-toolbox/internal/tools"
+	"github.com/googleapis/genai-toolbox/internal/tools/http"
 	"github.com/googleapis/genai-toolbox/internal/tools/postgressql"
 	"github.com/spf13/cobra"
 )

 func withDefaults(c server.ServerConfig) server.ServerConfig {
 	data, _ := os.ReadFile("version.txt")
-	c.Version = strings.TrimSpace(string(data))
+	version := strings.TrimSpace(string(data)) // Preserving 'data', new var for clarity
+	c.Version = version + "+" + strings.Join([]string{"dev", runtime.GOOS, runtime.GOARCH}, ".")
+
 	if c.Address == "" {
 		c.Address = "127.0.0.1"
 	}
@@ -161,6 +167,13 @@ func TestServerConfigFlags(t *testing.T) {
 				TelemetryServiceName: "toolbox-custom",
 			}),
 		},
+		{
+			desc: "stdio",
+			args: []string{"--stdio"},
+			want: withDefaults(server.ServerConfig{
+				Stdio: true,
+			}),
+		},
 	}
 	for _, tc := range tcs {
 		t.Run(tc.desc, func(t *testing.T) {
@@ -185,7 +198,7 @@ func TestToolFileFlag(t *testing.T) {
 		{
 			desc: "default value",
 			args: []string{},
-			want: "tools.yaml",
+			want: "",
 		},
 		{
 			desc: "foo file",
@@ -216,6 +229,36 @@ func TestToolFileFlag(t *testing.T) {
 	}
 }

+func TestPrebuiltFlag(t *testing.T) {
+	tcs := []struct {
+		desc string
+		args []string
+		want string
+	}{
+		{
+			desc: "default value",
+			args: []string{},
+			want: "",
+		},
+		{
+			desc: "custom pre built flag",
+			args: []string{"--tools-file", "alloydb"},
+			want: "alloydb",
+		},
+	}
+	for _, tc := range tcs {
+		t.Run(tc.desc, func(t *testing.T) {
+			c, _, err := invokeCommand(tc.args)
+			if err != nil {
+				t.Fatalf("unexpected error invoking command: %s", err)
+			}
+			if c.tools_file != tc.want {
+				t.Fatalf("got %v, want %v", c.cfg, tc.want)
+			}
+		})
+	}
+}
+
 func TestFailServerConfigFlags(t *testing.T) {
 	tcs := []struct {
 		desc string
@@ -318,13 +361,14 @@ func TestParseToolFile(t *testing.T) {
 				Tools: server.ToolConfigs{
 					"example_tool": postgressql.Config{
 						Name:        "example_tool",
-						Kind:        postgressql.ToolKind,
+						Kind:        "postgres-sql",
 						Source:      "my-pg-instance",
 						Description: "some description",
 						Statement:   "SELECT * FROM SQL_STATEMENT;\n",
 						Parameters: []tools.Parameter{
 							tools.NewStringParameter("country", "some description"),
 						},
+						AuthRequired: []string{},
 					},
 				},
 				Toolsets: server.ToolsetConfigs{
@@ -447,11 +491,12 @@ func TestParseToolFileWithAuth(t *testing.T) {
 				},
 				Tools: server.ToolConfigs{
 					"example_tool": postgressql.Config{
-						Name:        "example_tool",
-						Kind:        postgressql.ToolKind,
-						Source:      "my-pg-instance",
-						Description: "some description",
-						Statement:   "SELECT * FROM SQL_STATEMENT;\n",
+						Name:         "example_tool",
+						Kind:         "postgres-sql",
+						Source:       "my-pg-instance",
+						Description:  "some description",
+						Statement:    "SELECT * FROM SQL_STATEMENT;\n",
+						AuthRequired: []string{},
 						Parameters: []tools.Parameter{
 							tools.NewStringParameter("country", "some description"),
 							tools.NewIntParameterWithAuth("id", "user id", []tools.ParamAuthService{{Name: "my-google-service", Field: "user_id"}}),
@@ -545,11 +590,113 @@ func TestParseToolFileWithAuth(t *testing.T) {
 				},
 				Tools: server.ToolConfigs{
 					"example_tool": postgressql.Config{
-						Name:        "example_tool",
-						Kind:        postgressql.ToolKind,
-						Source:      "my-pg-instance",
-						Description: "some description",
-						Statement:   "SELECT * FROM SQL_STATEMENT;\n",
+						Name:         "example_tool",
+						Kind:         "postgres-sql",
+						Source:       "my-pg-instance",
+						Description:  "some description",
+						Statement:    "SELECT * FROM SQL_STATEMENT;\n",
+						AuthRequired: []string{},
+						Parameters: []tools.Parameter{
+							tools.NewStringParameter("country", "some description"),
+							tools.NewIntParameterWithAuth("id", "user id", []tools.ParamAuthService{{Name: "my-google-service", Field: "user_id"}}),
+							tools.NewStringParameterWithAuth("email", "user email", []tools.ParamAuthService{{Name: "my-google-service", Field: "email"}, {Name: "other-google-service", Field: "other_email"}}),
+						},
+					},
+				},
+				Toolsets: server.ToolsetConfigs{
+					"example_toolset": tools.ToolsetConfig{
+						Name:      "example_toolset",
+						ToolNames: []string{"example_tool"},
+					},
+				},
+			},
+		},
+		{
+			description: "basic example with authRequired",
+			in: `
+			sources:
+				my-pg-instance:
+					kind: cloud-sql-postgres
+					project: my-project
+					region: my-region
+					instance: my-instance
+					database: my_db
+					user: my_user
+					password: my_pass
+			authServices:
+				my-google-service:
+					kind: google
+					clientId: my-client-id
+				other-google-service:
+					kind: google
+					clientId: other-client-id
+
+			tools:
+				example_tool:
+					kind: postgres-sql
+					source: my-pg-instance
+					description: some description
+					statement: |
+						SELECT * FROM SQL_STATEMENT;
+					authRequired:
+						- my-google-service
+					parameters:
+						- name: country
+						  type: string
+						  description: some description
+						- name: id
+						  type: integer
+						  description: user id
+						  authServices:
+							- name: my-google-service
+								field: user_id
+						- name: email
+							type: string
+							description: user email
+							authServices:
+							- name: my-google-service
+							  field: email
+							- name: other-google-service
+							  field: other_email
+
+			toolsets:
+				example_toolset:
+					- example_tool
+			`,
+			wantToolsFile: ToolsFile{
+				Sources: server.SourceConfigs{
+					"my-pg-instance": cloudsqlpgsrc.Config{
+						Name:     "my-pg-instance",
+						Kind:     cloudsqlpgsrc.SourceKind,
+						Project:  "my-project",
+						Region:   "my-region",
+						Instance: "my-instance",
+						IPType:   "public",
+						Database: "my_db",
+						User:     "my_user",
+						Password: "my_pass",
+					},
+				},
+				AuthServices: server.AuthServiceConfigs{
+					"my-google-service": google.Config{
+						Name:     "my-google-service",
+						Kind:     google.AuthServiceKind,
+						ClientID: "my-client-id",
+					},
+					"other-google-service": google.Config{
+						Name:     "other-google-service",
+						Kind:     google.AuthServiceKind,
+						ClientID: "other-client-id",
+					},
+				},
+				Tools: server.ToolConfigs{
+					"example_tool": postgressql.Config{
+						Name:         "example_tool",
+						Kind:         "postgres-sql",
+						Source:       "my-pg-instance",
+						Description:  "some description",
+						Statement:    "SELECT * FROM SQL_STATEMENT;\n",
+						AuthRequired: []string{"my-google-service"},
 						Parameters: []tools.Parameter{
 							tools.NewStringParameter("country", "some description"),
 							tools.NewIntParameterWithAuth("id", "user id", []tools.ParamAuthService{{Name: "my-google-service", Field: "user_id"}}),
@@ -588,3 +735,328 @@ func TestParseToolFileWithAuth(t *testing.T) {
 	}

 }
+
+func TestEnvVarReplacement(t *testing.T) {
+	ctx, err := testutils.ContextWithNewLogger()
+	os.Setenv("TestHeader", "ACTUAL_HEADER")
+	os.Setenv("API_KEY", "ACTUAL_API_KEY")
+	os.Setenv("clientId", "ACTUAL_CLIENT_ID")
+	os.Setenv("clientId2", "ACTUAL_CLIENT_ID_2")
+	os.Setenv("toolset_name", "ACTUAL_TOOLSET_NAME")
+	os.Setenv("cat_string", "cat")
+	os.Setenv("food_string", "food")
+
+	if err != nil {
+		t.Fatalf("unexpected error: %s", err)
+	}
+	tcs := []struct {
+		description   string
+		in            string
+		wantToolsFile ToolsFile
+	}{
+		{
+			description: "file with env var example",
+			in: `
+			sources:
+				my-http-instance:
+					kind: http
+					baseUrl: http://test_server/
+					timeout: 10s
+					headers:
+						Authorization: ${TestHeader}
+					queryParams:
+						api-key: ${API_KEY}
+			authServices:
+				my-google-service:
+					kind: google
+					clientId: ${clientId}
+				other-google-service:
+					kind: google
+					clientId: ${clientId2}
+
+			tools:
+				example_tool:
+					kind: http
+					source: my-instance
+					method: GET
+					path: "search?name=alice&pet=${cat_string}"
+					description: some description
+					authRequired:
+						- my-google-auth-service
+						- other-auth-service
+					queryParams:
+						- name: country
+						  type: string
+						  description: some description
+						  authServices:
+							- name: my-google-auth-service
+							  field: user_id
+							- name: other-auth-service
+							  field: user_id
+					requestBody: |
+							{
+								"age": {{.age}},
+								"city": "{{.city}}",
+								"food": "${food_string}",
+								"other": "$OTHER"
+							}
+					bodyParams:
+						- name: age
+						  type: integer
+						  description: age num
+						- name: city
+						  type: string
+						  description: city string
+					headers:
+						Authorization: API_KEY
+						Content-Type: application/json
+					headerParams:
+						- name: Language
+						  type: string
+						  description: language string
+
+			toolsets:
+				${toolset_name}:
+					- example_tool
+			`,
+			wantToolsFile: ToolsFile{
+				Sources: server.SourceConfigs{
+					"my-http-instance": httpsrc.Config{
+						Name:           "my-http-instance",
+						Kind:           httpsrc.SourceKind,
+						BaseURL:        "http://test_server/",
+						Timeout:        "10s",
+						DefaultHeaders: map[string]string{"Authorization": "ACTUAL_HEADER"},
+						QueryParams:    map[string]string{"api-key": "ACTUAL_API_KEY"},
+					},
+				},
+				AuthServices: server.AuthServiceConfigs{
+					"my-google-service": google.Config{
+						Name:     "my-google-service",
+						Kind:     google.AuthServiceKind,
+						ClientID: "ACTUAL_CLIENT_ID",
+					},
+					"other-google-service": google.Config{
+						Name:     "other-google-service",
+						Kind:     google.AuthServiceKind,
+						ClientID: "ACTUAL_CLIENT_ID_2",
+					},
+				},
+				Tools: server.ToolConfigs{
+					"example_tool": http.Config{
+						Name:         "example_tool",
+						Kind:         "http",
+						Source:       "my-instance",
+						Method:       "GET",
+						Path:         "search?name=alice&pet=cat",
+						Description:  "some description",
+						AuthRequired: []string{"my-google-auth-service", "other-auth-service"},
+						QueryParams: []tools.Parameter{
+							tools.NewStringParameterWithAuth("country", "some description",
+								[]tools.ParamAuthService{{Name: "my-google-auth-service", Field: "user_id"},
+									{Name: "other-auth-service", Field: "user_id"}}),
+						},
+						RequestBody: `{
+  "age": {{.age}},
+  "city": "{{.city}}",
+  "food": "food",
+  "other": "$OTHER"
+}
+`,
+						BodyParams:   []tools.Parameter{tools.NewIntParameter("age", "age num"), tools.NewStringParameter("city", "city string")},
+						Headers:      map[string]string{"Authorization": "API_KEY", "Content-Type": "application/json"},
+						HeaderParams: []tools.Parameter{tools.NewStringParameter("Language", "language string")},
+					},
+				},
+				Toolsets: server.ToolsetConfigs{
+					"ACTUAL_TOOLSET_NAME": tools.ToolsetConfig{
+						Name:      "ACTUAL_TOOLSET_NAME",
+						ToolNames: []string{"example_tool"},
+					},
+				},
+			},
+		},
+	}
+	for _, tc := range tcs {
+		t.Run(tc.description, func(t *testing.T) {
+			toolsFile, err := parseToolsFile(ctx, testutils.FormatYaml(tc.in))
+			if err != nil {
+				t.Fatalf("failed to parse input: %v", err)
+			}
+			if diff := cmp.Diff(tc.wantToolsFile.Sources, toolsFile.Sources); diff != "" {
+				t.Fatalf("incorrect sources parse: diff %v", diff)
+			}
+			if diff := cmp.Diff(tc.wantToolsFile.AuthServices, toolsFile.AuthServices); diff != "" {
+				t.Fatalf("incorrect authServices parse: diff %v", diff)
+			}
+			if diff := cmp.Diff(tc.wantToolsFile.Tools, toolsFile.Tools); diff != "" {
+				t.Fatalf("incorrect tools parse: diff %v", diff)
+			}
+			if diff := cmp.Diff(tc.wantToolsFile.Toolsets, toolsFile.Toolsets); diff != "" {
+				t.Fatalf("incorrect tools parse: diff %v", diff)
+			}
+		})
+	}
+
+}
+
+func TestPrebuiltTools(t *testing.T) {
+	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")
+	postgresconfig, _ := prebuiltconfigs.Get("postgres")
+	spanner_config, _ := prebuiltconfigs.Get("spanner")
+	spannerpg_config, _ := prebuiltconfigs.Get("spanner-postgres")
+	ctx, err := testutils.ContextWithNewLogger()
+	if err != nil {
+		t.Fatalf("unexpected error: %s", err)
+	}
+	tcs := []struct {
+		name        string
+		in          []byte
+		wantToolset server.ToolsetConfigs
+	}{
+		{
+			name: "alloydb prebuilt tools",
+			in:   alloydb_config,
+			wantToolset: server.ToolsetConfigs{
+				"alloydb-postgres-database-tools": tools.ToolsetConfig{
+					Name:      "alloydb-postgres-database-tools",
+					ToolNames: []string{"execute_sql", "list_tables"},
+				},
+			},
+		},
+		{
+			name: "bigquery prebuilt tools",
+			in:   bigquery_config,
+			wantToolset: server.ToolsetConfigs{
+				"bigquery-database-tools": tools.ToolsetConfig{
+					Name:      "bigquery-database-tools",
+					ToolNames: []string{"execute_sql", "get_dataset_info", "get_table_info", "list_dataset_ids", "list_table_ids"},
+				},
+			},
+		},
+		{
+			name: "cloudsqlpg prebuilt tools",
+			in:   cloudsqlpg_config,
+			wantToolset: server.ToolsetConfigs{
+				"cloud-sql-postgres-database-tools": tools.ToolsetConfig{
+					Name:      "cloud-sql-postgres-database-tools",
+					ToolNames: []string{"execute_sql", "list_tables"},
+				},
+			},
+		},
+		{
+			name: "cloudsqlmysql prebuilt tools",
+			in:   cloudsqlmysql_config,
+			wantToolset: server.ToolsetConfigs{
+				"cloud-sql-mysql-database-tools": tools.ToolsetConfig{
+					Name:      "cloud-sql-mysql-database-tools",
+					ToolNames: []string{"execute_sql", "list_tables"},
+				},
+			},
+		},
+		{
+			name: "cloudsqlmssql prebuilt tools",
+			in:   cloudsqlmssql_config,
+			wantToolset: server.ToolsetConfigs{
+				"cloud-sql-mssql-database-tools": tools.ToolsetConfig{
+					Name:      "cloud-sql-mssql-database-tools",
+					ToolNames: []string{"execute_sql", "list_tables"},
+				},
+			},
+		},
+		{
+			name: "postgres prebuilt tools",
+			in:   postgresconfig,
+			wantToolset: server.ToolsetConfigs{
+				"postgres-database-tools": tools.ToolsetConfig{
+					Name:      "postgres-database-tools",
+					ToolNames: []string{"execute_sql", "list_tables"},
+				},
+			},
+		},
+		{
+			name: "spanner prebuilt tools",
+			in:   spanner_config,
+			wantToolset: server.ToolsetConfigs{
+				"spanner-database-tools": tools.ToolsetConfig{
+					Name:      "spanner-database-tools",
+					ToolNames: []string{"execute_sql", "execute_sql_dql", "list_tables"},
+				},
+			},
+		},
+		{
+			name: "spanner pg prebuilt tools",
+			in:   spannerpg_config,
+			wantToolset: server.ToolsetConfigs{
+				"spanner-postgres-database-tools": tools.ToolsetConfig{
+					Name:      "spanner-postgres-database-tools",
+					ToolNames: []string{"execute_sql", "execute_sql_dql", "list_tables"},
+				},
+			},
+		},
+	}
+
+	for _, tc := range tcs {
+		t.Run(tc.name, func(t *testing.T) {
+			toolsFile, err := parseToolsFile(ctx, tc.in)
+			if err != nil {
+				t.Fatalf("failed to parse input: %v", err)
+			}
+			if diff := cmp.Diff(tc.wantToolset, toolsFile.Toolsets); diff != "" {
+				t.Fatalf("incorrect tools parse: diff %v", diff)
+			}
+		})
+	}
+}
+
+func TestUpdateLogLevel(t *testing.T) {
+	tcs := []struct {
+		desc     string
+		stdio    bool
+		logLevel string
+		want     bool
+	}{
+		{
+			desc:     "no stdio",
+			stdio:    false,
+			logLevel: "info",
+			want:     false,
+		},
+		{
+			desc:     "stdio with info log",
+			stdio:    true,
+			logLevel: "info",
+			want:     true,
+		},
+		{
+			desc:     "stdio with debug log",
+			stdio:    true,
+			logLevel: "debug",
+			want:     true,
+		},
+		{
+			desc:     "stdio with warn log",
+			stdio:    true,
+			logLevel: "warn",
+			want:     false,
+		},
+		{
+			desc:     "stdio with error log",
+			stdio:    true,
+			logLevel: "error",
+			want:     false,
+		},
+	}
+	for _, tc := range tcs {
+		t.Run(tc.desc, func(t *testing.T) {
+			got := updateLogLevel(tc.stdio, tc.logLevel)
+			if got != tc.want {
+				t.Fatalf("incorrect indication to update log level: got %t, want %t", got, tc.want)
+			}
+		})
+	}
+}
--- a/cmd/version.txt
+++ b/cmd/version.txt
@@ -1 +1 @@
-0.3.0
+0.7.0
--- a/docs/en/_index.md
+++ b/docs/en/_index.md
@@ -12,4 +12,4 @@ description: >
    <link rel="canonical" href="getting-started/introduction/"/>
    <meta http-equiv="refresh" content="0;url=getting-started/introduction"/>
  </head>
-</html>
+</html>
--- a/docs/en/about/_index.md
+++ b/docs/en/about/_index.md
@@ -1,6 +1,7 @@
 ---
 title: "About"
 type: docs
-weight: 5
-description: A list of other information related to Toolbox.
+weight: 6
+description: >
+  A list of other information related to Toolbox.
 ---
--- a/docs/en/about/faq.md
+++ b/docs/en/about/faq.md
@@ -7,7 +7,7 @@ description: Frequently asked questions about Toolbox.

 ## How can I deploy or run Toolbox?

-Gen AI Toolbox for Databases is open-source and can be ran or deployed to a
+MCP Toolbox for Databases is open-source and can be ran or deployed to a
 multitude of environments. For convenience, we release [compiled binaries and
 docker images][release-notes] (but you can always compile yourself as well!). 

@@ -75,7 +75,10 @@ While a large part of the Gen AI Ecosystem is predominately Python, we opted to
 use Go. We chose Go because it's still easy and simple to use, but also easier
 to write fast, efficient, and concurrent servers. Additionally, given the
 server-client architecture, we can still meet many developers where they are
-with clients in their preferred language. As Gen AI matures, we want developers to be able to use Toolbox on the serving path of mission critical applications. It's easier to build the needed robustness, performance and scalability in Go than in Python.
+with clients in their preferred language. As Gen AI matures, we want developers
+to be able to use Toolbox on the serving path of mission critical applications.
+It's easier to build the needed robustness, performance and scalability in Go
+than in Python.


 ## Is Toolbox compatible with Model Context Protocol (MCP)? 
--- a/docs/en/concepts/_index.md
+++ b/docs/en/concepts/_index.md
@@ -2,5 +2,6 @@
 title: "Concepts"
 type: docs
 weight: 2
-description: Some core concepts in Toolbox
+description: >
+  Some core concepts in Toolbox
 ---
--- a/docs/en/concepts/telemetry/index.md
+++ b/docs/en/concepts/telemetry/index.md
@@ -2,7 +2,8 @@
 title: "Telemetry"
 type: docs
 weight: 2
-description: An overview of telemetry and observability in Toolbox. 
+description: >
+  An overview of telemetry and observability in Toolbox. 
 ---

 ## About
@@ -28,7 +29,7 @@ The following flags can be used to customize Toolbox logging:

 __Example:__
 ```bash
-./toolbox --tools_file "tools.yaml" --log-level warn --logging-format json
+./toolbox --tools-file "tools.yaml" --log-level warn --logging-format json
 ```

 ### Level
--- a/docs/en/getting-started/_index.md
+++ b/docs/en/getting-started/_index.md
@@ -3,5 +3,5 @@ title: "Getting Started"
 type: docs
 weight: 1
 description: >
-  How to get started with Toolbox
+  How to get started with Toolbox.
 ---
--- a/docs/en/getting-started/colab_quickstart.ipynb
+++ b/docs/en/getting-started/colab_quickstart.ipynb
@@ -29,7 +29,7 @@
        "id": "5sZ7_HCYJm4y"
      },
      "source": [
-        "[![Open In Colab](https://colab.research.google.com/assets/colab-badge.svg)](https://github.com/googleapis/genai-toolbox/tree/main/docs/en/getting-started/colab_quickstart.ipynb)"
+        "[![Open In Colab](https://colab.research.google.com/assets/colab-badge.svg)](https://colab.research.google.com/github/googleapis/genai-toolbox/blob/main/docs/en/getting-started/colab_quickstart.ipynb)"
      ]
    },
    {
@@ -38,9 +38,14 @@
        "id": "DMLivT-MIcmV"
      },
      "source": [
-        "# Getting Started With GenAI Toolbox\n",
+        "# Getting Started With MCP Toolbox\n",
        "\n",
-        "This guide demonstrates how to quickly run [Toolbox](https://github.com/googleapis/genai-toolbox) end-to-end in Google Colab using Python, PostgreSQL, and LlamaIndex.\n",
+        "This guide demonstrates how to quickly run\n",
+        "[Toolbox](https://github.com/googleapis/genai-toolbox) end-to-end in Google\n",
+        "Colab using Python, PostgreSQL, and either [Google\n",
+        "GenAI](https://pypi.org/project/google-genai/), [ADK](https://google.github.io/adk-docs/),\n",
+        "[Langgraph](https://www.langchain.com/langgraph)\n",
+        "or [LlamaIndex](https://www.llamaindex.ai/).\n",
        "\n",
        "Within this Colab environment, you'll\n",
        "- Set up a `PostgreSQL database`.\n",
@@ -217,7 +222,8 @@
      },
      "outputs": [],
      "source": [
-        "! curl -O https://storage.googleapis.com/genai-toolbox/v0.2.0/linux/amd64/toolbox\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",
        "! chmod +x toolbox"
@@ -347,6 +353,13 @@
        "        type: string\n",
        "        description: The ID of the hotel to cancel.\n",
        "    statement: UPDATE hotels SET booked = B'0' WHERE id = \\$1;\n",
+        "toolsets:\n",
+        "  my-toolset:\n",
+        "    - search-hotels-by-name\n",
+        "    - search-hotels-by-location\n",
+        "    - book-hotel\n",
+        "    - update-hotel\n",
+        "    - cancel-hotel\n",
        "\"\"\""
      ]
    },
@@ -382,7 +395,7 @@
      "outputs": [],
      "source": [
        "# Start a toolbox server\n",
-        "! nohup {TOOLBOX_BINARY_PATH} --tools_file {TOOLS_FILE_PATH} -p {SERVER_PORT} > toolbox.log 2>&1 &"
+        "! nohup {TOOLBOX_BINARY_PATH} --tools-file {TOOLS_FILE_PATH} -p {SERVER_PORT} > toolbox.log 2>&1 &"
      ]
    },
    {
@@ -444,7 +457,7 @@
        "# @markdown Please fill in the value below with your GCP project ID and then run the cell.\n",
        "\n",
        "# Please fill in these values.\n",
-        "project_id = \"twisha-dev\"  # @param {type:\"string\"}\n",
+        "project_id = \"\"  # @param {type:\"string\"}\n",
        "\n",
        "# Quick input validations.\n",
        "assert project_id, \"⚠️ Please provide a Google Cloud project ID\"\n",
@@ -459,8 +472,260 @@
        "id": "J46eLkFbNhWq"
      },
      "source": [
-        "> You can either use LangGraph or LlamaIndex to develop a Toolbox based application. Run one of the [Connect Using LangGraph](#scrollTo=pbapNMhhL33S) or [Connect using LlamaIndex](#scrollTo=04iysrm_L_7v&line=1&uniqifier=1) sections below.\n",
-        "\n"
+        "> You can either use LangGraph or LlamaIndex to develop a Toolbox based\n",
+        "> application. Run one of the sections below\n",
+        "> - [Connect using Google GenAI](#scrollTo=Rwgv1LDdNKSn)\n",
+        "> - [Connect using ADK](#scrollTo=QqRlWqvYNKSo)\n",
+        "> - [Connect Using LangGraph](#scrollTo=pbapNMhhL33S)\n",
+        "> - [Connect using LlamaIndex](#scrollTo=04iysrm_L_7v)\n"
+      ]
+    },
+    {
+      "cell_type": "markdown",
+      "metadata": {
+        "id": "Rwgv1LDdNKSn"
+      },
+      "source": [
+        "### Connect Using Google GenAI"
+      ]
+    },
+    {
+      "cell_type": "code",
+      "execution_count": null,
+      "metadata": {
+        "id": "HY23RMk4NKSn"
+      },
+      "outputs": [],
+      "source": [
+        "# Install the Toolbox Core package\n",
+        "!pip install toolbox-core --quiet\n",
+        "\n",
+        "# Install the Google GenAI package\n",
+        "!pip install google-genai --quiet"
+      ]
+    },
+    {
+      "cell_type": "markdown",
+      "metadata": {
+        "id": "9F1u566sNKSn"
+      },
+      "source": [
+        "Create a Google GenAI Application which can Search, Book and Cancel hotels."
+      ]
+    },
+    {
+      "cell_type": "code",
+      "execution_count": null,
+      "metadata": {
+        "id": "LAuBIOXvNKSn"
+      },
+      "outputs": [],
+      "source": [
+        "import asyncio\n",
+        "\n",
+        "from google import genai\n",
+        "from google.genai.types import (\n",
+        "    Content,\n",
+        "    FunctionDeclaration,\n",
+        "    GenerateContentConfig,\n",
+        "    Part,\n",
+        "    Tool,\n",
+        ")\n",
+        "\n",
+        "from toolbox_core import ToolboxClient\n",
+        "\n",
+        "prompt = \"\"\"\n",
+        "  You're a helpful hotel assistant. You handle hotel searching, booking and\n",
+        "  cancellations. When the user searches for a hotel, mention it's name, id,\n",
+        "  location and price tier. Always mention hotel id while performing any\n",
+        "  searches. This is very important for any operations. For any bookings or\n",
+        "  cancellations, please provide the appropriate confirmation. Be sure to\n",
+        "  update checkin or checkout dates if mentioned by the user.\n",
+        "  Don't ask for confirmations from the user.\n",
+        "\"\"\"\n",
+        "\n",
+        "queries = [\n",
+        "    \"Find hotels in Basel with Basel in it's name.\",\n",
+        "    \"Please book the hotel Hilton Basel for me.\",\n",
+        "    \"This is too expensive. Please cancel it.\",\n",
+        "    \"Please book Hyatt Regency for me\",\n",
+        "    \"My check in dates for my booking would be from April 10, 2024 to April 19, 2024.\",\n",
+        "]\n",
+        "\n",
+        "\n",
+        "async def run_application():\n",
+        "    toolbox_client = ToolboxClient(\"http://127.0.0.1:5000\")\n",
+        "\n",
+        "    # The toolbox_tools list contains Python callables (functions/methods) designed for LLM tool-use\n",
+        "    # integration. While this example uses Google's genai client, these callables can be adapted for\n",
+        "    # various function-calling or agent frameworks. For easier integration with supported frameworks\n",
+        "    # (https://github.com/googleapis/mcp-toolbox-python-sdk/tree/main/packages), use the\n",
+        "    # provided wrapper packages, which handle framework-specific boilerplate.\n",
+        "    toolbox_tools = await toolbox_client.load_toolset(\"my-toolset\")\n",
+        "    genai_client = genai.Client(\n",
+        "        vertexai=True, project=project_id, location=\"us-central1\"\n",
+        "    )\n",
+        "\n",
+        "    genai_tools = [\n",
+        "        Tool(\n",
+        "            function_declarations=[\n",
+        "                FunctionDeclaration.from_callable_with_api_option(callable=tool)\n",
+        "            ]\n",
+        "        )\n",
+        "        for tool in toolbox_tools\n",
+        "    ]\n",
+        "    history = []\n",
+        "    for query in queries:\n",
+        "        user_prompt_content = Content(\n",
+        "            role=\"user\",\n",
+        "            parts=[Part.from_text(text=query)],\n",
+        "        )\n",
+        "        history.append(user_prompt_content)\n",
+        "\n",
+        "        response = genai_client.models.generate_content(\n",
+        "            model=\"gemini-2.0-flash-001\",\n",
+        "            contents=history,\n",
+        "            config=GenerateContentConfig(\n",
+        "                system_instruction=prompt,\n",
+        "                tools=genai_tools,\n",
+        "            ),\n",
+        "        )\n",
+        "        history.append(response.candidates[0].content)\n",
+        "        function_response_parts = []\n",
+        "        for function_call in response.function_calls:\n",
+        "            fn_name = function_call.name\n",
+        "            # The tools are sorted alphabetically\n",
+        "            if fn_name == \"search-hotels-by-name\":\n",
+        "                function_result = await toolbox_tools[3](**function_call.args)\n",
+        "            elif fn_name == \"search-hotels-by-location\":\n",
+        "                function_result = await toolbox_tools[2](**function_call.args)\n",
+        "            elif fn_name == \"book-hotel\":\n",
+        "                function_result = await toolbox_tools[0](**function_call.args)\n",
+        "            elif fn_name == \"update-hotel\":\n",
+        "                function_result = await toolbox_tools[4](**function_call.args)\n",
+        "            elif fn_name == \"cancel-hotel\":\n",
+        "                function_result = await toolbox_tools[1](**function_call.args)\n",
+        "            else:\n",
+        "                raise ValueError(\"Function name not present.\")\n",
+        "            function_response = {\"result\": function_result}\n",
+        "            function_response_part = Part.from_function_response(\n",
+        "                name=function_call.name,\n",
+        "                response=function_response,\n",
+        "            )\n",
+        "            function_response_parts.append(function_response_part)\n",
+        "\n",
+        "        if function_response_parts:\n",
+        "            tool_response_content = Content(role=\"tool\", parts=function_response_parts)\n",
+        "            history.append(tool_response_content)\n",
+        "\n",
+        "        response2 = genai_client.models.generate_content(\n",
+        "            model=\"gemini-2.0-flash-001\",\n",
+        "            contents=history,\n",
+        "            config=GenerateContentConfig(\n",
+        "                tools=genai_tools,\n",
+        "            ),\n",
+        "        )\n",
+        "        final_model_response_content = response2.candidates[0].content\n",
+        "        history.append(final_model_response_content)\n",
+        "        print(response2.text)\n",
+        "\n",
+        "\n",
+        "asyncio.run(run_application())"
+      ]
+    },
+    {
+      "cell_type": "markdown",
+      "metadata": {
+        "id": "QqRlWqvYNKSo"
+      },
+      "source": [
+        "### Connect Using ADK"
+      ]
+    },
+    {
+      "cell_type": "code",
+      "execution_count": null,
+      "metadata": {
+        "id": "dhQTKlpVNKSo"
+      },
+      "outputs": [],
+      "source": [
+        "! pip install toolbox-core --quiet\n",
+        "! pip install google-adk --quiet"
+      ]
+    },
+    {
+      "cell_type": "code",
+      "execution_count": null,
+      "metadata": {
+        "id": "tSLO_0vKNKSo"
+      },
+      "outputs": [],
+      "source": [
+        "from google.adk.agents import Agent\n",
+        "from google.adk.runners import Runner\n",
+        "from google.adk.sessions import InMemorySessionService\n",
+        "from google.adk.artifacts.in_memory_artifact_service import InMemoryArtifactService\n",
+        "from google.genai import types\n",
+        "from toolbox_core import ToolboxSyncClient\n",
+        "\n",
+        "import os\n",
+        "# TODO(developer): replace this with your Google API key\n",
+        "os.environ['GOOGLE_API_KEY'] = \"<GOOGLE_API_KEY>\"\n",
+        "\n",
+        "toolbox_client = ToolboxSyncClient(\"http://127.0.0.1:5000\")\n",
+        "\n",
+        "prompt = \"\"\"\n",
+        "  You're a helpful hotel assistant. You handle hotel searching, booking and\n",
+        "  cancellations. When the user searches for a hotel, mention it's name, id,\n",
+        "  location and price tier. Always mention hotel ids while performing any\n",
+        "  searches. This is very important for any operations. For any bookings or\n",
+        "  cancellations, please provide the appropriate confirmation. Be sure to\n",
+        "  update checkin or checkout dates if mentioned by the user.\n",
+        "  Don't ask for confirmations from the user.\n",
+        "\"\"\"\n",
+        "\n",
+        "root_agent = Agent(\n",
+        "    model='gemini-2.0-flash-001',\n",
+        "    name='hotel_agent',\n",
+        "    description='A helpful AI assistant.',\n",
+        "    instruction=prompt,\n",
+        "    tools=toolbox_client.load_toolset(\"my-toolset\"),\n",
+        ")\n",
+        "\n",
+        "session_service = InMemorySessionService()\n",
+        "artifacts_service = InMemoryArtifactService()\n",
+        "session = session_service.create_session(\n",
+        "    state={}, app_name='hotel_agent', user_id='123'\n",
+        ")\n",
+        "runner = Runner(\n",
+        "    app_name='hotel_agent',\n",
+        "    agent=root_agent,\n",
+        "    artifact_service=artifacts_service,\n",
+        "    session_service=session_service,\n",
+        ")\n",
+        "\n",
+        "queries = [\n",
+        "    \"Find hotels in Basel with Basel in it's name.\",\n",
+        "    \"Can you book the Hilton Basel for me?\",\n",
+        "    \"Oh wait, this is too expensive. Please cancel it and book the Hyatt Regency instead.\",\n",
+        "    \"My check in dates would be from April 10, 2024 to April 19, 2024.\",\n",
+        "]\n",
+        "\n",
+        "for query in queries:\n",
+        "    content = types.Content(role='user', parts=[types.Part(text=query)])\n",
+        "    events = runner.run(session_id=session.id,\n",
+        "                        user_id='123', new_message=content)\n",
+        "\n",
+        "    responses = (\n",
+        "      part.text\n",
+        "      for event in events\n",
+        "      for part in event.content.parts\n",
+        "      if part.text is not None\n",
+        "    )\n",
+        "\n",
+        "    for text in responses:\n",
+        "      print(text)"
      ]
    },
    {
@@ -534,23 +799,26 @@
        "    \"My check in dates would be from April 10, 2024 to April 19, 2024.\",\n",
        "]\n",
        "\n",
-        "# Create an LLM to bind with the agent.\n",
-        "# TODO(developer): replace this with another model if needed\n",
-        "model = ChatVertexAI(model_name=\"gemini-1.5-pro\", project=project_id)\n",
-        "# model = ChatGoogleGenerativeAI(model=\"gemini-1.5-pro\")\n",
-        "# model = ChatAnthropic(model=\"claude-3-5-sonnet-20240620\")\n",
+        "async def run_application():\n",
+        "  # Create an LLM to bind with the agent.\n",
+        "  # TODO(developer): replace this with another model if needed\n",
+        "  model = ChatVertexAI(model_name=\"gemini-2.0-flash-001\", project=project_id)\n",
+        "  # model = ChatGoogleGenerativeAI(model=\"gemini-2.0-flash-001\")\n",
+        "  # model = ChatAnthropic(model=\"claude-3-5-sonnet-20240620\")\n",
        "\n",
-        "# Load the tools from the Toolbox server\n",
-        "client = ToolboxClient(\"http://127.0.0.1:5000\")\n",
-        "tools = client.load_toolset()\n",
+        "  # Load the tools from the Toolbox server\n",
+        "  client = ToolboxClient(\"http://127.0.0.1:5000\")\n",
+        "  tools = await client.aload_toolset()\n",
        "\n",
-        "# Create a Langraph agent\n",
-        "agent = create_react_agent(model, tools, checkpointer=MemorySaver())\n",
-        "config = {\"configurable\": {\"thread_id\": \"thread-1\"}}\n",
-        "for query in queries:\n",
-        "    inputs = {\"messages\": [(\"user\", prompt + query)]}\n",
-        "    response = agent.invoke(inputs, stream_mode=\"values\", config=config)\n",
-        "    print(response[\"messages\"][-1].content)"
+        "  # Create a Langraph agent\n",
+        "  agent = create_react_agent(model, tools, checkpointer=MemorySaver())\n",
+        "  config = {\"configurable\": {\"thread_id\": \"thread-1\"}}\n",
+        "  for query in queries:\n",
+        "      inputs = {\"messages\": [(\"user\", prompt + query)]}\n",
+        "      response = agent.invoke(inputs, stream_mode=\"values\", config=config)\n",
+        "      print(response[\"messages\"][-1].content)\n",
+        "\n",
+        "await run_application()"
      ]
    },
    {
@@ -626,16 +894,16 @@
        "    \"My check in dates would be from April 10, 2024 to April 19, 2024.\",\n",
        "]\n",
        "\n",
-        "async def run_agent():\n",
+        "async def run_application():\n",
        "    # Create an LLM to bind with the agent.\n",
        "    # TODO(developer): replace this with another model if needed\n",
        "    llm = GoogleGenAI(\n",
-        "        model=\"gemini-1.5-pro\",\n",
+        "        model=\"gemini-2.0-flash-001\",\n",
        "        vertexai_config={\"project\": project_id, \"location\": \"us-central1\"},\n",
        "    )\n",
        "    # llm = GoogleGenAI(\n",
        "    #     api_key=os.getenv(\"GOOGLE_API_KEY\"),\n",
-        "    #     model=\"gemini-1.5-pro\",\n",
+        "    #     model=\"gemini-2.0-flash-001\",\n",
        "    # )\n",
        "    # llm = Anthropic(\n",
        "    #   model=\"claude-3-7-sonnet-latest\",\n",
@@ -644,7 +912,7 @@
        "\n",
        "    # Load the tools from the Toolbox server\n",
        "    client = ToolboxClient(\"http://127.0.0.1:5000\")\n",
-        "    tools = client.load_toolset()\n",
+        "    tools = await client.aload_toolset()\n",
        "\n",
        "    # Create a LlamaIndex agent\n",
        "    agent = AgentWorkflow.from_tools_or_functions(\n",
@@ -660,7 +928,7 @@
        "        print(f\"---- {query} ----\")\n",
        "        print(str(response))\n",
        "\n",
-        "await run_agent()"
+        "await run_application()"
      ]
    },
    {
@@ -737,6 +1005,7 @@
  "metadata": {
    "colab": {
      "collapsed_sections": [
+        "Rwgv1LDdNKSn",
        "pbapNMhhL33S",
        "04iysrm_L_7v"
      ],
--- a/docs/en/getting-started/configure.md
+++ b/docs/en/getting-started/configure.md
@@ -2,16 +2,27 @@
 title: "Configuration"
 type: docs
 weight: 4
-description: How to configure Toolbox's tools.yaml file.
+description: >
+  How to configure Toolbox's tools.yaml file.
 ---

 The primary way to configure Toolbox is through the `tools.yaml` file. If you
-have multiple files, you can tell toolbox which to load with the `--tools_file
+have multiple files, you can tell toolbox which to load with the `--tools-file
 tools.yaml` flag.

 You can find more detailed reference documentation to all resource types in the
 [Resources](../resources/).

+### Using Environment Variables
+
+To avoid hardcoding certain secret fields like passwords, usernames, API keys
+etc., you could use environment variables instead with the format `${ENV_NAME}`.
+
+```yaml
+  user: ${USER_NAME}
+  password: ${PASSWORD}
+```
+
 ### Sources

 The `sources` section of your `tools.yaml` defines what data sources your
@@ -25,8 +36,8 @@ sources:
    host: 127.0.0.1
    port: 5432
    database: toolbox_db
-    user: toolbox_user
-    password: my-password
+    user: ${USER_NAME}
+    password: ${PASSWORD}
 ```

 For more details on configuring different types of sources, see the
@@ -54,7 +65,6 @@ tools:
 For more details on configuring different types of tools, see the
 [Tools](../resources/tools/).

-
 ### Toolsets

 The `toolsets` section of your `tools.yaml` allows you to define groups of tools
@@ -79,4 +89,4 @@ all_tools = client.load_toolset()

 # This will only load the tools listed in 'my_second_toolset'
 my_second_toolset = client.load_toolset("my_second_toolset")
-```
+```
--- a/docs/en/getting-started/introduction/_index.md
+++ b/docs/en/getting-started/introduction/_index.md
@@ -2,13 +2,20 @@
 title: "Introduction"
 type: docs
 weight: 1
-description: An introduction to Gen AI Toolbox for Databases.
+description: >
+  An introduction to MCP Toolbox for Databases.
 ---

-Gen AI Toolbox for Databases is an open source server that makes it easier to
-build Gen AI tools for interacting with databases. It enables you to develop
-tools easier, faster, and more securely by handling the complexities such as
-connection pooling, authentication, and more.
+MCP Toolbox for Databases is an open source MCP server for databases. It enables
+you to develop tools easier, faster, and more securely by handling the complexities
+such as connection pooling, authentication, and more.
+
+
+{{< notice note >}}
+This solution was originally named “Gen AI Toolbox for
+Databases” as its initial development predated MCP, but was renamed to align
+with recently added MCP compatibility.
+{{< /notice >}}

 ##  Why Toolbox?

@@ -24,6 +31,21 @@ database. Toolbox provides:
  support for OpenTelemetry.


+**⚡ Supercharge Your Workflow with an AI Database Assistant ⚡**
+
+Stop context-switching and let your AI assistant become a true co-developer. By [connecting your IDE to your databases with MCP Toolbox][connect-ide], you can delegate complex and time-consuming database tasks, allowing you to build faster and focus on what matters. This isn't just about code completion; it's about giving your AI the context it needs to handle the entire development lifecycle.
+
+Here’s how it will save you time:
+
+* **Query in Plain English**: Interact with your data using natural language right from your IDE. Ask complex questions like, *"How many orders were delivered in 2024, and what items were in them?"* without writing any SQL.
+* **Automate Database Management**: Simply describe your data needs, and let the AI assistant manage your database for you. It can handle generating queries, creating tables, adding indexes, and more.
+* **Generate Context-Aware Code**: Empower your AI assistant to generate application code and tests with a deep understanding of your real-time database schema.  This accelerates the development cycle by ensuring the generated code is directly usable.
+* **Slash Development Overhead**: Radically reduce the time spent on manual setup and boilerplate. MCP Toolbox helps streamline lengthy database configurations, repetitive code, and error-prone schema migrations.
+
+Learn [how to connect your AI tools (IDEs) to Toolbox using MCP][connect-ide].
+
+[connect-ide]: ../../how-to/connect-ide/
+
 ## General Architecture

 Toolbox sits between your application's orchestration framework and your
@@ -51,7 +73,7 @@ To install Toolbox as a binary:

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

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

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

 {{% /tab %}}
@@ -86,7 +108,7 @@ go install github.com/googleapis/genai-toolbox@v0.3.0
 execute `toolbox` to start the server:

 ```sh
-./toolbox --tools_file "tools.yaml"
+./toolbox --tools-file "tools.yaml"
 ```

 You can use `toolbox help` for a full list of flags! To stop the server, send a
@@ -101,24 +123,44 @@ 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:

 {{< tabpane text=true persist=header >}}
+{{% tab header="Core" lang="en" %}}
+
+Once you've installed the [Toolbox Core
+SDK](https://pypi.org/project/toolbox-core/), you can load
+tools:
+
+{{< highlight python >}}
+from toolbox_core import ToolboxClient
+
+# update the url to point to your server
+async with ToolboxClient("http://127.0.0.1:5000") as client:
+
+    # these tools can be passed to your application!
+    tools = await client.load_toolset("toolset_name")
+{{< /highlight >}}
+
+For more detailed instructions on using the Toolbox Core SDK, see the
+[project's README](https://github.com/googleapis/mcp-toolbox-sdk-python/blob/main/packages/toolbox-core/README.md).
+
+{{% /tab %}}
 {{% tab header="LangChain" lang="en" %}}

 Once you've installed the [Toolbox LangChain
-SDK](https://github.com/googleapis/genai-toolbox-langchain-python), you can load
+SDK](https://pypi.org/project/toolbox-langchain/), you can load
 tools:

 {{< highlight python >}}
 from toolbox_langchain import ToolboxClient

 # update the url to point to your server
-client = ToolboxClient("http://127.0.0.1:5000")
+async with ToolboxClient("http://127.0.0.1:5000") as client:

-# these tools can be passed to your application! 
-tools = client.load_toolset()
+    # these tools can be passed to your application!
+    tools = client.load_toolset()
 {{< /highlight >}}

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

 {{% /tab %}}
 {{% tab header="Llamaindex" lang="en" %}}
@@ -131,10 +173,10 @@ tools:
 from toolbox_llamaindex import ToolboxClient

 # update the url to point to your server
-client = ToolboxClient("http://127.0.0.1:5000")
+async with ToolboxClient("http://127.0.0.1:5000") as client:

-# these tools can be passed to your application! 
-tools = client.load_toolset()
+  # these tools can be passed to your application!
+  tools = client.load_toolset()
 {{< /highlight >}}

 For more detailed instructions on using the Toolbox Llamaindex SDK, see the
--- a/docs/en/getting-started/introduction/architecture.png
+++ b/docs/en/getting-started/introduction/architecture.png
--- a/docs/en/getting-started/local_quickstart.md
+++ b/docs/en/getting-started/local_quickstart.md
@@ -4,33 +4,19 @@ type: docs
 weight: 2
 description: >
  How to get started running Toolbox locally with Python, PostgreSQL, and 
-  LangGraph or LlamaIndex. 
+  [GoogleGenAI](https://pypi.org/project/google-genai/), 
+  [LangGraph](https://www.langchain.com/langgraph), [LlamaIndex](https://www.llamaindex.ai/) or [Agent Development Kit](https://google.github.io/adk-docs/). 
 ---

 [![Open In Colab](https://colab.research.google.com/assets/colab-badge.svg)](https://colab.research.google.com/github/googleapis/genai-toolbox/blob/main/docs/en/getting-started/colab_quickstart.ipynb)

 ## Before you begin

-This guide assumes you have already done the following: 
+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]
-1. Completed setup for usage with an LLM model such as
-{{< tabpane text=true persist=header >}}
-{{% tab header="LangChain" lang="en" %}}
- [langchain-vertexai](https://python.langchain.com/docs/integrations/llms/google_vertex_ai_palm/#setup) package.
-
- [langchain-google-genai](https://python.langchain.com/docs/integrations/chat/google_generative_ai/#setup) package.
-
- [langchain-anthropic](https://python.langchain.com/docs/integrations/chat/anthropic/#setup) package.
-{{% /tab %}}
-{{% tab header="LlamaIndex" lang="en" %}}
- [llama-index-llms-google-genai](https://pypi.org/project/llama-index-llms-google-genai/) package.
-
- [llama-index-llms-anthropic](https://docs.llamaindex.ai/en/stable/examples/llm/anthropic) package.
-{{% /tab %}}
-{{< /tabpane >}}

 [install-python]: https://wiki.python.org/moin/BeginnersGuide/Download
 [install-pip]: https://pip.pypa.io/en/stable/installation/
@@ -40,7 +26,7 @@ This guide assumes you have already done the following:
 ## Step 1: Set up your database

 In this section, we will create a database, insert some data that needs to be
-access by our agent, and create a database user for Toolbox to connect with. 
+accessed by our agent, and create a database user for Toolbox to connect with.

 1. Connect to postgres using the `psql` command:

@@ -50,11 +36,32 @@ access by our agent, and create a database user for Toolbox to connect with.

    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 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
@@ -66,13 +73,12 @@ access by our agent, and create a database user for Toolbox to connect with.
      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:

@@ -117,7 +123,6 @@ access by our agent, and create a database user for Toolbox to connect with.
    \q
    ```

-
 ## Step 2: Install and configure Toolbox

 In this section, we will download Toolbox, configure our tools in a
@@ -125,15 +130,15 @@ In this section, we will download Toolbox, configure our tools in a

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

@@ -147,6 +152,11 @@ In this section, we will download Toolbox, configure our tools in a
   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:
@@ -154,8 +164,8 @@ In this section, we will download Toolbox, configure our tools in a
        host: 127.0.0.1
        port: 5432
        database: toolbox_db
-        user: toolbox_user
-        password: my-password
+        user: ${USER_NAME}
+        password: ${PASSWORD}
    tools:
      search-hotels-by-name:
        kind: postgres-sql
@@ -213,13 +223,21 @@ In this section, we will download Toolbox, configure our tools in a
            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"
+    ./toolbox --tools-file "tools.yaml"
    ```

 ## Step 3: Connect your agent to Toolbox
@@ -227,15 +245,22 @@ In this section, we will download Toolbox, configure our tools in a
 In this section, we will write and run an agent that will load the Tools
 from Toolbox.

-{{< notice tip>}} If you prefer to experiment within a Google Colab environment, 
-you can connect to a 
-[local runtime](https://research.google.com/colaboratory/local-runtimes.html). 
+{{< notice tip>}} If you prefer to experiment within a Google Colab environment,
+you can connect to a
+[local runtime](https://research.google.com/colaboratory/local-runtimes.html).
 {{< /notice >}}

-
 1. In a new terminal, install the SDK package.
-    
+
    {{< tabpane persist=header >}}
+{{< tab header="Core" lang="bash" >}}
+
+pip install toolbox-core
+{{< /tab >}}
+{{< tab header="ADK" lang="bash" >}}
+
+pip install toolbox-core
+{{< /tab >}}
 {{< tab header="Langchain" lang="bash" >}}

 pip install toolbox-langchain
@@ -247,43 +272,243 @@ pip install toolbox-llamaindex
 {{< /tabpane >}}

 1. Install other required dependencies:
-    
+
    {{< tabpane persist=header >}}
+{{< tab header="Core" lang="bash" >}}
+
+pip install google-genai
+{{< /tab >}}
+{{< tab header="ADK" lang="bash" >}}
+
+pip install google-adk
+{{< /tab >}}
 {{< tab header="Langchain" lang="bash" >}}

 # TODO(developer): replace with correct package if needed
+
 pip install langgraph langchain-google-vertexai
+
 # pip install langchain-google-genai
+
 # pip install langchain-anthropic
+
 {{< /tab >}}
 {{< tab header="LlamaIndex" lang="bash" >}}

 # TODO(developer): replace with correct package if needed
+
 pip install llama-index-llms-google-genai
+
 # pip install llama-index-llms-anthropic
+
 {{< /tab >}}
 {{< /tabpane >}}
-    
+
 1. Create a new file named `hotel_agent.py` and copy the following
   code to create an agent:
    {{< tabpane persist=header >}}
+{{< tab header="Core" lang="python" >}}
+import asyncio
+
+from google import genai
+from google.genai.types import (
+    Content,
+    FunctionDeclaration,
+    GenerateContentConfig,
+    Part,
+    Tool,
+)
+
+from toolbox_core import ToolboxClient
+
+prompt = """
+  You're a helpful hotel assistant. You handle hotel searching, booking and
+  cancellations. When the user searches for a hotel, mention it's name, id,
+  location and price tier. Always mention hotel id while performing any
+  searches. This is very important for any operations. For any bookings or
+  cancellations, please provide the appropriate confirmation. Be sure to
+  update checkin or checkout dates if mentioned by the user.
+  Don't ask for confirmations from the user.
+"""
+
+queries = [
+    "Find hotels in Basel with Basel in it's name.",
+    "Please book the hotel Hilton Basel for me.",
+    "This is too expensive. Please cancel it.",
+    "Please book Hyatt Regency for me",
+    "My check in dates for my booking would be from April 10, 2024 to April 19, 2024.",
+]
+
+async def run_application():
+    async with ToolboxClient("http://127.0.0.1:5000") as toolbox_client:
+
+        # The toolbox_tools list contains Python callables (functions/methods) designed for LLM tool-use
+        # integration. While this example uses Google's genai client, these callables can be adapted for
+        # various function-calling or agent frameworks. For easier integration with supported frameworks
+        # (https://github.com/googleapis/mcp-toolbox-python-sdk/tree/main/packages), use the
+        # provided wrapper packages, which handle framework-specific boilerplate.
+        toolbox_tools = await toolbox_client.load_toolset("my-toolset")
+        genai_client = genai.Client(
+            vertexai=True, project="project-id", location="us-central1"
+        )
+
+        genai_tools = [
+            Tool(
+                function_declarations=[
+                    FunctionDeclaration.from_callable_with_api_option(callable=tool)
+                ]
+            )
+            for tool in toolbox_tools
+        ]
+        history = []
+        for query in queries:
+            user_prompt_content = Content(
+                role="user",
+                parts=[Part.from_text(text=query)],
+            )
+            history.append(user_prompt_content)
+
+            response = genai_client.models.generate_content(
+                model="gemini-2.0-flash-001",
+                contents=history,
+                config=GenerateContentConfig(
+                    system_instruction=prompt,
+                    tools=genai_tools,
+                ),
+            )
+            history.append(response.candidates[0].content)
+            function_response_parts = []
+            for function_call in response.function_calls:
+                fn_name = function_call.name
+                # The tools are sorted alphabetically
+                if fn_name == "search-hotels-by-name":
+                    function_result = await toolbox_tools[3](**function_call.args)
+                elif fn_name == "search-hotels-by-location":
+                    function_result = await toolbox_tools[2](**function_call.args)
+                elif fn_name == "book-hotel":
+                    function_result = await toolbox_tools[0](**function_call.args)
+                elif fn_name == "update-hotel":
+                    function_result = await toolbox_tools[4](**function_call.args)
+                elif fn_name == "cancel-hotel":
+                    function_result = await toolbox_tools[1](**function_call.args)
+                else:
+                    raise ValueError("Function name not present.")
+                function_response = {"result": function_result}
+                function_response_part = Part.from_function_response(
+                    name=function_call.name,
+                    response=function_response,
+                )
+                function_response_parts.append(function_response_part)
+
+            if function_response_parts:
+                tool_response_content = Content(role="tool", parts=function_response_parts)
+                history.append(tool_response_content)
+
+            response2 = genai_client.models.generate_content(
+                model="gemini-2.0-flash-001",
+                contents=history,
+                config=GenerateContentConfig(
+                    tools=genai_tools,
+                ),
+            )
+            final_model_response_content = response2.candidates[0].content
+            history.append(final_model_response_content)
+            print(response2.text)
+
+asyncio.run(run_application())
+
+{{< /tab >}}
+{{< tab header="ADK" lang="python" >}}
+from google.adk.agents import Agent
+from google.adk.runners import Runner
+from google.adk.sessions import InMemorySessionService
+from google.adk.artifacts.in_memory_artifact_service import InMemoryArtifactService
+from google.genai import types
+from toolbox_core import ToolboxSyncClient
+
+import os
+
+# TODO(developer): replace this with your Google API key
+
+os.environ['GOOGLE_API_KEY'] = 'your-api-key'
+
+with ToolboxSyncClient("http://127.0.0.1:5000") as toolbox_client:
+
+    prompt = """
+      You're a helpful hotel assistant. You handle hotel searching, booking and
+      cancellations. When the user searches for a hotel, mention it's name, id,
+      location and price tier. Always mention hotel ids while performing any
+      searches. This is very important for any operations. For any bookings or
+      cancellations, please provide the appropriate confirmation. Be sure to
+      update checkin or checkout dates if mentioned by the user.
+      Don't ask for confirmations from the user.
+    """
+
+    root_agent = Agent(
+        model='gemini-2.0-flash-001',
+        name='hotel_agent',
+        description='A helpful AI assistant.',
+        instruction=prompt,
+        tools=toolbox_client.load_toolset("my-toolset"),
+    )
+
+    session_service = InMemorySessionService()
+    artifacts_service = InMemoryArtifactService()
+    session = session_service.create_session(
+        state={}, app_name='hotel_agent', user_id='123'
+    )
+    runner = Runner(
+        app_name='hotel_agent',
+        agent=root_agent,
+        artifact_service=artifacts_service,
+        session_service=session_service,
+    )
+
+    queries = [
+        "Find hotels in Basel with Basel in it's name.",
+        "Can you book the Hilton Basel for me?",
+        "Oh wait, this is too expensive. Please cancel it and book the Hyatt Regency instead.",
+        "My check in dates would be from April 10, 2024 to April 19, 2024.",
+    ]
+
+    for query in queries:
+        content = types.Content(role='user', parts=[types.Part(text=query)])
+        events = runner.run(session_id=session.id,
+                            user_id='123', new_message=content)
+
+        responses = (
+          part.text
+          for event in events
+          for part in event.content.parts
+          if part.text is not None
+        )
+
+        for text in responses:
+          print(text)
+{{< /tab >}}
 {{< tab header="LangChain" lang="python" >}}
+import asyncio

 from langgraph.prebuilt import create_react_agent
+
 # TODO(developer): replace this with another import if needed
+
 from langchain_google_vertexai import ChatVertexAI
+
 # from langchain_google_genai import ChatGoogleGenerativeAI
+
 # from langchain_anthropic import ChatAnthropic
+
 from langgraph.checkpoint.memory import MemorySaver

 from toolbox_langchain import ToolboxClient

 prompt = """
  You're a helpful hotel assistant. You handle hotel searching, booking and
-  cancellations. When the user searches for a hotel, mention it's name, id, 
-  location and price tier. Always mention hotel ids while performing any 
-  searches. This is very important for any operations. For any bookings or 
-  cancellations, please provide the appropriate confirmation. Be sure to 
+  cancellations. When the user searches for a hotel, mention it's name, id,
+  location and price tier. Always mention hotel ids while performing any
+  searches. This is very important for any operations. For any bookings or
+  cancellations, please provide the appropriate confirmation. Be sure to
  update checkin or checkout dates if mentioned by the user.
  Don't ask for confirmations from the user.
 """
@@ -295,25 +520,25 @@ queries = [
    "My check in dates would be from April 10, 2024 to April 19, 2024.",
 ]

-def main():
+async def run_application():
    # TODO(developer): replace this with another model if needed
-    model = ChatVertexAI(model_name="gemini-1.5-pro")
-    # model = ChatGoogleGenerativeAI(model="gemini-1.5-pro")
+    model = ChatVertexAI(model_name="gemini-2.0-flash-001")
+    # model = ChatGoogleGenerativeAI(model="gemini-2.0-flash-001")
    # model = ChatAnthropic(model="claude-3-5-sonnet-20240620")
-    
+
    # Load the tools from the Toolbox server
-    client = ToolboxClient("http://127.0.0.1:5000")
-    tools = client.load_toolset()
+    async with ToolboxClient("http://127.0.0.1:5000") as client:
+        tools = await client.aload_toolset()

-    agent = create_react_agent(model, tools, checkpointer=MemorySaver())
+        agent = create_react_agent(model, tools, checkpointer=MemorySaver())

-    config = {"configurable": {"thread_id": "thread-1"}}
-    for query in queries:
-        inputs = {"messages": [("user", prompt + query)]}
-        response = agent.invoke(inputs, stream_mode="values", config=config)
-        print(response["messages"][-1].content)
+        config = {"configurable": {"thread_id": "thread-1"}}
+        for query in queries:
+            inputs = {"messages": [("user", prompt + query)]}
+            response = agent.invoke(inputs, stream_mode="values", config=config)
+            print(response["messages"][-1].content)

-main()
+asyncio.run(run_application())
 {{< /tab >}}
 {{< tab header="LlamaIndex" lang="python" >}}
 import asyncio
@@ -323,18 +548,20 @@ from llama_index.core.agent.workflow import AgentWorkflow

 from llama_index.core.workflow import Context

-# TODO(developer): replace this with another import if needed 
+# TODO(developer): replace this with another import if needed
+
 from llama_index.llms.google_genai import GoogleGenAI
+
 # from llama_index.llms.anthropic import Anthropic

 from toolbox_llamaindex import ToolboxClient

 prompt = """
  You're a helpful hotel assistant. You handle hotel searching, booking and
-  cancellations. When the user searches for a hotel, mention it's name, id, 
-  location and price tier. Always mention hotel ids while performing any 
-  searches. This is very important for any operations. For any bookings or 
-  cancellations, please provide the appropriate confirmation. Be sure to 
+  cancellations. When the user searches for a hotel, mention it's name, id,
+  location and price tier. Always mention hotel ids while performing any
+  searches. This is very important for any operations. For any bookings or
+  cancellations, please provide the appropriate confirmation. Be sure to
  update checkin or checkout dates if mentioned by the user.
  Don't ask for confirmations from the user.
 """
@@ -346,48 +573,57 @@ queries = [
    "My check in dates would be from April 10, 2024 to April 19, 2024.",
 ]

-async def main():
+async def run_application():
    # TODO(developer): replace this with another model if needed
    llm = GoogleGenAI(
-        model="gemini-1.5-pro",
+        model="gemini-2.0-flash-001",
        vertexai_config={"project": "project-id", "location": "us-central1"},
    )
    # llm = GoogleGenAI(
    #     api_key=os.getenv("GOOGLE_API_KEY"),
-    #     model="gemini-1.5-pro",
+    #     model="gemini-2.0-flash-001",
    # )
    # llm = Anthropic(
    #   model="claude-3-7-sonnet-latest",
    #   api_key=os.getenv("ANTHROPIC_API_KEY")
    # )
-    
+
    # Load the tools from the Toolbox server
-    client = ToolboxClient("http://127.0.0.1:5000")
-    tools = client.load_toolset()
+    async with ToolboxClient("http://127.0.0.1:5000") as client:
+        tools = await client.aload_toolset()

-    agent = AgentWorkflow.from_tools_or_functions(
-        tools,
-        llm=llm,
-        system_prompt=prompt,
-    )
-    ctx = Context(agent)
-    for query in queries:
-         response = await agent.run(user_msg=query, ctx=ctx)
-         print(f"---- {query} ----")
-         print(str(response))
+        agent = AgentWorkflow.from_tools_or_functions(
+            tools,
+            llm=llm,
+            system_prompt=prompt,
+        )
+        ctx = Context(agent)
+        for query in queries:
+            response = await agent.run(user_msg=query, ctx=ctx)
+            print(f"---- {query} ----")
+            print(str(response))

-asyncio.run(main())
+asyncio.run(run_application())
 {{< /tab >}}
 {{< /tabpane >}}
-    
+
    {{< tabpane text=true persist=header >}}
+{{% tab header="Core" lang="en" %}}
+To learn more about tool calling with Google GenAI, check out the
+[Google GenAI Documentation](https://github.com/googleapis/python-genai?tab=readme-ov-file#manually-declare-and-invoke-a-function-for-function-calling).
+{{% /tab %}}
+{{% tab header="ADK" lang="en" %}}
+To learn more about Agent Development Kit, check out the [ADK documentation.](https://google.github.io/adk-docs/)
+{{% /tab %}}
 {{% tab header="Langchain" lang="en" %}}
 To learn more about Agents in LangChain, check out the [LangGraph Agent documentation.](https://langchain-ai.github.io/langgraph/reference/prebuilt/#langgraph.prebuilt.chat_agent_executor.create_react_agent)
 {{% /tab %}}
 {{% tab header="LlamaIndex" lang="en" %}}
-To learn more about Agents in LlamaIndex, check out the [LlamaIndex AgentWorkflow documentation.](https://docs.llamaindex.ai/en/stable/examples/agent/agent_workflow_basic/)
+To learn more about Agents in LlamaIndex, check out the
+[LlamaIndex AgentWorkflow documentation.](https://docs.llamaindex.ai/en/stable/examples/agent/agent_workflow_basic/)
 {{% /tab %}}
 {{< /tabpane >}}
+
 1. Run your agent, and observe the results:

    ```sh
--- a/docs/en/getting-started/mcp_quickstart/_index.md
+++ b/docs/en/getting-started/mcp_quickstart/_index.md
@@ -7,6 +7,7 @@ description: >
 ---

 ## 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).
@@ -14,7 +15,7 @@ on how to [connect to Toolbox via MCP](../../how-to/connect_via_mcp.md).
 ## Step 1: Set up your database

 In this section, we will create a database, insert some data that needs to be
-access by our agent, and create a database user for Toolbox to connect with. 
+access by our agent, and create a database user for Toolbox to connect with.

 1. Connect to postgres using the `psql` command:

@@ -26,9 +27,9 @@ access by our agent, and create a database user for Toolbox to connect with.

 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 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
@@ -40,8 +41,6 @@ access by our agent, and create a database user for Toolbox to connect with.
      ALTER DATABASE toolbox_db OWNER TO toolbox_user;
    ```

-
-
 1. End the database session:

    ```bash
@@ -98,15 +97,15 @@ In this section, we will download Toolbox, configure our tools in a

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

@@ -120,6 +119,11 @@ In this section, we will download Toolbox, configure our tools in a
   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:
@@ -186,13 +190,21 @@ In this section, we will download Toolbox, configure our tools in a
            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.
+
+    For more info on tools, check out the [Tools](../../resources/tools/_index.md) section.

 1. Run the Toolbox server, pointing to the `tools.yaml` file created earlier:

    ```bash
-    ./toolbox --tools_file "tools.yaml"
+    ./toolbox --tools-file "tools.yaml"
    ```

 ## Step 3: Connect to MCP Inspector
@@ -205,7 +217,7 @@ 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 folo=lowing when the MCP Inspector is up and runnning:
+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 🚀
@@ -225,4 +237,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/how-to/connect-ide/_index.md
+++ b/docs/en/how-to/connect-ide/_index.md
@@ -0,0 +1,9 @@
+---
+title: "Connect from your IDE"
+type: docs
+weight: 1
+description: >
+  List of guides detailing how to connect your AI tools (IDEs) to Toolbox using MCP.
+aliases:
+- /how-to/connect_tools_using_mcp
+---
--- a/docs/en/how-to/connect-ide/alloydb_pg_mcp.md
+++ b/docs/en/how-to/connect-ide/alloydb_pg_mcp.md
@@ -0,0 +1,270 @@
+---
+title: "AlloyDB using MCP"
+type: docs
+weight: 2
+description: >
+  Connect your IDE to AlloyDB using Toolbox.
+---
+
+[Model Context Protocol (MCP)](https://modelcontextprotocol.io/introduction) is an open protocol for connecting Large Language Models (LLMs) to data sources like AlloyDB. This guide covers how to use [MCP Toolbox for Databases][toolbox] to expose your developer assistant tools to a AlloyDB for Postgres 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
+
+## Before you begin
+
+1. In the Google Cloud console, on the [project selector page](https://console.cloud.google.com/projectselector2/home/dashboard), select or create a Google Cloud project.
+
+1. [Make sure that billing is enabled for your Google Cloud project](https://cloud.google.com/billing/docs/how-to/verify-billing-enabled#confirm_billing_is_enabled_on_a_project).
+
+
+## Set up the database
+
+1. [Enable the AlloyDB, Compute Engine, Cloud Resource Manager, and Service Networking APIs in the Google Cloud project](https://console.cloud.google.com/flows/enableapi?apiid=alloydb.googleapis.com,compute.googleapis.com,cloudresourcemanager.googleapis.com,servicenetworking.googleapis.com).
+
+1. [Create a cluster and its primary instance](https://cloud.google.com/alloydb/docs/quickstart/create-and-connect). These instructions assume that your AlloyDB instance has a [public IP address](https://cloud.google.com/alloydb/docs/connect-public-ip). By default, AlloyDB assigns a private IP address to a new instance. Toolbox will connect securely using the [AlloyDB Language Connectors](https://cloud.google.com/alloydb/docs/language-connectors-overview).
+
+1. Configure the required roles and permissions to complete this task. You will need [Cloud AlloyDB Client](https://cloud.google.com/alloydb/docs/auth-proxy/connect#required-iam-permissions) (`roles/alloydb.client`)  and Service Usage Consumer (`roles/serviceusage.serviceUsageConsumer`) roles or equivalent IAM permissions to connect to the instance.
+
+1. Configured [Application Default Credentials (ADC)](https://cloud.google.com/docs/authentication/set-up-adc-local-dev-environment) for your environment.
+
+1. Create or reuse [a database user](https://cloud.google.com/alloydb/docs/database-users/manage-roles) and have the username and password ready.
+
+
+## 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.6.0+:
+
+   <!-- {x-release-please-start-version} -->
+   {{< tabpane persist=header >}}
+{{< tab header="linux/amd64" lang="bash" >}}
+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.7.0/darwin/arm64/toolbox
+{{< /tab >}}
+
+{{< tab header="darwin/amd64" lang="bash" >}}
+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.7.0/windows/amd64/toolbox
+{{< /tab >}}
+{{< /tabpane >}}
+    <!-- {x-release-please-end} -->
+
+
+1. Make the binary executable:
+
+    ```bash
+    chmod +x toolbox
+    ```
+
+1. Verify the installation:
+
+    ```bash
+    ./toolbox --version
+    ```
+
+## Configure your MCP Client
+
+{{< tabpane text=true >}}
+{{% tab header="Claude code" lang="en" %}}
+
+1. Install [Claude Code](https://docs.anthropic.com/en/docs/agents-and-tools/claude-code/overview).
+1. Create a `.mcp.json` file in your project root if it doesn't exist.
+1. Add the following configuration, replace the environment variables with your values, and save:
+
+    ```json
+    {
+      "mcpServers": {
+        "alloydb": {
+          "command": "./PATH/TO/toolbox",
+          "args": ["--prebuilt","alloydb-postgres","--stdio"],
+          "env": {
+            "ALLOYDB_POSTGRES_PROJECT": "your-gcp-project-id",
+            "ALLOYDB_POSTGRES_REGION": "your-cluster-region",
+            "ALLOYDB_POSTGRES_CLUSTER": "your-cluster-name",
+            "ALLOYDB_POSTGRES_INSTANCE": "your-instance-name",
+            "ALLOYDB_POSTGRES_DATABASE": "your-database-name",
+            "ALLOYDB_POSTGRES_USER": "your-database-user",
+            "ALLOYDB_POSTGRES_PASSWORD": "your-database-password"
+          }
+        }
+      }
+    }
+    ```
+
+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": {
+        "alloydb": {
+          "command": "./PATH/TO/toolbox",
+          "args": ["--prebuilt","alloydb-postgres","--stdio"],
+          "env": {
+            "ALLOYDB_POSTGRES_PROJECT": "your-gcp-project-id",
+            "ALLOYDB_POSTGRES_REGION": "your-cluster-region",
+            "ALLOYDB_POSTGRES_CLUSTER": "your-cluster-name",
+            "ALLOYDB_POSTGRES_INSTANCE": "your-instance-name",
+            "ALLOYDB_POSTGRES_DATABASE": "your-database-name",
+            "ALLOYDB_POSTGRES_USER": "your-database-user",
+            "ALLOYDB_POSTGRES_PASSWORD": "your-database-password"
+          }
+        }
+      }
+    }
+    ```
+
+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": {
+        "alloydb": {
+          "command": "./PATH/TO/toolbox",
+          "args": ["--prebuilt","alloydb-postgres","--stdio"],
+          "env": {
+            "ALLOYDB_POSTGRES_PROJECT": "your-gcp-project-id",
+            "ALLOYDB_POSTGRES_REGION": "your-cluster-region",
+            "ALLOYDB_POSTGRES_CLUSTER": "your-cluster-name",
+            "ALLOYDB_POSTGRES_INSTANCE": "your-instance-name",
+            "ALLOYDB_POSTGRES_DATABASE": "your-database-name",
+            "ALLOYDB_POSTGRES_USER": "your-database-user",
+            "ALLOYDB_POSTGRES_PASSWORD": "your-database-password"
+          }
+        }
+      }
+    }
+    ```
+
+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": {
+        "alloydb": {
+          "command": "./PATH/TO/toolbox",
+          "args": ["--prebuilt","alloydb-postgres","--stdio"],
+          "env": {
+            "ALLOYDB_POSTGRES_PROJECT": "your-gcp-project-id",
+            "ALLOYDB_POSTGRES_REGION": "your-cluster-region",
+            "ALLOYDB_POSTGRES_CLUSTER": "your-cluster-name",
+            "ALLOYDB_POSTGRES_INSTANCE": "your-instance-name",
+            "ALLOYDB_POSTGRES_DATABASE": "your-database-name",
+            "ALLOYDB_POSTGRES_USER": "your-database-user",
+            "ALLOYDB_POSTGRES_PASSWORD": "your-database-password"
+          }
+        }
+      }
+    }
+    ```
+
+1. [Cursor](https://www.cursor.com/) and navigate to **Settings > Cursor Settings > MCP**. You should see a green active status after the server is successfully connected.
+{{% /tab %}}
+
+{{% tab header="Visual Studio Code (Copilot)" lang="en" %}}
+
+1. Open [VS Code](https://code.visualstudio.com/docs/copilot/overview) and create a `.vscode` directory in your project root if it doesn't exist.
+1. Create a `.vscode/mcp.json` file if it doesn't exist and open it.
+1. Add the following configuration, replace the environment variables with your values, and save:
+
+    ```json
+    {
+      "mcpServers": {
+        "alloydb": {
+          "command": "./PATH/TO/toolbox",
+          "args": ["--prebuilt","alloydb-postgres","--stdio"],
+          "env": {
+            "ALLOYDB_POSTGRES_PROJECT": "your-gcp-project-id",
+            "ALLOYDB_POSTGRES_REGION": "your-cluster-region",
+            "ALLOYDB_POSTGRES_CLUSTER": "your-cluster-name",
+            "ALLOYDB_POSTGRES_INSTANCE": "your-instance-name",
+            "ALLOYDB_POSTGRES_DATABASE": "your-database-name",
+            "ALLOYDB_POSTGRES_USER": "your-database-user",
+            "ALLOYDB_POSTGRES_PASSWORD": "your-database-password"
+          }
+        }
+      }
+    }
+    ```
+{{% /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": {
+        "alloydb": {
+          "command": "./PATH/TO/toolbox",
+          "args": ["--prebuilt","alloydb-postgres","--stdio"],
+          "env": {
+            "ALLOYDB_POSTGRES_PROJECT": "your-gcp-project-id",
+            "ALLOYDB_POSTGRES_REGION": "your-cluster-region",
+            "ALLOYDB_POSTGRES_CLUSTER": "your-cluster-name",
+            "ALLOYDB_POSTGRES_INSTANCE": "your-instance-name",
+            "ALLOYDB_POSTGRES_DATABASE": "your-database-name",
+            "ALLOYDB_POSTGRES_USER": "your-database-user",
+            "ALLOYDB_POSTGRES_PASSWORD": "your-database-password"
+          }
+        }
+      }
+    }
+
+    ```
+{{% /tab %}}
+{{< /tabpane >}}
+
+## Use Tools
+
+Your AI tool is now connected to AlloyDB using MCP. Try asking your AI assistant to list tables, create a table, or define and execute other SQL statements.
+
+The following tools are available to the LLM:
+
+1. **list_tables**: lists tables and descriptions
+1. **execute_sql**: execute any SQL statement
+
+{{< 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/bigquery_mcp.md
+++ b/docs/en/how-to/connect-ide/bigquery_mcp.md
@@ -0,0 +1,239 @@
+---
+title: "BigQuery using MCP"
+type: docs
+weight: 2
+description: >
+  Connect your IDE to BigQuery using Toolbox.
+---
+
+[Model Context Protocol (MCP)](https://modelcontextprotocol.io/introduction) is an open protocol for connecting Large Language Models (LLMs) to data sources like BigQuery. This guide covers how to use [MCP Toolbox for Databases][toolbox] to expose your developer assistant tools to a BigQuery 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
+
+## Before you begin
+
+1. In the Google Cloud console, on the [project selector page](https://console.cloud.google.com/projectselector2/home/dashboard), select or create a Google Cloud project.
+
+1. [Make sure that billing is enabled for your Google Cloud project](https://cloud.google.com/billing/docs/how-to/verify-billing-enabled#confirm_billing_is_enabled_on_a_project).
+
+
+## Set up the database
+
+1. [Enable the BigQuery API in the Google Cloud project](https://console.cloud.google.com/flows/enableapi?apiid=bigquery.googleapis.com&redirect=https://console.cloud.google.com).
+
+1. Configure the required roles and permissions to complete this task. You will need [BigQuery User](https://cloud.google.com/bigquery/docs/access-control) role (`roles/bigquery.user`), BigQuery Data Viewer role(`roles/bigquery.dataViewer`), or equivalent IAM permissions to connect to the instance.
+
+1. Configured [Application Default Credentials (ADC)](https://cloud.google.com/docs/authentication/set-up-adc-local-dev-environment) for your environment.
+
+## 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.6.0+:
+
+   <!-- {x-release-please-start-version} -->
+   {{< tabpane persist=header >}}
+{{< tab header="linux/amd64" lang="bash" >}}
+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.7.0/darwin/arm64/toolbox
+{{< /tab >}}
+
+{{< tab header="darwin/amd64" lang="bash" >}}
+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.7.0/windows/amd64/toolbox
+{{< /tab >}}
+{{< /tabpane >}}
+    <!-- {x-release-please-end} -->
+
+
+1. Make the binary executable:
+
+    ```bash
+    chmod +x toolbox
+    ```
+
+1. Verify the installation:
+
+    ```bash
+    ./toolbox --version
+    ```
+
+## Configure your MCP Client
+
+{{< tabpane text=true >}}
+{{% tab header="Claude code" lang="en" %}}
+
+1. Install [Claude Code](https://docs.anthropic.com/en/docs/agents-and-tools/claude-code/overview).
+1. Create a `.mcp.json` file in your project root if it doesn't exist.
+1. Add the following configuration, replace the environment variables with your values, and save:
+
+    ```json
+    {
+      "mcpServers": {
+        "bigquery": {
+          "command": "./PATH/TO/toolbox",
+          "args": ["--prebuilt","bigquery","--stdio"],
+          "env": {
+            "BIGQUERY_PROJECT": ""
+          }
+        }
+      }
+    }
+    ```
+
+
+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": {
+        "bigquery": {
+          "command": "./PATH/TO/toolbox",
+          "args": ["--prebuilt","bigquery","--stdio"],
+          "env": {
+            "BIGQUERY_PROJECT": ""
+          }
+        }
+      }
+    }
+    ```
+
+
+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": {
+        "bigquery": {
+          "command": "./PATH/TO/toolbox",
+          "args": ["--prebuilt","bigquery","--stdio"],
+          "env": {
+            "BIGQUERY_PROJECT": ""
+          }
+        }
+      }
+    }
+    ```
+
+
+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": {
+        "bigquery": {
+          "command": "./PATH/TO/toolbox",
+          "args": ["--prebuilt","bigquery","--stdio"],
+          "env": {
+            "BIGQUERY_PROJECT": ""
+          }
+        }
+      }
+    }
+    ```
+
+
+1. [Cursor](https://www.cursor.com/) and navigate to **Settings > Cursor Settings > MCP**. You should see a green active status after the server is successfully connected.
+{{% /tab %}}
+
+{{% tab header="Visual Studio Code (Copilot)" lang="en" %}}
+
+1. Open [VS Code](https://code.visualstudio.com/docs/copilot/overview) and create a `.vscode` directory in your project root if it doesn't exist.
+1. Create a `.vscode/mcp.json` file if it doesn't exist and open it.
+1. Add the following configuration, replace the environment variables with your values, and save:
+
+    ```json
+    {
+      "mcpServers": {
+        "bigquery": {
+          "command": "./PATH/TO/toolbox",
+          "args": ["--prebuilt","bigquery","--stdio"],
+          "env": {
+            "BIGQUERY_PROJECT": ""
+          }
+        }
+      }
+    }
+    ```
+
+
+{{% /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": {
+        "bigquery": {
+          "command": "./PATH/TO/toolbox",
+          "args": ["--prebuilt","bigquery","--stdio"],
+          "env": {
+            "BIGQUERY_PROJECT": ""
+          }
+        }
+      }
+    }
+    ```
+
+
+{{% /tab %}}
+{{< /tabpane >}}
+
+## Use Tools
+
+Your AI tool is now connected to BigQuery using MCP. Try asking your AI assistant to list tables, create a table, or define and execute other SQL statements.
+
+The following tools are available to the LLM:
+
+1. **execute_sql**: execute SQL statement
+1. **get_dataset_info**: get dataset metadata
+1. **get_table_info**: get table metadata
+1. **list_dataset_ids**: list datasets
+1. **list_table_ids**: list tables
+
+{{< 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/cloud_sql_mssql_mcp.md
+++ b/docs/en/how-to/connect-ide/cloud_sql_mssql_mcp.md
@@ -0,0 +1,269 @@
+---
+title: "Cloud SQL for SQL Server using MCP"
+type: docs
+weight: 2
+description: >
+  Connect your IDE to Cloud SQL for SQL Server using Toolbox.
+---
+
+[Model Context Protocol (MCP)](https://modelcontextprotocol.io/introduction) is an open protocol for connecting Large Language Models (LLMs) to data sources like Cloud SQL. This guide covers how to use [MCP Toolbox for Databases][toolbox] to expose your developer assistant tools to a Cloud SQL for SQL Server 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
+
+## Before you begin
+
+1. In the Google Cloud console, on the [project selector page](https://console.cloud.google.com/projectselector2/home/dashboard), select or create a Google Cloud project.
+
+1. [Make sure that billing is enabled for your Google Cloud project](https://cloud.google.com/billing/docs/how-to/verify-billing-enabled#confirm_billing_is_enabled_on_a_project).
+
+
+## Set up the database
+
+1. [Enable the Cloud SQL Admin API in the Google Cloud project](https://console.cloud.google.com/flows/enableapi?apiid=sqladmin&redirect=https://console.cloud.google.com).
+
+1. [Create or select a Cloud SQL for SQL Server instance](https://cloud.google.com/sql/docs/sqlserver/create-instance). These instructions assume that your Cloud SQL instance has a [public IP address](https://cloud.google.com/sql/docs/sqlserver/configure-ip). By default, Cloud SQL assigns a public IP address to a new instance. Toolbox will connect securely using the [Cloud SQL connectors](https://cloud.google.com/sql/docs/sqlserver/language-connectors).
+
+1. Configure the required roles and permissions to complete this task. You will need [Cloud SQL > Client](https://cloud.google.com/sql/docs/sqlserver/roles-and-permissions#proxy-roles-permissions) role (`roles/cloudsql.client`) or equivalent IAM permissions to connect to the instance.
+
+1. Configured [Application Default Credentials (ADC)](https://cloud.google.com/docs/authentication/set-up-adc-local-dev-environment) for your environment.
+
+1. Create or reuse [a database user](https://cloud.google.com/sql/docs/sqlserver/create-manage-users) and have the username and password ready.
+
+
+## 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.6.0+:
+
+   <!-- {x-release-please-start-version} -->
+   {{< tabpane persist=header >}}
+{{< tab header="linux/amd64" lang="bash" >}}
+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.7.0/darwin/arm64/toolbox
+{{< /tab >}}
+
+{{< tab header="darwin/amd64" lang="bash" >}}
+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.7.0/windows/amd64/toolbox
+{{< /tab >}}
+{{< /tabpane >}}
+    <!-- {x-release-please-end} -->
+
+
+1. Make the binary executable:
+
+    ```bash
+    chmod +x toolbox
+    ```
+
+1. Verify the installation:
+
+    ```bash
+    ./toolbox --version
+    ```
+
+## Configure your MCP Client
+
+{{< tabpane text=true >}}
+{{% tab header="Claude code" lang="en" %}}
+
+1. Install [Claude Code](https://docs.anthropic.com/en/docs/agents-and-tools/claude-code/overview).
+1. Create a `.mcp.json` file in your project root if it doesn't exist.
+1. Add the following configuration, replace the environment variables with your values, and save:
+
+    ```json
+    {
+      "mcpServers": {
+        "cloud-sql-sqlserver": {
+          "command": "./PATH/TO/toolbox",
+          "args": ["--prebuilt","cloud-sql-mssql","--stdio"],
+          "env": {
+            "CLOUD_SQL_MSSQL_PROJECT": "",
+            "CLOUD_SQL_MSSQL_REGION": "",
+            "CLOUD_SQL_MSSQL_INSTANCE": "",
+            "CLOUD_SQL_MSSQL_DATABASE": "",
+            "CLOUD_SQL_MSSQL_IP_ADDRESS": "",
+            "CLOUD_SQL_MSSQL_USER": "",
+            "CLOUD_SQL_MSSQL_PASSWORD": ""
+        }
+      }
+    }
+    ```
+
+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": {
+        "cloud-sql-sqlserver": {
+          "command": "./PATH/TO/toolbox",
+          "args": ["--prebuilt","cloud-sql-mssql","--stdio"],
+          "env": {
+            "CLOUD_SQL_MSSQL_PROJECT": "",
+            "CLOUD_SQL_MSSQL_REGION": "",
+            "CLOUD_SQL_MSSQL_INSTANCE": "",
+            "CLOUD_SQL_MSSQL_DATABASE": "",
+            "CLOUD_SQL_MSSQL_IP_ADDRESS": "",
+            "CLOUD_SQL_MSSQL_USER": "",
+            "CLOUD_SQL_MSSQL_PASSWORD": ""
+          }
+        }
+      }
+    }
+    ```
+
+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": {
+        "cloud-sql-sqlserver": {
+          "command": "./PATH/TO/toolbox",
+          "args": ["--prebuilt","cloud-sql-mssql","--stdio"],
+          "env": {
+            "CLOUD_SQL_MSSQL_PROJECT": "",
+            "CLOUD_SQL_MSSQL_REGION": "",
+            "CLOUD_SQL_MSSQL_INSTANCE": "",
+            "CLOUD_SQL_MSSQL_DATABASE": "",
+            "CLOUD_SQL_MSSQL_IP_ADDRESS": "",
+            "CLOUD_SQL_MSSQL_USER": "",
+            "CLOUD_SQL_MSSQL_PASSWORD": ""
+          }
+        }
+      }
+    }
+    ```
+
+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": {
+        "cloud-sql-sqlserver": {
+          "command": "./PATH/TO/toolbox",
+          "args": ["--prebuilt","cloud-sql-mssql","--stdio"],
+          "env": {
+            "CLOUD_SQL_MSSQL_PROJECT": "",
+            "CLOUD_SQL_MSSQL_REGION": "",
+            "CLOUD_SQL_MSSQL_INSTANCE": "",
+            "CLOUD_SQL_MSSQL_DATABASE": "",
+            "CLOUD_SQL_MSSQL_IP_ADDRESS": "",
+            "CLOUD_SQL_MSSQL_USER": "",
+            "CLOUD_SQL_MSSQL_PASSWORD": ""
+          }
+        }
+      }
+    }
+    ```
+
+1. [Cursor](https://www.cursor.com/) and navigate to **Settings > Cursor Settings > MCP**. You should see a green active status after the server is successfully connected.
+{{% /tab %}}
+
+{{% tab header="Visual Studio Code (Copilot)" lang="en" %}}
+
+1. Open [VS Code](https://code.visualstudio.com/docs/copilot/overview) and create a `.vscode` directory in your project root if it doesn't exist.
+1. Create a `.vscode/mcp.json` file if it doesn't exist and open it.
+1. Add the following configuration, replace the environment variables with your values, and save:
+
+    ```json
+    {
+      "mcpServers": {
+        "cloud-sql-sqlserver": {
+          "command": "./PATH/TO/toolbox",
+          "args": ["--prebuilt","cloud-sql-mssql","--stdio"],
+          "env": {
+            "CLOUD_SQL_MSSQL_PROJECT": "",
+            "CLOUD_SQL_MSSQL_REGION": "",
+            "CLOUD_SQL_MSSQL_INSTANCE": "",
+            "CLOUD_SQL_MSSQL_DATABASE": "",
+            "CLOUD_SQL_MSSQL_IP_ADDRESS": "",
+            "CLOUD_SQL_MSSQL_USER": "",
+            "CLOUD_SQL_MSSQL_PASSWORD": ""
+          }
+        }
+      }
+    }
+    ```
+{{% /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": {
+        "cloud-sql-sqlserver": {
+          "command": "./PATH/TO/toolbox",
+          "args": ["--prebuilt","cloud-sql-mssql","--stdio"],
+          "env": {
+            "CLOUD_SQL_MSSQL_PROJECT": "",
+            "CLOUD_SQL_MSSQL_REGION": "",
+            "CLOUD_SQL_MSSQL_INSTANCE": "",
+            "CLOUD_SQL_MSSQL_DATABASE": "",
+            "CLOUD_SQL_MSSQL_IP_ADDRESS": "",
+            "CLOUD_SQL_MSSQL_USER": "",
+            "CLOUD_SQL_MSSQL_PASSWORD": ""
+          }
+        }
+      }
+    }
+
+    ```
+{{% /tab %}}
+{{< /tabpane >}}
+
+## Use Tools
+
+Your AI tool is now connected to Cloud SQL for Sql Server using MCP. Try asking your AI assistant to list tables, create a table, or define and execute other SQL statements.
+
+The following tools are available to the LLM:
+
+1. **list_tables**: lists tables and descriptions
+1. **execute_sql**: execute any SQL statement
+
+{{< 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/cloud_sql_mysql_mcp.md
+++ b/docs/en/how-to/connect-ide/cloud_sql_mysql_mcp.md
@@ -0,0 +1,263 @@
+---
+title: "Cloud SQL for MySQL using MCP"
+type: docs
+weight: 2
+description: >
+  Connect your IDE to Cloud SQL for MySQL using Toolbox.
+---
+
+[Model Context Protocol (MCP)](https://modelcontextprotocol.io/introduction) is an open protocol for connecting Large Language Models (LLMs) to data sources like Cloud SQL. This guide covers how to use [MCP Toolbox for Databases][toolbox] to expose your developer assistant tools to a Cloud SQL for MySQL 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
+
+## Before you begin
+
+1. In the Google Cloud console, on the [project selector page](https://console.cloud.google.com/projectselector2/home/dashboard), select or create a Google Cloud project.
+
+1. [Make sure that billing is enabled for your Google Cloud project](https://cloud.google.com/billing/docs/how-to/verify-billing-enabled#confirm_billing_is_enabled_on_a_project).
+
+
+## Set up the database
+
+1. [Enable the Cloud SQL Admin API in the Google Cloud project](https://console.cloud.google.com/flows/enableapi?apiid=sqladmin&redirect=https://console.cloud.google.com).
+
+1. [Create a Cloud SQL for MySQL instance](https://cloud.google.com/sql/docs/mysql/create-instance). These instructions assume that your Cloud SQL instance has a [public IP address](https://cloud.google.com/sql/docs/mysql/configure-ip). By default, Cloud SQL assigns a public IP address to a new instance. Toolbox will connect securely using the [Cloud SQL connectors](https://cloud.google.com/sql/docs/mysql/language-connectors).
+
+1. Configure the required roles and permissions to complete this task. You will need [Cloud SQL > Client](https://cloud.google.com/sql/docs/mysql/roles-and-permissions#proxy-roles-permissions) role (`roles/cloudsql.client`) or equivalent IAM permissions to connect to the instance.
+
+1. Configured [Application Default Credentials (ADC)](https://cloud.google.com/docs/authentication/set-up-adc-local-dev-environment) for your environment.
+
+1. Create or reuse [a database user](https://cloud.google.com/sql/docs/mysql/create-manage-users) and have the username and password ready.
+
+
+## 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.6.0+:
+
+   <!-- {x-release-please-start-version} -->
+   {{< tabpane persist=header >}}
+{{< tab header="linux/amd64" lang="bash" >}}
+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.7.0/darwin/arm64/toolbox
+{{< /tab >}}
+
+{{< tab header="darwin/amd64" lang="bash" >}}
+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.7.0/windows/amd64/toolbox
+{{< /tab >}}
+{{< /tabpane >}}
+    <!-- {x-release-please-end} -->
+
+
+1. Make the binary executable:
+
+    ```bash
+    chmod +x toolbox
+    ```
+
+1. Verify the installation:
+
+    ```bash
+    ./toolbox --version
+    ```
+
+## Configure your MCP Client
+
+{{< tabpane text=true >}}
+{{% tab header="Claude code" lang="en" %}}
+
+1. Install [Claude Code](https://docs.anthropic.com/en/docs/agents-and-tools/claude-code/overview).
+1. Create a `.mcp.json` file in your project root if it doesn't exist.
+1. Add the following configuration, replace the environment variables with your values, and save:
+
+    ```json
+    {
+      "mcpServers": {
+        "cloud-sql-mysql": {
+          "command": "./PATH/TO/toolbox",
+          "args": ["--prebuilt","cloud-sql-mysql","--stdio"],
+          "env": {
+            "CLOUD_SQL_MYSQL_PROJECT": "",
+            "CLOUD_SQL_MYSQL_REGION": "",
+            "CLOUD_SQL_MYSQL_INSTANCE": "",
+            "CLOUD_SQL_MYSQL_DATABASE": "",
+            "CLOUD_SQL_MYSQL_USER": "",
+            "CLOUD_SQL_MYSQL_PASSWORD": ""
+          }
+        }
+      }
+    }
+    ```
+
+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": {
+        "cloud-sql-mysql": {
+          "command": "./PATH/TO/toolbox",
+          "args": ["--prebuilt","cloud-sql-mysql","--stdio"],
+          "env": {
+            "CLOUD_SQL_MYSQL_PROJECT": "",
+            "CLOUD_SQL_MYSQL_REGION": "",
+            "CLOUD_SQL_MYSQL_INSTANCE": "",
+            "CLOUD_SQL_MYSQL_DATABASE": "",
+            "CLOUD_SQL_MYSQL_USER": "",
+            "CLOUD_SQL_MYSQL_PASSWORD": ""
+          }
+        }
+      }
+    }
+    ```
+
+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": {
+        "cloud-sql-mysql": {
+          "command": "./PATH/TO/toolbox",
+          "args": ["--prebuilt","cloud-sql-mysql","--stdio"],
+          "env": {
+            "CLOUD_SQL_MYSQL_PROJECT": "",
+            "CLOUD_SQL_MYSQL_REGION": "",
+            "CLOUD_SQL_MYSQL_INSTANCE": "",
+            "CLOUD_SQL_MYSQL_DATABASE": "",
+            "CLOUD_SQL_MYSQL_USER": "",
+            "CLOUD_SQL_MYSQL_PASSWORD": ""
+          }
+        }
+      }
+    }
+    ```
+
+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": {
+        "cloud-sql-mysql": {
+          "command": "./PATH/TO/toolbox",
+          "args": ["--prebuilt","cloud-sql-mysql","--stdio"],
+          "env": {
+            "CLOUD_SQL_MYSQL_PROJECT": "",
+            "CLOUD_SQL_MYSQL_REGION": "",
+            "CLOUD_SQL_MYSQL_INSTANCE": "",
+            "CLOUD_SQL_MYSQL_DATABASE": "",
+            "CLOUD_SQL_MYSQL_USER": "",
+            "CLOUD_SQL_MYSQL_PASSWORD": ""
+          }
+      }
+    }
+    ```
+
+1. [Cursor](https://www.cursor.com/) and navigate to **Settings > Cursor Settings > MCP**. You should see a green active status after the server is successfully connected.
+{{% /tab %}}
+
+{{% tab header="Visual Studio Code (Copilot)" lang="en" %}}
+
+1. Open [VS Code](https://code.visualstudio.com/docs/copilot/overview) and create a `.vscode` directory in your project root if it doesn't exist.
+1. Create a `.vscode/mcp.json` file if it doesn't exist and open it.
+1. Add the following configuration, replace the environment variables with your values, and save:
+
+    ```json
+    {
+      "mcpServers": {
+        "cloud-sql-mysql": {
+          "command": "./PATH/TO/toolbox",
+          "args": ["--prebuilt","cloud-sql-mysql","--stdio"],
+          "env": {
+            "CLOUD_SQL_MYSQL_PROJECT": "",
+            "CLOUD_SQL_MYSQL_REGION": "",
+            "CLOUD_SQL_MYSQL_INSTANCE": "",
+            "CLOUD_SQL_MYSQL_DATABASE": "",
+            "CLOUD_SQL_MYSQL_USER": "",
+            "CLOUD_SQL_MYSQL_PASSWORD": ""
+          }
+        }
+      }
+    }
+    ```
+{{% /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": {
+        "cloud-sql-mysql": {
+          "command": "./PATH/TO/toolbox",
+          "args": ["--prebuilt","cloud-sql-mysql","--stdio"],
+          "env": {
+            "CLOUD_SQL_MYSQL_PROJECT": "",
+            "CLOUD_SQL_MYSQL_REGION": "",
+            "CLOUD_SQL_MYSQL_INSTANCE": "",
+            "CLOUD_SQL_MYSQL_DATABASE": "",
+            "CLOUD_SQL_MYSQL_USER": "",
+            "CLOUD_SQL_MYSQL_PASSWORD": ""
+          }
+        }
+      }
+    }
+
+    ```
+{{% /tab %}}
+{{< /tabpane >}}
+
+## Use Tools
+
+Your AI tool is now connected to Cloud SQL for MySQL using MCP. Try asking your AI assistant to list tables, create a table, or define and execute other SQL statements.
+
+The following tools are available to the LLM:
+
+1. **list_tables**: lists tables and descriptions
+1. **execute_sql**: execute any SQL statement
+
+{{< 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/cloud_sql_pg_mcp.md
+++ b/docs/en/how-to/connect-ide/cloud_sql_pg_mcp.md
@@ -0,0 +1,264 @@
+---
+title: "Cloud SQL for Postgres using MCP"
+type: docs
+weight: 2
+description: >
+  Connect your IDE to Cloud SQL for Postgres using Toolbox.
+---
+
+[Model Context Protocol (MCP)](https://modelcontextprotocol.io/introduction) is an open protocol for connecting Large Language Models (LLMs) to data sources like Cloud SQL. This guide covers how to use [MCP Toolbox for Databases][toolbox] to expose your developer assistant tools to a Cloud SQL for Postgres 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
+
+## Before you begin
+
+1. In the Google Cloud console, on the [project selector page](https://console.cloud.google.com/projectselector2/home/dashboard), select or create a Google Cloud project.
+
+1. [Make sure that billing is enabled for your Google Cloud project](https://cloud.google.com/billing/docs/how-to/verify-billing-enabled#confirm_billing_is_enabled_on_a_project).
+
+
+## Set up the database
+
+1. [Enable the Cloud SQL Admin API in the Google Cloud project](https://console.cloud.google.com/flows/enableapi?apiid=sqladmin&redirect=https://console.cloud.google.com).
+
+1. [Create  or select a Cloud SQL for PostgreSQL instance](https://cloud.google.com/sql/docs/postgres/create-instance). These instructions assume that your Cloud SQL instance has a [public IP address](https://cloud.google.com/sql/docs/postgres/configure-ip). By default, Cloud SQL assigns a public IP address to a new instance. Toolbox will connect securely using the [Cloud SQL connectors](https://cloud.google.com/sql/docs/postgres/language-connectors).
+
+1. Configure the required roles and permissions to complete this task. You will need [Cloud SQL > Client](https://cloud.google.com/sql/docs/postgres/roles-and-permissions#proxy-roles-permissions) role (`roles/cloudsql.client`) or equivalent IAM permissions to connect to the instance.
+
+1. Configured [Application Default Credentials (ADC)](https://cloud.google.com/docs/authentication/set-up-adc-local-dev-environment) for your environment.
+
+1. Create or reuse [a database user](https://cloud.google.com/sql/docs/postgres/create-manage-users) and have the username and password ready.
+
+
+## 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.6.0+:
+
+   <!-- {x-release-please-start-version} -->
+   {{< tabpane persist=header >}}
+{{< tab header="linux/amd64" lang="bash" >}}
+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.7.0/darwin/arm64/toolbox
+{{< /tab >}}
+
+{{< tab header="darwin/amd64" lang="bash" >}}
+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.7.0/windows/amd64/toolbox
+{{< /tab >}}
+{{< /tabpane >}}
+    <!-- {x-release-please-end} -->
+
+
+1. Make the binary executable:
+
+    ```bash
+    chmod +x toolbox
+    ```
+
+1. Verify the installation:
+
+    ```bash
+    ./toolbox --version
+    ```
+
+## Configure your MCP Client
+
+{{< tabpane text=true >}}
+{{% tab header="Claude code" lang="en" %}}
+
+1. Install [Claude Code](https://docs.anthropic.com/en/docs/agents-and-tools/claude-code/overview).
+1. Create a `.mcp.json` file in your project root if it doesn't exist.
+1. Add the following configuration, replace the environment variables with your values, and save:
+
+    ```json
+    {
+      "mcpServers": {
+        "cloud-sql-postgres": {
+          "command": "./PATH/TO/toolbox",
+          "args": ["--prebuilt","cloud-sql-postgres","--stdio"],
+          "env": {
+            "CLOUD_SQL_POSTGRES_PROJECT": "",
+            "CLOUD_SQL_POSTGRES_REGION": "",
+            "CLOUD_SQL_POSTGRES_INSTANCE": "",
+            "CLOUD_SQL_POSTGRES_DATABASE": "",
+            "CLOUD_SQL_POSTGRES_USER": "",
+            "CLOUD_SQL_POSTGRES_PASSWORD": ""
+          }
+        }
+      }
+    }
+    ```
+
+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": {
+        "cloud-sql-postgres": {
+          "command": "./PATH/TO/toolbox",
+          "args": ["--prebuilt","cloud-sql-postgres","--stdio"],
+          "env": {
+            "CLOUD_SQL_POSTGRES_PROJECT": "",
+            "CLOUD_SQL_POSTGRES_REGION": "",
+            "CLOUD_SQL_POSTGRES_INSTANCE": "",
+            "CLOUD_SQL_POSTGRES_DATABASE": "",
+            "CLOUD_SQL_POSTGRES_USER": "",
+            "CLOUD_SQL_POSTGRES_PASSWORD": ""
+          }
+        }
+      }
+    }
+    ```
+
+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": {
+        "cloud-sql-postgres": {
+          "command": "./PATH/TO/toolbox",
+          "args": ["--prebuilt","cloud-sql-postgres","--stdio"],
+          "env": {
+            "CLOUD_SQL_POSTGRES_PROJECT": "",
+            "CLOUD_SQL_POSTGRES_REGION": "",
+            "CLOUD_SQL_POSTGRES_INSTANCE": "",
+            "CLOUD_SQL_POSTGRES_DATABASE": "",
+            "CLOUD_SQL_POSTGRES_USER": "",
+            "CLOUD_SQL_POSTGRES_PASSWORD": ""
+          }
+        }
+      }
+    }
+    ```
+
+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": {
+        "cloud-sql-postgres": {
+          "command": "./PATH/TO/toolbox",
+          "args": ["--prebuilt","cloud-sql-postgres","--stdio"],
+          "env": {
+            "CLOUD_SQL_POSTGRES_PROJECT": "",
+            "CLOUD_SQL_POSTGRES_REGION": "",
+            "CLOUD_SQL_POSTGRES_INSTANCE": "",
+            "CLOUD_SQL_POSTGRES_DATABASE": "",
+            "CLOUD_SQL_POSTGRES_USER": "",
+            "CLOUD_SQL_POSTGRES_PASSWORD": ""
+          }
+        }
+      }
+    }
+    ```
+
+1. [Cursor](https://www.cursor.com/) and navigate to **Settings > Cursor Settings > MCP**. You should see a green active status after the server is successfully connected.
+{{% /tab %}}
+
+{{% tab header="Visual Studio Code (Copilot)" lang="en" %}}
+
+1. Open [VS Code](https://code.visualstudio.com/docs/copilot/overview) and create a `.vscode` directory in your project root if it doesn't exist.
+1. Create a `.vscode/mcp.json` file if it doesn't exist and open it.
+1. Add the following configuration, replace the environment variables with your values, and save:
+
+    ```json
+    {
+      "mcpServers": {
+        "cloud-sql-postgres": {
+          "command": "./PATH/TO/toolbox",
+          "args": ["--prebuilt","cloud-sql-postgres","--stdio"],
+          "env": {
+            "CLOUD_SQL_POSTGRES_PROJECT": "",
+            "CLOUD_SQL_POSTGRES_REGION": "",
+            "CLOUD_SQL_POSTGRES_INSTANCE": "",
+            "CLOUD_SQL_POSTGRES_DATABASE": "",
+            "CLOUD_SQL_POSTGRES_USER": "",
+            "CLOUD_SQL_POSTGRES_PASSWORD": ""
+          }
+        }
+      }
+    }
+    ```
+{{% /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": {
+        "cloud-sql-postgres": {
+          "command": "./PATH/TO/toolbox",
+          "args": ["--prebuilt","cloud-sql-postgres","--stdio"],
+          "env": {
+            "CLOUD_SQL_POSTGRES_PROJECT": "",
+            "CLOUD_SQL_POSTGRES_REGION": "",
+            "CLOUD_SQL_POSTGRES_INSTANCE": "",
+            "CLOUD_SQL_POSTGRES_DATABASE": "",
+            "CLOUD_SQL_POSTGRES_USER": "",
+            "CLOUD_SQL_POSTGRES_PASSWORD": ""
+          }
+        }
+      }
+    }
+
+    ```
+{{% /tab %}}
+{{< /tabpane >}}
+
+## Use Tools
+
+Your AI tool is now connected to Cloud SQL for PostgreSQL using MCP. Try asking your AI assistant to list tables, create a table, or define and execute other SQL statements.
+
+The following tools are available to the LLM:
+
+1. **list_tables**: lists tables and descriptions
+1. **execute_sql**: execute any SQL statement
+
+{{< 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
@@ -0,0 +1,252 @@
+---
+title: "PostgreSQL using MCP"
+type: docs
+weight: 2
+description: >
+  Connect your IDE to PostgreSQL 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 Postgres 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
+
+{{< notice tip >}}
+This guide can be used with [AlloyDB Omni](https://cloud.google.com/alloydb/omni/current/docs/overview).
+{{< /notice >}}
+
+## Set up the database
+
+1. Create or select a PostgreSQL instance.
+
+    * [Install PostgreSQL locally](https://www.postgresql.org/download/)
+    * [Install AlloyDB Omni](https://cloud.google.com/alloydb/omni/current/docs/quickstart)
+
+1. Create or reuse [a database user](https://cloud.google.com/alloydb/omni/current/docs/database-users/manage-users) and have the username and password ready.
+
+
+## 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.6.0+:
+
+   <!-- {x-release-please-start-version} -->
+   {{< tabpane persist=header >}}
+{{< tab header="linux/amd64" lang="bash" >}}
+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.7.0/darwin/arm64/toolbox
+{{< /tab >}}
+
+{{< tab header="darwin/amd64" lang="bash" >}}
+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.7.0/windows/amd64/toolbox
+{{< /tab >}}
+{{< /tabpane >}}
+    <!-- {x-release-please-end} -->
+
+
+1. Make the binary executable:
+
+    ```bash
+    chmod +x toolbox
+    ```
+
+1. Verify the installation:
+
+    ```bash
+    ./toolbox --version
+    ```
+
+## Configure your MCP Client
+
+{{< tabpane text=true >}}
+{{% tab header="Claude code" lang="en" %}}
+
+1. Install [Claude Code](https://docs.anthropic.com/en/docs/agents-and-tools/claude-code/overview).
+1. Create a `.mcp.json` file in your project root if it doesn't exist.
+1. Add the following configuration, replace the environment variables with your values, and save:
+
+    ```json
+    {
+      "mcpServers": {
+        "postgres": {
+          "command": "./PATH/TO/toolbox",
+          "args": ["--prebuilt","postgres","--stdio"],
+          "env": {
+            "POSTGRES_HOST": "",
+            "POSTGRES_PORT": "",
+            "POSTGRES_DATABASE": "",
+            "POSTGRES_USER": "",
+            "POSTGRES_PASSWORD": ""
+          }
+        }
+      }
+    }
+    ```
+
+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": {
+        "postgres": {
+          "command": "./PATH/TO/toolbox",
+          "args": ["--prebuilt","postgres","--stdio"],
+          "env": {
+            "POSTGRES_HOST": "",
+            "POSTGRES_PORT": "",
+            "POSTGRES_DATABASE": "",
+            "POSTGRES_USER": "",
+            "POSTGRES_PASSWORD": ""
+          }
+        }
+      }
+    }
+    ```
+
+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": {
+        "postgres": {
+          "command": "./PATH/TO/toolbox",
+          "args": ["--prebuilt","postgres","--stdio"],
+          "env": {
+            "POSTGRES_HOST": "",
+            "POSTGRES_PORT": "",
+            "POSTGRES_DATABASE": "",
+            "POSTGRES_USER": "",
+            "POSTGRES_PASSWORD": ""
+          }
+        }
+      }
+    }
+    ```
+
+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": {
+        "postgres": {
+          "command": "./PATH/TO/toolbox",
+          "args": ["--prebuilt","postgres","--stdio"],
+          "env": {
+            "POSTGRES_HOST": "",
+            "POSTGRES_PORT": "",
+            "POSTGRES_DATABASE": "",
+            "POSTGRES_USER": "",
+            "POSTGRES_PASSWORD": ""
+          }
+        }
+      }
+    }
+    ```
+
+1. [Cursor](https://www.cursor.com/) and navigate to **Settings > Cursor Settings > MCP**. You should see a green active status after the server is successfully connected.
+{{% /tab %}}
+
+{{% tab header="Visual Studio Code (Copilot)" lang="en" %}}
+
+1. Open [VS Code](https://code.visualstudio.com/docs/copilot/overview) and create a `.vscode` directory in your project root if it doesn't exist.
+1. Create a `.vscode/mcp.json` file if it doesn't exist and open it.
+1. Add the following configuration, replace the environment variables with your values, and save:
+
+    ```json
+    {
+      "mcpServers": {
+        "postgres": {
+          "command": "./PATH/TO/toolbox",
+          "args": ["--prebuilt","postgres","--stdio"],
+          "env": {
+            "POSTGRES_HOST": "",
+            "POSTGRES_PORT": "",
+            "POSTGRES_DATABASE": "",
+            "POSTGRES_USER": "",
+            "POSTGRES_PASSWORD": ""
+          }
+        }
+      }
+    }
+    ```
+{{% /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": {
+        "postgres": {
+          "command": "./PATH/TO/toolbox",
+          "args": ["--prebuilt","postgres","--stdio"],
+          "env": {
+            "POSTGRES_HOST": "",
+            "POSTGRES_PORT": "",
+            "POSTGRES_DATABASE": "",
+            "POSTGRES_USER": "",
+            "POSTGRES_PASSWORD": ""
+          }
+        }
+      }
+    }
+
+    ```
+{{% /tab %}}
+{{< /tabpane >}}
+
+## Use Tools
+
+Your AI tool is now connected to Postgres using MCP. Try asking your AI assistant to list tables, create a table, or define and execute other SQL statements.
+
+The following tools are available to the LLM:
+
+1. **list_tables**: lists tables and descriptions
+1. **execute_sql**: execute any SQL statement
+
+{{< 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/spanner_mcp.md
+++ b/docs/en/how-to/connect-ide/spanner_mcp.md
@@ -0,0 +1,358 @@
+---
+title: "Spanner using MCP"
+type: docs
+weight: 2
+description: >
+  Connect your IDE to Spanner using Toolbox.
+---
+
+[Model Context Protocol (MCP)](https://modelcontextprotocol.io/introduction) is an open protocol for connecting Large Language Models (LLMs) to data sources like Spanner. This guide covers how to use [MCP Toolbox for Databases][toolbox] to expose your developer assistant tools to a Spanner 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
+
+## Before you begin
+
+1. In the Google Cloud console, on the [project selector page](https://console.cloud.google.com/projectselector2/home/dashboard), select or create a Google Cloud project.
+
+1. [Make sure that billing is enabled for your Google Cloud project](https://cloud.google.com/billing/docs/how-to/verify-billing-enabled#confirm_billing_is_enabled_on_a_project).
+
+
+## Set up the database
+
+1. [Enable the Spanner API in the Google Cloud project](https://console.cloud.google.com/flows/enableapi?apiid=spanner.googleapis.com&redirect=https://console.cloud.google.com).
+
+1. [Create or select a Spanner instance and database](https://cloud.google.com/spanner/docs/create-query-database-console).
+
+1. Configure the required roles and permissions to complete this task. You will need [Cloud Spanner Database User](https://cloud.google.com/spanner/docs/iam#roles) role (`roles/spanner.databaseUser`) or equivalent IAM permissions to connect to the instance.
+
+1. Configured [Application Default Credentials (ADC)](https://cloud.google.com/docs/authentication/set-up-adc-local-dev-environment) for your environment.
+
+## 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.6.0+:
+
+   <!-- {x-release-please-start-version} -->
+   {{< tabpane persist=header >}}
+{{< tab header="linux/amd64" lang="bash" >}}
+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.7.0/darwin/arm64/toolbox
+{{< /tab >}}
+
+{{< tab header="darwin/amd64" lang="bash" >}}
+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.7.0/windows/amd64/toolbox
+{{< /tab >}}
+{{< /tabpane >}}
+    <!-- {x-release-please-end} -->
+
+
+1. Make the binary executable:
+
+    ```bash
+    chmod +x toolbox
+    ```
+
+1. Verify the installation:
+
+    ```bash
+    ./toolbox --version
+    ```
+
+## Configure your MCP Client
+
+{{< tabpane text=true >}}
+{{% tab header="Claude code" lang="en" %}}
+
+1. Install [Claude Code](https://docs.anthropic.com/en/docs/agents-and-tools/claude-code/overview).
+1. Create a `.mcp.json` file in your project root if it doesn't exist.
+1. Add the following configuration, replace the environment variables with your values, and save:
+
+   Spanner with `googlesql` dialect
+    ```json
+    {
+      "mcpServers": {
+        "spanner": {
+          "command": "./PATH/TO/toolbox",
+          "args": ["--prebuilt","spanner","--stdio"],
+          "env": {
+            "SPANNER_PROJECT": "",
+            "SPANNER_INSTANCE": "",
+            "SPANNER_DATABASE": ""
+          }
+        }
+      }
+    }
+    ```
+
+   Spanner with `postgresql` dialect
+
+    ```json
+    {
+      "mcpServers": {
+        "spanner": {
+          "command": "./PATH/TO/toolbox",
+          "args": ["--prebuilt","spanner-postgres","--stdio"],
+          "env": {
+            "SPANNER_PROJECT": "",
+            "SPANNER_INSTANCE": "",
+            "SPANNER_DATABASE": ""          }
+        }
+      }
+    }
+    ```
+
+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:
+
+   Spanner with `googlesql` dialect
+    ```json
+    {
+      "mcpServers": {
+        "spanner": {
+          "command": "./PATH/TO/toolbox",
+          "args": ["--prebuilt","spanner","--stdio"],
+          "env": {
+            "SPANNER_PROJECT": "",
+            "SPANNER_INSTANCE": "",
+            "SPANNER_DATABASE": ""
+          }
+        }
+      }
+    }
+    ```
+
+   Spanner with `postgresql` dialect
+
+    ```json
+    {
+      "mcpServers": {
+        "spanner": {
+          "command": "./PATH/TO/toolbox",
+          "args": ["--prebuilt","spanner-postgres","--stdio"],
+          "env": {
+            "SPANNER_PROJECT": "",
+            "SPANNER_INSTANCE": "",
+            "SPANNER_DATABASE": ""
+          }
+        }
+      }
+    }
+    ```
+
+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:
+
+   Spanner with `googlesql` dialect
+    ```json
+    {
+      "mcpServers": {
+        "spanner": {
+          "command": "./PATH/TO/toolbox",
+          "args": ["--prebuilt","spanner","--stdio"],
+          "env": {
+            "SPANNER_PROJECT": "",
+            "SPANNER_INSTANCE": "",
+            "SPANNER_DATABASE": ""
+          }
+        }
+      }
+    }
+    ```
+
+   Spanner with `postgresql` dialect
+
+    ```json
+    {
+      "mcpServers": {
+        "spanner": {
+          "command": "./PATH/TO/toolbox",
+          "args": ["--prebuilt","spanner-postgres","--stdio"],
+          "env": {
+            "SPANNER_PROJECT": "",
+            "SPANNER_INSTANCE": "",
+            "SPANNER_DATABASE": ""
+          }
+        }
+      }
+    }
+    ```
+
+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:
+
+   Spanner with `googlesql` dialect
+    ```json
+    {
+      "mcpServers": {
+        "spanner": {
+          "command": "./PATH/TO/toolbox",
+          "args": ["--prebuilt","spanner","--stdio"],
+          "env": {
+            "SPANNER_PROJECT": "",
+            "SPANNER_INSTANCE": "",
+            "SPANNER_DATABASE": ""
+          }
+        }
+      }
+    }
+    ```
+
+   Spanner with `postgresql` dialect
+
+    ```json
+    {
+      "mcpServers": {
+        "spanner": {
+          "command": "./PATH/TO/toolbox",
+          "args": ["--prebuilt","spanner-postgres","--stdio"],
+          "env": {
+            "SPANNER_PROJECT": "",
+            "SPANNER_INSTANCE": "",
+            "SPANNER_DATABASE": ""
+          }
+        }
+      }
+    }
+    ```
+
+1. [Cursor](https://www.cursor.com/) and navigate to **Settings > Cursor Settings > MCP**. You should see a green active status after the server is successfully connected.
+{{% /tab %}}
+
+{{% tab header="Visual Studio Code (Copilot)" lang="en" %}}
+
+1. Open [VS Code](https://code.visualstudio.com/docs/copilot/overview) and create a `.vscode` directory in your project root if it doesn't exist.
+1. Create a `.vscode/mcp.json` file if it doesn't exist and open it.
+1. Add the following configuration, replace the environment variables with your values, and save:
+
+   Spanner with `googlesql` dialect
+    ```json
+    {
+      "mcpServers": {
+        "spanner": {
+          "command": "./PATH/TO/toolbox",
+          "args": ["--prebuilt","spanner","--stdio"],
+          "env": {
+            "SPANNER_PROJECT": "",
+            "SPANNER_INSTANCE": "",
+            "SPANNER_DATABASE": ""
+          }
+        }
+      }
+    }
+    ```
+
+   Spanner with `postgresql` dialect
+
+    ```json
+    {
+      "mcpServers": {
+        "spanner": {
+          "command": "./PATH/TO/toolbox",
+          "args": ["--prebuilt","spanner-postgres","--stdio"],
+          "env": {
+            "SPANNER_PROJECT": "",
+            "SPANNER_INSTANCE": "",
+            "SPANNER_DATABASE": ""
+          }
+        }
+      }
+    }
+    ```
+
+{{% /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:
+
+   Spanner with `googlesql` dialect
+    ```json
+    {
+      "mcpServers": {
+        "spanner": {
+          "command": "./PATH/TO/toolbox",
+          "args": ["--prebuilt","spanner","--stdio"],
+          "env": {
+            "SPANNER_PROJECT": "",
+            "SPANNER_INSTANCE": "",
+            "SPANNER_DATABASE": ""
+          }
+        }
+      }
+    }
+    ```
+
+   Spanner with `postgresql` dialect
+
+    ```json
+    {
+      "mcpServers": {
+        "spanner": {
+          "command": "./PATH/TO/toolbox",
+          "args": ["--prebuilt","spanner-postgres","--stdio"],
+          "env": {
+            "SPANNER_PROJECT": "",
+            "SPANNER_INSTANCE": "",
+            "SPANNER_DATABASE": ""
+          }
+        }
+      }
+    }
+    ```
+
+{{% /tab %}}
+{{< /tabpane >}}
+
+## Use Tools
+
+Your AI tool is now connected to Spanner using MCP. Try asking your AI assistant to list tables, create a table, or define and execute other SQL statements.
+
+The following tools are available to the LLM:
+
+1. **list_tables**: lists tables and descriptions
+1. **execute_sql**: execute DML SQL statement
+1. **execute_sql_dql**: execute DQL SQL statement
+
+{{< 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_via_mcp.md
+++ b/docs/en/how-to/connect_via_mcp.md
@@ -7,7 +7,7 @@ description: >
 ---

 ## Toolbox SDKs vs Model Context Protocol (MCP)
-Toolbox now supports connections via both the native Toolbox SDKs and via [Model Context Protocol (MCP)](https://modelcontextprotocol.io/). However, Toolbox as several features which are not supported in the MCP specification (such as Authenticated Parameters and Authorized invocation). 
+Toolbox now supports connections via both the native Toolbox SDKs and via [Model Context Protocol (MCP)](https://modelcontextprotocol.io/). However, Toolbox has several features which are not supported in the MCP specification (such as Authenticated Parameters and Authorized invocation). 

 We recommend using the native SDKs over MCP clients to leverage these features. The native SDKs can be combined with MCP clients in many cases. 

@@ -20,7 +20,6 @@ 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)
-* **Toolsets**: MCP does not have the concept of toolset. Hence, all tools are automatically loaded when using Toolbox with MCP.
 * **Notifications:** Currently, editing Toolbox Tools requires a server restart. Clients should reload tools on disconnect to get the latest version. 


@@ -37,6 +36,20 @@ MCP is only compatible with Toolbox version 0.3.0 and above.

 1. [Set up](../getting-started/configure.md) your `tools.yaml` file.

+### Connecting via Standard Input/Output (stdio)
+Toolbox supports the
+[stdio](https://modelcontextprotocol.io/docs/concepts/transports#standard-input%2Foutput-stdio)
+transport protocol. Users that wish to use stdio will have to include the
+`--stdio` flag when running Toolbox.
+
+```bash
+./toolbox --stdio
+```
+
+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.
+
 ### Connecting via HTTP
 Toolbox supports the HTTP transport protocol with and without SSE.

@@ -52,14 +65,37 @@ 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`.
+
+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

-Use MCP [Inspector](https://github.com/modelcontextprotocol/inspector) for testing and debugging Toolbox server.
+Use MCP [Inspector](https://github.com/modelcontextprotocol/inspector) for
+testing and debugging Toolbox server.

+{{< tabpane text=true >}}
+{{% tab header="STDIO" lang="en" %}}
+1. Run Inspector with Toolbox as a subprocess:
+
+   ```bash
+   npx @modelcontextprotocol/inspector ./toolbox --stdio
+   ```
+
+1. For `Transport Type` dropdown menu, select `STDIO`.
+
+1. In `Command`, make sure that it is set to :`./toolbox` (or the correct path to where the Toolbox binary is installed).
+
+1. In `Arguments`, make sure that it's filled with `--stdio`.
+
+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" lang="en" %}}
 1. [Run Toolbox](../getting-started/introduction/_index.md#running-the-server).

 1. In a separate terminal, run Inspector directly through `npx`:
@@ -70,7 +106,19 @@ Use MCP [Inspector](https://github.com/modelcontextprotocol/inspector) for testi

 1. For `Transport Type` dropdown menu, select `SSE`.

-1. For `URL`, type in `http://127.0.0.1:5000/mcp/sse`.
+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!
+   tools!
+{{% /tab %}} {{< /tabpane >}}
+
+### Tested Clients
+
+| Client | SSE Works | MCP Config Docs |
+|--------|--------|--------|
+| Claude Desktop | ✅ | https://modelcontextprotocol.io/quickstart/user#1-download-claude-for-desktop | 
+| MCP Inspector | ✅ | https://github.com/modelcontextprotocol/inspector |
+| Cursor | ✅ | https://docs.cursor.com/context/model-context-protocol |
+| Windsurf | ✅ | https://docs.windsurf.com/windsurf/mcp | 
+| VS Code (Insiders) | ✅ | https://code.visualstudio.com/docs/copilot/chat/mcp-servers |
--- a/docs/en/how-to/deploy_docker.md
+++ b/docs/en/how-to/deploy_docker.md
@@ -1,9 +1,9 @@
 ---
 title: "Deploy using Docker Compose"
 type: docs
-weight: 3
+weight: 4
 description: >
-  How to deploy Toolbox using Docker Compose. 
+  How to deploy Toolbox using Docker Compose.
 ---

 <!-- Contributor: Sujith R Pillai <sujithrpillai@gmail.com> -->
@@ -35,7 +35,7 @@ services:
      - "5000:5000"
    volumes:
      - ./config:/config
-    command: [ "toolbox", "--tools_file", "/config/tools.yaml", "--address", "0.0.0.0"]
+    command: [ "toolbox", "--tools-file", "/config/tools.yaml", "--address", "0.0.0.0"]
    depends_on:
      db:
        condition: service_healthy
@@ -75,18 +75,18 @@ networks:
    ```


-{{< notice tip >}} 
+{{< notice tip >}}

 You can use this setup quickly set up Toolbox + Postgres to follow along in our
 [Quickstart](../getting-started/local_quickstart.md)

-{{< /notice >}} 
+{{< /notice >}}



 ## Connecting with Toolbox Client SDK

-Next, we will use Toolbox with the Client SDKs: 
+Next, we will use Toolbox with the Client SDKs:

 1. The url for the Toolbox server running using docker-compose will be:

@@ -101,13 +101,13 @@ Next, we will use Toolbox with the Client SDKs:
 from toolbox_langchain import ToolboxClient

 # Replace with the cloud run service URL generated above
-toolbox = ToolboxClient("http://$YOUR_URL")
+async with ToolboxClient("http://$YOUR_URL") as toolbox:
 {{< /tab >}}
 {{< tab header="Llamaindex" lang="Python" >}}
 from toolbox_llamaindex import ToolboxClient

 # Replace with the cloud run service URL generated above
-toolbox = ToolboxClient("http://$YOUR_URL")
+async with ToolboxClient("http://$YOUR_URL") as toolbox:
 {{< /tab >}}
 {{< /tabpane >}}

--- a/docs/en/how-to/deploy_gke.md
+++ b/docs/en/how-to/deploy_gke.md
@@ -1,7 +1,7 @@
 ---
 title: "Deploy to Kubernetes"
 type: docs
-weight: 2
+weight: 4
 description: >
  How to set up and configure Toolbox to deploy on Kubernetes with Google Kubernetes Engine (GKE).
 ---
@@ -40,7 +40,7 @@ description: >
    ```bash
    kubectl version --client
    ```
-   
+

 1. If needed, install `kubectl` component using the Google Cloud CLI:

@@ -76,7 +76,7 @@ description: >
    - [CloudSQL IAM Identity](../resources/sources/cloud-sql-pg.md#iam-permissions)
    - [Spanner IAM Identity](../resources/sources/spanner.md#iam-permissions)

-## Deploy to Kubernetes 
+## Deploy to Kubernetes

 1. Set environment variables:

@@ -94,7 +94,7 @@ description: >

    ```bash
    gcloud container clusters create-auto $CLUSTER_NAME \
-        --location=us-central1 
+        --location=us-central1
    ```

 1. Get authentication credentials to interact with the cluster. This also
--- a/docs/en/how-to/deploy_toolbox.md
+++ b/docs/en/how-to/deploy_toolbox.md
@@ -1,7 +1,7 @@
 ---
 title: "Deploy to Cloud Run"
 type: docs
-weight: 1
+weight: 3
 description: >
  How to set up and configure Toolbox to run on Cloud Run.
 ---
@@ -33,7 +33,7 @@ description: >
                           cloudbuild.googleapis.com \
                           artifactregistry.googleapis.com \
                           iam.googleapis.com \
-                           secretmanager.googleapis.com 
+                           secretmanager.googleapis.com

    ```

@@ -48,18 +48,10 @@ description: >
    - Cloud Run Developer (roles/run.developer)
    - Service Account User role (roles/iam.serviceAccountUser)

-{{< notice note >}} 
-If you are under a domain restriction organization policy
-[restricting](https://cloud.google.com/run/docs/authenticating/public#domain-restricted-sharing)
-unauthenticated invocations for your project, you will need to access your
-deployed service as described under [Testing private
-services](https://cloud.google.com/run/docs/triggering/https-request#testing-private).
-{{< /notice >}}
-
-{{< notice note >}} 
+{{< notice note >}}
 If you are using sources that require VPC-access (such as
 AlloyDB or Cloud SQL over private IP), make sure your Cloud Run service and the
-database are in the same VPC network. 
+database are in the same VPC network.
 {{< /notice >}}


@@ -119,7 +111,7 @@ section.
        --service-account toolbox-identity \
        --region us-central1 \
        --set-secrets "/app/tools.yaml=tools:latest" \
-        --args="--tools_file=/app/tools.yaml","--address=0.0.0.0","--port=8080"
+        --args="--tools-file=/app/tools.yaml","--address=0.0.0.0","--port=8080"
        # --allow-unauthenticated # https://cloud.google.com/run/docs/authenticating/public#gcloud
    ```

@@ -131,34 +123,28 @@ section.
        --service-account toolbox-identity \
        --region us-central1 \
        --set-secrets "/app/tools.yaml=tools:latest" \
-        --args="--tools_file=/app/tools.yaml","--address=0.0.0.0","--port=8080" \
+        --args="--tools-file=/app/tools.yaml","--address=0.0.0.0","--port=8080" \
        # TODO(dev): update the following to match your VPC if necessary 
        --network default \
        --subnet default
        # --allow-unauthenticated # https://cloud.google.com/run/docs/authenticating/public#gcloud
    ```

-## Connecting to Cloud Run
-
-Next, we will use `gcloud` to authenticate requests to our Cloud Run instance:
-
-1. Run the `run services proxy` to proxy connections to Cloud Run:
-
-    ```bash
-    gcloud run services proxy toolbox --port=8080 --region=us-central1
-    ```
-
-    If you are prompted to install the proxy, reply *Y* to install.
-
-1. Finally, use `curl` to verify the endpoint works:
-
-    ```bash
-    curl http://127.0.0.1:8080
-    ``` 
-
 ## Connecting with Toolbox Client SDK

-Next, we will use Toolbox with client 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. 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:

@@ -168,18 +154,16 @@ Next, we will use Toolbox with client SDK:

 1. Import and initialize the toolbox client with the URL retrieved above:

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

-# Replace with the cloud run service URL generated above
-toolbox = ToolboxClient("http://$YOUR_URL")
-{{< /tab >}}
-{{< tab header="Llamaindex" lang="Python" >}}
-from toolbox_llamaindex import ToolboxClient
+    auth_token_provider = auth_methods.aget_google_id_token # can also use sync method

-# Replace with the cloud run service URL generated above
-toolbox = ToolboxClient("http://$YOUR_URL")
-{{< /tab >}}
-{{< /tabpane >}}
+    # Replace with the Cloud Run service URL generated in the previous step.
+    async with ToolboxClient(
+        URL,
+        client_headers={"Authorization": auth_token_provider},
+    ) as toolbox:
+    ```

+Now, you can use this client to connect to the deployed Cloud Run instance!
--- a/docs/en/how-to/export_telemetry.md
+++ b/docs/en/how-to/export_telemetry.md
@@ -1,13 +1,13 @@
 ---
 title: "Export Telemetry"
 type: docs
-weight: 4
+weight: 5
 description: >
-  How to set up and configure Toolbox to use the Otel Collector. 
+  How to set up and configure Toolbox to use the Otel Collector.
 ---


-## About 
+## About

 The [OpenTelemetry Collector][about-collector] offers a vendor-agnostic
 implementation of how to receive, process and export telemetry data. It removes
@@ -56,7 +56,7 @@ service:
      exporters: ["googlecloud"]
 ```

-## Running the Connector
+## Running the Collector

 There are a couple of steps to run and use a Collector.

--- a/docs/en/resources/_index.md
+++ b/docs/en/resources/_index.md
@@ -2,5 +2,6 @@
 title: "Resources"
 type: docs
 weight: 4
-description: List of reference documentation for resources in Toolbox.
+description: >
+  List of reference documentation for resources in Toolbox.
 ---
--- a/docs/en/resources/authServices/_index.md
+++ b/docs/en/resources/authServices/_index.md
@@ -7,11 +7,11 @@ description: >
 ---

 AuthServices represent services that handle authentication and authorization. It
-can primarily be used by [Tools](../tools) in two different ways: 
+can primarily be used by [Tools](../tools) in two different ways:

 - [**Authorized Invocation**][auth-invoke] is when a tool
-  to be validate by the auth service before the call can be invoked. Toolbox
-  will rejected an calls that fail to validate or have an invalid token.
+  is validated by the auth service before the call can be invoked. Toolbox
+  will reject any calls that fail to validate or have an invalid token.
 - [**Authenticated Parameters**][auth-params] replace the value of a parameter
  with a field from an [OIDC][openid-claims] claim. Toolbox will automatically
  resolve the ID token provided by the client and replace the parameter in the
@@ -35,19 +35,24 @@ If you are accessing Toolbox with multiple applications, each
 authServices:
  my_auth_app_1:
    kind: google
-    clientId: YOUR_CLIENT_ID_1
+    clientId: ${YOUR_CLIENT_ID_1}
  my_auth_app_2:
    kind: google
-    clientId: YOUR_CLIENT_ID_2
+    clientId: ${YOUR_CLIENT_ID_2}
 ```

+{{< notice tip >}}
+Use environment variable replacement with the format ${ENV_NAME}
+instead of hardcoding your secrets into the configuration file.
+{{< /notice >}}
+
 After you've configured an `authService` you'll, need to reference it in the
 configuration for each tool that should use it:
- **Authorized Invocations** for authorizing a tool call, [use the
-  `requiredAuth` field in a tool config][auth-invoke]
- **Authenticated Parameters** for using the value from a ODIC claim, [use the
-  `authServices` field in a parameter config][auth-params]

+- **Authorized Invocations** for authorizing a tool call, [use the
+  `authRequired` field in a tool config][auth-invoke]
+- **Authenticated Parameters** for using the value from a OIDC claim, [use the
+  `authServices` field in a parameter config][auth-params]

 ## Specifying ID Tokens from Clients

@@ -55,59 +60,123 @@ After [configuring](#example) your `authServices` section, use a Toolbox SDK to
 add your ID tokens to the header of a Tool invocation request. When specifying a
 token you will provide a function (that returns an id). This function is called
 when the tool is invoked. This allows you to cache and refresh the ID token as
-needed. 
+needed.
+
+The primary method for providing these getters is via the `auth_token_getters` parameter when loading tools, or the `add_auth_token_getter`() / `add_auth_token_getters()` methods on a loaded tool object.

 ### Specifying tokens during load
+
 {{< tabpane persist=header >}}
-{{< tab header="LangChain" lang="Python" >}}
+{{< tab header="Core" lang="Python" >}}
+import asyncio
+from toolbox_core import ToolboxClient
+
 async def get_auth_token():
    # ... Logic to retrieve ID token (e.g., from local storage, OAuth flow)
    # This example just returns a placeholder. Replace with your actual token retrieval.
    return "YOUR_ID_TOKEN" # Placeholder

-# for a single tool use:
-authorized_tool = toolbox.load_tool("my-tool-name", auth_tokens={"my_auth": get_auth_token})
+async def main():
+    async with ToolboxClient("http://127.0.0.1:5000") as toolbox:
+        auth_tool = await toolbox.load_tool(
+            "get_sensitive_data",
+            auth_token_getters={"my_auth_app_1": get_auth_token}
+        )
+        result = await auth_tool(param="value")
+        print(result)

-# for a toolset use: 
-authorized_tools = toolbox.load_toolset("my-toolset-name", auth_tokens={"my_auth": get_auth_token})
+if __name__ == "__main__":
+    asyncio.run(main())
+{{< /tab >}}
+{{< tab header="LangChain" lang="Python" >}}
+import asyncio
+from toolbox_langchain import ToolboxClient
+
+async def get_auth_token():
+    # ... Logic to retrieve ID token (e.g., from local storage, OAuth flow)
+    # This example just returns a placeholder. Replace with your actual token retrieval.
+    return "YOUR_ID_TOKEN" # Placeholder
+
+async def main():
+    toolbox = ToolboxClient("http://127.0.0.1:5000")
+
+    auth_tool = await toolbox.aload_tool(
+        "get_sensitive_data",
+        auth_token_getters={"my_auth_app_1": get_auth_token}
+    )
+    result = await auth_tool.ainvoke({"param": "value"})
+    print(result)
+
+if __name__ == "__main__":
+    asyncio.run(main())
 {{< /tab >}}
 {{< tab header="Llamaindex" lang="Python" >}}
+import asyncio
+from toolbox_llamaindex import ToolboxClient
+
 async def get_auth_token():
    # ... Logic to retrieve ID token (e.g., from local storage, OAuth flow)
    # This example just returns a placeholder. Replace with your actual token retrieval.
    return "YOUR_ID_TOKEN" # Placeholder

-# for a single tool use:
-authorized_tool = toolbox.load_tool("my-tool-name", auth_tokens={"my_auth": get_auth_token})
+async def main():
+    toolbox = ToolboxClient("http://127.0.0.1:5000")

-# for a toolset use: 
-authorized_tools = toolbox.load_toolset("my-toolset-name", auth_tokens={"my_auth": get_auth_token})
-{{< /tab >}}
+    auth_tool = await toolbox.aload_tool(
+        "get_sensitive_data",
+        auth_token_getters={"my_auth_app_1": get_auth_token}
+    )
+    # result = await auth_tool.acall(param="value")
+    # print(result.content)
+
+if __name__ == "__main__":
+    asyncio.run(main()){{< /tab >}}
 {{< /tabpane >}}

-
 ### Specifying tokens for existing tools

 {{< tabpane persist=header >}}
-{{< tab header="LangChain" lang="Python" >}}
-tools = toolbox.load_toolset()
+{{< tab header="Core" lang="Python" >}}
+tools = await toolbox.load_toolset()
+
 # for a single token
-auth_tools = [tool.add_auth_token("my_auth", get_auth_token) for tool in tools]
+
+authorized_tool = tools[0].add_auth_token_getter("my_auth", get_auth_token)
+
 # OR, if multiple tokens are needed
-authorized_tool = tools[0].add_auth_tokens({
+
+authorized_tool = tools[0].add_auth_token_getters({
  "my_auth1": get_auth1_token,
  "my_auth2": get_auth2_token,
-}) 
+})
+{{< /tab >}}
+{{< tab header="LangChain" lang="Python" >}}
+tools = toolbox.load_toolset()
+
+# for a single token
+
+authorized_tool = tools[0].add_auth_token_getter("my_auth", get_auth_token)
+
+# OR, if multiple tokens are needed
+
+authorized_tool = tools[0].add_auth_token_getters({
+  "my_auth1": get_auth1_token,
+  "my_auth2": get_auth2_token,
+})
 {{< /tab >}}
 {{< tab header="Llamaindex" lang="Python" >}}
 tools = toolbox.load_toolset()
+
 # for a single token
-auth_tools = [tool.add_auth_token("my_auth", get_auth_token) for tool in tools]
+
+authorized_tool = tools[0].add_auth_token_getter("my_auth", get_auth_token)
+
 # OR, if multiple tokens are needed
-authorized_tool = tools[0].add_auth_tokens({
+
+authorized_tool = tools[0].add_auth_token_getters({
  "my_auth1": get_auth1_token,
  "my_auth2": get_auth2_token,
-}) 
+})
 {{< /tab >}}
 {{< /tabpane >}}

--- a/docs/en/resources/authServices/google.md
+++ b/docs/en/resources/authServices/google.md
@@ -43,9 +43,14 @@ id-token][provided-claims] can be used for the parameter.
 authServices:
  my-google-auth:
    kind: google
-    clientId: YOUR_GOOGLE_CLIENT_ID
+    clientId: ${YOUR_GOOGLE_CLIENT_ID}
 ```

+{{< 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**                                                  |
--- a/docs/en/resources/sources/_index.md
+++ b/docs/en/resources/sources/_index.md
@@ -11,6 +11,11 @@ Sources as a map in the `sources` section of your `tools.yaml` file. Typically,
 a source configuration will contain any information needed to connect with and
 interact with the database.

+{{< notice tip >}}
+Use environment variable replacement with the format ${ENV_NAME}
+instead of hardcoding your secrets into the configuration file.
+{{< /notice >}}
+
 ```yaml
 sources:
    my-cloud-sql-source:
@@ -19,11 +24,11 @@ sources:
        region: us-central1
        instance: my-instance-name
        database: my_db
-        user: my-user
-        password: my-password
+        user: ${USER_NAME}
+        password: ${PASSWORD}
 ```

 In implementation, each source is a different connection pool or client that used
-to connect to the database and execute the tool. 
+to connect to the database and execute the tool.

-## Available Sources
+## Available Sources
--- a/docs/en/resources/sources/alloydb-pg.md
+++ b/docs/en/resources/sources/alloydb-pg.md
@@ -58,11 +58,34 @@ mTLS.
 [public-ip]: https://cloud.google.com/alloydb/docs/connect-public-ip
 [conn-overview]: https://cloud.google.com/alloydb/docs/connection-overview

-### Database User
+### Authentication

-Currently, this source only uses standard authentication. You will need to [create
-a PostgreSQL user][alloydb-users] to login to the database with.
+This source supports both password-based authentication and IAM
+authentication (using your [Application Default Credentials][adc]).

+#### Standard Authentication
+
+To connect using user/password, [create
+a PostgreSQL user][alloydb-users] and input your credentials in the `user` and
+`password` fields.
+
+```yaml
+user: ${USER_NAME}
+password: ${PASSWORD}
+```
+
+#### IAM Authentication
+
+To connect using IAM authentication:
+
+1. Prepare your database instance and user following this [guide][iam-guide].
+2. You could choose one of the two ways to log in:
+    - Specify your IAM email as the `user`.
+    - Leave your `user` field blank. Toolbox
+            will fetch the [ADC][adc] automatically and log in using the email associated with it.
+3. Leave the `password` field blank.
+
+[iam-guide]: https://cloud.google.com/alloydb/docs/database-users/manage-iam-auth
 [alloydb-users]: https://cloud.google.com/alloydb/docs/database-users/about

 ## Example
@@ -70,27 +93,32 @@ a PostgreSQL user][alloydb-users] to login to the database with.
 ```yaml
 sources:
    my-alloydb-pg-source:
-        kind: "alloydb-postgres"
-        project: "my-project-id"
-        region: "us-central1"
-        cluster: "my-cluster"
-        instance: "my-instance"
-        database: "my_db"
-        user: "my-user"
-        password: "my-password"
+        kind: alloydb-postgres
+        project: my-project-id
+        region: us-central1
+        cluster: my-cluster
+        instance: my-instance
+        database: my_db
+        user: ${USER_NAME}
+        password: ${PASSWORD}
        # ipType: "public"
 ```

+{{< 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 "alloydb-postgres".                                                               |
-| project   |  string  |     true     | Id of the GCP project that the cluster was created in (e.g. "my-project-id").             |
-| region    |  string  |     true     | Name of the GCP region that the cluster was created in (e.g. "us-central1").              |
-| cluster   |  string  |     true     | Name of the AlloyDB cluster (e.g. "my-cluster").                                          |
-| instance  |  string  |     true     | Name of the AlloyDB instance within the cluster (e.g. "my-instance").                      |
-| database  |  string  |     true     | Name of the Postgres database to connect to (e.g. "my_db").                               |
-| user      |  string  |     true     | Name of the Postgres user to connect as (e.g. "my-pg-user").                              |
-| password  |  string  |     true     | Password of the Postgres user (e.g. "my-password").                                       |
-| ipType    |  string  |    false     | IP Type of the AlloyDB instance; must be one of `public` or `private`. Default: `public`. |
+| **field** | **type** | **required** | **description**                                                                                                          |
+|-----------|:--------:|:------------:|--------------------------------------------------------------------------------------------------------------------------|
+| kind      |  string  |     true     | Must be "alloydb-postgres".                                                                                              |
+| project   |  string  |     true     | Id of the GCP project that the cluster was created in (e.g. "my-project-id").                                            |
+| region    |  string  |     true     | Name of the GCP region that the cluster was created in (e.g. "us-central1").                                             |
+| cluster   |  string  |     true     | Name of the AlloyDB cluster (e.g. "my-cluster").                                                                         |
+| instance  |  string  |     true     | Name of the AlloyDB instance within the cluster (e.g. "my-instance").                                                    |
+| database  |  string  |     true     | Name of the Postgres database to connect to (e.g. "my_db").                                                              |
+| user      |  string  |    false     | Name of the Postgres user to connect as (e.g. "my-pg-user"). Defaults to IAM auth using [ADC][adc] email if unspecified. |
+| password  |  string  |    false     | Password of the Postgres user (e.g. "my-password"). Defaults to attempting IAM authentication if unspecified.            |
+| ipType    |  string  |    false     | IP Type of the AlloyDB instance; must be one of `public` or `private`. Default: `public`.                                |
--- a/docs/en/resources/sources/bigquery.md
+++ b/docs/en/resources/sources/bigquery.md
@@ -0,0 +1,73 @@
+---
+title: "BigQuery"
+type: docs
+weight: 1
+description: >
+  BigQuery is Google Cloud's fully managed, petabyte-scale, and cost-effective
+  analytics data warehouse that lets you run analytics over vast amounts of 
+  data in near real time. With BigQuery, there's no infrastructure to set 
+  up or manage, letting you focus on finding meaningful insights using 
+  GoogleSQL and taking advantage of flexible pricing models across on-demand 
+  and flat-rate options.
+---
+
+# BigQuery Source
+
+[BigQuery][bigquery-docs] is Google Cloud's fully managed, petabyte-scale,
+and cost-effective analytics data warehouse that lets you run analytics
+over vast amounts of data in near real time. With BigQuery, there's no
+infrastructure to set up or manage, letting you focus on finding meaningful
+insights using GoogleSQL and taking advantage of flexible pricing models
+across on-demand and flat-rate options.
+
+If you are new to BigQuery, you can try to
+[load and query data with the bq tool][bigquery-quickstart-cli].
+
+BigQuery uses [GoogleSQL][bigquery-googlesql] for querying data. GoogleSQL
+is an ANSI-compliant structured query language (SQL) that is also implemented
+for other Google Cloud services. SQL queries are handled by cluster nodes
+in the same way as NoSQL data requests. Therefore, the same best practices
+apply when creating SQL queries to run against your BigQuery data, such as
+avoiding full table scans or complex filters.
+
+[bigquery-docs]: https://cloud.google.com/bigquery/docs
+[bigquery-quickstart-cli]: https://cloud.google.com/bigquery/docs/quickstarts/quickstart-command-line
+[bigquery-googlesql]: https://cloud.google.com/bigquery/docs/reference/standard-sql/
+
+## Requirements
+
+### IAM Permissions
+
+BigQuery uses [Identity and Access Management (IAM)][iam-overview] to control
+user and group access to BigQuery resources like projects, datasets, and tables.
+Toolbox will use your [Application Default Credentials (ADC)][adc] to authorize
+and authenticate when interacting with [BigQuery][bigquery-docs].
+
+In addition to [setting the ADC for your server][set-adc], you need to ensure
+the IAM identity has been given the correct IAM permissions for the queries
+you intend to run. Common roles include `roles/bigquery.user` (which includes
+permissions to run jobs and read data) or `roles/bigquery.dataViewer`. See
+[Introduction to BigQuery IAM][grant-permissions] for more information on
+applying IAM permissions and roles to an identity.
+
+[iam-overview]: https://cloud.google.com/bigquery/docs/access-control
+[adc]: https://cloud.google.com/docs/authentication#adc
+[set-adc]: https://cloud.google.com/docs/authentication/provide-credentials-adc
+[grant-permissions]: https://cloud.google.com/bigquery/docs/access-control
+
+## Example
+
+```yaml
+sources:
+  my-bigquery-source:
+    kind: "bigquery"
+    project: "my-project-id"
+```
+
+## Reference
+
+| **field** | **type** | **required** | **description**                                                               |
+|-----------|:--------:|:------------:|-------------------------------------------------------------------------------|
+| kind      |  string  |     true     | Must be "bigquery".                                                           |
+| project   |  string  |     true     | Id of the GCP project that the cluster was created in (e.g. "my-project-id"). |
+| location  |  string  |    false     | Specifies the location (e.g., 'us', 'asia-northeast1') in which to run the query job. This location must match the location of any tables referenced in the query. The default behavior is for it to be executed in the US multi-region |
--- a/docs/en/resources/sources/bigtable.md
+++ b/docs/en/resources/sources/bigtable.md
@@ -0,0 +1,70 @@
+---
+title: "Bigtable"
+type: docs
+weight: 1
+description: >
+  Bigtable is a low-latency NoSQL database service for machine learning, operational analytics, and user-facing operations. It's a wide-column, key-value store that can scale to billions of rows and thousands of columns. With Bigtable, you can replicate your data to regions across the world for high availability and data resiliency.
+
+---
+
+# Bigtable Source
+
+[Bigtable][bigtable-docs] is a low-latency NoSQL database service for machine
+learning, operational analytics, and user-facing operations. It's a wide-column,
+key-value store that can scale to billions of rows and thousands of columns.
+With Bigtable, you can replicate your data to regions across the world for high
+availability and data resiliency.
+
+If you are new to Bigtable, you can try to [create an instance and write data
+with the cbt CLI][bigtable-quickstart-with-cli].
+
+You can use [GoogleSQL statements][bigtable-googlesql] to query your Bigtable
+data. GoogleSQL is an ANSI-compliant structured query language (SQL) that is
+also implemented for other Google Cloud services. SQL queries are handled by
+cluster nodes in the same way as NoSQL data requests. Therefore, the same best
+practices apply when creating SQL queries to run against your Bigtable data,
+such as avoiding full table scans or complex filters.
+
+[bigtable-docs]: https://cloud.google.com/bigtable/docs
+[bigtable-quickstart-with-cli]:
+    https://cloud.google.com/bigtable/docs/create-instance-write-data-cbt-cli
+
+[bigtable-googlesql]:
+    https://cloud.google.com/bigtable/docs/googlesql-overview
+
+## Requirements
+
+### IAM Permissions
+
+Bigtable uses [Identity and Access Management (IAM)][iam-overview] to control
+user and group access to Bigtable resources at the project, instance, table, and
+backup level. Toolbox will use your [Application Default Credentials (ADC)][adc]
+to authorize and authenticate when interacting with [Bigtable][bigtable-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 the query
+provided. See [Apply IAM roles][grant-permissions] for more information on
+applying IAM permissions and roles to an identity.
+
+[iam-overview]: https://cloud.google.com/bigtable/docs/access-control
+[adc]: https://cloud.google.com/docs/authentication#adc
+[set-adc]: https://cloud.google.com/docs/authentication/provide-credentials-adc
+[grant-permissions]: https://cloud.google.com/bigtable/docs/access-control#iam-management-instance
+
+## Example
+
+```yaml
+sources:
+  my-bigtable-source:
+    kind: "bigtable"
+    project: "my-project-id"
+    instance: "test-instance"
+```
+
+## Reference
+
+| **field** | **type** | **required** | **description**                                                               |
+|-----------|:--------:|:------------:|-------------------------------------------------------------------------------|
+| kind      |  string  |     true     | Must be "bigtable".                                                           |
+| project   |  string  |     true     | Id of the GCP project that the cluster was created in (e.g. "my-project-id"). |
+| instance  |  string  |     true     | Name of the Bigtable instance.                                                |
--- a/docs/en/resources/sources/cloud-sql-mssql.md
+++ b/docs/en/resources/sources/cloud-sql-mssql.md
@@ -79,9 +79,16 @@ sources:
     instance: my-instance
     database: my_db
     ipAddress: localhost
+     user: ${USER_NAME}
+     password: ${PASSWORD}
     # ipType: private
 ```

+{{< 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**                                                                             |
--- a/docs/en/resources/sources/cloud-sql-mysql.md
+++ b/docs/en/resources/sources/cloud-sql-mysql.md
@@ -74,16 +74,21 @@ a MySQL user][cloud-sql-users] to login to the database with.
 ```yaml
 sources:
    my-cloud-sql-mysql-source:
-        kind: "cloud-sql-mysql"
-        project: "my-project-id"
-        region: "us-central1"
-        instance: "my-instance"
-        database: "my_db"
-        user: "my-user"
-        password: "my-password"
+        kind: cloud-sql-mysql
+        project: my-project-id
+        region: us-central1
+        instance: my-instance
+        database: my_db
+        user: ${USER_NAME}
+        password: ${PASSWORD}
        # ipType: "private"
 ```

+{{< 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**                                                                             |
--- a/docs/en/resources/sources/cloud-sql-pg.md
+++ b/docs/en/resources/sources/cloud-sql-pg.md
@@ -42,9 +42,9 @@ scope](https://cloud.google.com/compute/docs/access/service-accounts#accesscopes
 to connect using the Cloud SQL Admin API.
 {{< /notice >}}

-[csql-go-conn]: https://github.com/GoogleCloudPlatform/cloud-sql-go-connector
-[adc]: https://cloud.google.com/docs/authentication#adc
-[set-adc]: https://cloud.google.com/docs/authentication/provide-credentials-adc
+[csql-go-conn]: <https://github.com/GoogleCloudPlatform/cloud-sql-go-connector>
+[adc]: <https://cloud.google.com/docs/authentication#adc>
+[set-adc]: <https://cloud.google.com/docs/authentication/provide-credentials-adc>

 ### Networking

@@ -62,28 +62,57 @@ mTLS.
 [public-ip]: https://cloud.google.com/sql/docs/postgres/configure-ip
 [conn-overview]: https://cloud.google.com/sql/docs/postgres/connect-overview

-### Database User
+### Authentication

-Currently, this source only uses standard authentication. You will need to [create
-a PostgreSQL user][cloud-sql-users] to login to the database with.
+This source supports both password-based authentication and IAM
+authentication (using your [Application Default Credentials][adc]).

-[cloud-sql-users]: https://cloud.google.com/sql/docs/postgres/create-manage-users
+#### Standard Authentication
+
+To connect using user/password, [create
+a PostgreSQL user][cloudsql-users] and input your credentials in the `user` and
+`password` fields.
+
+```yaml
+user: ${USER_NAME}
+password: ${PASSWORD}
+```
+
+#### IAM Authentication
+
+To connect using IAM authentication:
+
+1. Prepare your database instance and user following this [guide][iam-guide].
+2. You could choose one of the two ways to log in:
+    - Specify your IAM email as the `user`.
+    - Leave your `user` field blank. Toolbox
+            will fetch the [ADC][adc] automatically and log in using the email associated with it.
+
+3. Leave the `password` field blank.
+
+[iam-guide]: https://cloud.google.com/sql/docs/postgres/iam-logins
+[cloudsql-users]: https://cloud.google.com/sql/docs/postgres/create-manage-users

 ## Example

 ```yaml
 sources:
    my-cloud-sql-pg-source:
-        kind: "cloud-sql-postgres"
-        project: "my-project-id"
-        region: "us-central1"
-        instance: "my-instance"
-        database: "my_db"
-        user: "my-user"
-        password: "my-password"
+        kind: cloud-sql-postgres
+        project: my-project-id
+        region: us-central1
+        instance: my-instance
+        database: my_db
+        user: ${USER_NAME}
+        password: ${PASSWORD}
        # ipType: "private"
 ```

+{{< 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**                                                                             |
@@ -93,6 +122,6 @@ sources:
 | region    |  string  |     true     | Name of the GCP region that the cluster was created in (e.g. "us-central1").                |
 | instance  |  string  |     true     | Name of the Cloud SQL instance within the cluster (e.g. "my-instance").                     |
 | database  |  string  |     true     | Name of the Postgres database to connect to (e.g. "my_db").                                 |
-| user      |  string  |     true     | Name of the Postgres user to connect as (e.g. "my-pg-user").                                |
-| password  |  string  |     true     | Password of the Postgres user (e.g. "my-password").                                         |
+| user      |  string  |     false     | Name of the Postgres user to connect as (e.g. "my-pg-user"). Defaults to IAM auth using [ADC][adc] email if unspecified.                               |
+| password  |  string  |     false     | Password of the Postgres user (e.g. "my-password"). Defaults to attempting IAM authentication if unspecified.                                        |
 | ipType    |  string  |    false     | IP Type of the Cloud SQL instance; must be one of `public` or `private`. Default: `public`. |
--- a/docs/en/resources/sources/couchbase.md
+++ b/docs/en/resources/sources/couchbase.md
@@ -0,0 +1,43 @@
+---
+title: "couchbase"
+type: docs
+weight: 1
+description: > 
+  A "couchbase" source connects to a Couchbase database.
+---
+
+## About
+
+A `couchbase` source establishes a connection to a Couchbase database cluster, allowing tools to execute SQL queries against it.
+
+## Example
+
+```yaml
+sources:
+    my-couchbase-instance:
+        kind: couchbase
+        connectionString: couchbase://localhost:8091
+        bucket: travel-sample
+        scope: inventory
+        username: Administrator
+        password: password
+```
+
+## Reference
+
+| **field**           | **type** | **required** | **description**                                                                                                             |
+|---------------------|:--------:|:------------:|-----------------------------------------------------------------------------------------------------------------------------|
+| kind                | string   |    true      | Must be "couchbase".                                                                                                         |
+| connectionString   | string   |    true      | Connection string for the Couchbase cluster.                                                                                |
+| bucket              | string   |    true      | Name of the bucket to connect to.                                                                                           |
+| scope               | string   |    true      | Name of the scope within the bucket.                                                                                        |
+| username            | string   |    false     | Username for authentication.                                                                                                |
+| password            | string   |    false     | Password for authentication.                                                                                                |
+| clientCert         | string   |    false     | Path to client certificate file for TLS authentication.                                                                     |
+| clientCertPassword| string   |    false     | Password for the client certificate.                                                                                        |
+| clientKey          | string   |    false     | Path to client key file for TLS authentication.                                                                             |
+| clientKeyPassword | string   |    false     | Password for the client key.                                                                                                |
+| caCert             | string   |    false     | Path to CA certificate file.                                                                                                |
+| noSslVerify       | boolean  |    false     | If true, skip server certificate verification. **Warning:** This option should only be used in development or testing environments. Disabling SSL verification poses significant security risks in production as it makes your connection vulnerable to man-in-the-middle attacks. |
+| profile             | string   |    false     | Name of the connection profile to apply.                                                                                    |
+| queryScanConsistency | integer  |    false     | Query scan consistency. Controls the consistency guarantee for index scanning. Values: 1 for "not_bounded" (fastest option, but results may not include the most recent operations), 2 for "request_plus" (highest consistency level, includes all operations up until the query started, but incurs a performance penalty). If not specified, defaults to the Couchbase Go SDK default. |
--- a/docs/en/resources/sources/dgraph.md
+++ b/docs/en/resources/sources/dgraph.md
@@ -9,7 +9,7 @@ description: >

 ## About

-[Dgraph][dgraph-docs] is an open-source graph database. It is designed for real-time workloads, horizontal scalability, and data flexibility. Implemented as a distributed system, Dgraph processes queries in parallel to deliver the fastest result. 
+[Dgraph][dgraph-docs] is an open-source graph database. It is designed for real-time workloads, horizontal scalability, and data flexibility. Implemented as a distributed system, Dgraph processes queries in parallel to deliver the fastest result.

 This source can connect to either a self-managed Dgraph cluster or one hosted on
 Dgraph Cloud. If you're new to Dgraph, the fastest way to get started is to
@@ -18,7 +18,7 @@ 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

-## Requirements 
+## Requirements

 ### Database User

@@ -34,20 +34,25 @@ and user credentials for that namespace.
 ```yaml
 sources:
    my-dgraph-source:
-        kind: "dgraph"
-        dgraphUrl: "https://xxxx.cloud.dgraph.io"
-        user: "groot"
-        password: "password"
-        apiKey: abc123
-        namepace : 0
+        kind: dgraph
+        dgraphUrl: https://xxxx.cloud.dgraph.io
+        user: ${USER_NAME}
+        password: ${PASSWORD}
+        apiKey: ${API_KEY}
+        namespace : 0
 ```

+{{< 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 "dgraph".                                                                                |
-| dgraphUrl   |  string  |     true     | Connection URI (e.g. "https://xxx.cloud.dgraph.io", "https://localhost:8080").                   |
+| dgraphUrl   |  string  |     true     | Connection URI (e.g. "<https://xxx.cloud.dgraph.io>", "<https://localhost:8080>").                   |
 | user        |  string  |     false    | Name of the Dgraph user to connect as (e.g., "groot").                                           |
 | password    |  string  |     false    | Password of the Dgraph user (e.g., "password").                                                  |
 | apiKey      |  string  |     false    | API key to connect to a Dgraph Cloud instance.                                                   |
--- a/docs/en/resources/sources/http.md
+++ b/docs/en/resources/sources/http.md
@@ -9,7 +9,7 @@ description: >

 ## About

-The HTTP Source allows the Gen AI Toolbox to retrieve data from arbitrary HTTP
+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.

@@ -22,13 +22,18 @@ sources:
    baseUrl: https://api.example.com/data
    timeout: 10s # default to 30s
    headers:
-      Authorization: Bearer YOUR_API_TOKEN
+      Authorization: Bearer ${API_KEY}
      Content-Type: application/json
    queryParams:
      param1: value1
      param2: value2
 ```

+{{< 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**                                                                                                                   |
--- a/docs/en/resources/sources/mssql.md
+++ b/docs/en/resources/sources/mssql.md
@@ -7,7 +7,7 @@ description: >

 ---

-##  About
+## About

 [SQL Server][mssql-docs] is a relational database management system (RDBMS)
 developed by Microsoft that allows users to store, retrieve, and manage large
@@ -20,7 +20,7 @@ amount of data through a structured format.
 ### Database User

 This source only uses standard authentication. You will need to [create a
-SQL Server user][mssql-users] to login to the database with. 
+SQL Server user][mssql-users] to login to the database with.

 [mssql-users]: https://learn.microsoft.com/en-us/sql/relational-databases/security/authentication-access/create-a-database-user?view=sql-server-ver16

@@ -29,14 +29,19 @@ SQL Server user][mssql-users] to login to the database with.
 ```yaml
 sources:
    my-mssql-source:
-        kind: "mssql"
-        host: "127.0.0.1"
-        port: "1433"
-        database: "my_db"
-        user: "my-user"
-        password: "my-password"
+        kind: mssql
+        host: 127.0.0.1
+        port: 1433
+        database: my_db
+        user: ${USER_NAME}
+        password: ${PASSWORD}
 ```

+{{< 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**                                                        |
--- a/docs/en/resources/sources/mysql.md
+++ b/docs/en/resources/sources/mysql.md
@@ -11,7 +11,7 @@ description: >

 [MySQL][mysql-docs] is a relational database management system (RDBMS) that
 stores and manages data. It's a popular choice for developers because of its
-reliability, performance, and ease of use. 
+reliability, performance, and ease of use.

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

@@ -20,7 +20,7 @@ reliability, performance, and ease of use.
 ### Database User

 This source only uses standard authentication. You will need to [create a
-MySQL user][mysql-users] to login to the database with. 
+MySQL user][mysql-users] to login to the database with.

 [mysql-users]: https://dev.mysql.com/doc/refman/8.4/en/user-names.html

@@ -29,14 +29,19 @@ MySQL user][mysql-users] to login to the database with.
 ```yaml
 sources:
    my-mysql-source:
-        kind: "mysql"
-        host: "127.0.0.1"
-        port: "3306"
-        database: "my_db"
-        user: "my-user"
-        password: "my-password"
+        kind: mysql
+        host: 127.0.0.1
+        port: 3306
+        database: my_db
+        user: ${USER_NAME}
+        password: ${PASSWORD}
 ```

+{{< 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**                                                                             |
--- a/docs/en/resources/sources/neo4j.md
+++ b/docs/en/resources/sources/neo4j.md
@@ -13,13 +13,13 @@ reliability, feature robustness, and performance.

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

-## Requirements 
+## Requirements

 ### Database User

 This source only uses standard authentication. You will need to [create a Neo4j
 user][neo4j-users] to log in to the database with, or use the default `neo4j`
-user if available. 
+user if available.

 [neo4j-users]: https://neo4j.com/docs/operations-manual/current/authentication-authorization/manage-users/

@@ -28,13 +28,18 @@ user if available.
 ```yaml
 sources:
    my-neo4j-source:
-        kind: "neo4j"
-        uri: "neo4j+s://xxxx.databases.neo4j.io:7687"
-        user: "neo4j"
-        password: "my-password"
+        kind: neo4j
+        uri: neo4j+s://xxxx.databases.neo4j.io:7687
+        user: ${USER_NAME}
+        password: ${PASSWORD}
        database: "neo4j"
 ```

+{{< 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**                                                      |
@@ -44,5 +49,3 @@ sources:
 | user      |  string  |     true     | Name of the Neo4j user to connect as (e.g. "neo4j").                 |
 | password  |  string  |     true     | Password of the Neo4j user (e.g. "my-password").                     |
 | database  |  string  |     true     | Name of the Neo4j database to connect to (e.g. "neo4j").             |
-
-
--- a/docs/en/resources/sources/postgres.md
+++ b/docs/en/resources/sources/postgres.md
@@ -29,14 +29,19 @@ PostgreSQL user][pg-users] to login to the database with.
 ```yaml
 sources:
    my-pg-source:
-        kind: "postgres"
-        host: "127.0.0.1"
-        port: "5432"
-        database: "my_db"
-        user: "my-user"
-        password: "my-password"
+        kind: postgres
+        host: 127.0.0.1
+        port: 5432
+        database: my_db
+        user: ${USER_NAME}
+        password: ${PASSWORD}
 ```

+{{< 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**                                                        |
--- a/docs/en/resources/sources/redis.md
+++ b/docs/en/resources/sources/redis.md
@@ -0,0 +1,90 @@
+---
+title: "Redis"
+linkTitle: "Redis"
+type: docs
+weight: 1
+description: >
+    Redis is an open-source, in-memory data structure store.
+    
+---
+
+## About
+
+Redis is an open-source, in-memory data structure store, used as a database, cache, and message broker. It supports data structures such as strings, hashes, lists, sets, sorted sets with range queries, bitmaps, hyperloglogs, and 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/).
+
+## Requirements
+
+### Redis
+
+[AUTH string][auth] is a password for connection to Redis. If you have the `requirepass` directive set in your Redis configuration, incoming client connections must authenticate in order to connect.
+
+Specify your AUTH string in the password field:
+
+```yaml
+sources:
+    my-redis-instance:
+     kind: redis
+     address:
+       - 127.0.0.1
+     username: ${MY_USER_NAME}
+     password: ${MY_AUTH_STRING} # Omit this field if you don't have a password.
+     # database: 0
+     # clusterEnabled: false
+     # useGCPIAM: false
+```
+
+{{< notice tip >}}
+Use environment variable replacement with the format ${ENV_NAME}
+instead of hardcoding your secrets into the configuration file.
+{{< /notice >}}
+
+### Memorystore For Redis
+
+Memorystore standalone instances support authentication using an [AUTH][auth]
+string.
+
+Here is an example tools.yaml config with [AUTH][auth] enabled:
+
+```yaml
+sources:
+    my-redis-cluster-instance:
+     kind: memorystore-redis
+     address:
+       - 127.0.0.1
+     password: ${MY_AUTH_STRING}
+     # useGCPIAM: false
+     # clusterEnabled: false
+```
+
+Memorystore Redis Cluster supports IAM authentication instead. Grant your account the
+required [IAM role][iam] and make sure to set `useGCPIAM` to `true`.
+
+Here is an example tools.yaml config for Memorystore Redis Cluster instances
+using IAM authentication:
+
+```yaml
+sources:
+    my-redis-cluster-instance:
+     kind: memorystore-redis
+     address: 127.0.0.1
+     useGCPIAM: true
+     clusterEnabled: true
+```
+
+[iam]: https://cloud.google.com/memorystore/docs/cluster/about-iam-auth
+
+## Reference
+
+| **field**      | **type** | **required** | **description**                                                                                                                 |
+|----------------|:--------:|:------------:|---------------------------------------------------------------------------------------------------------------------------------|
+| kind           |  string  |     true     | Must be "memorystore-redis".                                                                                                    |
+| address        |  string  |     true     | Primary endpoint for the Memorystore Redis instance to connect to.                                                              |
+| username       |  string  |    false     | If you are using a non-default user, specify the user name here. If you are using Memorystore for Redis, leave this field blank |
+| password       |  string  |    false     | If you have [Redis AUTH][auth] enabled, specify the AUTH string here                                                            |
+| database       |   int    |    false     | The Redis database to connect to. Not applicable for cluster enabled instances. The default database is `0`.                    |
+| clusterEnabled |   bool   |    false     | Set it to `true` if using a Redis Cluster instance. Defaults to `false`.                                                        |
+| useGCPIAM      |  string  |    false     | Set it to `true` if you are using GCP's IAM authentication. Defaults to `false`.                                                |
+
+[auth]: https://cloud.google.com/memorystore/docs/redis/about-redis-auth
--- a/docs/en/resources/sources/spanner.md
+++ b/docs/en/resources/sources/spanner.md
@@ -8,7 +8,7 @@ description: >

 ---

-# Spanner Source 
+# Spanner Source

 [Spanner][spanner-docs] is a fully managed, mission-critical database service
 that brings together relational, graph, key-value, and search. It offers
@@ -23,7 +23,7 @@ the Google Cloud console][spanner-quickstart].
 [spanner-quickstart]:
    https://cloud.google.com/spanner/docs/create-query-database-console

-## Requirements 
+## Requirements

 ### IAM Permissions

--- a/docs/en/resources/sources/sqlite.md
+++ b/docs/en/resources/sources/sqlite.md
@@ -0,0 +1,63 @@
+---
+title: "SQLite"
+linkTitle: "SQLite"
+type: docs
+weight: 1
+description: >
+  SQLite is a C-language library that implements a small, fast, self-contained, 
+  high-reliability, full-featured, SQL database engine.
+---
+
+## About
+
+[SQLite](https://sqlite.org/) is a software library that provides a relational
+database management system. The lite in SQLite means lightweight in terms of
+setup, database administration, and required resources.
+
+SQLite has the following notable characteristics:
+- Self-contained with no external dependencies
+- Serverless - the SQLite library accesses its storage files directly
+- Single database file that can be easily copied or moved
+- Zero-configuration - no setup or administration needed
+- Transactional with ACID properties
+
+## Requirements
+
+### Database File
+
+You need a SQLite database file. This can be:
+- An existing database file
+- A path where a new database file should be created
+- `:memory:` for an in-memory database
+
+## Example
+
+```yaml
+sources:
+    my-sqlite-db:
+        kind: "sqlite"
+        database: "/path/to/database.db"
+```
+
+For an in-memory database:
+```yaml
+sources:
+    my-sqlite-memory-db:
+        kind: "sqlite"
+        database: ":memory:"
+```
+
+## Reference
+
+### Configuration Fields
+
+| Field | Type | Required | Description |
+|-------|------|----------|-------------|
+| kind | string | Yes | Must be "sqlite" |
+| database | string | Yes | Path to SQLite database file, or ":memory:" for an in-memory database |
+
+### Connection Properties
+
+SQLite connections are configured with these defaults for optimal performance:
+- `MaxOpenConns`: 1 (SQLite only supports one writer at a time)
+- `MaxIdleConns`: 1
--- a/docs/en/resources/sources/valkey.md
+++ b/docs/en/resources/sources/valkey.md
@@ -0,0 +1,64 @@
+---
+title: "Valkey"
+linkTitle: "Valkey"
+type: docs
+weight: 1
+description: >
+    Valkey is an open-source, in-memory data structure store, forked from Redis.
+    
+---
+
+## About
+
+Valkey is an open-source, in-memory data structure store that originated as a fork of Redis. It's designed to be used as a database, cache, and message broker, supporting a wide range of data structures like strings, hashes, lists, 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/docs/getting-started/).
+
+## Example
+
+```yaml
+sources:
+    my-valkey-instance:
+     kind: valkey
+     address:
+       - 127.0.0.1
+     username: ${YOUR_USERNAME}
+     password: ${YOUR_PASSWORD}
+     # database: 0
+     # useGCPIAM: false
+     # disableCache: false
+```
+
+{{< notice tip >}}
+Use environment variable replacement with the format ${ENV_NAME}
+instead of hardcoding your secrets into the configuration file.
+{{< /notice >}}
+
+### IAM Authentication
+
+If you are using GCP's Memorystore for Valkey, you can connect using IAM
+authentication. Grant your account the required [IAM role][iam] and set
+`useGCPIAM` to `true`:
+
+```yaml
+sources:
+    my-valkey-instance:
+     kind: valkey
+     address:
+       - 127.0.0.1
+     useGCPIAM: true
+```
+
+[iam]: https://cloud.google.com/memorystore/docs/valkey/about-iam-auth
+
+## Reference
+
+| **field**    | **type** | **required** | **description**                                                                                                                  |
+|--------------|:--------:|:------------:|----------------------------------------------------------------------------------------------------------------------------------|
+| kind         |  string  |     true     | Must be "valkey".                                                                                                                |
+| address      | []string |     true     | Endpoints for the Valkey instance to connect to.                                                                                 |
+| username     |  string  |    false     | If you are using a non-default user, specify the user name here. If you are using Memorystore for Valkey, leave this field blank |
+| password     |  string  |    false     | Password for the Valkey instance                                                                                                 |
+| database     |   int    |    false     | The Valkey database to connect to. Not applicable for cluster enabled instances. The default database is `0`.                    |
+| useGCPIAM    |   bool   |    false     | Set it to `true` if you are using GCP's IAM authentication. Defaults to `false`.                                                 |
+| disableCache |   bool   |    false     | Set it to `true` if you want to enable client-side caching. Defaults to `false`.                                                 |
--- a/docs/en/resources/tools/_index.md
+++ b/docs/en/resources/tools/_index.md
@@ -93,7 +93,7 @@ in the list using the items field:

 ```yaml
    parameters:
-      - name: preffered_airlines
+      - name: preferred_airlines
        type: array
        description: A list of airline, ordered by preference. 
        items:
@@ -141,6 +141,58 @@ specific claims within the user's ID token.
 | name      |  string  |     true     | Name of the [authServices](../authservices) used to verify the OIDC auth token. |
 | field     |  string  |     true     | Claim field decoded from the OIDC token used to auto-populate this parameter.           |

+### Template Parameters
+
+Template parameters types include `string`, `integer`, `float`, `boolean` types. In
+most cases, the description will be provided to the LLM as context on specifying
+the parameter. Template parameters will be inserted into the SQL statement before
+executing the prepared statement. They will be inserted without quotes, so to
+insert a string using template parameters, quotes must be explicitly added within
+the string.
+
+Template parameter arrays can also be used similarly to basic parameters, and array
+items must be strings. Once inserted into the SQL statement, the outer layer of quotes
+will be removed. Therefore to insert strings into the SQL statement, a set of quotes 
+must be explicitly added within the string.
+
+{{< notice warning >}}
+Because template parameters can directly replace identifiers, column names, and table names, they are prone to SQL injections. Basic parameters are preferred for performance and safety reasons.
+{{< /notice >}}
+
+```yaml
+tools:
+ select_columns_from_table:
+    kind: postgres-sql
+    source: my-pg-instance
+    statement: |
+      SELECT {{array .columnNames}} FROM {{.tableName}}
+    description: |
+      Use this tool to list all information from a specific table.
+      Example:
+      {{
+          "tableName": "flights",
+          "columnNames": ["id", "name"]
+      }}
+    templateParameters:
+      - name: tableName
+        type: string
+        description: Table to select from
+      - name: columnNames
+        type: array
+        description: The columns to select
+        items:
+          name: column
+          type: string
+          description: Name of a column to select
+```
+
+| **field**   | **type**         | **required**  | **description**                                                                     |
+|-------------|:----------------:|:-------------:|-------------------------------------------------------------------------------------|
+| name        |  string          |     true      | Name of the template parameter.                                                     |
+| type        |  string          |     true      | Must be one of "string", "integer", "float", "boolean" "array"                      |
+| description |  string          |     true      | Natural language description of the template parameter to describe it to the agent. |
+| items       | parameter object |true (if array)| Specify a Parameter object for the type of the values in the array (string only).   |
+
 ## Authorized Invocations

 You can require an authorization check for any Tool invocation request by
--- a/docs/en/resources/tools/alloydb-ai-nl.md
+++ b/docs/en/resources/tools/alloydb-ai-nl.md
@@ -30,8 +30,7 @@ database layer.
 ## Requirements
 {{< notice tip >}} AlloyDB AI natural language is currently in gated public
 preview. For more information on availability and limitations, please see
-[AlloyDB AI natural language
-overview](https://cloud.google.com/alloydb/docs/natural-language-questions-overview)
+[AlloyDB AI natural language overview](https://cloud.google.com/alloydb/docs/ai/natural-language-overview)
 {{< /notice >}}

 To enable AlloyDB AI natural language for your AlloyDB cluster, please follow
@@ -39,8 +38,8 @@ the steps listed in the [Generate SQL queries that answer natural language
 questions][alloydb-ai-gen-nl], including enabling the extension and configuring
 context for your application.

-[alloydb-ai-nl-overview]: https://cloud.google.com/alloydb/docs/natural-language-questions-overview
-[alloydb-ai-gen-nl]: https://cloud.google.com/alloydb/docs/alloydb/docs/ai/generate-queries-natural-language
+[alloydb-ai-nl-overview]: https://cloud.google.com/alloydb/docs/ai/natural-language-overview
+[alloydb-ai-gen-nl]: https://cloud.google.com/alloydb/docs/ai/generate-sql-queries-natural-language


 ## Configuration
@@ -70,7 +69,7 @@ Parameters](../tools/#array-parameters) or Bound Parameters to provide secure
 access to queries generated using natural language, as these parameters are not
 visible to the LLM.

-[alloydb-psv]: https://cloud.google.com/alloydb/docs/ai/use-psvs#parameterized_secure_views
+[alloydb-psv]: https://cloud.google.com/alloydb/docs/parameterized-secure-views-overview

 ## Example

--- a/docs/en/resources/tools/bigquery-execute-sql.md
+++ b/docs/en/resources/tools/bigquery-execute-sql.md
@@ -0,0 +1,35 @@
+---
+title: "bigquery-execute-sql"
+type: docs
+weight: 1
+description: > 
+  A "bigquery-execute-sql" tool executes a SQL statement against BigQuery.
+---
+
+## About
+
+A `bigquery-execute-sql` tool executes a SQL statement against BigQuery.
+It's compatible with the following sources:
+
+- [bigquery](../sources/bigquery.md)
+
+`bigquery-execute-sql` takes one input parameter `sql` and runs the sql
+statement against the `source`.
+
+## Example
+
+```yaml
+tools:
+ execute_sql_tool:
+    kind: bigquery-execute-sql
+    source: my-bigquery-source
+    description: Use this tool to execute sql statement.
+```
+
+## Reference
+
+| **field**   |                  **type**                  | **required** | **description**                                                                                  |
+|-------------|:------------------------------------------:|:------------:|--------------------------------------------------------------------------------------------------|
+| kind        |                   string                   |     true     | Must be "bigquery-execute-sql".                                                                          |
+| source      |                   string                   |     true     | Name of the source the SQL should execute on.                                                    |
+| description |                   string                   |     true     | Description of the tool that is passed to the LLM.                                               |
--- a/docs/en/resources/tools/bigquery-get-dataset-info.md
+++ b/docs/en/resources/tools/bigquery-get-dataset-info.md
@@ -0,0 +1,35 @@
+---
+title: "bigquery-get-dataset-info"
+type: docs
+weight: 1
+description: > 
+  A "bigquery-get-dataset-info" tool retrieves metadata for a BigQuery dataset.
+---
+
+## About
+
+A `bigquery-get-dataset-info` tool retrieves metadata for a BigQuery dataset.
+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.
+
+## Example
+
+```yaml
+tools:
+  bigquery_get_dataset_info:
+    kind: bigquery-get-dataset-info
+    source: my-bigquery-source
+    description: Use this tool to get dataset metadata.
+```
+
+## Reference
+
+| **field**   |                  **type**                  | **required** | **description**                                                                                  |
+|-------------|:------------------------------------------:|:------------:|--------------------------------------------------------------------------------------------------|
+| kind        |                   string                   |     true     | Must be "bigquery-get-dataset-info".                                                                          |
+| source      |                   string                   |     true     | Name of the source the SQL should execute on.                                                    |
+| description |                   string                   |     true     | Description of the tool that is passed to the LLM.                                               |
--- a/docs/en/resources/tools/bigquery-get-table-info.md
+++ b/docs/en/resources/tools/bigquery-get-table-info.md
@@ -0,0 +1,35 @@
+---
+title: "bigquery-get-table-info"
+type: docs
+weight: 1
+description: > 
+  A "bigquery-get-table-info" tool retrieves metadata for a BigQuery table.
+---
+
+## About
+
+A `bigquery-get-table-info` tool retrieves metadata for a BigQuery table.
+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.
+
+## Example
+
+```yaml
+tools:
+  bigquery_get_table_info:
+    kind: bigquery-get-table-info
+    source: my-bigquery-source
+    description: Use this tool to get table metadata.
+```
+
+## Reference
+
+| **field**   |                  **type**                  | **required** | **description**                                                                                  |
+|-------------|:------------------------------------------:|:------------:|--------------------------------------------------------------------------------------------------|
+| kind        |                   string                   |     true     | Must be "bigquery-get-table-info".                                                                          |
+| source      |                   string                   |     true     | Name of the source the SQL should execute on.                                                    |
+| description |                   string                   |     true     | Description of the tool that is passed to the LLM.                                               |
--- a/docs/en/resources/tools/bigquery-list-dataset-ids.md
+++ b/docs/en/resources/tools/bigquery-list-dataset-ids.md
@@ -0,0 +1,35 @@
+---
+title: "bigquery-list-dataset-ids"
+type: docs
+weight: 1
+description: > 
+  A "bigquery-list-dataset-ids" tool returns all dataset IDs from the source.
+---
+
+## About
+
+A `bigquery-list-dataset-ids` tool returns all dataset IDs from the source.
+It's compatible with the following sources:
+
+- [bigquery](../sources/bigquery.md)
+
+bigquery-list-dataset-ids requires no input parameters beyond the configured 
+source.
+
+## Example
+
+```yaml
+tools:
+  bigquery_list_dataset_ids:
+    kind: bigquery-list-dataset-ids
+    source: my-bigquery-source
+    description: Use this tool to get dataset metadata.
+```
+
+## Reference
+
+| **field**   |                  **type**                  | **required** | **description**                                                                                  |
+|-------------|:------------------------------------------:|:------------:|--------------------------------------------------------------------------------------------------|
+| kind        |                   string                   |     true     | Must be "bigquery-list-dataset-ids".                                                                          |
+| source      |                   string                   |     true     | Name of the source the SQL should execute on.                                                    |
+| description |                   string                   |     true     | Description of the tool that is passed to the LLM.                                               |
--- a/docs/en/resources/tools/bigquery-list-table-ids.md
+++ b/docs/en/resources/tools/bigquery-list-table-ids.md
@@ -0,0 +1,35 @@
+---
+title: "bigquery-list-table-ids"
+type: docs
+weight: 1
+description: > 
+  A "bigquery-list-table-ids" tool returns table IDs in a given BigQuery dataset.
+---
+
+## About
+
+A `bigquery-list-table-ids` tool returns table IDs in a given BigQuery dataset.
+It's compatible with the following sources:
+
+- [bigquery](../sources/bigquery.md)
+
+bigquery-get-dataset-info takes a dataset parameter to specify the dataset
+from which to list table IDs.
+
+## Example
+
+```yaml
+tools:
+  bigquery_list_table_ids:
+    kind: bigquery-list-table-ids
+    source: my-bigquery-source
+    description: Use this tool to get table metadata.
+```
+
+## Reference
+
+| **field**   |                  **type**                  | **required** | **description**                                                                                  |
+|-------------|:------------------------------------------:|:------------:|--------------------------------------------------------------------------------------------------|
+| kind        |                   string                   |     true     | Must be "bigquery-list-table-ids".                                                                          |
+| source      |                   string                   |     true     | Name of the source the SQL should execute on.                                                    |
+| description |                   string                   |     true     | Description of the tool that is passed to the LLM.                                               |
--- a/docs/en/resources/tools/bigquery-sql.md
+++ b/docs/en/resources/tools/bigquery-sql.md
@@ -0,0 +1,70 @@
+---
+title: "bigquery-sql"
+type: docs
+weight: 1
+description: >
+  A "bigquery-sql" tool executes a pre-defined SQL statement.
+---
+
+## About
+A `bigquery-sql` tool executes a pre-defined SQL statement. It's compatible with 
+the following sources:
+
+- [bigquery](../sources/bigquery.md)
+
+### GoogleSQL
+
+BigQuery uses [GoogleSQL][bigquery-googlesql] for querying data. The integration
+with Toolbox supports this dialect. The specified SQL statement is executed, and
+parameters can be inserted into the query. BigQuery supports both named parameters
+(e.g., `@name`) and positional parameters (`?`), but they cannot be mixed in the
+same query.
+
+> **Note:** This tool uses [parameterized queries](https://cloud.google.com/bigquery/docs/parameterized-queries) to prevent SQL injections. Query parameters can be used as substitutes for arbitrary expressions. Parameters cannot be used as substitutes for identifiers, column names, table names, or other parts of the query.
+
+[bigquery-googlesql]: https://cloud.google.com/bigquery/docs/reference/standard-sql/
+
+## Example
+
+```yaml
+tools:
+  # Example: Querying a user table in BigQuery
+  search_users_bq:
+    kind: bigquery-sql
+    source: my-bigquery-source
+    statement: |
+      SELECT
+        id,
+        name,
+        email
+      FROM
+        `my-project.my-dataset.users`
+      WHERE
+        id = @id OR email = @email;
+    description: |
+      Use this tool to get information for a specific user.
+      Takes an id number or a name and returns info on the user.
+
+      Example:
+      {{
+          "id": 123,
+          "name": "Alice",
+      }}
+    parameters:
+      - name: id
+        type: integer
+        description: User ID
+      - name: email
+        type: string
+        description: Email address of the user
+```
+
+## Reference
+
+| **field**   |                  **type**                  | **required** | **description**                                                                                  |
+|-------------|:------------------------------------------:|:------------:|--------------------------------------------------------------------------------------------------|
+| kind        |                   string                   |     true     | Must be "bigquery-sql".                                                                          |
+| source      |                   string                   |     true     | Name of the source the GoogleSQL should execute on.                                              |
+| description |                   string                   |     true     | Description of the tool that is passed to the LLM.                                               |
+| statement   |                   string                   |     true     | The GoogleSQL statement to execute.                                                              |
+| parameters  | [parameters](_index#specifying-parameters) |    false     | List of [parameters](_index#specifying-parameters) that will be inserted into the SQL statement. |
--- a/docs/en/resources/tools/bigtable-sql.md
+++ b/docs/en/resources/tools/bigtable-sql.md
@@ -0,0 +1,87 @@
+---
+title: "bigtable-sql"
+type: docs
+weight: 1
+description: > 
+  A "bigtable-sql" tool executes a pre-defined SQL statement against a Google 
+  Cloud Bigtable instance.
+---
+
+## About
+
+A `bigtable-sql` tool executes a pre-defined SQL statement against a Bigtable
+instance. It's compatible with any of the following sources:
+
+- [bigtable](../sources/bigtable.md)
+
+### GoogleSQL
+
+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`.
+
+> **Note:** This tool uses parameterized queries to prevent SQL injections.
+> Query parameters can be used as substitutes for arbitrary expressions.
+> Parameters cannot be used as substitutes for identifiers, column names, table
+> names, or other parts of the query.
+
+[bigtable-googlesql]: https://cloud.google.com/bigtable/docs/googlesql-overview
+
+## Example
+
+```yaml
+tools:
+ search_user_by_id_or_name:
+    kind: bigtable-sql
+    source: my-bigtable-instance
+    statement: |
+      SELECT 
+        TO_INT64(cf[ 'id' ]) as id, 
+        CAST(cf[ 'name' ] AS string) as name, 
+      FROM 
+        mytable 
+      WHERE 
+        TO_INT64(cf[ 'id' ]) = @id 
+        OR CAST(cf[ 'name' ] AS string) = @name;
+    description: |
+      Use this tool to get information for a specific user.
+      Takes an id number or a name and returns info on the user.
+
+      Example:
+      {{
+          "id": 123,
+          "name": "Alice",
+      }}
+    parameters:
+      - name: id
+        type: integer
+        description: User ID
+      - name: name
+        type: string
+        description: Name of the user
+```
+
+## Reference
+
+| **field**   |                  **type**                  | **required** | **description**                                                                                  |
+|-------------|:------------------------------------------:|:------------:|--------------------------------------------------------------------------------------------------|
+| kind        |                   string                   |     true     | Must be "bigtable-sql".                                                                          |
+| source      |                   string                   |     true     | Name of the source the SQL should execute on.                                                    |
+| description |                   string                   |     true     | Description of the tool that is passed to the LLM.                                               |
+| statement   |                   string                   |     true     | SQL statement to execute on.                                                                     |
+| parameters  | [parameters](_index#specifying-parameters) |    false     | List of [parameters](_index#specifying-parameters) that will be inserted into the SQL statement. |
+
+## Tips
+
+- [Bigtable Studio][bigtable-studio] is a useful to explore and manage your
+  Bigtable data. If you're unfamiliar with the query syntax, [Query
+  Builder][bigtable-querybuilder] lets you build a query, run it against a
+  table, and then view the results in the console.
+- Some Python libraries limit the use of underscore columns such as `_key`. A
+  workaround would be to leverage Bigtable [Logical
+  Views][bigtable-logical-view] to rename the columns.
+
+[bigtable-studio]: https://cloud.google.com/bigtable/docs/manage-data-using-console
+[bigtable-logical-view]: https://cloud.google.com/bigtable/docs/create-manage-logical-views
+[bigtable-querybuilder]: https://cloud.google.com/bigtable/docs/query-builder
--- a/docs/en/resources/tools/couchbase-sql.md
+++ b/docs/en/resources/tools/couchbase-sql.md
@@ -0,0 +1,70 @@
+---
+title: "couchbase-sql"
+type: docs
+weight: 1
+description: > 
+  A "couchbase-sql" tool executes a pre-defined SQL statement against a Couchbase
+  database.
+---
+
+## About
+
+A `couchbase-sql` tool executes a pre-defined SQL statement against a Couchbase
+database. It's compatible with any of the following sources:
+
+- [couchbase](../sources/couchbase.md)
+
+The specified SQL statement is executed as a parameterized statement, and specified
+parameters will be used according to their name: e.g. `$id`.
+
+> **Note:** This tool uses parameterized queries to prevent SQL injections.
+> Query parameters can be used as substitutes for arbitrary expressions.
+> Parameters cannot be used as substitutes for identifiers, column names, table
+> names, or other parts of the query.
+
+## Example
+
+```yaml
+tools:
+    search_products_by_category:
+        kind: couchbase-sql
+        source: my-couchbase-instance
+        statement: |
+            SELECT p.name, p.price, p.description
+            FROM products p
+            WHERE p.category = $category AND p.price < $max_price
+            ORDER BY p.price DESC
+            LIMIT 10
+        description: |
+            Use this tool to get a list of products for a specific category under a maximum price.
+            Takes a category name, e.g. "Electronics" and a maximum price e.g 500 and returns a list of product names, prices, and descriptions.
+            Do NOT use this tool with invalid category names. Do NOT guess a category name, Do NOT guess a price.
+            Example:
+            {{
+                "category": "Electronics",
+                "max_price": 500
+            }}
+            Example:
+            {{
+                "category": "Furniture",
+                "max_price": 1000
+            }}
+        parameters:
+            - name: category
+              type: string
+              description: Product category name
+            - name: max_price
+              type: integer
+              description: Maximum price (positive integer)
+```
+
+## Reference
+
+| **field**   |                  **type**                  | **required** | **description**                                                                                |
+|-------------|:------------------------------------------:|:------------:|------------------------------------------------------------------------------------------------|
+| kind        |                   string                   |     true     | Must be "couchbase-sql".                                                                       |
+| source      |                   string                   |     true     | Name of the source the SQL query should execute on.                                            |
+| description |                   string                   |     true     | Description of the tool that is passed to the LLM.                                             |
+| statement   |                   string                   |     true     | SQL statement to execute                                                                       |
+| parameters  | [parameters](_index#specifying-parameters) |    false     | List of [parameters](_index#specifying-parameters) that will be used with the SQL statement.   |
+| authRequired|                array[string]               |    false     | List of auth services that are required to use this tool.                                      |
--- a/docs/en/resources/tools/dgraph-dql.md
+++ b/docs/en/resources/tools/dgraph-dql.md
@@ -18,9 +18,14 @@ To run a statement as a query, you need to set the config `isQuery=true`. For
 upserts or mutations, set `isQuery=false`. You can also configure timeout for a
 query.

+> **Note:** This tool uses parameterized queries to prevent SQL injections.
+> Query parameters can be used as substitutes for arbitrary expressions.
+> Parameters cannot be used as substitutes for identifiers, column names, table
+> names, or other parts of the query.
+
 ## Example

-{{< tabpane >}}
+{{< tabpane persist="header" >}}
 {{< tab header="Query" lang="yaml" >}}

 tools:
@@ -112,6 +117,6 @@ tools:
 | source      |                   string                   |     true     | Name of the source the dql query should execute on.                                          |
 | description |                   string                   |     true     | Description of the tool that is passed to the LLM.                                           |
 | statement   |                   string                   |     true     | dql statement to execute                                                                     |
-| isQuery     |                  boolean                   |    false     | To run statment as query set true otherwise false                                            |
-| timeout     |                   string                   |    false     | To set timout for query                                                                      |
+| isQuery     |                  boolean                   |    false     | To run statement as query set true otherwise false                                            |
+| timeout     |                   string                   |    false     | To set timeout for query                                                                      |
 | parameters  | [parameters](_index#specifying-parameters) |    false     | List of [parameters](_index#specifying-parameters) that will be used with the dql statement. |
--- a/docs/en/resources/tools/mssql-execute-sql.md
+++ b/docs/en/resources/tools/mssql-execute-sql.md
@@ -0,0 +1,39 @@
+---
+title: "mssql-execute-sql"
+type: docs
+weight: 1
+description: > 
+  A "mssql-execute-sql" tool executes a SQL statement against a SQL Server
+  database.
+---
+
+## About
+
+A `mssql-execute-sql` tool executes a SQL statement against a SQL Server
+database. It's compatible with any of the following sources:
+
+- [cloud-sql-mssql](../sources/cloud-sql-mssql.md)
+- [mssql](../sources/mssql.md)
+
+`mssql-execute-sql` takes one input parameter `sql` and run the sql
+statement against the `source`.
+
+> **Note:** This tool is intended for developer assistant workflows with
+> human-in-the-loop and shouldn't be used for production agents.
+
+## Example
+
+```yaml
+tools:
+ execute_sql_tool:
+    kind: mssql-execute-sql
+    source: my-mssql-instance
+    description: Use this tool to execute sql statement.
+```
+## Reference
+
+| **field**   |                  **type**                  | **required** | **description**                                    |
+|-------------|:------------------------------------------:|:------------:|----------------------------------------------------|
+| kind        |                   string                   |     true     | Must be "mssql-execute-sql".                       |
+| source      |                   string                   |     true     | Name of the source the SQL should execute on.      |
+| description |                   string                   |     true     | Description of the tool that is passed to the LLM. |
--- a/docs/en/resources/tools/mssql-sql.md
+++ b/docs/en/resources/tools/mssql-sql.md
@@ -23,6 +23,11 @@ Server and expects parameters in the SQL query to be in the form of either
 db.QueryContext(ctx, `select * from t where ID = @ID and Name = @p2;`, sql.Named("ID", 6), "Bob")
 ```

+> **Note:** This tool uses parameterized queries to prevent SQL injections.
+> Query parameters can be used as substitutes for arbitrary expressions.
+> Parameters cannot be used as substitutes for identifiers, column names, table
+> names, or other parts of the query.
+
 [prepare-statement]: https://learn.microsoft.com/sql/relational-databases/system-stored-procedures/sp-prepare-transact-sql?view=sql-server-ver16

 ## Example
--- a/docs/en/resources/tools/mysql-execute-sql.md
+++ b/docs/en/resources/tools/mysql-execute-sql.md
@@ -0,0 +1,40 @@
+---
+title: "mysql-execute-sql"
+type: docs
+weight: 1
+description: > 
+  A "mysql-execute-sql" tool executes a SQL statement against a MySQL
+  database.
+---
+
+## About
+
+A `mysql-execute-sql` tool executes a SQL statement against a MySQL
+database. It's compatible with any of the following sources:
+
+- [cloud-sql-mysql](../sources/cloud-sql-mysql.md)
+- [mysql](../sources/mysql.md)
+
+`mysql-execute-sql` takes one input parameter `sql` and run the sql
+statement against the `source`.
+
+> **Note:** This tool is intended for developer assistant workflows with
+> human-in-the-loop and shouldn't be used for production agents.
+
+## Example
+
+```yaml
+tools:
+ execute_sql_tool:
+    kind: mysql-execute-sql
+    source: my-mysql-instance
+    description: Use this tool to execute sql statement.
+```
+
+## Reference
+
+| **field**   |                  **type**                  | **required** | **description**                                                                                  |
+|-------------|:------------------------------------------:|:------------:|--------------------------------------------------------------------------------------------------|
+| kind        |                   string                   |     true     | Must be "mysql-execute-sql".                                                                          |
+| source      |                   string                   |     true     | Name of the source the SQL should execute on.                                                    |
+| description |                   string                   |     true     | Description of the tool that is passed to the LLM.                                               |
--- a/docs/en/resources/tools/mysql-sql.md
+++ b/docs/en/resources/tools/mysql-sql.md
@@ -3,13 +3,13 @@ title: "mysql-sql"
 type: docs
 weight: 1
 description: > 
-  A "mysql-sql" tool executes a pre-defined SQL statement against a SQL Server
+  A "mysql-sql" tool executes a pre-defined SQL statement against a MySQL
  database.
 ---

 ## About

-A `mysql-sql` tool executes a pre-defined SQL statement against a mysql
+A `mysql-sql` tool executes a pre-defined SQL statement against a MySQL
 database. It's compatible with any of the following sources:

 - [cloud-sql-mysql](../sources/cloud-sql-mysql.md)
@@ -18,6 +18,11 @@ database. It's compatible with any of the following sources:
 The specified SQL statement is executed as a [prepared statement][mysql-prepare],
 and expects parameters in the SQL query to be in the form of placeholders `?`.

+> **Note:** This tool uses parameterized queries to prevent SQL injections.
+> Query parameters can be used as substitutes for arbitrary expressions.
+> Parameters cannot be used as substitutes for identifiers, column names, table
+> names, or other parts of the query.
+
 [mysql-prepare]: https://dev.mysql.com/doc/refman/8.4/en/sql-prepared-statements.html

 ## Example
--- a/docs/en/resources/tools/neo4j-cypher.md
+++ b/docs/en/resources/tools/neo4j-cypher.md
@@ -18,6 +18,11 @@ The specified Cypher statement is executed as a [parameterized
 statement][neo4j-parameters], and specified parameters will be used according to
 their name: e.g. `$id`.

+> **Note:** This tool uses parameterized queries to prevent SQL injections.
+> Query parameters can be used as substitutes for arbitrary expressions.
+> Parameters cannot be used as substitutes for identifiers, column names, table
+> names, or other parts of the query.
+
 [neo4j-parameters]:
    https://neo4j.com/docs/cypher-manual/current/syntax/parameters/

@@ -34,7 +39,7 @@ tools:
      RETURN m.title, m.year
      LIMIT 10
    description: |
-      Use this tool to get a list of movies for a specific actor and a given minium release year.
+      Use this tool to get a list of movies for a specific actor and a given minimum release year.
      Takes an full actor name, e.g. "Tom Hanks" and a year e.g 1993 and returns a list of movie titles and release years.
      Do NOT use this tool with a movie title. Do NOT guess an actor name, Do NOT guess a year.
      A actor name is a fully qualified name with first and last name separated by a space.
--- a/docs/en/resources/tools/postgres-execute-sql.md
+++ b/docs/en/resources/tools/postgres-execute-sql.md
@@ -0,0 +1,41 @@
+---
+title: "postgres-execute-sql"
+type: docs
+weight: 1
+description: > 
+  A "postgres-execute-sql" tool executes a SQL statement against a Postgres
+  database.
+---
+
+## About
+
+A `postgres-execute-sql` tool executes a SQL statement against a Postgres
+database. It's compatible with any of the following sources:
+
+- [alloydb-postgres](../sources/alloydb-pg.md)
+- [cloud-sql-postgres](../sources/cloud-sql-pg.md)
+- [postgres](../sources/postgres.md)
+
+`postgres-execute-sql` takes one input parameter `sql` and run the sql
+statement against the `source`.
+
+> **Note:** This tool is intended for developer assistant workflows with
+> human-in-the-loop and shouldn't be used for production agents.
+
+## Example
+
+```yaml
+tools:
+ execute_sql_tool:
+    kind: postgres-execute-sql
+    source: my-pg-instance
+    description: Use this tool to execute sql statement.
+```
+
+## Reference
+
+| **field**   |                  **type**                  | **required** | **description**                                                                                  |
+|-------------|:------------------------------------------:|:------------:|--------------------------------------------------------------------------------------------------|
+| kind        |                   string                   |     true     | Must be "postgres-execute-sql".                                                                          |
+| source      |                   string                   |     true     | Name of the source the SQL should execute on.                                                    |
+| description |                   string                   |     true     | Description of the tool that is passed to the LLM.                                               |
--- a/docs/en/resources/tools/postgres-sql.md
+++ b/docs/en/resources/tools/postgres-sql.md
@@ -19,12 +19,18 @@ database. It's compatible with any of the following sources:
 The specified SQL statement is executed as a [prepared statement][pg-prepare],
 and specified parameters will inserted according to their position: e.g. `1`
 will be the first parameter specified, `$@` will be the second parameter, and so
-on.
-
-[pg-prepare]: https://www.postgresql.org/docs/current/sql-prepare.html
+on. If template parameters are included, they will be resolved before execution
+of the prepared statement.

 ## Example

+> **Note:** This tool uses parameterized queries to prevent SQL injections.
+> Query parameters can be used as substitutes for arbitrary expressions.
+> Parameters cannot be used as substitutes for identifiers, column names, table
+> names, or other parts of the query.
+
+[pg-prepare]: https://www.postgresql.org/docs/current/sql-prepare.html
+
 ```yaml
 tools:
 search_flights_by_number:
@@ -63,12 +69,39 @@ tools:
        description: 1 to 4 digit number
 ```

+### Example with Template Parameters
+
+> **Note:** This tool allows direct modifications to the SQL statement, including identifiers, column names,
+> and table names. **This makes it more vulnerable to SQL injections**. Using basic parameters 
+> only (see above) is recommended for performance and safety reasons. For more details, please
+> check [templateParameters](_index#template-parameters).
+
+```yaml
+tools:
+ list_table:
+    kind: postgres-sql
+    source: my-pg-instance
+    statement: |
+      SELECT * FROM {{.tableName}}
+    description: |
+      Use this tool to list all information from a specific table.
+      Example:
+      {{
+          "tableName": "flights",
+      }}
+    templateParameters:
+      - name: tableName
+        type: string
+        description: Table to select from
+```
+
 ## Reference

-| **field**   |                  **type**                  | **required** | **description**                                                                                  |
-|-------------|:------------------------------------------:|:------------:|--------------------------------------------------------------------------------------------------|
-| kind        |                   string                   |     true     | Must be "postgres-sql".                                                                          |
-| source      |                   string                   |     true     | Name of the source the SQL should execute on.                                                    |
-| description |                   string                   |     true     | Description of the tool that is passed to the LLM.                                               |
-| statement   |                   string                   |     true     | SQL statement to execute on.                                                                     |
-| parameters  | [parameters](_index#specifying-parameters) |    false     | List of [parameters](_index#specifying-parameters) that will be inserted into the SQL statement. |
+| **field**           |                  **type**                                 | **required** | **description**                                                                                                                            |
+|---------------------|:---------------------------------------------------------:|:------------:|--------------------------------------------------------------------------------------------------------------------------------------------|
+| kind                |                   string                                  |     true     | Must be "postgres-sql".                                                                                                                    |
+| source              |                   string                                  |     true     | Name of the source the SQL should execute on.                                                                                              |
+| description         |                   string                                  |     true     | Description of the tool that is passed to the LLM.                                                                                         |
+| statement           |                   string                                  |     true     | SQL statement to execute on.                                                                                                               |
+| parameters          | [parameters](_index#specifying-parameters)                |    false     | List of [parameters](_index#specifying-parameters) that will be inserted into the SQL statement.                                           |
+| templateParameters  |  [templateParameters](_index#template-parameters)         |    false     | List of [templateParameters](_index#template-parameters) that will be inserted into the SQL statement before executing prepared statement. |
--- a/docs/en/resources/tools/redis.md
+++ b/docs/en/resources/tools/redis.md
@@ -0,0 +1,57 @@
+---
+title: "redis"
+type: docs
+weight: 1
+description: > 
+  A "redis" tool executes a set of pre-defined Redis commands against a Redis instance.
+
+---
+
+## About
+
+A redis tool executes a series of pre-defined Redis commands against a
+Redis source.
+
+The specified Redis commands are executed sequentially. Each command is
+represented as a string list, where the first element is the command name (e.g., SET,
+GET, HGETALL) and subsequent elements are its arguments.
+
+### Dynamic Command Parameters
+
+Command arguments can be templated using the `$variableName` annotation. The
+array type parameters will be expanded once into multiple arguments. Take the
+following config for example:
+
+```yaml
+  commands:
+      - [SADD, userNames, $userNames] # Array will be flattened into multiple arguments.
+  parameters:
+    - name: userNames
+      type: array
+      description: The user names to be set.  
+```
+
+If the input is an array of strings `["Alice", "Sid", "Bob"]`,  The final command
+to be executed after argument expansion will be `[SADD, userNames, Alice, Sid, Bob]`.
+
+## Example
+
+```yaml
+tools:
+  user_data_tool:
+    kind: redis
+    source: my-redis-instance
+    description: |
+      Use this tool to interact with user data stored in Redis.
+      It can set, retrieve, and delete user-specific information.
+    commands:
+      - [SADD, userNames, $userNames] # Array will be flattened into multiple arguments.
+      - [GET, $userId]
+    parameters:
+      - name: userId
+        type: string
+        description: The unique identifier for the user.
+      - name: userNames
+        type: array
+        description: The user names to be set.  
+```
--- a/docs/en/resources/tools/spanner-execute-sql.md
+++ b/docs/en/resources/tools/spanner-execute-sql.md
@@ -0,0 +1,40 @@
+---
+title: "spanner-execute-sql"
+type: docs
+weight: 1
+description: > 
+  A "spanner-execute-sql" tool executes a SQL statement against a Spanner
+  database.
+---
+
+## About
+
+A `spanner-execute-sql` tool executes a SQL statement against a Spanner
+database. It's compatible with any of the following sources:
+
+- [spanner](../sources/spanner.md)
+
+`spanner-execute-sql` takes one input parameter `sql` and run the sql
+statement against the `source`.
+
+> **Note:** This tool is intended for developer assistant workflows with
+> human-in-the-loop and shouldn't be used for production agents.
+
+## Example
+
+```yaml
+tools:
+ execute_sql_tool:
+    kind: spanner-execute-sql
+    source: my-spanner-instance
+    description: Use this tool to execute sql statement.
+```
+
+## Reference
+
+| **field**   |                  **type**                  | **required** | **description**                                                                                  |
+|-------------|:------------------------------------------:|:------------:|--------------------------------------------------------------------------------------------------|
+| kind        |                   string                   |     true     | Must be "spanner-execute-sql".                                                                          |
+| source      |                   string                   |     true     | Name of the source the SQL should execute on.                                                    |
+| description |                   string                   |     true     | Description of the tool that is passed to the LLM.                                               |
+| readOnly    |                   bool                     |     false    | When set to `true`, the `statement` is run as a read-only transaction. Default: `false`.         |
--- a/docs/en/resources/tools/spanner-sql.md
+++ b/docs/en/resources/tools/spanner-sql.md
@@ -21,6 +21,11 @@ For the `googlesql` dialect, the specified SQL statement is executed as a [data
 manipulation language (DML)][gsql-dml] statements, and specified parameters will
 inserted according to their name: e.g. `@name`.

+> **Note:** This tool uses parameterized queries to prevent SQL injections.
+> Query parameters can be used as substitutes for arbitrary expressions.
+> Parameters cannot be used as substitutes for identifiers, column names, table
+> names, or other parts of the query.
+
 [gsql-dml]: https://cloud.google.com/spanner/docs/reference/standard-sql/dml-syntax

 ### PostgreSQL
@@ -30,11 +35,16 @@ statement][pg-prepare], and specified parameters will inserted according to
 their position: e.g. `$1` will be the first parameter specified, `$@` will be
 the second parameter, and so on.

+> **Note:** This tool uses parameterized queries to prevent SQL injections.
+> Query parameters can be used as substitutes for arbitrary expressions.
+> Parameters cannot be used as substitutes for identifiers, column names, table
+> names, or other parts of the query.
+
 [pg-prepare]: https://www.postgresql.org/docs/current/sql-prepare.html

 ## Example

-{{< tabpane >}}
+{{< tabpane persist="header" >}}
 {{< tab header="GoogleSQL" lang="yaml" >}}

 tools:
@@ -124,3 +134,4 @@ tools:
 | description |                   string                   |     true     | Description of the tool that is passed to the LLM.                                               |
 | statement   |                   string                   |     true     | SQL statement to execute on.                                                                     |
 | parameters  | [parameters](_index#specifying-parameters) |    false     | List of [parameters](_index#specifying-parameters) that will be inserted into the SQL statement. |
+| readOnly    |                   bool                     |    false     | When set to `true`, the `statement` is run as a read-only transaction. Default: `false`.         |
--- a/docs/en/resources/tools/sqlite-sql.md
+++ b/docs/en/resources/tools/sqlite-sql.md
@@ -0,0 +1,54 @@
+---
+title: "sqlite-sql"
+type: docs
+weight: 1
+description: >
+  Execute SQL statements against a SQLite database.
+---
+
+## About
+
+A `sqlite-sql` tool executes SQL statements against a SQLite database.
+It's compatible with any of the following sources:
+
+- [sqlite](../sources/sqlite.md)
+
+SQLite uses the `?` placeholder for parameters in SQL statements. Parameters are
+bound in the order they are provided.
+
+The statement field supports any valid SQLite SQL statement, including `SELECT`,
+`INSERT`, `UPDATE`, `DELETE`, `CREATE/ALTER/DROP` table statements, and other
+DDL statements.
+
+> **Note:** This tool uses parameterized queries to prevent SQL injections.
+> Query parameters can be used as substitutes for arbitrary expressions.
+> Parameters cannot be used as substitutes for identifiers, column names, table
+> names, or other parts of the query.
+
+### Example
+
+```yaml
+tools:
+  search-users:
+    kind: sqlite-sql
+    source: my-sqlite-db
+    description: Search users by name and age
+    parameters:
+      - name: name
+        type: string
+        description: The name to search for
+      - name: min_age
+        type: integer
+        description: Minimum age
+    statement: SELECT * FROM users WHERE name LIKE ? AND age >= ?
+```
+
+## Reference
+
+| **field**   |                  **type**                  | **required** | **description**                                                                                  |
+|-------------|:------------------------------------------:|:------------:|--------------------------------------------------------------------------------------------------|
+| kind | string | Yes | Must be "sqlite-sql" |
+| source | string | Yes | Name of a SQLite source configuration |
+| description | string | Yes | Description of what the tool does |
+| parameters | array | No | List of parameters for the SQL statement |
+| statement | string | Yes | The SQL statement to execute |
--- a/docs/en/resources/tools/valkey.md
+++ b/docs/en/resources/tools/valkey.md
@@ -0,0 +1,56 @@
+---
+title: "valkey"
+type: docs
+weight: 1
+description: > 
+  A "valkey" tool executes a set of pre-defined Valkey commands against a Memorystore for Valkey instance.
+---
+
+## About
+
+A valkey tool executes a series of pre-defined Valkey commands against a
+Memorystore for Valkey instance.
+
+The specified Valkey commands are executed sequentially. Each command is
+represented as a string array, where the first element is the command name (e.g., SET,
+GET, HGETALL) and subsequent elements are its arguments.
+
+### Dynamic Command Parameters
+
+Command arguments can be templated using the `$variableName` annotation. The
+array type parameters will be expanded once into multiple arguments. Take the
+following config for example:
+
+```yaml
+  commands:
+      - [SADD, userNames, $userNames] # Array will be flattened into multiple arguments.
+  parameters:
+    - name: userNames
+      type: array
+      description: The user names to be set.  
+```
+
+If the input is an array of strings `["Alice", "Sid", "Bob"]`,  The final command
+to be executed after argument expansion will be `[SADD, userNames, Alice, Sid, Bob]`.
+
+## Example
+
+```yaml
+tools:
+  user_data_tool:
+    kind: valkey
+    source: my-valkey-instance
+    description: |
+      Use this tool to interact with user data stored in Valkey.
+      It can set, retrieve, and delete user-specific information.
+    commands:
+      - [SADD, userNames, $userNames] # Array will be flattened into multiple arguments.
+      - [GET, $userId]
+    parameters:
+      - name: userId
+        type: string
+        description: The unique identifier for the user.
+      - name: userNames
+        type: array
+        description: The user names to be set.  
+```
--- a/Show More
+++ b/Show More
				`@@ -1 +0,0 @@`
				`{{ template "_default/_markup/td-render-heading.html" . }}`
				`@@ -0,0 +1 @@`
				`{{ template "partials/td/render-heading.html" . }}`
@@ -1 +1 @@
 .3.0
 .7.0