feat(server/admin): add get resource endpoint

feat(server/admin): add new admin api router
chore(deps): update module cloud.google.com/go/cloudsqlconn to v1.18.1 (#1268 )
2026-01-11 16:38:15 -05:00 · 2025-08-28 16:37:27 -07:00 · 2025-08-28 14:03:22 -07:00 · 2025-08-27 19:07:20 -07:00 · 2025-08-27 18:42:10 -04:00 · 2025-08-27 14:54:58 -07:00
540 changed files with 62889 additions and 6789 deletions
--- a/.ci/continuous.release.cloudbuild.yaml
+++ b/.ci/continuous.release.cloudbuild.yaml
@@ -17,15 +17,8 @@ steps:
    waitFor: ['-']
    script: |
        #!/usr/bin/env bash
-        docker buildx build --build-arg METADATA_TAGS=$(git rev-parse HEAD) -t ${_DOCKER_URI}:$REF_NAME .
-
-  - id: "push-docker"
-    name: "gcr.io/cloud-builders/docker"
-    waitFor:
-      - "build-docker"
-    script: |
-        #!/usr/bin/env bash
-        docker push ${_DOCKER_URI}:$REF_NAME
+        docker buildx create --name container-builder --driver docker-container --bootstrap --use
+        docker buildx build --platform linux/amd64,linux/arm64 --build-arg COMMIT_SHA=$(git rev-parse HEAD) -t ${_DOCKER_URI}:$REF_NAME --push .

  - id: "install-dependencies"
    name: golang:1
@@ -50,7 +43,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 +65,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 +87,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 +109,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,12 +117,13 @@ 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
  dynamicSubstitutions: true
  logging: CLOUD_LOGGING_ONLY # Necessary for custom service account
+  machineType: 'E2_HIGHCPU_32'

 substitutions:
  _REGION: us-central1
--- a/.ci/generate_release_table.sh
+++ b/.ci/generate_release_table.sh
@@ -36,7 +36,12 @@ do
    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

--- a/.ci/integration.cloudbuild.yaml
+++ b/.ci/integration.cloudbuild.yaml
@@ -33,7 +33,9 @@ steps:
      - name: "go"
        path: "/gopath"
    script: |
-      go test -c -race ./tests/...
+      go test -c -race -cover \
+      -coverpkg=./internal/sources/...,./internal/tools/... ./tests/...
+      chmod +x .ci/test_with_coverage.sh

  - id: "cloud-sql-pg"
    name: golang:1
@@ -54,7 +56,11 @@ steps:
    args:
      - -c
      - |
-        ./cloudsqlpg.test -test.v
+        .ci/test_with_coverage.sh \
+          "Cloud SQL Postgres" \
+          cloudsqlpg \
+          postgressql \
+          postgresexecutesql

  - id: "alloydb-pg"
    name: golang:1
@@ -75,7 +81,11 @@ steps:
    args:
      - -c
      - |
-        ./alloydbpg.test -test.v
+        .ci/test_with_coverage.sh \
+          "AlloyDB Postgres" \
+          alloydbpg \
+          postgressql \
+          postgresexecutesql

  - id: "alloydb-ai-nl"
    name: golang:1
@@ -96,7 +106,10 @@ steps:
    args:
      - -c
      - |
-        ./alloydbainl.test -test.v
+        .ci/test_with_coverage.sh \
+          "AlloyDB AI NL" \
+          alloydbainl \
+          alloydbainl

  - id: "bigtable"
    name: golang:1
@@ -107,15 +120,17 @@ steps:
      - "BIGTABLE_PROJECT=$PROJECT_ID"
      - "BIGTABLE_INSTANCE=$_BIGTABLE_INSTANCE"
      - "SERVICE_ACCOUNT_EMAIL=$SERVICE_ACCOUNT_EMAIL"
-    secretEnv:
-      ["CLIENT_ID"]
+    secretEnv: ["CLIENT_ID"]
    volumes:
      - name: "go"
        path: "/gopath"
    args:
      - -c
      - |
-        ./bigtable.test -test.v
+        .ci/test_with_coverage.sh \
+          "Bigtable" \
+          bigtable \
+          bigtable

  - id: "bigquery"
    name: golang:1
@@ -132,7 +147,30 @@ steps:
    args:
      - -c
      - |
-        ./bigquery.test -test.v
+        .ci/test_with_coverage.sh \
+          "BigQuery" \
+          bigquery \
+          bigquery
+
+  # - id: "dataplex"
+  #   name: golang:1
+  #   waitFor: ["compile-test-binary"]
+  #   entrypoint: /bin/bash
+  #   env:
+  #     - "GOPATH=/gopath"
+  #     - "DATAPLEX_PROJECT=$PROJECT_ID"
+  #     - "SERVICE_ACCOUNT_EMAIL=$SERVICE_ACCOUNT_EMAIL"
+  #   secretEnv: ["CLIENT_ID"]
+  #   volumes:
+  #     - name: "go"
+  #       path: "/gopath"
+  #   args:
+  #     - -c
+  #     - |
+  #       .ci/test_with_coverage.sh \
+  #         "Dataplex" \
+  #         dataplex \
+  #         dataplex

  - id: "postgres"
    name: golang:1
@@ -151,7 +189,11 @@ steps:
    args:
      - -c
      - |
-        ./postgres.test -test.v
+        .ci/test_with_coverage.sh \
+          "Postgres" \
+          postgres \
+          postgressql \
+          postgresexecutesql

  - id: "spanner"
    name: golang:1
@@ -170,7 +212,10 @@ steps:
    args:
      - -c
      - |
-        ./spanner.test -test.v
+        .ci/test_with_coverage.sh \
+          "Spanner" \
+          spanner \
+          spanner

  - id: "neo4j"
    name: golang:1
@@ -187,7 +232,10 @@ steps:
    args:
      - -c
      - |
-        ./neo4j.test -test.v
+        .ci/test_with_coverage.sh \
+          "Neo4j" \
+          neo4j \
+          neo4j

  - id: "cloud-sql-mssql"
    name: golang:1
@@ -208,7 +256,10 @@ steps:
    args:
      - -c
      - |
-        ./cloudsqlmssql.test -test.v
+        .ci/test_with_coverage.sh \
+          "Cloud SQL MSSQL" \
+          cloudsqlmssql \
+          mssql

  - id: "cloud-sql-mysql"
    name: golang:1
@@ -221,15 +272,17 @@ steps:
      - "CLOUD_SQL_MYSQL_DATABASE=$_DATABASE_NAME"
      - "CLOUD_SQL_MYSQL_REGION=$_REGION"
      - "SERVICE_ACCOUNT_EMAIL=$SERVICE_ACCOUNT_EMAIL"
-    secretEnv:
-      ["CLOUD_SQL_MYSQL_USER", "CLOUD_SQL_MYSQL_PASS", "CLIENT_ID"]
+    secretEnv: ["CLOUD_SQL_MYSQL_USER", "CLOUD_SQL_MYSQL_PASS", "CLIENT_ID"]
    volumes:
      - name: "go"
        path: "/gopath"
    args:
      - -c
      - |
-        ./cloudsqlmysql.test -test.v
+        .ci/test_with_coverage.sh \
+          "Cloud SQL MySQL" \
+          cloudsqlmysql \
+          mysql

  - id: "mysql"
    name: golang:1
@@ -248,7 +301,10 @@ steps:
    args:
      - -c
      - |
-        ./mysql.test -test.v
+        .ci/test_with_coverage.sh \
+          "MySQL" \
+          mysql \
+          mysql

  - id: "mssql"
    name: golang:1
@@ -267,7 +323,10 @@ steps:
    args:
      - -c
      - |
-        ./mssql.test -test.v
+        .ci/test_with_coverage.sh \
+          "MSSQL" \
+          mssql \
+          mssql

  - id: "dgraph"
    name: golang:1
@@ -282,7 +341,10 @@ steps:
    args:
      - -c
      - |
-        ./dgraph.test -test.v
+        .ci/test_with_coverage.sh \
+          "Dgraph" \
+          dgraph \
+          dgraph

  - id: "http"
    name: golang:1
@@ -297,7 +359,10 @@ steps:
    args:
      - -c
      - |
-        ./http.test -test.v
+        .ci/test_with_coverage.sh \
+          "HTTP" \
+          http \
+          http

  - id: "sqlite"
    name: golang:1
@@ -313,10 +378,13 @@ steps:
    args:
      - -c
      - |
-        ./sqlite.test -test.v
+        .ci/test_with_coverage.sh \
+          "SQLite" \
+          sqlite \
+          sqlite

  - id: "couchbase"
-    name : golang:1
+    name: golang:1
    waitFor: ["compile-test-binary"]
    entrypoint: /bin/bash
    env:
@@ -324,15 +392,233 @@ steps:
      - "COUCHBASE_SCOPE=$_COUCHBASE_SCOPE"
      - "COUCHBASE_BUCKET=$_COUCHBASE_BUCKET"
      - "SERVICE_ACCOUNT_EMAIL=$SERVICE_ACCOUNT_EMAIL"
-    secretEnv: ["COUCHBASE_CONNECTION", "COUCHBASE_USER", "COUCHBASE_PASS", "CLIENT_ID"]
+    secretEnv:
+      ["COUCHBASE_CONNECTION", "COUCHBASE_USER", "COUCHBASE_PASS", "CLIENT_ID"]
    volumes:
      - name: "go"
        path: "/gopath"
    args:
      - -c
      - |
-        ./couchbase.test -test.v
-    
+        .ci/test_with_coverage.sh \
+          "Couchbase" \
+          couchbase \
+          couchbase
+
+  - 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
+      - |
+        .ci/test_with_coverage.sh \
+          "Redis" \
+          redis \
+          redis
+
+  - 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
+      - |
+        .ci/test_with_coverage.sh \
+          "Valkey" \
+          valkey \
+          valkey
+
+  - id: "oceanbase"
+    name: golang:1
+    waitFor: ["compile-test-binary"]
+    entrypoint: /bin/bash
+    env:
+      - "GOPATH=/gopath"
+      - "OCEANBASE_PORT=$_OCEANBASE_PORT"
+      - "OCEANBASE_DATABASE=$_OCEANBASE_DATABASE"
+      - "SERVICE_ACCOUNT_EMAIL=$SERVICE_ACCOUNT_EMAIL"
+    secretEnv: ["CLIENT_ID", "OCEANBASE_HOST", "OCEANBASE_USER", "OCEANBASE_PASSWORD"]
+    volumes:
+      - name: "go"
+        path: "/gopath"
+    args:
+      - -c
+      - |
+        .ci/test_with_coverage.sh \
+          "OceanBase" \
+          oceanbase \
+          oceanbase
+          
+  - id: "firestore"
+    name: golang:1
+    waitFor: ["compile-test-binary"]
+    entrypoint: /bin/bash
+    env:
+      - "GOPATH=/gopath"
+      - "FIRESTORE_PROJECT=$PROJECT_ID"
+      - "SERVICE_ACCOUNT_EMAIL=$SERVICE_ACCOUNT_EMAIL"
+    secretEnv: ["CLIENT_ID"]
+    volumes:
+      - name: "go"
+        path: "/gopath"
+    args:
+      - -c
+      - |
+        .ci/test_with_coverage.sh \
+          "Firestore" \
+          firestore \
+          firestore
+
+  - id: "looker"
+    name: golang:1
+    waitFor: ["compile-test-binary"]
+    entrypoint: /bin/bash
+    env:
+      - "GOPATH=/gopath"
+      - "FIRESTORE_PROJECT=$PROJECT_ID"
+      - "SERVICE_ACCOUNT_EMAIL=$SERVICE_ACCOUNT_EMAIL"
+      - "LOOKER_VERIFY_SSL=$_LOOKER_VERIFY_SSL"
+    secretEnv:
+      [
+        "CLIENT_ID",
+        "LOOKER_BASE_URL",
+        "LOOKER_CLIENT_ID",
+        "LOOKER_CLIENT_SECRET",
+      ]
+    volumes:
+      - name: "go"
+        path: "/gopath"
+    args:
+      - -c
+      - |
+        .ci/test_with_coverage.sh \
+          "Looker" \
+          looker \
+          looker
+
+  - id: "alloydbwaitforoperation"
+    name: golang:1
+    waitFor: ["compile-test-binary"]
+    entrypoint: /bin/bash
+    env:
+      - "GOPATH=/gopath"
+      - "API_KEY=$(gcloud auth print-access-token)"
+    secretEnv: ["CLIENT_ID"]
+    volumes:
+      - name: "go"
+        path: "/gopath"
+    args:
+      - -c
+      - |
+        .ci/test_with_coverage.sh \
+          "Alloydb Wait for Operation" \
+          utility \
+          utility/alloydbwaitforoperation
+
+  - id: "tidb"
+    name: golang:1
+    waitFor: ["compile-test-binary"]
+    entrypoint: /bin/bash
+    env:
+      - "GOPATH=/gopath"
+      - "TIDB_DATABASE=$_DATABASE_NAME"
+      - "TIDB_HOST=$_TIDB_HOST"
+      - "TIDB_PORT=$_TIDB_PORT"
+      - "SERVICE_ACCOUNT_EMAIL=$SERVICE_ACCOUNT_EMAIL"
+    secretEnv: ["CLIENT_ID", "TIDB_USER", "TIDB_PASS"]
+    volumes:
+      - name: "go"
+        path: "/gopath"
+    args:
+      - -c
+      - |
+        .ci/test_with_coverage.sh \
+          "TiDB" \
+          tidb \
+          tidbsql tidbexecutesql
+
+  - id: "firebird"
+    name: golang:1
+    waitFor: ["compile-test-binary"]
+    entrypoint: /bin/bash
+    env:
+      - "GOPATH=/gopath"
+      - "FIREBIRD_DATABASE=$_FIREBIRD_DATABASE_NAME"
+      - "FIREBIRD_HOST=$_FIREBIRD_HOST"
+      - "FIREBIRD_PORT=$_FIREBIRD_PORT"
+      - "SERVICE_ACCOUNT_EMAIL=$SERVICE_ACCOUNT_EMAIL"
+    secretEnv: ["CLIENT_ID", "FIREBIRD_USER", "FIREBIRD_PASS"]
+    volumes:
+      - name: "go"
+        path: "/gopath"
+    args:
+      - -c
+      - |
+        .ci/test_with_coverage.sh \
+          "Firebird" \
+          firebird \
+          firebirdsql firebirdexecutesql
+
+  - id: "clickhouse"
+    name : golang:1
+    waitFor: ["compile-test-binary"]
+    entrypoint: /bin/bash
+    env:
+      - "GOPATH=/gopath"
+      - "CLICKHOUSE_DATABASE=$_CLICKHOUSE_DATABASE"
+      - "CLICKHOUSE_PORT=$_CLICKHOUSE_PORT"
+      - "CLICKHOUSE_PROTOCOL=$_CLICKHOUSE_PROTOCOL"
+      - "SERVICE_ACCOUNT_EMAIL=$SERVICE_ACCOUNT_EMAIL"
+    secretEnv: ["CLICKHOUSE_HOST", "CLICKHOUSE_USER", "CLIENT_ID"]
+    volumes:
+      - name: "go"
+        path: "/gopath"
+    args:
+      - -c
+      - |
+        .ci/test_with_coverage.sh \
+          "ClickHouse" \
+          clickhouse \
+          clickhouse
+
+  - id: "trino"
+    name: golang:1
+    waitFor: ["compile-test-binary"]
+    entrypoint: /bin/bash
+    env:
+      - "GOPATH=/gopath"
+      - "TRINO_HOST=$_TRINO_HOST"
+      - "TRINO_PORT=$_TRINO_PORT"
+      - "TRINO_CATALOG=$_TRINO_CATALOG"
+      - "TRINO_SCHEMA=$_TRINO_SCHEMA"
+      - "SERVICE_ACCOUNT_EMAIL=$SERVICE_ACCOUNT_EMAIL"
+    secretEnv: ["CLIENT_ID", "TRINO_USER"]
+    volumes:
+      - name: "go"
+        path: "/gopath"
+    args:
+      - -c
+      - |
+        .ci/test_with_coverage.sh \
+          "Trino" \
+          trino \
+          trinosql trinoexecutesql

 availableSecrets:
  secretManager:
@@ -371,7 +657,7 @@ availableSecrets:
    - versionName: projects/$PROJECT_ID/secrets/mysql_pass/versions/latest
      env: MYSQL_PASS
    - versionName: projects/$PROJECT_ID/secrets/mssql_user/versions/latest
-      env: MSSQL_USER 
+      env: MSSQL_USER
    - versionName: projects/$PROJECT_ID/secrets/mssql_pass/versions/latest
      env: MSSQL_PASS
    - versionName: projects/$PROJECT_ID/secrets/couchbase_connection/versions/latest
@@ -380,7 +666,38 @@ availableSecrets:
      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
+    - versionName: projects/$PROJECT_ID/secrets/looker_base_url/versions/latest
+      env: LOOKER_BASE_URL
+    - versionName: projects/$PROJECT_ID/secrets/looker_client_id/versions/latest
+      env: LOOKER_CLIENT_ID
+    - versionName: projects/$PROJECT_ID/secrets/looker_client_secret/versions/latest
+      env: LOOKER_CLIENT_SECRET
+    - versionName: projects/$PROJECT_ID/secrets/tidb_user/versions/latest
+      env: TIDB_USER
+    - versionName: projects/$PROJECT_ID/secrets/tidb_pass/versions/latest
+      env: TIDB_PASS
+    - versionName: projects/$PROJECT_ID/secrets/clickhouse_host/versions/latest
+      env: CLICKHOUSE_HOST
+    - versionName: projects/$PROJECT_ID/secrets/clickhouse_user/versions/latest
+      env: CLICKHOUSE_USER
+    - versionName: projects/$PROJECT_ID/secrets/firebird_user/versions/latest
+      env: FIREBIRD_USER
+    - versionName: projects/$PROJECT_ID/secrets/firebird_pass/versions/latest
+      env: FIREBIRD_PASS
+    - versionName: projects/$PROJECT_ID/secrets/trino_user/versions/latest
+      env: TRINO_USER
+    - versionName: projects/$PROJECT_ID/secrets/oceanbase_host/versions/latest
+      env: OCEANBASE_HOST
+    - versionName: projects/$PROJECT_ID/secrets/oceanbase_user/versions/latest
+      env: OCEANBASE_USER
+    - versionName: projects/$PROJECT_ID/secrets/oceanbase_pass/versions/latest
+      env: OCEANBASE_PASSWORD

 options:
  logging: CLOUD_LOGGING_ONLY
@@ -392,6 +709,7 @@ options:

 substitutions:
  _DATABASE_NAME: test_database
+  _FIREBIRD_DATABASE_NAME: /firebird/test_database.fdb
  _REGION: "us-central1"
  _CLOUD_SQL_POSTGRES_INSTANCE: "cloud-sql-pg-testing"
  _ALLOYDB_POSTGRES_CLUSTER: "alloydb-pg-testing"
@@ -412,3 +730,17 @@ substitutions:
  _DGRAPHURL: "https://play.dgraph.io"
  _COUCHBASE_BUCKET: "couchbase-bucket"
  _COUCHBASE_SCOPE: "couchbase-scope"
+  _LOOKER_VERIFY_SSL: "true"
+  _TIDB_HOST: 127.0.0.1
+  _TIDB_PORT: "4000"
+  _CLICKHOUSE_DATABASE: "default"
+  _CLICKHOUSE_PORT: "8123"
+  _CLICKHOUSE_PROTOCOL: "http"
+  _FIREBIRD_HOST: 127.0.0.1
+  _FIREBIRD_PORT: "3050"
+  _TRINO_HOST: 127.0.0.1
+  _TRINO_PORT: "8080"
+  _TRINO_CATALOG: "memory"
+  _TRINO_SCHEMA: "default"
+  _OCEANBASE_PORT: "2883"
+  _OCEANBASE_DATABASE: "oceanbase"
--- a/.ci/test_with_coverage.sh
+++ b/.ci/test_with_coverage.sh
@@ -0,0 +1,62 @@
+#!/bin/bash
+
+# Arguments:
+# $1: Display name for logs (e.g., "Cloud SQL Postgres")
+# $2: Integration test's package name (e.g., cloudsqlpg)
+# $3, $4, ...: Tool package names for grep (e.g., postgressql), if the
+# integration test specifically check a separate package inside a folder, please
+# specify the full path instead (e.g., postgressql/postgresexecutesql)
+
+DISPLAY_NAME="$1"
+SOURCE_PACKAGE_NAME="$2"
+
+# Construct the test binary name
+TEST_BINARY="${SOURCE_PACKAGE_NAME}.test"
+
+# Construct the full source path
+SOURCE_PATH="sources/${SOURCE_PACKAGE_NAME}/"
+
+# Shift arguments so that $3 and onwards become the list of tool package names
+shift 2
+TOOL_PACKAGE_NAMES=("$@")
+
+COVERAGE_FILE="${TEST_BINARY%.test}_coverage.out"
+FILTERED_COVERAGE_FILE="${TEST_BINARY%.test}_filtered_coverage.out"
+
+export path="github.com/googleapis/genai-toolbox/internal/"
+
+GREP_PATTERN="^mode:|${path}${SOURCE_PATH}"
+# Add each tool package path to the grep pattern
+for tool_name in "${TOOL_PACKAGE_NAMES[@]}"; do
+  if [ -n "$tool_name" ]; then
+    full_tool_path="tools/${tool_name}/"
+    GREP_PATTERN="${GREP_PATTERN}|${path}${full_tool_path}"
+  fi
+done
+
+# Run integration test
+if ! ./"${TEST_BINARY}" -test.v -test.coverprofile="${COVERAGE_FILE}"; then
+  echo "Error: Tests for ${DISPLAY_NAME} failed. Exiting."
+  exit 1
+fi
+
+# Filter source/tool packages
+if ! grep -E "${GREP_PATTERN}" "${COVERAGE_FILE}" > "${FILTERED_COVERAGE_FILE}"; then
+  echo "Warning: Could not filter coverage for ${DISPLAY_NAME}. Filtered file might be empty or invalid."
+fi
+
+# Calculate coverage
+echo "Calculating coverage for ${DISPLAY_NAME}..."
+total_coverage=$(go tool cover -func="${FILTERED_COVERAGE_FILE}" 2>/dev/null | grep "total:" | awk '{print $3}')
+
+
+echo "${DISPLAY_NAME} total coverage: $total_coverage"
+coverage_numeric=$(echo "$total_coverage" | sed 's/%//')
+
+# Check coverage threshold
+if awk -v coverage="$coverage_numeric" 'BEGIN {exit !(coverage < 50)}'; then
+    echo "Coverage failure: ${DISPLAY_NAME} total coverage($total_coverage) is below 50%."
+    exit 1
+else
+    echo "Coverage for ${DISPLAY_NAME} is sufficient."
+fi
--- a/.ci/versioned.release.cloudbuild.yaml
+++ b/.ci/versioned.release.cloudbuild.yaml
@@ -18,19 +18,13 @@ 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 create --name container-builder --driver docker-container --bootstrap --use

-  - id: "push-docker"
-    name: "gcr.io/cloud-builders/docker"
-    waitFor:
-      - "build-docker"
-    script: |
-        #!/usr/bin/env bash
-        export VERSION=$(cat ./cmd/version.txt)
-        docker push ${_DOCKER_URI}:$VERSION
+        export TAGS="-t ${_DOCKER_URI}:$VERSION"
        if [[ $_PUSH_LATEST == 'true' ]]; then
-          docker push ${_DOCKER_URI}:latest
+          export TAGS="$TAGS -t ${_DOCKER_URI}:latest"
        fi
+        docker buildx build --platform linux/amd64,linux/arm64 --build-arg BUILD_TYPE=container.release --build-arg COMMIT_SHA=$(git rev-parse HEAD) $TAGS --push .

  - id: "install-dependencies"
    name: golang:1
@@ -56,7 +50,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 +74,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 +98,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 +122,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,12 +131,13 @@ 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
  dynamicSubstitutions: true
  logging: CLOUD_LOGGING_ONLY # Necessary for custom service account
+  machineType: 'E2_HIGHCPU_32'

 substitutions:
  _REGION: us-central1
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,21 @@
+## Description
+---
+> Should include a concise description of the changes (bug or feature), it's
+> impact, along with a summary of the solution
+
+## PR Checklist
+---
+> Thank you for opening a Pull Request! Before submitting your PR, there are a
+> few things you can do to make sure it goes smoothly:
+- [ ] Make sure you reviewed
+  [CONTRIBUTING.md](https://github.com/googleapis/genai-toolbox/blob/main/CONTRIBUTING.md)
+- [ ] Make sure to open an issue as a
+  [bug/issue](https://github.com/googleapis/langchain-google-alloydb-pg-python/issues/new/choose)
+  before writing your code!  That way we can discuss the change, evaluate
+  designs, and agree on the general idea
+- [ ] Ensure the tests and linter pass
+- [ ] Code coverage does not decrease (if any source code was changed)
+- [ ] Appropriate docs were updated (if necessary)
+- [ ] Make sure to add `!` if this involve a breaking change
+
+🛠️ Fixes #<issue_number_goes_here>
--- a/.github/blunderbuss.yml
+++ b/.github/blunderbuss.yml
@@ -1,8 +1,19 @@
 assign_issues:
-  - kurtisvg
  - Yuan325
  - duwenxin99
+  - averikitsch
+assign_issues_by:
+  - labels:
+    - 'product: bigquery'
+    to:
+    - Genesis929
+    - shobsi
+    - jiaxunwu
+  - labels:
+    - 'product: looker'
+    to:
+    - drstrangelooker
 assign_prs:
-  - kurtisvg
  - Yuan325
-  - duwenxin99
+  - duwenxin99
+  - averikitsch
--- a/.github/labels.yaml
+++ b/.github/labels.yaml
@@ -50,7 +50,7 @@
  color: ffffc7
  description: Desirable enhancement or fix. May not be included in next release.

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

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

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

- name: 'status: awaiting response'
+- name: 'status: waiting for response'
  color: 8befd7
-  description: Status - Awaiting response from author.
+  description: 'Status: reviewer is awaiting feedback or responses from the author before proceeding.'

- name: 'status: awaiting codeowners'
-  color: 8befd7
-  description: Status - Awaiting response from code owners.
+# Product Labels
+- name: 'product: bigquery'
+  color: 5065c7
+  description: 'Product: Assigned to the BigQuery team.'
+# Product Labels
+- name: 'product: looker'
+  color: 5065c7
+  description: 'Product: Assigned to the Looker team.'
--- a/.github/release-please.yml
+++ b/.github/release-please.yml
@@ -18,12 +18,28 @@ releaseType: simple
 versionFile: "cmd/version.txt"
 extraFiles: [
    "README.md",
+    "docs/en/getting-started/colab_quickstart.ipynb",
    "docs/en/getting-started/introduction/_index.md",
    "docs/en/getting-started/local_quickstart.md",
+    "docs/en/getting-started/local_quickstart_js.md",
+    "docs/en/getting-started/local_quickstart_go.md",
    "docs/en/getting-started/mcp_quickstart/_index.md",
-    "docs/en/how-to/deploy_gke.md",
+    "docs/en/samples/alloydb/_index.md",
    "docs/en/samples/bigquery/local_quickstart.md",
-    "docs/en/samples/bigquery/mcp_quickstart.md",
-    "docs/en/getting-started/colab_quickstart.ipynb",
+    "docs/en/samples/bigquery/mcp_quickstart/_index.md",
    "docs/en/samples/bigquery/colab_quickstart_bigquery.ipynb",
+    "docs/en/samples/looker/looker_gemini.md",
+    "docs/en/samples/looker/looker_mcp_inspector.md",
+    "docs/en/how-to/connect-ide/alloydb_pg_mcp.md",
+    "docs/en/how-to/connect-ide/alloydb_pg_admin_mcp.md",
+    "docs/en/how-to/connect-ide/bigquery_mcp.md",
+    "docs/en/how-to/connect-ide/cloud_sql_pg_mcp.md",
+    "docs/en/how-to/connect-ide/cloud_sql_mssql_mcp.md",
+    "docs/en/how-to/connect-ide/cloud_sql_mysql_mcp.md",
+    "docs/en/how-to/connect-ide/firestore_mcp.md",
+    "docs/en/how-to/connect-ide/looker_mcp.md",
+    "docs/en/how-to/connect-ide/mysql_mcp.md",
+    "docs/en/how-to/connect-ide/mssql_mcp.md",
+    "docs/en/how-to/connect-ide/postgres_mcp.md",
+    "docs/en/how-to/connect-ide/spanner_mcp.md",
 ]
--- a/.github/sync-repo-settings.yaml
+++ b/.github/sync-repo-settings.yaml
@@ -31,6 +31,8 @@ branchProtectionRules:
      - "header-check"
    # - Add required status checks like presubmit tests
      - "unit tests (ubuntu-latest)"
+      - "unit tests (windows-latest)"
+      - "unit tests (macos-latest)"
      - "integration-test-pr (toolbox-testing-438616)"
    requiredApprovingReviewCount: 1
    requiresCodeOwnerReviews: true
--- a/.github/workflows/docs_deploy.yaml
+++ b/.github/workflows/docs_deploy.yaml
@@ -39,7 +39,7 @@ jobs:
      group: ${{ github.workflow }}-${{ github.ref }}
      cancel-in-progress: true
    steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
        with:
          fetch-depth: 0 # Fetch all history for .GitInfo and .Lastmod

@@ -55,7 +55,7 @@ jobs:
          node-version: "22"

      - name: Cache dependencies
-        uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4
+        uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4
        with:
          path: ~/.npm
          key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
--- a/.github/workflows/docs_preview_clean.yaml
+++ b/.github/workflows/docs_preview_clean.yaml
@@ -34,7 +34,7 @@ jobs:
      group: "preview-${{ github.event.number }}"
      cancel-in-progress: true
    steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
        with:
          ref: gh-pages

--- 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:
@@ -27,9 +27,19 @@ on:
      - 'docs/**'
      - 'github/workflows/docs**'
      - '.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:
@@ -39,8 +49,10 @@ jobs:
      group: "preview-${{ github.event.number }}"
      cancel-in-progress: true
    steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
        with:
+          # Checkout the PR's HEAD commit (supports forks).
+          ref: ${{ github.event.pull_request.head.sha }}
          fetch-depth: 0 # Fetch all history for .GitInfo and .Lastmod

      - name: Setup Hugo
@@ -55,7 +67,7 @@ jobs:
          node-version: "22"

      - name: Cache dependencies
-        uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4
+        uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4
        with:
          path: ~/.npm
          key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
@@ -70,8 +82,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 +90,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: |
--- a/.github/workflows/lint.yaml
+++ b/.github/workflows/lint.yaml
@@ -55,7 +55,7 @@ jobs:
        with:
          go-version: "1.22"
      - name: Checkout code
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
        with:
          ref: ${{ github.event.pull_request.head.sha }}
          repository: ${{ github.event.pull_request.head.repo.full_name }}
--- a/.github/workflows/schedule_reporter.yml
+++ b/.github/workflows/schedule_reporter.yml
@@ -26,4 +26,4 @@ jobs:
        contents: 'read'
    uses: ./.github/workflows/cloud_build_failure_reporter.yml
    with:
-      trigger_names: "toolbox-test-nightly,toolbox-test-on-merge"
+      trigger_names: "toolbox-test-nightly,toolbox-test-on-merge,toolbox-continuous-release"
--- a/.github/workflows/sync-labels.yaml
+++ b/.github/workflows/sync-labels.yaml
@@ -29,7 +29,7 @@ jobs:
      issues: 'write'
      pull-requests: 'write'
    steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
      - uses: micnncim/action-label-syncer@3abd5ab72fda571e69fffd97bd4e0033dd5f495c # v1.3.0
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
--- a/.github/workflows/tests.yaml
+++ b/.github/workflows/tests.yaml
@@ -16,7 +16,7 @@ name: tests
 on:
  push:
    branches:
-    - 'main'
+      - "main"
  pull_request:
  pull_request_target:
    types: [labeled]
@@ -32,13 +32,12 @@ jobs:
    runs-on: ${{ matrix.os }}
    strategy:
      matrix:
-        # os: [macos-latest, windows-latest, ubuntu-latest]
-        os: [ubuntu-latest]
+        os: [macos-latest, windows-latest, ubuntu-latest]
      fail-fast: false
    permissions:
-      contents: 'read'
-      issues: 'write'
-      pull-requests: 'write'
+      contents: "read"
+      issues: "write"
+      pull-requests: "write"
    steps:
      - name: Remove PR label
        if: "${{ github.event.action == 'labeled' && github.event.label.name == 'tests: run' }}"
@@ -63,7 +62,7 @@ jobs:
          go-version: "1.22"

      - name: Checkout code
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
        with:
          ref: ${{ github.event.pull_request.head.sha }}
          repository: ${{ github.event.pull_request.head.repo.full_name }}
@@ -75,7 +74,10 @@ jobs:
      - name: Build
        run: go build -v ./...

-      - name: Run tests
+      - name: Run tests with coverage
+        if: ${{ runner.os == 'Linux' }}
+        env:
+          GOTOOLCHAIN: go1.25.0+auto
        run: |
          source_dir="./internal/sources/*"
          tool_dir="./internal/tools/*"
@@ -85,7 +87,13 @@ jobs:
          go test -race -cover -coverprofile=coverage.out -v $included_packages
          go test -race -v ./internal/sources/... ./internal/tools/... ./internal/auth/...

+      - name: Run tests without coverage
+        if: ${{ runner.os != 'Linux' }}
+        run: |
+          go test -race -v ./internal/... ./cmd/...
+
      - name: Check coverage
+        if: ${{ runner.os == 'Linux' }}
        run: |
          FILE_TO_EXCLUDE="github.com/googleapis/genai-toolbox/internal/server/config.go"
          ESCAPED_PATH=$(echo "$FILE_TO_EXCLUDE" | sed 's/\//\\\//g; s/\./\\\./g')
--- a/.gitignore
+++ b/.gitignore
@@ -4,6 +4,9 @@
 # vscode
 .vscode/

+# idea
+.idea/
+
 # npm
 node_modules

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

 # coverage
 .coverage
+
+# executable
+genai-toolbox
+toolbox
--- a/.hugo/assets/scss/_styles_project.scss
+++ b/.hugo/assets/scss/_styles_project.scss
@@ -0,0 +1 @@
+@import 'td/code-dark';
--- a/.hugo/hugo.toml
+++ b/.hugo/hugo.toml
@@ -8,6 +8,8 @@ defaultContentLanguageInSubdir = false
 enableGitInfo = true
 enableRobotsTXT = true

+ignoreFiles = ["quickstart/shared", "quickstart/python", "quickstart/js", "quickstart/go"]
+
 [languages]
  [languages.en]
    languageName ="English"
@@ -48,14 +50,23 @@ enableRobotsTXT = true
  pre = "<i class='fa-brands fa-github'></i>"

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

 [outputFormats]
-  [outputFormats.TXT]
+  [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", "TXT"]
+  home = ["HTML", "RSS", "LLMS", "LLMS-FULL"]
--- 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
--- a/.hugo/layouts/shortcodes/include.html
+++ b/.hugo/layouts/shortcodes/include.html
@@ -0,0 +1,2 @@
+{{ $file := .Get 0 }}
+{{ (printf "%s%s" .Page.File.Dir $file) | readFile | replaceRE "^---[\\s\\S]+?---" "" | safeHTML }}
--- a/.hugo/layouts/shortcodes/ipynb.html
+++ b/.hugo/layouts/shortcodes/ipynb.html
@@ -0,0 +1,47 @@
+{{ $notebookFile := .Get 0 }}
+{{ with .Page.Resources.Get $notebookFile }}
+
+  {{ $content := .Content | transform.Unmarshal }}
+  {{ range $content.cells }}
+
+    {{ if eq .cell_type "markdown" }}
+      <div class="notebook-markdown">
+        {{ $markdown := "" }}
+        {{ range .source }}{{ $markdown = print $markdown . }}{{ end }}
+        {{ $markdown | markdownify }}
+      </div>
+    {{ end }}
+
+    {{ if eq .cell_type "code" }}
+      <div class="notebook-code">
+        {{ $code := "" }}
+        {{ range .source }}{{ $code = print $code . }}{{ end }}
+        {{ highlight $code "python" "" }}
+
+        {{ range .outputs }}
+          <div class="notebook-output">
+            {{ with .text }}
+              <pre class="notebook-stream"><code>{{- range . }}{{ . }}{{ end -}}</code></pre>
+            {{ end }}
+
+            {{ with .data }}
+              {{ with index . "image/png" }}
+                <img src="data:image/png;base64,{{ . }}" alt="Notebook output image">
+              {{ end }}
+              {{ with index . "image/jpeg" }}
+                <img src="data:image/jpeg;base64,{{ . }}" alt="Notebook output image">
+              {{ end }}
+              {{ with index . "text/html" }}
+                {{ $html := "" }}
+                {{ range . }}{{ $html = print $html . }}{{ end }}
+                {{ $html | safeHTML }}
+              {{ end }}
+            {{ end }}
+          </div>
+        {{ end }}
+      </div>
+    {{ end }}
+  {{ end }}
+{{ else }}
+  <p style="color: red;">Error: Notebook '{{ $notebookFile }}' not found in page resources.</p>
+{{ end }}
--- a/.hugo/layouts/shortcodes/regionInclude.html
+++ b/.hugo/layouts/shortcodes/regionInclude.html
@@ -0,0 +1,49 @@
+{{/*
+  snippet.html
+  Usage:
+    {{< regionInclude "filename.md" "region_name" >}}
+    {{< regionInclude "filename.python" "region_name" "python" >}}
+*/}}
+
+{{ $file := .Get 0 }}
+{{ $region := .Get 1 }}
+{{ $lang := .Get 2 | default "text" }}
+{{ $path := printf "%s%s" .Page.File.Dir $file }}
+
+{{ if or (not $file) (eq $file "") }}
+  {{ errorf "The file parameter (first argument) is required and must be non-empty in %s" .Page.File.Path }}
+{{ end }}
+{{ if or (not $region) (eq $region "") }}
+  {{ errorf "The region parameter (second argument) is required and must be non-empty in %s" .Page.File.Path }}
+{{ end }}
+{{ if not (fileExists $path) }}
+  {{ errorf "File %q not found (referenced in %s)" $path .Page.File.Path }}
+{{ end }}
+
+{{ $content := readFile $path }}
+{{ $start_tag := printf "[START %s]" $region }}
+{{ $end_tag := printf "[END %s]" $region }}
+
+{{ $snippet := "" }}
+{{ $in_snippet := false }}
+{{ range split $content "\n" }}
+  {{ if $in_snippet }}
+    {{ if in . $end_tag }}
+      {{ $in_snippet = false }}
+    {{ else }}
+      {{ $snippet = printf "%s%s\n" $snippet . }}
+    {{ end }}
+  {{ else if in . $start_tag }}
+    {{ $in_snippet = true }}
+  {{ end }}
+{{ end }}
+
+{{ if eq (trim $snippet "") "" }}
+  {{ errorf "Region %q not found or empty in file %s (referenced in %s)" $region $file .Page.File.Path }}
+{{ end }}
+
+{{ if eq $lang "text" }}
+  {{ $snippet | markdownify }}
+{{ else }}
+  {{ highlight (trim $snippet "\n") $lang "" }}
+{{ end }}
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,186 @@
 # Changelog

+## [0.13.0](https://github.com/googleapis/genai-toolbox/compare/v0.12.0...v0.13.0) (2025-08-27)
+
+### ⚠ BREAKING CHANGES
+
+* **prebuilt/alloydb:** Add bearer token support for alloydb-wait-for-operation ([#1183](https://github.com/googleapis/genai-toolbox/issues/1183))
+
+
+### Features
+
+* Add capability to set default for environment variable in config ([#1248](https://github.com/googleapis/genai-toolbox/issues/1248)) ([5bcd52e](https://github.com/googleapis/genai-toolbox/commit/5bcd52e7dcd0773ded723585f4abe29d044e1540))
+* **firebird:** Add Firebird SQL 2.5+ source and tool ([#1011](https://github.com/googleapis/genai-toolbox/issues/1011)) ([4f6b806](https://github.com/googleapis/genai-toolbox/commit/4f6b806de947efc4e12bdb50dff7781aedb7b966))
+* **oceanbase:** Add Oceanbase source and tool  ([#895](https://github.com/googleapis/genai-toolbox/issues/895)) ([6fc4982](https://github.com/googleapis/genai-toolbox/commit/6fc49826d43f46c84028e752ebebddf3d94b3d13))
+* **server/mcp:** Support `ping` mechanism ([#1178](https://github.com/googleapis/genai-toolbox/issues/1178)) ([5dcc66c](https://github.com/googleapis/genai-toolbox/commit/5dcc66c84fa72c75ec50a9ac5198018212ec2979))
+* **server:** Fail-fast on environment variable substitution ([#1177](https://github.com/googleapis/genai-toolbox/issues/1177)) ([212aaba](https://github.com/googleapis/genai-toolbox/commit/212aaba74c8b431de8a5f7b9822a0af4afcaaa0e))
+* **server:** Implement Tool call auth error propagation ([#1235](https://github.com/googleapis/genai-toolbox/issues/1235)) ([b94a021](https://github.com/googleapis/genai-toolbox/commit/b94a021ca11c6637cf8038449483b5e75f2012b3))
+* **sources/bigquery:** Add support for user-credential passthrough  ([#1067](https://github.com/googleapis/genai-toolbox/issues/1067)) ([650e2e2](https://github.com/googleapis/genai-toolbox/commit/650e2e26f51bff75ce66343f64944d0a89a58b69))
+* **tool/looker:** Add support for `description` field in looker tool ([#1199](https://github.com/googleapis/genai-toolbox/issues/1199)) ([97f0dd2](https://github.com/googleapis/genai-toolbox/commit/97f0dd2acf26caf28ecad65abea8779c196a27f1))
+* **tools/bigquery-ask-data-insights:** Add bigquery `ask-data-insights` tool ([#932](https://github.com/googleapis/genai-toolbox/issues/932)) ([7651357](https://github.com/googleapis/genai-toolbox/commit/7651357d424a2b6656d8b6818cebc5c8a86ed053))
+* **tools/bigquery-forecast:** Add bigqueryforecast tool ([#1148](https://github.com/googleapis/genai-toolbox/issues/1148)) ([2ad0ccf](https://github.com/googleapis/genai-toolbox/commit/2ad0ccf83df542340087742468d6762f81eedee6))
+* **tools/firestore-add-documents:** Add firestore-add-documents tool ([#1107](https://github.com/googleapis/genai-toolbox/issues/1107)) ([ee4a70a](https://github.com/googleapis/genai-toolbox/commit/ee4a70a0e82b346b07b5b4c60dfa060da2273f50))
+* **tools/firestore-update-document:** Add firestore-update-document tool ([#1191](https://github.com/googleapis/genai-toolbox/issues/1191)) ([0010123](https://github.com/googleapis/genai-toolbox/commit/00101232a39c70288aac5715649c184858d351e3))
+* **tools/looker:** Control over whether hidden objects are surfaced ([#1222](https://github.com/googleapis/genai-toolbox/issues/1222)) ([bc91559](https://github.com/googleapis/genai-toolbox/commit/bc91559cc4e5b20385b84cc562b624fabf7e47a8))
+* **trino:** Add Trino source and tools ([#948](https://github.com/googleapis/genai-toolbox/issues/948)) ([7dd123b](https://github.com/googleapis/genai-toolbox/commit/7dd123b3d76b8eb2b74b5d960959c1f90684b37e))
+
+
+### Bug Fixes
+
+* **tools/looker:** Lookergetdashboards uses proper Authorized helper func ([#1255](https://github.com/googleapis/genai-toolbox/issues/1255)) ([00866bc](https://github.com/googleapis/genai-toolbox/commit/00866bc7fc33115c547213e60316ae889735fdbb))
+* **tools/mongodb-find-one:** ProjectPayload unmarshaling ([#1167](https://github.com/googleapis/genai-toolbox/issues/1167)) ([8ea6a98](https://github.com/googleapis/genai-toolbox/commit/8ea6a98bd9096ba97722e5f807366887e864004f))
+* **tools/mysql:** Fix encoded text for mysql ([#1161](https://github.com/googleapis/genai-toolbox/issues/1161)) ([a37cfa8](https://github.com/googleapis/genai-toolbox/commit/a37cfa841d151b9995d4fab73cfc5e4d30d2cc57)), closes [#840](https://github.com/googleapis/genai-toolbox/issues/840)
+
+## [0.12.0](https://github.com/googleapis/genai-toolbox/compare/v0.11.0...v0.12.0) (2025-08-14)
+
+
+### Features
+
+* **prebuiltconfig:** Introduce additional parameter to limit context in list_tables ([#1151](https://github.com/googleapis/genai-toolbox/issues/1151)) ([497d3b1](https://github.com/googleapis/genai-toolbox/commit/497d3b126da252a4b59806ca2ca3c56e78efc13d))
+* **prebuiltconfig/alloydb-admin:** Add list cluster, instance and users ([#1126](https://github.com/googleapis/genai-toolbox/issues/1126)) ([b42c139](https://github.com/googleapis/genai-toolbox/commit/b42c139158650fb1f3b696965e840c52e2016bf0))
+* **prebuiltconfig/alloydb-admin:** Add tool to create user via Built in user type or IAM ([#1130](https://github.com/googleapis/genai-toolbox/issues/1130)) ([f5bcb9c](https://github.com/googleapis/genai-toolbox/commit/f5bcb9c755a2c1747d0beeda568b6217d7420e7a))
+* **source/http:** Add User Agent to `http` invocations ([#1102](https://github.com/googleapis/genai-toolbox/issues/1102)) ([6f55b78](https://github.com/googleapis/genai-toolbox/commit/6f55b78e96b8c7aa9aca601cfae4d62f3e1eb42b))
+* **sources/postgres:** Add support for `queryParams` ([#1047](https://github.com/googleapis/genai-toolbox/issues/1047)) ([7b57251](https://github.com/googleapis/genai-toolbox/commit/7b5725140279de21fece45e860945b7a7d23e7d0)), closes [#963](https://github.com/googleapis/genai-toolbox/issues/963)
+* **tools/bigquery-execute-sql:** Add dry run support ([#1057](https://github.com/googleapis/genai-toolbox/issues/1057)) ([1cac9b5](https://github.com/googleapis/genai-toolbox/commit/1cac9b5b378153c7dc65ff3dfb4ebd852b715a10))
+* **tools/dataplex-search-aspect-types:** Add support for `dataplex-search-aspect-types` tool ([#1061](https://github.com/googleapis/genai-toolbox/issues/1061)) ([d940187](https://github.com/googleapis/genai-toolbox/commit/d940187c851666cc201f519665fb4f2e1478465c))
+* **tools/looker:** Add `looker-make-look` tool to create Looks ([#1099](https://github.com/googleapis/genai-toolbox/issues/1099)) ([61d9489](https://github.com/googleapis/genai-toolbox/commit/61d94893448f633a5f2b9d7f0744ab40704af824))
+* **tools/looker:** Add visualizations to `query-url` tool ([#1090](https://github.com/googleapis/genai-toolbox/issues/1090)) ([5bf2758](https://github.com/googleapis/genai-toolbox/commit/5bf275846a268a8d305d6392fa4e8e79e365f00d))
+* **tools/looker:** New Looker tools for dashboards ([#1118](https://github.com/googleapis/genai-toolbox/issues/1118)) ([42be3f5](https://github.com/googleapis/genai-toolbox/commit/42be3f550ceab34baf43fe2a246ded7a09cff8e3))
+* **ui:** Add login with google button for automatic id token retrieval ([#1044](https://github.com/googleapis/genai-toolbox/issues/1044)) ([d91bdfc](https://github.com/googleapis/genai-toolbox/commit/d91bdfcbdcbf5fcae6e17770c88c5ffba4115d67))
+
+
+### Bug Fixes
+
+* Correct the capitalization of `map` manifests ([#1139](https://github.com/googleapis/genai-toolbox/issues/1139)) ([0b0457c](https://github.com/googleapis/genai-toolbox/commit/0b0457c8e6b78f53a2f1929c05d46fb31421fbca))
+* Remove unnecessary fields from `map` parameter manifests ([#1138](https://github.com/googleapis/genai-toolbox/issues/1138)) ([fbe8c1a](https://github.com/googleapis/genai-toolbox/commit/fbe8c1a9c0f28797443bf9cb32d63bfbc1072881))
+* **tools/looker:** Add authorized invocation feature to all Looker tools ([#1091](https://github.com/googleapis/genai-toolbox/issues/1091)) ([3b1cce7](https://github.com/googleapis/genai-toolbox/commit/3b1cce72e7ff4f6b3a0a31db0564dc45b8302caa))
+* Update ui info log to reflect port ([#1125](https://github.com/googleapis/genai-toolbox/issues/1125)) ([6d691d5](https://github.com/googleapis/genai-toolbox/commit/6d691d582f18137de504d39f372c5104b7392bff))
+
+## [0.11.0](https://github.com/googleapis/genai-toolbox/compare/v0.11.0...v0.11.0) (2025-08-05)
+
+
+### ⚠ BREAKING CHANGES
+
+* **tools/bigquery-sql:** Ensure invoke always returns a non-null value ([#1020](https://github.com/googleapis/genai-toolbox/issues/1020)) ([9af55b6](https://github.com/googleapis/genai-toolbox/commit/9af55b651d836f268eda342ea27380e7c9967c94))
+* **tools/bigquery-execute-sql:** Update the return messages ([#1034](https://github.com/googleapis/genai-toolbox/issues/1034)) ([051e686](https://github.com/googleapis/genai-toolbox/commit/051e686476a781ca49f7617764d507916a1188b8))
+
+### Features
+
+* Add TiDB source and tool ([#829](https://github.com/googleapis/genai-toolbox/issues/829)) ([6eaf36a](https://github.com/googleapis/genai-toolbox/commit/6eaf36ac8505d523fa4f5a4ac3c97209fd688cef))
+* Interactive web UI for Toolbox  ([#1065](https://github.com/googleapis/genai-toolbox/issues/1065)) ([8749b03](https://github.com/googleapis/genai-toolbox/commit/8749b030035e65361047c4ead13dfacb8e9a9b59))
+* **prebuiltconfigs/cloud-sql-postgres:** Introduce additional parameter to limit context in list tables ([#1062](https://github.com/googleapis/genai-toolbox/issues/1062)) ([c3a58e1](https://github.com/googleapis/genai-toolbox/commit/c3a58e1d1678dc14d8de5006511df597fd75faa3))
+* **tools/looker-query-url:** Add support for `looker-query-url` tool ([#1015](https://github.com/googleapis/genai-toolbox/issues/1015)) ([327ddf0](https://github.com/googleapis/genai-toolbox/commit/327ddf0439058aa5ecd2c7ae8251fcde6aeff18c))
+* **tools/dataplex-lookup-entry:** Add support for `dataplex-lookup-entry` tool ([#1009](https://github.com/googleapis/genai-toolbox/issues/1009)) ([5fa1660](https://github.com/googleapis/genai-toolbox/commit/5fa1660fc8631989b4d13abea205b6426bb506a5))
+
+### Bug Fixes
+
+* **tools/bigquery,mssql,mysql,postgres,spanner,tidb:** Add query logging to execute-sql tools ([#1069](https://github.com/googleapis/genai-toolbox/issues/1069)) ([0527532]([https://github.com/googleapis/genai-toolbox/commit/0527532bd7085ef9eb8f9c30f430a2f2f35cef32))
+
+## [0.10.0](https://github.com/googleapis/genai-toolbox/compare/v0.9.0...v0.10.0) (2025-07-25)
+
+
+### Features
+
+* Add `Map` parameters support ([#928](https://github.com/googleapis/genai-toolbox/issues/928)) ([4468bc9](https://github.com/googleapis/genai-toolbox/commit/4468bc920bbf27dce4ab160197587b7c12fcd20f))
+* Add Dataplex source and tool ([#847](https://github.com/googleapis/genai-toolbox/issues/847)) ([30c16a5](https://github.com/googleapis/genai-toolbox/commit/30c16a559e8d49a9a717935269e69b97ec25519a))
+* Add Looker source and tool ([#923](https://github.com/googleapis/genai-toolbox/issues/923)) ([c67e01b](https://github.com/googleapis/genai-toolbox/commit/c67e01bcf998e7b884be30ebb1fd277c89ed6ffc))
+* Add support for null optional parameter ([#802](https://github.com/googleapis/genai-toolbox/issues/802)) ([a817b12](https://github.com/googleapis/genai-toolbox/commit/a817b120ca5e09ce80eb8d7544ebbe81fc28b082)), closes [#736](https://github.com/googleapis/genai-toolbox/issues/736)
+* **prebuilt/alloydb-admin-config:** Add alloydb control plane as a prebuilt config ([#937](https://github.com/googleapis/genai-toolbox/issues/937)) ([0b28b72](https://github.com/googleapis/genai-toolbox/commit/0b28b72aa0ca2cdc87afbddbeb7f4dbb9688593d))
+* **prebuilt/mysql,prebuilt/mssql:** Add generic mysql and mssql prebuilt tools ([#983](https://github.com/googleapis/genai-toolbox/issues/983)) ([c600c30](https://github.com/googleapis/genai-toolbox/commit/c600c30374443b6106c1f10b60cd334fd202789b))
+* **server/mcp:** Support MCP version 2025-06-18 ([#898](https://github.com/googleapis/genai-toolbox/issues/898)) ([313d3ca](https://github.com/googleapis/genai-toolbox/commit/313d3ca0d084a3a6e7ac9a21a862aa31bf3edadd))
+* **sources/mssql:** Add support for encrypt connection parameter ([#874](https://github.com/googleapis/genai-toolbox/issues/874)) ([14a868f](https://github.com/googleapis/genai-toolbox/commit/14a868f2a0780b94c2ca104419b2ff098778303b))
+* **sources/firestore:** Add Firestore as Source ([#786](https://github.com/googleapis/genai-toolbox/issues/786)) ([2bb790e](https://github.com/googleapis/genai-toolbox/commit/2bb790e4f8194b677fe0ba40122d409d0e3e687e))
+* **sources/mongodb:** Add MongoDB Source ([#969](https://github.com/googleapis/genai-toolbox/issues/969)) ([74dbd61](https://github.com/googleapis/genai-toolbox/commit/74dbd6124daab6192dd880dbd1d15f36861abf74))
+* **tools/alloydb-wait-for-operation:** Add wait for operation tool with exponential backoff ([#920](https://github.com/googleapis/genai-toolbox/issues/920)) ([3f6ec29](https://github.com/googleapis/genai-toolbox/commit/3f6ec2944ede18ee02b10157cc048145bdaec87a))
+* **tools/mongodb-aggregate:** Add MongoDB `aggregate` Tools ([#977](https://github.com/googleapis/genai-toolbox/issues/977)) ([bd399bb](https://github.com/googleapis/genai-toolbox/commit/bd399bb0fb7134469345ed9a1111ea4209440867))
+* **tools/mongodb-delete:** Add MongoDB `delete` Tools ([#974](https://github.com/googleapis/genai-toolbox/issues/974)) ([78e9752](https://github.com/googleapis/genai-toolbox/commit/78e9752f620e065246f3e7b9d37062e492247c8a))
+* **tools/mongodb-find:** Add MongoDB `find` Tools ([#970](https://github.com/googleapis/genai-toolbox/issues/970)) ([a747475](https://github.com/googleapis/genai-toolbox/commit/a7474752d8d7ea7af1e80a3c4533d2fd4154d897))
+* **tools/mongodb-insert:** Add MongoDB `insert` Tools ([#975](https://github.com/googleapis/genai-toolbox/issues/975)) ([4c63f0c](https://github.com/googleapis/genai-toolbox/commit/4c63f0c1e402817a0c8fec611635e99290308d0e))
+* **tools/mongodb-update:** Add MongoDB `update` Tools ([#972](https://github.com/googleapis/genai-toolbox/issues/972)) ([dfde52c](https://github.com/googleapis/genai-toolbox/commit/dfde52ca9a8e25e2f3944f52b4c2e307072b6c37))
+* **tools/neo4j-execute-cypher:** Add neo4j-execute-cypher for Neo4j sources ([#946](https://github.com/googleapis/genai-toolbox/issues/946)) ([81d0505](https://github.com/googleapis/genai-toolbox/commit/81d05053b2e08338fd6eabe4849c309064f76b6b))
+* **tools/neo4j-schema:** Add neo4j-schema tool ([#978](https://github.com/googleapis/genai-toolbox/issues/978)) ([be7db3d](https://github.com/googleapis/genai-toolbox/commit/be7db3dff263625ce64fdb726e81164996b7a708))
+* **tools/wait:** Create wait for tool ([#885](https://github.com/googleapis/genai-toolbox/issues/885)) ([ed5ef4c](https://github.com/googleapis/genai-toolbox/commit/ed5ef4caea10ba1dbc49c0fc0a0d2b91cf341d3b))
+
+
+### Bug Fixes
+
+* Fix document preview pipeline for forked PRs ([#950](https://github.com/googleapis/genai-toolbox/issues/950)) ([481cc60](https://github.com/googleapis/genai-toolbox/commit/481cc608bae807d9e92497bc8863066916f7ef21))
+* **prebuilt/firestore:** Mark database field as required in the firestore prebuilt tools ([#959](https://github.com/googleapis/genai-toolbox/issues/959)) ([15417d4](https://github.com/googleapis/genai-toolbox/commit/15417d4e0c7b173e81edbbeb672e53884d186104))
+* **prebuilt/cloud-sql-mssql:** Correct source reference for execute_sql tool in cloud-sql-mssql.yaml prebuilt config ([#938](https://github.com/googleapis/genai-toolbox/issues/938)) ([d16728e](https://github.com/googleapis/genai-toolbox/commit/d16728e5c603eab37700876a6ddacbf709fd5823))
+* **prebuilt/cloud-sql-mysql:** Update list_table tool ([#924](https://github.com/googleapis/genai-toolbox/issues/924)) ([2083ba5](https://github.com/googleapis/genai-toolbox/commit/2083ba50483951e9ee6101bb832aa68823cd96a5))
+* Replace 'float' with 'number' in McpManifest ([#985](https://github.com/googleapis/genai-toolbox/issues/985)) ([59e23e1](https://github.com/googleapis/genai-toolbox/commit/59e23e17250a516e3931996114f32ac6526a4f8e))
+* **server/api:** Add logger to context in tool invoke handler ([#891](https://github.com/googleapis/genai-toolbox/issues/891)) ([8ce311f](https://github.com/googleapis/genai-toolbox/commit/8ce311f256481e8f11ecb4aa505b95a562f394ef))
+* **sources/looker:** Add agent tag to Looker API calls. ([#966](https://github.com/googleapis/genai-toolbox/issues/966)) ([f55dd6f](https://github.com/googleapis/genai-toolbox/commit/f55dd6fcd099f23bd89df62b268c4a53d16f3bac))
+* **tools/bigquery-execute-sql:** Ensure invoke always returns a non-null value ([#925](https://github.com/googleapis/genai-toolbox/issues/925)) ([9a55b80](https://github.com/googleapis/genai-toolbox/commit/9a55b804821a6ccfcd157bcfaee7e599c4a5cb63))
+* **tools/mysqlsql:** Unmarshal json data from database during invoke ([#979](https://github.com/googleapis/genai-toolbox/issues/979)) ([ccc3498](https://github.com/googleapis/genai-toolbox/commit/ccc3498cf0a4c43eb909e3850b9e6f582cd48f2a)), closes [#840](https://github.com/googleapis/genai-toolbox/issues/840)
+
+## [0.9.0](https://github.com/googleapis/genai-toolbox/compare/v0.8.0...v0.9.0) (2025-07-11)
+
+
+### Features
+
+* Dynamic reloading for toolbox config ([#800](https://github.com/googleapis/genai-toolbox/issues/800)) ([4c240ac](https://github.com/googleapis/genai-toolbox/commit/4c240ac3c961cd14738c998ba2d10d5235ef523e))
+* **sources/mysql:** Add queryTimeout support to MySQL source ([#830](https://github.com/googleapis/genai-toolbox/issues/830)) ([391cb5b](https://github.com/googleapis/genai-toolbox/commit/391cb5bfe845e554411240a1d9838df5331b25fa))
+* **tools/bigquery:** Add optional projectID parameter to bigquery tools ([#799](https://github.com/googleapis/genai-toolbox/issues/799)) ([c6ab74c](https://github.com/googleapis/genai-toolbox/commit/c6ab74c5dad53a0e7885a18438ab3be36b9b7cb3))
+
+
+### Bug Fixes
+
+* Cleanup unassigned err log ([#857](https://github.com/googleapis/genai-toolbox/issues/857)) ([c081ace](https://github.com/googleapis/genai-toolbox/commit/c081ace46bb24cb3fd2adb21d519489be0d3f3c3))
+* Fix docs preview deployment pipeline ([#787](https://github.com/googleapis/genai-toolbox/issues/787)) ([0a93b04](https://github.com/googleapis/genai-toolbox/commit/0a93b0482c8d3c64b324e67408d408f5576ecaf3))
+* **tools:** Nil parameter error when arrays are used ([#801](https://github.com/googleapis/genai-toolbox/issues/801)) ([2bdcc08](https://github.com/googleapis/genai-toolbox/commit/2bdcc0841ab37d18e2f0d6fe63fb6f10da3e302b))
+* Trigger reload on additional fsnotify operations ([#854](https://github.com/googleapis/genai-toolbox/issues/854)) ([aa8dbec](https://github.com/googleapis/genai-toolbox/commit/aa8dbec97095cf0d7ac771c8084a84e2d3d8ce4e))
+
+## [0.8.0](https://github.com/googleapis/genai-toolbox/compare/v0.7.0...v0.8.0) (2025-07-02)
+
+
+### ⚠ BREAKING CHANGES
+
+* **postgres,mssql,cloudsqlmssql:** encode source connection url for  sources ([#727](https://github.com/googleapis/genai-toolbox/issues/727))
+
+### Features
+
+* Add support for multiple YAML configuration files ([#760](https://github.com/googleapis/genai-toolbox/issues/760)) ([40679d7](https://github.com/googleapis/genai-toolbox/commit/40679d700eded50d19569923e2a71c51e907a8bf))
+* Add support for optional parameters ([#617](https://github.com/googleapis/genai-toolbox/issues/617)) ([4827771](https://github.com/googleapis/genai-toolbox/commit/4827771b78dee9a1284a898b749509b472061527)), closes [#475](https://github.com/googleapis/genai-toolbox/issues/475)
+* **mcp:** Support MCP version 2025-03-26 ([#755](https://github.com/googleapis/genai-toolbox/issues/755)) ([474df57](https://github.com/googleapis/genai-toolbox/commit/474df57d62de683079f8d12c31db53396a545fd1))
+* **sources/http:** Support disable SSL verification for HTTP Source ([#674](https://github.com/googleapis/genai-toolbox/issues/674)) ([4055b0c](https://github.com/googleapis/genai-toolbox/commit/4055b0c3569c527560d7ad34262963b3dd4e282d))
+* **tools/bigquery:** Add templateParameters field for bigquery ([#699](https://github.com/googleapis/genai-toolbox/issues/699)) ([f5f771b](https://github.com/googleapis/genai-toolbox/commit/f5f771b0f3d159630ff602ff55c6c66b61981446))
+* **tools/bigtable:** Add templateParameters field for bigtable ([#692](https://github.com/googleapis/genai-toolbox/issues/692)) ([1c06771](https://github.com/googleapis/genai-toolbox/commit/1c067715fac06479eb0060d7067b73dba099ed92))
+* **tools/couchbase:** Add templateParameters field for couchbase ([#723](https://github.com/googleapis/genai-toolbox/issues/723)) ([9197186](https://github.com/googleapis/genai-toolbox/commit/9197186b8bea1ac4ec1b39c9c5c110807c8b2ba9))
+* **tools/http:** Add support for HTTP Tool pathParams ([#726](https://github.com/googleapis/genai-toolbox/issues/726)) ([fd300dc](https://github.com/googleapis/genai-toolbox/commit/fd300dc606d88bf9f7bba689e2cee4e3565537dd))
+* **tools/redis:** Add Redis Source and Tool ([#519](https://github.com/googleapis/genai-toolbox/issues/519)) ([f0aef29](https://github.com/googleapis/genai-toolbox/commit/f0aef29b0c2563e2a00277fbe2784f39f16d2835))
+* **tools/spanner:** Add templateParameters field for spanner ([#691](https://github.com/googleapis/genai-toolbox/issues/691)) ([075dfa4](https://github.com/googleapis/genai-toolbox/commit/075dfa47e1fd92be4847bd0aec63296146b66455))
+* **tools/sqlitesql:** Add templateParameters field for sqlitesql ([#687](https://github.com/googleapis/genai-toolbox/issues/687)) ([75e254c](https://github.com/googleapis/genai-toolbox/commit/75e254c0a4ce690ca5fa4d1741550ce54734b226))
+* **tools/valkey:** Add Valkey Source and Tool ([#532](https://github.com/googleapis/genai-toolbox/issues/532)) ([054ec19](https://github.com/googleapis/genai-toolbox/commit/054ec198b97ba9f36f67dd12b2eff0cc6bc4d080))
+
+
+### Bug Fixes
+
+* **bigquery,mssql:** Fix panic on tools with array param ([#722](https://github.com/googleapis/genai-toolbox/issues/722)) ([7a6644c](https://github.com/googleapis/genai-toolbox/commit/7a6644cf0c5413e5c803955c88a2cfd0a2233ed3))
+* **postgres,mssql,cloudsqlmssql:** Encode source connection url for  sources ([#727](https://github.com/googleapis/genai-toolbox/issues/727)) ([67964d9](https://github.com/googleapis/genai-toolbox/commit/67964d939f27320b63b5759f4b3f3fdaa0c76fbf)), closes [#717](https://github.com/googleapis/genai-toolbox/issues/717)
+* Set default value to field's type during unmarshalling ([#774](https://github.com/googleapis/genai-toolbox/issues/774)) ([fafed24](https://github.com/googleapis/genai-toolbox/commit/fafed2485839cf1acc1350e8a24103d2e6356ee0)), closes [#771](https://github.com/googleapis/genai-toolbox/issues/771)
+* **server/mcp:** Do not listen from port for stdio ([#719](https://github.com/googleapis/genai-toolbox/issues/719)) ([d51dbc7](https://github.com/googleapis/genai-toolbox/commit/d51dbc759ba493021d3ec6f5417fc04c21f7044f)), closes [#711](https://github.com/googleapis/genai-toolbox/issues/711)
+* **tools/mysqlexecutesql:** Handle nil panic and connection leak in Invoke ([#757](https://github.com/googleapis/genai-toolbox/issues/757)) ([7badba4](https://github.com/googleapis/genai-toolbox/commit/7badba42eefb34252be77b852a57d6bd78dd267d))
+* **tools/mysqlsql:** Handle nil panic and connection leak in invoke ([#758](https://github.com/googleapis/genai-toolbox/issues/758)) ([cbb4a33](https://github.com/googleapis/genai-toolbox/commit/cbb4a333517313744800d148840312e56340f3fd))
+
+## [0.7.0](https://github.com/googleapis/genai-toolbox/compare/v0.6.0...v0.7.0) (2025-06-10)
+
+
+### 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)


--- a/CODE_OF_CONDUCT.md
+++ b/CODE_OF_CONDUCT.md
@@ -14,21 +14,21 @@ race, religion, or sexual identity and orientation.
 Examples of behavior that contributes to creating a positive environment
 include:

-*   Using welcoming and inclusive language
-*   Being respectful of differing viewpoints and experiences
-*   Gracefully accepting constructive criticism
-*   Focusing on what is best for the community
-*   Showing empathy towards other community members
+* Using welcoming and inclusive language
+* Being respectful of differing viewpoints and experiences
+* Gracefully accepting constructive criticism
+* Focusing on what is best for the community
+* Showing empathy towards other community members

 Examples of unacceptable behavior by participants include:

-*   The use of sexualized language or imagery and unwelcome sexual attention or
+* The use of sexualized language or imagery and unwelcome sexual attention or
    advances
-*   Trolling, insulting/derogatory comments, and personal or political attacks
-*   Public or private harassment
-*   Publishing others' private information, such as a physical or electronic
+* Trolling, insulting/derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or electronic
    address, without explicit permission
-*   Other conduct which could reasonably be considered inappropriate in a
+* Other conduct which could reasonably be considered inappropriate in a
    professional setting

 ## Our Responsibilities
@@ -75,7 +75,7 @@ receive and address reported violations of the code of conduct. They will then
 work with a committee consisting of representatives from the Open Source
 Programs Office and the Google Open Source Strategy team. If for any reason you
 are uncomfortable reaching out to the Project Steward, please email
-opensource@google.com.
+<opensource@google.com>.

 We will investigate every complaint, but you may not receive a direct response.
 We will use our discretion in determining when and how to follow up on reported
@@ -90,4 +90,4 @@ harassment or threats to anyone's safety, we may take action without notice.

 This Code of Conduct is adapted from the Contributor Covenant, version 1.4,
 available at
-https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
+<https://www.contributor-covenant.org/version/1/4/code-of-conduct.html>
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -30,4 +30,192 @@ This project follows
 All submissions, including submissions by project members, require review. We
 use GitHub pull requests for this purpose. Consult
 [GitHub Help](https://help.github.com/articles/about-pull-requests/) for more
-information on using pull requests.
+information on using pull requests.
+
+Within 2-5 days, a reviewer will review your PR. They may approve it, or request
+changes. When requesting changes, reviewers should self-assign the PR to ensure
+they are aware of any updates.
+If additional changes are needed, push additional commits to your PR branch -
+this helps the reviewer know which parts of the PR have changed. Commits will be
+squashed when merged.
+Please follow up with changes promptly. If a PR is awaiting changes by the
+author for more than 10 days, maintainers may mark that PR as Draft. PRs that
+are inactive for more than 30 days may be closed.
+
+### Adding a New Database Source and Tool
+
+We recommend creating an
+[issue](https://github.com/googleapis/genai-toolbox/issues) before
+implementation to ensure we can accept the contribution and no duplicated work.
+If you have any questions, reach out on our
+[Discord](https://discord.gg/Dmm69peqjh) to chat directly with the team. New
+contributions should be added with both unit tests and integration tests.
+
+#### 1. Implement the New Data Source
+
+We recommend looking at an [example source
+implementation](https://github.com/googleapis/genai-toolbox/blob/main/internal/sources/postgres/postgres.go).
+
+* **Create a new directory** under `internal/sources` for your database type
+  (e.g., `internal/sources/newdb`).
+* **Define a configuration struct** for your data source in a file named
+  `newdb.go`. Create a `Config` struct to include all the necessary parameters
+  for connecting to the database (e.g., host, port, username, password, database
+  name) and a `Source` struct to store necessary parameters for tools (e.g.,
+  Name, Kind, connection object, additional config).
+* **Implement the
+  [`SourceConfig`](https://github.com/googleapis/genai-toolbox/blob/fd300dc606d88bf9f7bba689e2cee4e3565537dd/internal/sources/sources.go#L57)
+  interface**. This interface requires two methods:
+  * `SourceConfigKind() string`: Returns a unique string identifier for your
+    data source (e.g., `"newdb"`).
+  * `Initialize(ctx context.Context, tracer trace.Tracer) (Source, error)`:
+    Creates a new instance of your data source and establishes a connection to
+    the database.
+* **Implement the
+  [`Source`](https://github.com/googleapis/genai-toolbox/blob/fd300dc606d88bf9f7bba689e2cee4e3565537dd/internal/sources/sources.go#L63)
+  interface**. This interface requires one method:
+  * `SourceKind() string`: Returns the same string identifier as `SourceConfigKind()`.
+* **Implement `init()`** to register the new Source.
+* **Implement Unit Tests** in a file named `newdb_test.go`.
+
+#### 2. Implement the New Tool
+
+We recommend looking at an [example tool
+implementation](https://github.com/googleapis/genai-toolbox/tree/main/internal/tools/postgres/postgressql).
+
+* **Create a new directory** under `internal/tools` for your tool type (e.g.,
+  `internal/tools/newdb` or `internal/tools/newdb<tool_name>`).
+* **Define a configuration struct** for your tool in a file named `newdbtool.go`.
+Create a `Config` struct and a `Tool` struct to store necessary parameters for
+tools.
+* **Implement the
+  [`ToolConfig`](https://github.com/googleapis/genai-toolbox/blob/fd300dc606d88bf9f7bba689e2cee4e3565537dd/internal/tools/tools.go#L61)
+  interface**. This interface requires one method:
+  * `ToolConfigKind() string`: Returns a unique string identifier for your tool
+    (e.g., `"newdb"`).
+  * `Initialize(sources map[string]Source) (Tool, error)`: Creates a new
+    instance of your tool and validates that it can connect to the specified
+    data source.
+* **Implement the `Tool` interface**. This interface requires the following
+  methods:
+  * `Invoke(ctx context.Context, params map[string]any) ([]any, error)`:
+    Executes the operation on the database using the provided parameters.
+  * `ParseParams(data map[string]any, claims map[string]map[string]any)
+    (ParamValues, error)`: Parses and validates the input parameters.
+  * `Manifest() Manifest`: Returns a manifest describing the tool's capabilities
+    and parameters.
+  * `McpManifest() McpManifest`: Returns an MCP manifest describing the tool for
+    use with the Model Context Protocol.
+  * `Authorized(services []string) bool`: Checks if the tool is authorized to
+    run based on the provided authentication services.
+* **Implement `init()`** to register the new Tool.
+* **Implement Unit Tests** in a file named `newdb_test.go`.
+
+#### 3. Add Integration Tests
+
+* **Add a test file** under a new directory `tests/newdb`.
+* **Add pre-defined integration test suites** in the
+  `/tests/newdb/newdb_test.go` that are **required** to be run as long as your
+  code contains related features. Please check each test suites for the config
+  defaults, if your source require test suites config updates, please refer to
+  [config option](./tests/option.go):
+
+     1. [RunToolGetTest][tool-get]: tests for the `GET` endpoint that returns the
+            tool's manifest.
+
+     2. [RunToolInvokeTest][tool-call]: tests for tool calling through the native
+        Toolbox endpoints.
+
+     3. [RunMCPToolCallMethod][mcp-call]: tests tool calling through the MCP
+            endpoints.
+
+     4. (Optional) [RunExecuteSqlToolInvokeTest][execute-sql]: tests an
+        `execute-sql` tool for any source. Only run this test if you are adding an
+        `execute-sql` tool.
+
+     5. (Optional) [RunToolInvokeWithTemplateParameters][temp-param]: tests for [template
+            parameters][temp-param-doc]. Only run this test if template
+            parameters apply to your tool.
+
+* **Add the new database to the integration test workflow** in
+  [integration.cloudbuild.yaml](.ci/integration.cloudbuild.yaml).
+
+[tool-get]:
+    https://github.com/googleapis/genai-toolbox/blob/fd300dc606d88bf9f7bba689e2cee4e3565537dd/tests/tool.go#L31
+[tool-call]:
+    <https://github.com/googleapis/genai-toolbox/blob/fd300dc606d88bf9f7bba689e2cee4e3565537dd/tests/tool.go#L79>
+[mcp-call]:
+    https://github.com/googleapis/genai-toolbox/blob/fd300dc606d88bf9f7bba689e2cee4e3565537dd/tests/tool.go#L554
+[execute-sql]:
+    <https://github.com/googleapis/genai-toolbox/blob/fd300dc606d88bf9f7bba689e2cee4e3565537dd/tests/tool.go#L431>
+[temp-param]:
+    <https://github.com/googleapis/genai-toolbox/blob/fd300dc606d88bf9f7bba689e2cee4e3565537dd/tests/tool.go#L297>
+[temp-param-doc]:
+    https://googleapis.github.io/genai-toolbox/resources/tools/#template-parameters
+
+#### 4. Add Documentation
+
+* **Update the documentation** to include information about your new data source
+  and tool. This includes:
+  * Adding a new page to the `docs/en/resources/sources` directory for your data
+    source.
+  * Adding a new page to the `docs/en/resources/tools` directory for your tool.
+
+* **(Optional) Add samples** to the `docs/en/samples/<newdb>` directory.
+
+#### (Optional) 5. Add Prebuilt Tools
+
+You can provide developers with a set of "build-time" tools to aid common
+software development user journeys like viewing and creating tables/collections
+and data.
+
+* **Create a set of prebuilt tools** by defining a new `tools.yaml` and adding
+  it to `internal/tools`. Make sure the file name matches the source (i.e. for
+  source "alloydb-postgres" create a file named "alloydb-postgres.yaml").
+* **Update `cmd/root.go`** to add new source to the `prebuilt` flag.
+* **Add tests** in
+  [internal/prebuiltconfigs/prebuiltconfigs_test.go](internal/prebuiltconfigs/prebuiltconfigs_test.go)
+  and [cmd/root_test.go](cmd/root_test.go).
+
+#### 6. Submit a Pull Request
+
+Submit a pull request to the repository with your changes. Be sure to include a
+detailed description of your changes and any requests for long term testing
+resources.
+
+* **Title:** All pull request title should follow the formatting of
+  [Conventional 
+  Commit](https://www.conventionalcommits.org/) guidelines: `<type>[optional
+  scope]: description`. For example, if you are adding a new field in postgres
+  source, the title should be `feat(source/postgres): add support for
+  "new-field" field in postgres source`.
+  
+  Here are some commonly used `type` in this GitHub repo.
+
+  |     **type**    |                                **description**                                                        |
+  |-----------------|-------------------------------------------------------------------------------------------------------|
+  | Breaking Change | Anything with this type of a `!` after the type/scope introduces a breaking change.                   |
+  | feat            | Adding a new feature to the codebase.                                                                 |
+  | fix             | Fixing a bug or typo in the codebase. This does not include fixing docs.                              |
+  | test            | Changes made to test files.                                                                           |
+  | ci              | Changes made to the cicd configuration files or scripts.                                              |
+  | docs            | Documentation-related PRs, including fixes on docs.                                                   |
+  | chore           | Other small tasks or updates that don't fall into any of the above types.                             |
+  | refactor        | Change src code but unlike feat, there are no tests broke and no line lost coverage.                  |
+  | revert          | Revert changes made in another commit.                                                                |
+  | style           | Update src code, with only formatting and whitespace updates (e.g. code formatter or linter changes). |
+
+  Pull requests should always add scope whenever possible. The scope is
+  formatted as `<scope-type>/<scope-kind>` (e.g., `sources/postgres`, or
+  `tools/mssql-sql`).
+  
+  Ideally, **each PR covers only one scope**, if this is
+  inevitable, multiple scopes can be seaparated with a comma (e.g.
+  `sources/postgres,sources/alloydbpg`). If the PR covers multiple `scope-type`
+  (such as adding a new database), you can disregard the `scope-type`, e.g.
+  `feat(new-db): adding support for new-db source and tool`.
+
+* **PR Description:** PR description should **always** be included. It should
+  include a concise description of the changes, it's impact, along with a
+  summary of the solution. If the PR is related to a specific issue, the issue
+  number should be mentioned in the PR description (e.g. `Fixes #1`).
--- a/DEVELOPER.md
+++ b/DEVELOPER.md
@@ -1,12 +1,16 @@
 # DEVELOPER.md

-## Before you begin
+This document provides instructions for setting up your development environment
+and contributing to the Toolbox project.

-1. Make sure you've setup your databases.
+## Prerequisites

-1. Install the latest version of [Go](https://go.dev/doc/install).
+Before you begin, ensure you have the following:

-1. Locate and download dependencies:
+1. **Databases:** Set up the necessary databases for your development
+   environment.
+1. **Go:** Install the latest version of [Go](https://go.dev/doc/install).
+1. **Dependencies:** Download and manage project dependencies:

    ```bash
    go get
@@ -15,194 +19,343 @@

 ## Developing Toolbox

-### Run Toolbox from local source
+### Running from Local Source

-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:
+1. **Configuration:** Create a `tools.yaml` file to configure your sources and
+   tools. See the [Configuration section in the
+   README](./README.md#Configuration) for details.
+1. **CLI Flags:** List available command-line flags for the Toolbox server:

    ```bash
    go run . --help
    ```

-1. To run the server, execute the following (with any flags, if applicable):
+1. **Running the Server:** Start the Toolbox server with optional flags. The
+   server listens on port 5000 by default.

    ```bash
    go run .
    ```

-    The server will listen on port 5000 (by default).
-
-1. Test endpoint using the following:
+1. **Testing the Endpoint:** Verify the server is running by sending a request
+   to the endpoint:

    ```bash
    curl http://127.0.0.1:5000
    ```

-### Testing
+## Testing

- Run the lint check:
+### Infrastructure

-    ```bash
-    golangci-lint run --fix
+Toolbox uses both GitHub Actions and Cloud Build to run test workflows. Cloud
+Build is used when Google credentials are required. Cloud Build uses test
+project "toolbox-testing-438616".
+
+### Linting
+
+Run the lint check to ensure code quality:
+
+```bash
+golangci-lint run --fix
+```
+
+### Unit Tests
+
+Execute unit tests locally:
+
+```bash
+go test -race -v ./...
+```
+
+### Integration Tests
+
+#### Running Locally
+
+1. **Environment Variables:** Set the required environment variables. Refer to
+   the [Cloud Build testing configuration](./.ci/integration.cloudbuild.yaml)
+   for a complete list of variables for each source.
+    * `SERVICE_ACCOUNT_EMAIL`: Use your own GCP email.
+    * `CLIENT_ID`: Use the Google Cloud SDK application Client ID. Contact
+      Toolbox maintainers if you don't have it.
+1. **Running Tests:** Run the integration test for your target source. Specify
+   the required Go build tags at the top of each integration test file.
+
+    ```shell
+    go test -race -v ./tests/<YOUR_TEST_DIR>
    ```

- Run unit tests locally:
+    For example, to run the AlloyDB integration test:

-    ```bash
-    go test -race -v ./...
+    ```shell
+    go test -race -v ./tests/alloydbpg
    ```

- 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.
+#### Running on Pull Requests

-    2. Run the integration test for your target source with the required Go
-    build tags specified at the top of each integration test file:
+* **Internal Contributors:** Testing workflows should trigger automatically.
+* **External Contributors:** Request Toolbox maintainers to trigger the testing
+  workflows on your PR.

-        ```shell
-            go test -race -v ./tests/<YOUR_TEST_DIR>
-        ```
+#### Test Resources

-        For example, to run the AlloyDB integration test, run:
+The following databases have been added as test resources. To add a new database
+to test against, please contact the Toolbox maintainer team via an issue or PR.
+Refer to the [Cloud Build testing
+configuration](./.ci/integration.cloudbuild.yaml) for a complete list of
+variables for each source.

-        ```shell
-            go test -race -v ./tests/alloydbpg
-        ```
+* AlloyDB - setup in the test project
+  * AI Natural Language ([setup
+    instructions](https://cloud.google.com/alloydb/docs/ai/use-natural-language-generate-sql-queries))
+    has been configured for `alloydb-ai-nl` tool tests
+  * The Cloud Build service account is a user
+* Bigtable - setup in the test project
+  * The Cloud Build service account is a user
+* BigQuery - setup in the test project
+  * The Cloud Build service account is a user
+* Cloud SQL Postgres - setup in the test project
+  * The Cloud Build service account is a user
+* Cloud SQL MySQL - setup in the test project
+  * The Cloud Build service account is a user
+* Cloud SQL SQL Server - setup in the test project
+  * The Cloud Build service account is a user
+* Couchbase - setup in the test project via the Marketplace
+* DGraph - using the public dgraph interface <https://play.dgraph.io> for
+  testing
+* Memorystore Redis - setup in the test project using a Memorystore for Redis
+  standalone instance
+  * Memorystore Redis Cluster, Memorystore Valkey standalone, and Memorystore
+    Valkey Cluster instances all require PSC connections, which requires extra
+    security setup to connect from Cloud Build. Memorystore Redis standalone is
+    the only one allowing PSA connection.
+  * The Cloud Build service account is a user
+* Memorystore Valkey - setup in the test project using a Memorystore for Redis
+  standalone instance
+  * The Cloud Build service account is a user
+* MySQL - setup in the test project using a Cloud SQL instance
+* Neo4j - setup in the test project on a GCE VM
+* Postgres - setup in the test project using an AlloyDB instance
+* Spanner - setup in the test project
+  * The Cloud Build service account is a user
+* SQL Server - setup in the test project using a Cloud SQL instance
+* SQLite -  setup in the integration test, where we create a temporary database
+  file

- Run integration tests on your PR:
+### Other GitHub Checks

-    For internal contributors, the testing workflows should trigger
-    automatically. For external contributors, ask the Toolbox
-    maintainers to trigger the testing workflows on your PR.
-
-## Compile the app locally
-
-### Compile Toolbox binary
-
-1. Run build to compile binary:
-
-    ```bash
-    go build -o toolbox
-    ```
-
-1. You can specify flags for the Toolbox server. Execute the following to list the possible CLI flags:
-
-    ```bash
-    ./toolbox --help
-    ```
-
-1. To run the binary, execute the following (with any flags, if applicable):
-
-    ```bash
-    ./toolbox
-    ```
-
-    The server will listen on port 5000 (by default).
-
-1. Test endpoint using the following:
-
-    ```bash
-    curl http://127.0.0.1:5000
-    ```
-
-### Compile Toolbox container images
-
-1. Run build to compile container image:
-
-    ```bash
-    docker build -t toolbox:dev .
-    ```
-
-1. Execute the following to view image:
-
-    ```bash
-    docker images
-    ```
-
-1. Run container image with Docker:
-
-    ```bash
-    docker run -d toolbox:dev
-    ```
+* License header check (`.github/header-checker-lint.yml`) - Ensures files have
+  the appropriate license
+* CLA/google - Ensures the developer has signed the CLA:
+  <https://cla.developers.google.com/>
+* conventionalcommits.org - Ensures the commit messages are in the correct
+  format. This repository uses tool [Release
+  Please](https://github.com/googleapis/release-please) to create GitHub
+  releases. It does so by parsing your git history, looking for [Conventional
+  Commit messages](https://www.conventionalcommits.org/), and creating release
+  PRs. Learn more by reading [How should I write my
+  commits?](https://github.com/googleapis/release-please?tab=readme-ov-file#how-should-i-write-my-commits)

 ## Developing Documentation

-1. [Install Hugo](https://gohugo.io/installation/macos/) version 0.146.0+.
-1. Move into the `.hugo` directory
+### Running a Local Hugo Server
+
+Follow these steps to preview documentation changes locally using a Hugo server:
+
+1. **Install Hugo:** Ensure you have
+   [Hugo](https://gohugo.io/installation/macos/) extended edition version
+   0.146.0 or later installed.
+1. **Navigate to the Hugo Directory:**

    ```bash
    cd .hugo
    ```

-1. Install dependencies
+1. **Install Dependencies:**

    ```bash
    npm ci
    ```

-1. Run the server
+1. **Start the Server:**

    ```bash
    hugo server
    ```

+### Previewing Documentation on Pull Requests
+
+#### Contributors
+
+Request a repo owner to run the preview deployment workflow on your PR. A
+preview link will be automatically added as a comment to your PR.
+
+#### Maintainers
+
+1. **Inspect Changes:** Review the proposed changes in the PR to ensure they are
+   safe and do not contain malicious code. Pay close attention to changes in the
+   `.github/workflows/` directory.
+1. **Deploy Preview:** Apply the `docs: deploy-preview` label to the PR to
+   deploy a documentation preview.
+
+## Building Toolbox
+
+### Building the Binary
+
+1. **Build Command:** Compile the Toolbox binary:
+
+    ```bash
+    go build -o toolbox
+    ```
+
+1. **Running the Binary:** Execute the compiled binary with optional flags. The
+   server listens on port 5000 by default:
+
+    ```bash
+    ./toolbox
+    ```
+
+1. **Testing the Endpoint:** Verify the server is running by sending a request
+   to the endpoint:
+
+    ```bash
+    curl http://127.0.0.1:5000
+    ```
+
+### Building Container Images
+
+1. **Build Command:** Build the Toolbox container image:
+
+    ```bash
+    docker build -t toolbox:dev .
+    ```
+
+1. **View Image:** List available Docker images to confirm the build:
+
+    ```bash
+    docker images
+    ```
+
+1. **Run Container:** Run the Toolbox container image using Docker:
+
+    ```bash
+    docker run -d toolbox:dev
+    ```
+
 ## Developing Toolbox SDKs

-Please refer to the [SDK developer guide](https://github.com/googleapis/mcp-toolbox-sdk-python/blob/main/DEVELOPER.md)
+Refer to the [SDK developer
+guide](https://github.com/googleapis/mcp-toolbox-sdk-python/blob/main/DEVELOPER.md)
+for instructions on developing Toolbox SDKs.

-## (Optional) Maintainer Information
+## Maintainer Information
+
+### Team
+
+Team, `@googleapis/senseai-eco`, has been set as
+[CODEOWNERS](.github/CODEOWNERS). The GitHub TeamSync tool is used to create
+this team from MDB Group, `senseai-eco`.

 ### Releasing

-There are two types of release for Toolbox, including a versioned release and continuous release.
+Toolbox has two types of releases: versioned and continuous. It uses Google
+Cloud project, `database-toolbox`.

- Versioned release: Official supported distributions with the `latest` tag. The release process for versioned release is in [versioned.release.cloudbuild.yaml](https://github.com/googleapis/genai-toolbox/blob/main/versioned.release.cloudbuild.yaml).
- Continuous release: Used for early testing features between official supported releases and end-to-end testings.
+* **Versioned Release:** Official, supported distributions tagged as `latest`.
+  The release process is defined in
+  [versioned.release.cloudbuild.yaml](.ci/versioned.release.cloudbuild.yaml).
+* **Continuous Release:** Used for early testing of features between official
+  releases and for end-to-end testing. The release process is defined in
+  [continuous.release.cloudbuild.yaml](.ci/continuous.release.cloudbuild.yaml).
+* **GitHub Release:** `.github/release-please.yml` automatically creates GitHub
+  Releases and release PRs.

-#### Supported OS and Architecture binaries
+### How-to Release a new Version

-The following OS and computer architecture is supported within the binary releases.
+1. [Optional] If you want to override the version number, send a
+   [PR](https://github.com/googleapis/genai-toolbox/pull/31) to trigger
+   [release-please](https://github.com/googleapis/release-please?tab=readme-ov-file#how-do-i-change-the-version-number).
+   You can generate a commit with the following line: `git commit -m "chore:
+   release 0.1.0" -m "Release-As: 0.1.0" --allow-empty`
+1. [Optional] If you want to edit the changelog, send commits to the release PR
+1. Approve and merge the PR with the title “[chore(main): release
+   x.x.x](https://github.com/googleapis/genai-toolbox/pull/16)”
+1. The
+   [trigger](https://pantheon.corp.google.com/cloud-build/triggers;region=us-central1/edit/27bd0d21-264a-4446-b2d7-0df4e9915fb3?e=13802955&inv=1&invt=AbhU8A&mods=logs_tg_staging&project=database-toolbox)
+   should automatically run when a new tag is pushed. You can view [triggered
+   builds here to check the
+   status](https://pantheon.corp.google.com/cloud-build/builds;region=us-central1?query=trigger_id%3D%2227bd0d21-264a-4446-b2d7-0df4e9915fb3%22&e=13802955&inv=1&invt=AbhU8A&mods=logs_tg_staging&project=database-toolbox)
+1. Update the Github release notes to include the following table:
+    1. Run the following command (from the root directory):

- linux/amd64
- darwin/arm64
- darwin/amd64
- windows/amd64
+        ```
+        export VERSION="v0.0.0"
+        .ci/generate_release_table.sh
+        ```

-#### Supported container images
+    1. Copy the table output
+    1. In the GitHub UI, navigate to Releases and click the `edit` button.
+    1. Paste the table at the bottom of release note and click `Update release`.
+1. Post release in internal chat and on Discord.

-The following base container images is supported within the container image releases.
+#### Supported Binaries

- distroless
+The following operating systems and architectures are supported for binary
+releases:

-### Automated tests
+* linux/amd64
+* darwin/arm64
+* darwin/amd64
+* windows/amd64

-Integration and unit tests are automatically triggered via CloudBuild during each PR creation.
+#### Supported Container Images
+
+The following base container images are supported for container image releases:
+
+* distroless
+
+### Automated Tests
+
+Integration and unit tests are automatically triggered via Cloud Build on each
+pull request. Integration tests run on merge and nightly.
+
+#### Failure notifications
+
+On-merge and nightly tests that fail have notification setup via Cloud Build
+Failure Reporter [GitHub Actions
+Workflow](.github/workflows/schedule_reporter.yml).

 #### Trigger Setup

-Create a Cloud Build trigger via the UI or `gcloud` with the following specs:
+Configure a Cloud Build trigger using the UI or `gcloud` with the following
+settings:

- 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 for
+  authenticated services

-### Trigger
+### Triggering Tests

-Trigger the PR tests on PRs from external contributors:
+Trigger pull request tests for external contributors by:

- Cloud Build tests: comment `/gcbrun`
- Unit tests: add `tests:run` label
+* **Cloud Build tests:** Comment `/gcbrun`
+* **Unit tests:** Add the `tests:run` label
+
+## Repo Setup & Automation
+
+* .github/blunderbuss.yml - Auto-assign issues and PRs from GitHub teams
+* .github/renovate.json5 - Tooling for dependency updates. Dependabot is built
+  into the GitHub repo for GitHub security warnings
+* go/github-issue-mirror - GitHub issues are automatically mirrored into buganizer
+* (Suspended) .github/sync-repo-settings.yaml - configure repo settings
+* .github/release-please.yml - Creates GitHub releases
+* .github/ISSUE_TEMPLATE - templates for GitHub issues
--- a/7
+++ b/7
@@ -13,18 +13,19 @@
 # limitations under the License.

 # Use the latest stable golang 1.x to compile to a binary
-FROM --platform=$BUILDPLATFORM golang:1 as build
+FROM --platform=$BUILDPLATFORM golang:1 AS build

 WORKDIR /go/src/genai-toolbox
 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
@@ -2,7 +2,9 @@

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

 > [!NOTE]
@@ -16,7 +18,6 @@ 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
@@ -30,23 +31,27 @@ documentation](https://googleapis.github.io/genai-toolbox/).
 - [Why Toolbox?](#why-toolbox)
 - [General Architecture](#general-architecture)
 - [Getting Started](#getting-started)
-    - [Installing the server](#installing-the-server)
-    - [Running the server](#running-the-server)
-    - [Integrating your application](#integrating-your-application)
+  - [Installing the server](#installing-the-server)
+  - [Running the server](#running-the-server)
+    - [Homebrew Users](#homebrew-users)
+  - [Integrating your application](#integrating-your-application)
 - [Configuration](#configuration)
-    - [Sources](#sources)
-    - [Tools](#tools)
-    - [Toolsets](#toolsets)
+  - [Sources](#sources)
+  - [Tools](#tools)
+  - [Toolsets](#toolsets)
 - [Versioning](#versioning)
+  - [Pre-1.0.0 Versioning](#pre-100-versioning)
+  - [Post-1.0.0 Versioning](#post-100-versioning)
 - [Contributing](#contributing)
+- [Community](#community)

 <!-- /TOC -->

-
-##  Why Toolbox?
+## Why Toolbox?

 Toolbox helps you build Gen AI tools that let your agents access data in your
 database. Toolbox provides:
+
 - **Simplified development**: Integrate tools to your agent in less than 10
  lines of code, reuse tools between multiple agents or frameworks, and deploy
  new versions of tools more easily.
@@ -56,17 +61,29 @@ database. Toolbox provides:
 - **End-to-end observability**: Out of the box metrics and tracing with built-in
  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.
+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.
+- **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].

@@ -86,6 +103,7 @@ redeploying your application.
 ## Getting Started

 ### Installing the server
+
 For the latest version, check the [releases page][releases] and use the
 following instructions for your OS and CPU architecture.

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

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

 </details>

+<details>
+<summary>Homebrew</summary>
+
+To install Toolbox using Homebrew on macOS or Linux:
+
+```sh
+brew install mcp-toolbox
+```
+
+</details>
+
 <details>
 <summary>Compile from source</summary>

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

@@ -140,6 +169,18 @@ execute `toolbox` to start the server:
 ./toolbox --tools-file "tools.yaml"
 ```

+> [!NOTE]
+> Toolbox enables dynamic reloading by default. To disable, use the
+> `--disable-reload` flag.
+
+#### Homebrew Users
+
+If you installed Toolbox using Homebrew, the `toolbox` binary is available in your system path. You can start the server with the same command:
+
+```sh
+toolbox --tools-file "tools.yaml"
+```
+
 You can use `toolbox help` for a full list of flags! To stop the server, send a
 terminate signal (`ctrl+c` on most platforms).

@@ -153,13 +194,21 @@ 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>
+  <summary>Python (<a href="https://github.com/googleapis/mcp-toolbox-sdk-python">Github</a>)</summary>
+  <br>
+  <blockquote>
+
+  <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

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

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

 1. Install [Toolbox LangChain SDK][toolbox-langchain]:
+
    ```bash
    pip install toolbox-langchain
    ```
+
 1. Load tools:
+
    ```python
    from toolbox_langchain import ToolboxClient

@@ -195,22 +247,24 @@ For more detailed instructions on using the Toolbox Core SDK, see the
        tools = client.load_toolset()
    ```

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

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

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

 1. Install [Toolbox Llamaindex SDK][toolbox-llamaindex]:
+
    ```bash
    pip install toolbox-llamaindex
    ```
+
 1. Load tools:
+
    ```python
    from toolbox_llamaindex import ToolboxClient

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

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

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

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

 ## Configuration
@@ -237,6 +657,7 @@ tools.yaml` flag.

 You can find more detailed reference documentation to all resource types in the
 [Resources](https://googleapis.github.io/genai-toolbox/resources/).
+
 ### Sources

 The `sources` section of your `tools.yaml` defines what data sources your
@@ -278,7 +699,6 @@ tools:
 For more details on configuring different types of tools, see the
 [Tools](https://googleapis.github.io/genai-toolbox/resources/tools).

-
 ### Toolsets

 The `toolsets` section of your `tools.yaml` allows you to define groups of tools
@@ -307,12 +727,26 @@ my_second_toolset = client.load_toolset("my_second_toolset")

 ## Versioning

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

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

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

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

 	// Import tool packages for side effect of registration
 	_ "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/bigquery/bigqueryconversationalanalytics"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/bigquery/bigqueryexecutesql"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/bigquery/bigqueryforecast"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/bigquery/bigquerygetdatasetinfo"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/bigquery/bigquerygettableinfo"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/bigquery/bigquerylistdatasetids"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/bigquery/bigquerylisttableids"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/bigquery/bigquerysql"
 	_ "github.com/googleapis/genai-toolbox/internal/tools/bigtable"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/clickhouse/clickhouseexecutesql"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/clickhouse/clickhousesql"
 	_ "github.com/googleapis/genai-toolbox/internal/tools/couchbase"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/dataplex/dataplexlookupentry"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/dataplex/dataplexsearchaspecttypes"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/dataplex/dataplexsearchentries"
 	_ "github.com/googleapis/genai-toolbox/internal/tools/dgraph"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/firebird/firebirdexecutesql"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/firebird/firebirdsql"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/firestore/firestoreadddocuments"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/firestore/firestoredeletedocuments"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/firestore/firestoregetdocuments"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/firestore/firestoregetrules"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/firestore/firestorelistcollections"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/firestore/firestorequerycollection"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/firestore/firestoreupdatedocument"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/firestore/firestorevalidaterules"
 	_ "github.com/googleapis/genai-toolbox/internal/tools/http"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/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/spanner"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/spannerexecutesql"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/looker/lookeradddashboardelement"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/looker/lookergetdashboards"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/looker/lookergetdimensions"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/looker/lookergetexplores"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/looker/lookergetfilters"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/looker/lookergetlooks"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/looker/lookergetmeasures"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/looker/lookergetmodels"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/looker/lookergetparameters"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/looker/lookermakedashboard"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/looker/lookermakelook"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/looker/lookerquery"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/looker/lookerquerysql"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/looker/lookerqueryurl"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/looker/lookerrunlook"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/mongodb/mongodbaggregate"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/mongodb/mongodbdeletemany"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/mongodb/mongodbdeleteone"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/mongodb/mongodbfind"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/mongodb/mongodbfindone"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/mongodb/mongodbinsertmany"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/mongodb/mongodbinsertone"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/mongodb/mongodbupdatemany"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/mongodb/mongodbupdateone"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/mssql/mssqlexecutesql"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/mssql/mssqlsql"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/mysql/mysqlexecutesql"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/mysql/mysqlsql"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/neo4j/neo4jcypher"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/neo4j/neo4jexecutecypher"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/neo4j/neo4jschema"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/oceanbase/oceanbaseexecutesql"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/oceanbase/oceanbasesql"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/postgres/postgresexecutesql"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/postgres/postgressql"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/redis"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/spanner/spannerexecutesql"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/spanner/spannersql"
 	_ "github.com/googleapis/genai-toolbox/internal/tools/sqlitesql"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/tidb/tidbexecutesql"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/tidb/tidbsql"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/trino/trinoexecutesql"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/trino/trinosql"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/utility/alloydbwaitforoperation"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/utility/wait"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/valkey"

 	"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/clickhouse"
+	_ "github.com/googleapis/genai-toolbox/internal/sources/cloudsqlmssql"
+	_ "github.com/googleapis/genai-toolbox/internal/sources/cloudsqlmysql"
+	_ "github.com/googleapis/genai-toolbox/internal/sources/cloudsqlpg"
+	_ "github.com/googleapis/genai-toolbox/internal/sources/couchbase"
+	_ "github.com/googleapis/genai-toolbox/internal/sources/dataplex"
+	_ "github.com/googleapis/genai-toolbox/internal/sources/dgraph"
+	_ "github.com/googleapis/genai-toolbox/internal/sources/firebird"
+	_ "github.com/googleapis/genai-toolbox/internal/sources/firestore"
+	_ "github.com/googleapis/genai-toolbox/internal/sources/http"
+	_ "github.com/googleapis/genai-toolbox/internal/sources/looker"
+	_ "github.com/googleapis/genai-toolbox/internal/sources/mongodb"
+	_ "github.com/googleapis/genai-toolbox/internal/sources/mssql"
+	_ "github.com/googleapis/genai-toolbox/internal/sources/mysql"
+	_ "github.com/googleapis/genai-toolbox/internal/sources/neo4j"
+	_ "github.com/googleapis/genai-toolbox/internal/sources/oceanbase"
+	_ "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/tidb"
+	_ "github.com/googleapis/genai-toolbox/internal/sources/trino"
+	_ "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() {
@@ -73,10 +165,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
 }

@@ -96,6 +189,8 @@ type Command struct {
 	cfg            server.ServerConfig
 	logger         log.Logger
 	tools_file     string
+	tools_files    []string
+	tools_folder   string
 	prebuiltConfig string
 	inStream       io.Reader
 	outStream      io.Writer
@@ -139,14 +234,24 @@ func NewCommand(opts ...Option) *Command {
 	flags.StringVar(&cmd.tools_file, "tools_file", "", "File path specifying the tool configuration. Cannot be used with --prebuilt.")
 	// deprecate tools_file
 	_ = flags.MarkDeprecated("tools_file", "please use --tools-file instead")
-	flags.StringVar(&cmd.tools_file, "tools-file", "", "File path specifying the tool configuration. Cannot be used with --prebuilt.")
+	flags.StringVar(&cmd.tools_file, "tools-file", "", "File path specifying the tool configuration. Cannot be used with --prebuilt, --tools-files, or --tools-folder.")
+	flags.StringSliceVar(&cmd.tools_files, "tools-files", []string{}, "Multiple file paths specifying tool configurations. Files will be merged. Cannot be used with --prebuilt, --tools-file, or --tools-folder.")
+	flags.StringVar(&cmd.tools_folder, "tools-folder", "", "Directory path containing YAML tool configuration files. All .yaml and .yml files in the directory will be loaded and merged. Cannot be used with --prebuilt, --tools-file, or --tools-files.")
 	flags.Var(&cmd.cfg.LogLevel, "log-level", "Specify the minimum level logged. Allowed: 'DEBUG', 'INFO', 'WARN', 'ERROR'.")
 	flags.Var(&cmd.cfg.LoggingFormat, "logging-format", "Specify logging format to use. Allowed: 'standard' or 'JSON'.")
 	flags.BoolVar(&cmd.cfg.TelemetryGCP, "telemetry-gcp", false, "Enable exporting directly to Google Cloud Monitoring.")
 	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'.")
+
+	// Fetch prebuilt tools sources to customize the help description
+	prebuiltHelp := fmt.Sprintf(
+		"Use a prebuilt tool configuration by source type. Cannot be used with --tools-file. Allowed: '%s'.",
+		strings.Join(prebuiltconfigs.GetPrebuiltSources(), "', '"),
+	)
+	flags.StringVar(&cmd.prebuiltConfig, "prebuilt", "", prebuiltHelp)
 	flags.BoolVar(&cmd.cfg.Stdio, "stdio", false, "Listens via MCP STDIO instead of acting as a remote HTTP server.")
+	flags.BoolVar(&cmd.cfg.DisableReload, "disable-reload", false, "Disables dynamic reloading of tools file.")
+	flags.BoolVar(&cmd.cfg.UI, "ui", false, "Launches the Toolbox UI web server.")

 	// wrap RunE command so that we have access to original Command object
 	cmd.RunE = func(*cobra.Command, []string) error { return run(cmd) }
@@ -163,38 +268,348 @@ type ToolsFile struct {
 }

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

-	return re.ReplaceAllStringFunc(input, func(match string) string {
+	var err error
+	output := 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
+		if parts[2] != "" {
+			return parts[3]
+		}
+		err = fmt.Errorf("environment variable not found: %q", variableName)
+		return ""
 	})
+	return output, err
 }

 // parseToolsFile parses the provided yaml into appropriate configs.
 func parseToolsFile(ctx context.Context, raw []byte) (ToolsFile, error) {
 	var toolsFile ToolsFile
 	// Replace environment variables if found
-	raw = []byte(parseEnv(string(raw)))
+	output, err := parseEnv(string(raw))
+	if err != nil {
+		return toolsFile, fmt.Errorf("error parsing environment variables: %s", err)
+	}
+	raw = []byte(output)
+
 	// Parse contents
-	err := yaml.UnmarshalContext(ctx, raw, &toolsFile, yaml.Strict())
+	err = yaml.UnmarshalContext(ctx, raw, &toolsFile, yaml.Strict())
 	if err != nil {
 		return toolsFile, err
 	}
 	return toolsFile, nil
 }

+// mergeToolsFiles merges multiple ToolsFile structs into one.
+// Detects and raises errors for resource conflicts in sources, authServices, tools, and toolsets.
+// All resource names (sources, authServices, tools, toolsets) must be unique across all files.
+func mergeToolsFiles(files ...ToolsFile) (ToolsFile, error) {
+	merged := ToolsFile{
+		Sources:      make(server.SourceConfigs),
+		AuthServices: make(server.AuthServiceConfigs),
+		Tools:        make(server.ToolConfigs),
+		Toolsets:     make(server.ToolsetConfigs),
+	}
+
+	var conflicts []string
+
+	for fileIndex, file := range files {
+		// Check for conflicts and merge sources
+		for name, source := range file.Sources {
+			if _, exists := merged.Sources[name]; exists {
+				conflicts = append(conflicts, fmt.Sprintf("source '%s' (file #%d)", name, fileIndex+1))
+			} else {
+				merged.Sources[name] = source
+			}
+		}
+
+		// Check for conflicts and merge authSources (deprecated, but still support)
+		for name, authSource := range file.AuthSources {
+			if _, exists := merged.AuthSources[name]; exists {
+				conflicts = append(conflicts, fmt.Sprintf("authSource '%s' (file #%d)", name, fileIndex+1))
+			} else {
+				merged.AuthSources[name] = authSource
+			}
+		}
+
+		// Check for conflicts and merge authServices
+		for name, authService := range file.AuthServices {
+			if _, exists := merged.AuthServices[name]; exists {
+				conflicts = append(conflicts, fmt.Sprintf("authService '%s' (file #%d)", name, fileIndex+1))
+			} else {
+				merged.AuthServices[name] = authService
+			}
+		}
+
+		// Check for conflicts and merge tools
+		for name, tool := range file.Tools {
+			if _, exists := merged.Tools[name]; exists {
+				conflicts = append(conflicts, fmt.Sprintf("tool '%s' (file #%d)", name, fileIndex+1))
+			} else {
+				merged.Tools[name] = tool
+			}
+		}
+
+		// Check for conflicts and merge toolsets
+		for name, toolset := range file.Toolsets {
+			if _, exists := merged.Toolsets[name]; exists {
+				conflicts = append(conflicts, fmt.Sprintf("toolset '%s' (file #%d)", name, fileIndex+1))
+			} else {
+				merged.Toolsets[name] = toolset
+			}
+		}
+	}
+
+	// If conflicts were detected, return an error
+	if len(conflicts) > 0 {
+		return ToolsFile{}, fmt.Errorf("resource conflicts detected:\n  - %s\n\nPlease ensure each source, authService, tool, and toolset has a unique name across all files", strings.Join(conflicts, "\n  - "))
+	}
+
+	return merged, nil
+}
+
+// loadAndMergeToolsFiles loads multiple YAML files and merges them
+func loadAndMergeToolsFiles(ctx context.Context, filePaths []string) (ToolsFile, error) {
+	var toolsFiles []ToolsFile
+
+	for _, filePath := range filePaths {
+		buf, err := os.ReadFile(filePath)
+		if err != nil {
+			return ToolsFile{}, fmt.Errorf("unable to read tool file at %q: %w", filePath, err)
+		}
+
+		toolsFile, err := parseToolsFile(ctx, buf)
+		if err != nil {
+			return ToolsFile{}, fmt.Errorf("unable to parse tool file at %q: %w", filePath, err)
+		}
+
+		toolsFiles = append(toolsFiles, toolsFile)
+	}
+
+	mergedFile, err := mergeToolsFiles(toolsFiles...)
+	if err != nil {
+		return ToolsFile{}, fmt.Errorf("unable to merge tools files: %w", err)
+	}
+
+	return mergedFile, nil
+}
+
+// loadAndMergeToolsFolder loads all YAML files from a directory and merges them
+func loadAndMergeToolsFolder(ctx context.Context, folderPath string) (ToolsFile, error) {
+	// Check if directory exists
+	info, err := os.Stat(folderPath)
+	if err != nil {
+		return ToolsFile{}, fmt.Errorf("unable to access tools folder at %q: %w", folderPath, err)
+	}
+	if !info.IsDir() {
+		return ToolsFile{}, fmt.Errorf("path %q is not a directory", folderPath)
+	}
+
+	// Find all YAML files in the directory
+	pattern := filepath.Join(folderPath, "*.yaml")
+	yamlFiles, err := filepath.Glob(pattern)
+	if err != nil {
+		return ToolsFile{}, fmt.Errorf("error finding YAML files in %q: %w", folderPath, err)
+	}
+
+	// Also find .yml files
+	ymlPattern := filepath.Join(folderPath, "*.yml")
+	ymlFiles, err := filepath.Glob(ymlPattern)
+	if err != nil {
+		return ToolsFile{}, fmt.Errorf("error finding YML files in %q: %w", folderPath, err)
+	}
+
+	// Combine both file lists
+	allFiles := append(yamlFiles, ymlFiles...)
+
+	if len(allFiles) == 0 {
+		return ToolsFile{}, fmt.Errorf("no YAML files found in directory %q", folderPath)
+	}
+
+	// Use existing loadAndMergeToolsFiles function
+	return loadAndMergeToolsFiles(ctx, allFiles)
+}
+
+func handleDynamicReload(ctx context.Context, toolsFile ToolsFile, s *server.Server) error {
+	logger, err := util.LoggerFromContext(ctx)
+	if err != nil {
+		panic(err)
+	}
+
+	sourcesMap, authServicesMap, toolsMap, toolsetsMap, err := validateReloadEdits(ctx, toolsFile)
+	if err != nil {
+		errMsg := fmt.Errorf("unable to validate reloaded edits: %w", err)
+		logger.WarnContext(ctx, errMsg.Error())
+		return err
+	}
+
+	s.ResourceMgr.SetResources(sourcesMap, authServicesMap, toolsMap, toolsetsMap)
+
+	return nil
+}
+
+// validateReloadEdits checks that the reloaded tools file configs can initialized without failing
+func validateReloadEdits(
+	ctx context.Context, toolsFile ToolsFile,
+) (map[string]sources.Source, map[string]auth.AuthService, map[string]tools.Tool, map[string]tools.Toolset, error,
+) {
+	logger, err := util.LoggerFromContext(ctx)
+	if err != nil {
+		panic(err)
+	}
+
+	instrumentation, err := util.InstrumentationFromContext(ctx)
+	if err != nil {
+		panic(err)
+	}
+
+	logger.DebugContext(ctx, "Attempting to parse and validate reloaded tools file.")
+
+	ctx, span := instrumentation.Tracer.Start(ctx, "toolbox/server/reload")
+	defer span.End()
+
+	reloadedConfig := server.ServerConfig{
+		Version:            versionString,
+		SourceConfigs:      toolsFile.Sources,
+		AuthServiceConfigs: toolsFile.AuthServices,
+		ToolConfigs:        toolsFile.Tools,
+		ToolsetConfigs:     toolsFile.Toolsets,
+	}
+
+	sourcesMap, authServicesMap, toolsMap, toolsetsMap, err := server.InitializeConfigs(ctx, reloadedConfig)
+	if err != nil {
+		errMsg := fmt.Errorf("unable to initialize reloaded configs: %w", err)
+		logger.WarnContext(ctx, errMsg.Error())
+		return nil, nil, nil, nil, err
+	}
+
+	return sourcesMap, authServicesMap, toolsMap, toolsetsMap, nil
+}
+
+// watchChanges checks for changes in the provided yaml tools file(s) or folder.
+func watchChanges(ctx context.Context, watchDirs map[string]bool, watchedFiles map[string]bool, s *server.Server) {
+	logger, err := util.LoggerFromContext(ctx)
+	if err != nil {
+		panic(err)
+	}
+
+	w, err := fsnotify.NewWatcher()
+	if err != nil {
+		logger.WarnContext(ctx, "error setting up new watcher %s", err)
+		return
+	}
+
+	defer w.Close()
+
+	watchingFolder := false
+	var folderToWatch string
+
+	// if watchedFiles is empty, indicates that user passed entire folder instead
+	if len(watchedFiles) == 0 {
+		watchingFolder = true
+
+		// validate that watchDirs only has single element
+		if len(watchDirs) > 1 {
+			logger.WarnContext(ctx, "error setting watcher, expected single tools folder if no file(s) are defined.")
+			return
+		}
+
+		for onlyKey := range watchDirs {
+			folderToWatch = onlyKey
+			break
+		}
+	}
+
+	for dir := range watchDirs {
+		err := w.Add(dir)
+		if err != nil {
+			logger.WarnContext(ctx, fmt.Sprintf("Error adding path %s to watcher: %s", dir, err))
+			break
+		}
+		logger.DebugContext(ctx, fmt.Sprintf("Added directory %s to watcher.", dir))
+	}
+
+	// debounce timer is used to prevent multiple writes triggering multiple reloads
+	debounceDelay := 100 * time.Millisecond
+	debounce := time.NewTimer(1 * time.Minute)
+	debounce.Stop()
+
+	for {
+		select {
+		case <-ctx.Done():
+			logger.DebugContext(ctx, "file watcher context cancelled")
+			return
+		case err, ok := <-w.Errors:
+			if !ok {
+				logger.WarnContext(ctx, "file watcher was closed unexpectedly")
+				return
+			}
+			if err != nil {
+				logger.WarnContext(ctx, "file watcher error %s", err)
+				return
+			}
+
+		case e, ok := <-w.Events:
+			if !ok {
+				logger.WarnContext(ctx, "file watcher already closed")
+				return
+			}
+
+			// only check for events which indicate user saved a new tools file
+			// multiple operations checked due to various file update methods across editors
+			if !e.Has(fsnotify.Write | fsnotify.Create | fsnotify.Rename) {
+				continue
+			}
+
+			cleanedFilename := filepath.Clean(e.Name)
+			logger.DebugContext(ctx, fmt.Sprintf("%s event detected in %s", e.Op, cleanedFilename))
+
+			folderChanged := watchingFolder &&
+				(strings.HasSuffix(cleanedFilename, ".yaml") || strings.HasSuffix(cleanedFilename, ".yml"))
+
+			if folderChanged || watchedFiles[cleanedFilename] {
+				// indicates the write event is on a relevant file
+				debounce.Reset(debounceDelay)
+			}
+
+		case <-debounce.C:
+			debounce.Stop()
+			var reloadedToolsFile ToolsFile
+
+			if watchingFolder {
+				logger.DebugContext(ctx, "Reloading tools folder.")
+				reloadedToolsFile, err = loadAndMergeToolsFolder(ctx, folderToWatch)
+				if err != nil {
+					logger.WarnContext(ctx, "error loading tools folder %s", err)
+					continue
+				}
+			} else {
+				logger.DebugContext(ctx, "Reloading tools file(s).")
+				reloadedToolsFile, err = loadAndMergeToolsFiles(ctx, slices.Collect(maps.Keys(watchedFiles)))
+				if err != nil {
+					logger.WarnContext(ctx, "error loading tools files %s", err)
+					continue
+				}
+			}
+
+			err = handleDynamicReload(ctx, reloadedToolsFile, s)
+			if err != nil {
+				errMsg := fmt.Errorf("unable to parse reloaded tools file at %q: %w", reloadedToolsFile, err)
+				logger.WarnContext(ctx, errMsg.Error())
+				continue
+			}
+		}
+	}
+}
+
 // updateLogLevel checks if Toolbox have to update the existing log level set by users.
 // stdio doesn't support "debug" and "info" logs.
 func updateLogLevel(stdio bool, logLevel string) bool {
@@ -209,6 +624,33 @@ func updateLogLevel(stdio bool, logLevel string) bool {
 	return false
 }

+func resolveWatcherInputs(toolsFile string, toolsFiles []string, toolsFolder string) (map[string]bool, map[string]bool) {
+	var relevantFiles []string
+
+	// map for efficiently checking if a file is relevant
+	watchedFiles := make(map[string]bool)
+
+	// dirs that will be added to watcher (fsnotify prefers watching directory then filtering for file)
+	watchDirs := make(map[string]bool)
+
+	if len(toolsFiles) > 0 {
+		relevantFiles = toolsFiles
+	} else if toolsFolder != "" {
+		watchDirs[filepath.Clean(toolsFolder)] = true
+	} else {
+		relevantFiles = []string{toolsFile}
+	}
+
+	// extract parent dir for relevant files and dedup
+	for _, f := range relevantFiles {
+		cleanFile := filepath.Clean(f)
+		watchedFiles[cleanFile] = true
+		watchDirs[filepath.Dir(cleanFile)] = true
+	}
+
+	return watchDirs, watchedFiles
+}
+
 func run(cmd *Command) error {
 	if updateLogLevel(cmd.cfg.Stdio, cmd.cfg.LogLevel.String()) {
 		cmd.cfg.LogLevel = server.StringLevel(log.Warn)
@@ -258,7 +700,7 @@ func run(cmd *Command) error {
 	ctx = util.WithLogger(ctx, cmd.logger)

 	// Set up OpenTelemetry
-	otelShutdown, err := telemetry.SetupOTel(ctx, cmd.Version, cmd.cfg.TelemetryOTLP, cmd.cfg.TelemetryGCP, cmd.cfg.TelemetryServiceName)
+	otelShutdown, err := telemetry.SetupOTel(ctx, cmd.cfg.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())
@@ -272,82 +714,147 @@ func run(cmd *Command) error {
 		}
 	}()

-	var buf []byte
+	var toolsFile ToolsFile

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

-	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
 	if authSourceConfigs != nil {
 		cmd.logger.WarnContext(ctx, "`authSources` is deprecated, use `authServices` instead")
 		cmd.cfg.AuthServiceConfigs = authSourceConfigs
 	}
+
+	instrumentation, err := telemetry.CreateTelemetryInstrumentation(versionString)
 	if err != nil {
-		errMsg := fmt.Errorf("unable to parse tool file at %q: %w", cmd.tools_file, err)
+		errMsg := fmt.Errorf("unable to create telemetry instrumentation: %w", err)
 		cmd.logger.ErrorContext(ctx, errMsg.Error())
 		return errMsg
 	}

+	ctx = util.WithInstrumentation(ctx, instrumentation)
+
 	// start server
-	s, err := server.NewServer(ctx, cmd.cfg, cmd.logger)
+	s, err := server.NewServer(ctx, cmd.cfg)
 	if err != nil {
 		errMsg := fmt.Errorf("toolbox failed to initialize: %w", err)
 		cmd.logger.ErrorContext(ctx, errMsg.Error())
 		return errMsg
 	}

-	err = s.Listen(ctx)
-	if err != nil {
-		errMsg := fmt.Errorf("toolbox failed to start listener: %w", err)
-		cmd.logger.ErrorContext(ctx, errMsg.Error())
-		return errMsg
-	}
-	cmd.logger.InfoContext(ctx, "Server ready to serve!")
-
 	// run server in background
 	srvErr := make(chan error)
-	go func() {
-		defer close(srvErr)
-		if cmd.cfg.Stdio {
+	if cmd.cfg.Stdio {
+		go func() {
+			defer close(srvErr)
 			err = s.ServeStdio(ctx, cmd.inStream, cmd.outStream)
 			if err != nil {
 				srvErr <- err
 			}
-		} else {
+		}()
+	} else {
+		err = s.Listen(ctx)
+		if err != nil {
+			errMsg := fmt.Errorf("toolbox failed to start listener: %w", err)
+			cmd.logger.ErrorContext(ctx, errMsg.Error())
+			return errMsg
+		}
+		cmd.logger.InfoContext(ctx, "Server ready to serve!")
+		if cmd.cfg.UI {
+			cmd.logger.InfoContext(ctx, fmt.Sprintf("Toolbox UI is up and running at: http://%s:%d/ui", cmd.cfg.Address, cmd.cfg.Port))
+		}
+
+		go func() {
+			defer close(srvErr)
 			err = s.Serve(ctx)
 			if err != nil {
 				srvErr <- err
 			}
-		}
-	}()
+		}()
+	}
+
+	watchDirs, watchedFiles := resolveWatcherInputs(cmd.tools_file, cmd.tools_files, cmd.tools_folder)
+
+	if !cmd.cfg.DisableReload {
+		// start watching the file(s) or folder for changes to trigger dynamic reloading
+		go watchChanges(ctx, watchDirs, watchedFiles, s)
+	}

 	// wait for either the server to error out or the command's context to be canceled
 	select {
--- a/cmd/root_test.go
+++ b/cmd/root_test.go
@@ -16,28 +16,41 @@ package cmd

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

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

 	"github.com/googleapis/genai-toolbox/internal/auth/google"
+	"github.com/googleapis/genai-toolbox/internal/log"
 	"github.com/googleapis/genai-toolbox/internal/prebuiltconfigs"
 	"github.com/googleapis/genai-toolbox/internal/server"
 	cloudsqlpgsrc "github.com/googleapis/genai-toolbox/internal/sources/cloudsqlpg"
 	httpsrc "github.com/googleapis/genai-toolbox/internal/sources/http"
+	"github.com/googleapis/genai-toolbox/internal/telemetry"
 	"github.com/googleapis/genai-toolbox/internal/testutils"
 	"github.com/googleapis/genai-toolbox/internal/tools"
 	"github.com/googleapis/genai-toolbox/internal/tools/http"
-	"github.com/googleapis/genai-toolbox/internal/tools/postgressql"
+	"github.com/googleapis/genai-toolbox/internal/tools/postgres/postgressql"
+	"github.com/googleapis/genai-toolbox/internal/util"
 	"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"
 	}
@@ -171,6 +184,13 @@ func TestServerConfigFlags(t *testing.T) {
 				Stdio: true,
 			}),
 		},
+		{
+			desc: "disable reload",
+			args: []string{"--disable-reload"},
+			want: withDefaults(server.ServerConfig{
+				DisableReload: true,
+			}),
+		},
 	}
 	for _, tc := range tcs {
 		t.Run(tc.desc, func(t *testing.T) {
@@ -186,6 +206,72 @@ func TestServerConfigFlags(t *testing.T) {
 	}
 }

+func TestParseEnv(t *testing.T) {
+	tcs := []struct {
+		desc      string
+		env       map[string]string
+		in        string
+		want      string
+		err       bool
+		errString string
+	}{
+		{
+			desc:      "without default without env",
+			in:        "${FOO}",
+			want:      "",
+			err:       true,
+			errString: `environment variable not found: "FOO"`,
+		},
+		{
+			desc: "without default with env",
+			env: map[string]string{
+				"FOO": "bar",
+			},
+			in:   "${FOO}",
+			want: "bar",
+		},
+		{
+			desc: "with empty default",
+			in:   "${FOO:}",
+			want: "",
+		},
+		{
+			desc: "with default",
+			in:   "${FOO:bar}",
+			want: "bar",
+		},
+		{
+			desc: "with default with env",
+			env: map[string]string{
+				"FOO": "hello",
+			},
+			in:   "${FOO:bar}",
+			want: "hello",
+		},
+	}
+	for _, tc := range tcs {
+		t.Run(tc.desc, func(t *testing.T) {
+			if tc.env != nil {
+				for k, v := range tc.env {
+					t.Setenv(k, v)
+				}
+			}
+			got, err := parseEnv(tc.in)
+			if tc.err {
+				if err == nil {
+					t.Fatalf("expected error not found")
+				}
+				if tc.errString != err.Error() {
+					t.Fatalf("incorrect error string: got %s, want %s", err, tc.errString)
+				}
+			}
+			if tc.want != got {
+				t.Fatalf("unexpected want: got %s, want %s", got, tc.want)
+			}
+		})
+	}
+}
+
 func TestToolFileFlag(t *testing.T) {
 	tcs := []struct {
 		desc string
@@ -226,6 +312,71 @@ func TestToolFileFlag(t *testing.T) {
 	}
 }

+func TestToolsFilesFlag(t *testing.T) {
+	tcs := []struct {
+		desc string
+		args []string
+		want []string
+	}{
+		{
+			desc: "no value",
+			args: []string{},
+			want: []string{},
+		},
+		{
+			desc: "single file",
+			args: []string{"--tools-files", "foo.yaml"},
+			want: []string{"foo.yaml"},
+		},
+		{
+			desc: "multiple files",
+			args: []string{"--tools-files", "foo.yaml,bar.yaml"},
+			want: []string{"foo.yaml", "bar.yaml"},
+		},
+	}
+	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 diff := cmp.Diff(c.tools_files, tc.want); diff != "" {
+				t.Fatalf("got %v, want %v", c.tools_files, tc.want)
+			}
+		})
+	}
+}
+
+func TestToolsFolderFlag(t *testing.T) {
+	tcs := []struct {
+		desc string
+		args []string
+		want string
+	}{
+		{
+			desc: "no value",
+			args: []string{},
+			want: "",
+		},
+		{
+			desc: "folder set",
+			args: []string{"--tools-folder", "test-folder"},
+			want: "test-folder",
+		},
+	}
+	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_folder != tc.want {
+				t.Fatalf("got %v, want %v", c.tools_folder, tc.want)
+			}
+		})
+	}
+}
+
 func TestPrebuiltFlag(t *testing.T) {
 	tcs := []struct {
 		desc string
@@ -735,13 +886,14 @@ 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")
+	t.Setenv("TestHeader", "ACTUAL_HEADER")
+	t.Setenv("API_KEY", "ACTUAL_API_KEY")
+	t.Setenv("clientId", "ACTUAL_CLIENT_ID")
+	t.Setenv("clientId2", "ACTUAL_CLIENT_ID_2")
+	t.Setenv("toolset_name", "ACTUAL_TOOLSET_NAME")
+	t.Setenv("cat_string", "cat")
+	t.Setenv("food_string", "food")
+	t.Setenv("TestHeader", "ACTUAL_HEADER")

 	if err != nil {
 		t.Fatalf("unexpected error: %s", err)
@@ -897,15 +1049,275 @@ func TestEnvVarReplacement(t *testing.T) {

 }

+// normalizeFilepaths is a helper function to allow same filepath formats for Mac and Windows.
+// this prevents needing multiple "want" cases for TestResolveWatcherInputs
+func normalizeFilepaths(m map[string]bool) map[string]bool {
+	newMap := make(map[string]bool)
+	for k, v := range m {
+		newMap[filepath.ToSlash(k)] = v
+	}
+	return newMap
+}
+
+func TestResolveWatcherInputs(t *testing.T) {
+	tcs := []struct {
+		description      string
+		toolsFile        string
+		toolsFiles       []string
+		toolsFolder      string
+		wantWatchDirs    map[string]bool
+		wantWatchedFiles map[string]bool
+	}{
+		{
+			description:      "single tools file",
+			toolsFile:        "tools_folder/example_tools.yaml",
+			toolsFiles:       []string{},
+			toolsFolder:      "",
+			wantWatchDirs:    map[string]bool{"tools_folder": true},
+			wantWatchedFiles: map[string]bool{"tools_folder/example_tools.yaml": true},
+		},
+		{
+			description:      "default tools file (root dir)",
+			toolsFile:        "tools.yaml",
+			toolsFiles:       []string{},
+			toolsFolder:      "",
+			wantWatchDirs:    map[string]bool{".": true},
+			wantWatchedFiles: map[string]bool{"tools.yaml": true},
+		},
+		{
+			description:   "multiple files in different folders",
+			toolsFile:     "",
+			toolsFiles:    []string{"tools_folder/example_tools.yaml", "tools_folder2/example_tools.yaml"},
+			toolsFolder:   "",
+			wantWatchDirs: map[string]bool{"tools_folder": true, "tools_folder2": true},
+			wantWatchedFiles: map[string]bool{
+				"tools_folder/example_tools.yaml":  true,
+				"tools_folder2/example_tools.yaml": true,
+			},
+		},
+		{
+			description:   "multiple files in same folder",
+			toolsFile:     "",
+			toolsFiles:    []string{"tools_folder/example_tools.yaml", "tools_folder/example_tools2.yaml"},
+			toolsFolder:   "",
+			wantWatchDirs: map[string]bool{"tools_folder": true},
+			wantWatchedFiles: map[string]bool{
+				"tools_folder/example_tools.yaml":  true,
+				"tools_folder/example_tools2.yaml": true,
+			},
+		},
+		{
+			description: "multiple files in different levels",
+			toolsFile:   "",
+			toolsFiles: []string{
+				"tools_folder/example_tools.yaml",
+				"tools_folder/special_tools/example_tools2.yaml"},
+			toolsFolder:   "",
+			wantWatchDirs: map[string]bool{"tools_folder": true, "tools_folder/special_tools": true},
+			wantWatchedFiles: map[string]bool{
+				"tools_folder/example_tools.yaml":                true,
+				"tools_folder/special_tools/example_tools2.yaml": true,
+			},
+		},
+		{
+			description:      "tools folder",
+			toolsFile:        "",
+			toolsFiles:       []string{},
+			toolsFolder:      "tools_folder",
+			wantWatchDirs:    map[string]bool{"tools_folder": true},
+			wantWatchedFiles: map[string]bool{},
+		},
+	}
+	for _, tc := range tcs {
+		t.Run(tc.description, func(t *testing.T) {
+			gotWatchDirs, gotWatchedFiles := resolveWatcherInputs(tc.toolsFile, tc.toolsFiles, tc.toolsFolder)
+
+			normalizedGotWatchDirs := normalizeFilepaths(gotWatchDirs)
+			normalizedGotWatchedFiles := normalizeFilepaths(gotWatchedFiles)
+
+			if diff := cmp.Diff(tc.wantWatchDirs, normalizedGotWatchDirs); diff != "" {
+				t.Errorf("incorrect watchDirs: diff %v", diff)
+			}
+			if diff := cmp.Diff(tc.wantWatchedFiles, normalizedGotWatchedFiles); diff != "" {
+				t.Errorf("incorrect watchedFiles: diff %v", diff)
+			}
+
+		})
+	}
+}
+
+// helper function for testing file detection in dynamic reloading
+func tmpFileWithCleanup(content []byte) (string, func(), error) {
+	f, err := os.CreateTemp("", "*")
+	if err != nil {
+		return "", nil, err
+	}
+	cleanup := func() { os.Remove(f.Name()) }
+
+	if _, err := f.Write(content); err != nil {
+		cleanup()
+		return "", nil, err
+	}
+	if err := f.Close(); err != nil {
+		cleanup()
+		return "", nil, err
+	}
+	return f.Name(), cleanup, err
+}
+
+func TestSingleEdit(t *testing.T) {
+	ctx, cancelCtx := context.WithTimeout(context.Background(), time.Minute)
+	defer cancelCtx()
+
+	pr, pw := io.Pipe()
+	defer pw.Close()
+	defer pr.Close()
+
+	fileToWatch, cleanup, err := tmpFileWithCleanup([]byte("initial content"))
+	if err != nil {
+		t.Fatalf("error editing tools file %s", err)
+	}
+	defer cleanup()
+
+	logger, err := log.NewStdLogger(pw, pw, "DEBUG")
+	if err != nil {
+		t.Fatalf("failed to setup logger %s", err)
+	}
+	ctx = util.WithLogger(ctx, logger)
+
+	instrumentation, err := telemetry.CreateTelemetryInstrumentation(versionString)
+	if err != nil {
+		t.Fatalf("failed to setup instrumentation %s", err)
+	}
+	ctx = util.WithInstrumentation(ctx, instrumentation)
+
+	mockServer := &server.Server{}
+
+	cleanFileToWatch := filepath.Clean(fileToWatch)
+	watchDir := filepath.Dir(cleanFileToWatch)
+
+	watchedFiles := map[string]bool{cleanFileToWatch: true}
+	watchDirs := map[string]bool{watchDir: true}
+
+	go watchChanges(ctx, watchDirs, watchedFiles, mockServer)
+
+	// escape backslash so regex doesn't fail on windows filepaths
+	regexEscapedPathFile := strings.ReplaceAll(cleanFileToWatch, `\`, `\\\\*\\`)
+	regexEscapedPathFile = path.Clean(regexEscapedPathFile)
+
+	regexEscapedPathDir := strings.ReplaceAll(watchDir, `\`, `\\\\*\\`)
+	regexEscapedPathDir = path.Clean(regexEscapedPathDir)
+
+	begunWatchingDir := regexp.MustCompile(fmt.Sprintf(`DEBUG "Added directory %s to watcher."`, regexEscapedPathDir))
+	_, err = testutils.WaitForString(ctx, begunWatchingDir, pr)
+	if err != nil {
+		t.Fatalf("timeout or error waiting for watcher to start: %s", err)
+	}
+
+	err = os.WriteFile(fileToWatch, []byte("modification"), 0777)
+	if err != nil {
+		t.Fatalf("error writing to file: %v", err)
+	}
+
+	// only check substring of DEBUG message due to some OS/editors firing different operations
+	detectedFileChange := regexp.MustCompile(fmt.Sprintf(`event detected in %s"`, regexEscapedPathFile))
+	_, err = testutils.WaitForString(ctx, detectedFileChange, pr)
+	if err != nil {
+		t.Fatalf("timeout or error waiting for file to detect write: %s", err)
+	}
+}
+
 func TestPrebuiltTools(t *testing.T) {
+	// Get prebuilt configs
+	alloydb_admin_config, _ := prebuiltconfigs.Get("alloydb-postgres-admin")
 	alloydb_config, _ := prebuiltconfigs.Get("alloydb-postgres")
 	bigquery_config, _ := prebuiltconfigs.Get("bigquery")
+	clickhouse_config, _ := prebuiltconfigs.Get("clickhouse")
 	cloudsqlpg_config, _ := prebuiltconfigs.Get("cloud-sql-postgres")
 	cloudsqlmysql_config, _ := prebuiltconfigs.Get("cloud-sql-mysql")
 	cloudsqlmssql_config, _ := prebuiltconfigs.Get("cloud-sql-mssql")
+	dataplex_config, _ := prebuiltconfigs.Get("dataplex")
+	firestoreconfig, _ := prebuiltconfigs.Get("firestore")
+	mysql_config, _ := prebuiltconfigs.Get("mysql")
+	mssql_config, _ := prebuiltconfigs.Get("mssql")
+	looker_config, _ := prebuiltconfigs.Get("looker")
 	postgresconfig, _ := prebuiltconfigs.Get("postgres")
 	spanner_config, _ := prebuiltconfigs.Get("spanner")
 	spannerpg_config, _ := prebuiltconfigs.Get("spanner-postgres")
+
+	// Set environment variables
+	t.Setenv("API_KEY", "your_api_key")
+
+	t.Setenv("BIGQUERY_PROJECT", "your_gcp_project_id")
+	t.Setenv("DATAPLEX_PROJECT", "your_gcp_project_id")
+	t.Setenv("FIRESTORE_PROJECT", "your_gcp_project_id")
+	t.Setenv("FIRESTORE_DATABASE", "your_firestore_db_name")
+
+	t.Setenv("SPANNER_PROJECT", "your_gcp_project_id")
+	t.Setenv("SPANNER_INSTANCE", "your_spanner_instance")
+	t.Setenv("SPANNER_DATABASE", "your_spanner_db")
+
+	t.Setenv("ALLOYDB_POSTGRES_PROJECT", "your_gcp_project_id")
+	t.Setenv("ALLOYDB_POSTGRES_REGION", "your_gcp_region")
+	t.Setenv("ALLOYDB_POSTGRES_CLUSTER", "your_alloydb_cluster")
+	t.Setenv("ALLOYDB_POSTGRES_INSTANCE", "your_alloydb_instance")
+	t.Setenv("ALLOYDB_POSTGRES_DATABASE", "your_alloydb_db")
+	t.Setenv("ALLOYDB_POSTGRES_USER", "your_alloydb_user")
+	t.Setenv("ALLOYDB_POSTGRES_PASSWORD", "your_alloydb_password")
+
+	t.Setenv("CLICKHOUSE_PROTOCOL", "your_clickhouse_protocol")
+	t.Setenv("CLICKHOUSE_DATABASE", "your_clickhouse_database")
+	t.Setenv("CLICKHOUSE_PASSWORD", "your_clickhouse_password")
+	t.Setenv("CLICKHOUSE_USER", "your_clickhouse_user")
+	t.Setenv("CLICKHOUSE_HOST", "your_clickhosue_host")
+	t.Setenv("CLICKHOUSE_PORT", "8123")
+
+	t.Setenv("CLOUD_SQL_POSTGRES_PROJECT", "your_pg_project")
+	t.Setenv("CLOUD_SQL_POSTGRES_INSTANCE", "your_pg_instance")
+	t.Setenv("CLOUD_SQL_POSTGRES_DATABASE", "your_pg_db")
+	t.Setenv("CLOUD_SQL_POSTGRES_REGION", "your_pg_region")
+	t.Setenv("CLOUD_SQL_POSTGRES_USER", "your_pg_user")
+	t.Setenv("CLOUD_SQL_POSTGRES_PASS", "your_pg_pass")
+
+	t.Setenv("CLOUD_SQL_MYSQL_PROJECT", "your_gcp_project_id")
+	t.Setenv("CLOUD_SQL_MYSQL_REGION", "your_gcp_region")
+	t.Setenv("CLOUD_SQL_MYSQL_INSTANCE", "your_instance")
+	t.Setenv("CLOUD_SQL_MYSQL_DATABASE", "your_cloudsql_mysql_db")
+	t.Setenv("CLOUD_SQL_MYSQL_USER", "your_cloudsql_mysql_user")
+	t.Setenv("CLOUD_SQL_MYSQL_PASSWORD", "your_cloudsql_mysql_password")
+
+	t.Setenv("CLOUD_SQL_MSSQL_PROJECT", "your_gcp_project_id")
+	t.Setenv("CLOUD_SQL_MSSQL_REGION", "your_gcp_region")
+	t.Setenv("CLOUD_SQL_MSSQL_INSTANCE", "your_cloudsql_mssql_instance")
+	t.Setenv("CLOUD_SQL_MSSQL_DATABASE", "your_cloudsql_mssql_db")
+	t.Setenv("CLOUD_SQL_MSSQL_IP_ADDRESS", "127.0.0.1")
+	t.Setenv("CLOUD_SQL_MSSQL_USER", "your_cloudsql_mssql_user")
+	t.Setenv("CLOUD_SQL_MSSQL_PASSWORD", "your_cloudsql_mssql_password")
+	t.Setenv("CLOUD_SQL_POSTGRES_PASSWORD", "your_cloudsql_pg_password")
+
+	t.Setenv("POSTGRES_HOST", "localhost")
+	t.Setenv("POSTGRES_PORT", "5432")
+	t.Setenv("POSTGRES_DATABASE", "your_postgres_db")
+	t.Setenv("POSTGRES_USER", "your_postgres_user")
+	t.Setenv("POSTGRES_PASSWORD", "your_postgres_password")
+
+	t.Setenv("MYSQL_HOST", "localhost")
+	t.Setenv("MYSQL_PORT", "3306")
+	t.Setenv("MYSQL_DATABASE", "your_mysql_db")
+	t.Setenv("MYSQL_USER", "your_mysql_user")
+	t.Setenv("MYSQL_PASSWORD", "your_mysql_password")
+
+	t.Setenv("MSSQL_HOST", "localhost")
+	t.Setenv("MSSQL_PORT", "1433")
+	t.Setenv("MSSQL_DATABASE", "your_mssql_db")
+	t.Setenv("MSSQL_USER", "your_mssql_user")
+	t.Setenv("MSSQL_PASSWORD", "your_mssql_password")
+
+	t.Setenv("LOOKER_BASE_URL", "https://your_company.looker.com")
+	t.Setenv("LOOKER_CLIENT_ID", "your_looker_client_id")
+	t.Setenv("LOOKER_CLIENT_SECRET", "your_looker_client_secret")
+	t.Setenv("LOOKER_VERIFY_SSL", "true")
+
 	ctx, err := testutils.ContextWithNewLogger()
 	if err != nil {
 		t.Fatalf("unexpected error: %s", err)
@@ -915,6 +1327,16 @@ func TestPrebuiltTools(t *testing.T) {
 		in          []byte
 		wantToolset server.ToolsetConfigs
 	}{
+		{
+			name: "alloydb postgres admin prebuilt tools",
+			in:   alloydb_admin_config,
+			wantToolset: server.ToolsetConfigs{
+				"alloydb-postgres-admin-tools": tools.ToolsetConfig{
+					Name:      "alloydb-postgres-admin-tools",
+					ToolNames: []string{"alloydb-create-cluster", "alloydb-operations-get", "alloydb-create-instance", "alloydb-list-clusters", "alloydb-list-instances", "alloydb-list-users", "alloydb-create-user"},
+				},
+			},
+		},
 		{
 			name: "alloydb prebuilt tools",
 			in:   alloydb_config,
@@ -931,7 +1353,17 @@ func TestPrebuiltTools(t *testing.T) {
 			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"},
+					ToolNames: []string{"ask_data_insights", "execute_sql", "forecast", "get_dataset_info", "get_table_info", "list_dataset_ids", "list_table_ids"},
+				},
+			},
+		},
+		{
+			name: "clickhouse prebuilt tools",
+			in:   clickhouse_config,
+			wantToolset: server.ToolsetConfigs{
+				"clickhouse-database-tools": tools.ToolsetConfig{
+					Name:      "clickhouse-database-tools",
+					ToolNames: []string{"execute_sql"},
 				},
 			},
 		},
@@ -965,6 +1397,56 @@ func TestPrebuiltTools(t *testing.T) {
 				},
 			},
 		},
+		{
+			name: "dataplex prebuilt tools",
+			in:   dataplex_config,
+			wantToolset: server.ToolsetConfigs{
+				"dataplex-tools": tools.ToolsetConfig{
+					Name:      "dataplex-tools",
+					ToolNames: []string{"dataplex_search_entries", "dataplex_lookup_entry", "dataplex_search_aspect_types"},
+				},
+			},
+		},
+		{
+			name: "firestore prebuilt tools",
+			in:   firestoreconfig,
+			wantToolset: server.ToolsetConfigs{
+				"firestore-database-tools": tools.ToolsetConfig{
+					Name:      "firestore-database-tools",
+					ToolNames: []string{"firestore-get-documents", "firestore-add-documents", "firestore-update-document", "firestore-list-collections", "firestore-delete-documents", "firestore-query-collection", "firestore-get-rules", "firestore-validate-rules"},
+				},
+			},
+		},
+		{
+			name: "mysql prebuilt tools",
+			in:   mysql_config,
+			wantToolset: server.ToolsetConfigs{
+				"mysql-database-tools": tools.ToolsetConfig{
+					Name:      "mysql-database-tools",
+					ToolNames: []string{"execute_sql", "list_tables"},
+				},
+			},
+		},
+		{
+			name: "mssql prebuilt tools",
+			in:   mssql_config,
+			wantToolset: server.ToolsetConfigs{
+				"mssql-database-tools": tools.ToolsetConfig{
+					Name:      "mssql-database-tools",
+					ToolNames: []string{"execute_sql", "list_tables"},
+				},
+			},
+		},
+		{
+			name: "looker prebuilt tools",
+			in:   looker_config,
+			wantToolset: server.ToolsetConfigs{
+				"looker-tools": tools.ToolsetConfig{
+					Name:      "looker-tools",
+					ToolNames: []string{"get_models", "get_explores", "get_dimensions", "get_measures", "get_filters", "get_parameters", "query", "query_sql", "query_url", "get_looks", "run_look", "make_look", "get_dashboards", "make_dashboard", "add_dashboard_element"},
+				},
+			},
+		},
 		{
 			name: "postgres prebuilt tools",
 			in:   postgresconfig,
--- a/cmd/version.txt
+++ b/cmd/version.txt
@@ -1 +1 @@
-0.6.0
+0.13.0
--- a/docs/en/_index.md
+++ b/docs/en/_index.md
@@ -4,12 +4,12 @@ type: docs
 notoc: false
 weight: 1
 description: >
-  All of Toolbox's documentation. 
+  All of Toolbox's documentation.
 ---

 <html>
  <head>
    <link rel="canonical" href="getting-started/introduction/"/>
-    <meta http-equiv="refresh" content="0;url=getting-started/introduction"/>
+    <meta http-equiv="refresh" content="0;url=getting-started/introduction/"/>
  </head>
 </html>
--- a/docs/en/about/faq.md
+++ b/docs/en/about/faq.md
@@ -7,24 +7,24 @@ description: Frequently asked questions about Toolbox.

 ## How can I deploy or run Toolbox?

-MCP Toolbox for Databases is open-source and can be ran or deployed to a
+MCP Toolbox for Databases is open-source and can be run 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!). 
+docker images][release-notes] (but you can always compile yourself as well!).
+
+For detailed instructions, check out these resources:

-For detailed instructions, check our these resources:
 - [Quickstart: How to Run Locally](../getting-started/local_quickstart.md)
 - [Deploy to Cloud Run](../how-to/deploy_toolbox.md)

 [release-notes]: https://github.com/googleapis/genai-toolbox/releases/

-
 ## Do I need a Google Cloud account/project to get started with Toolbox?

 Nope! While some of the sources Toolbox connects to may require GCP credentials,
 Toolbox doesn't require them and can connect to a bunch of different resources
-that don't. 
+that don't.

-## Does Toolbox take contributions from external users? 
+## Does Toolbox take contributions from external users?

 Absolutely! Please check out our [DEVELOPER.md][] for instructions on how to get
 started developing _on_ Toolbox instead of with it, and the [CONTRIBUTING.md][]
@@ -33,17 +33,16 @@ for instructions on completing the CLA and getting a PR accepted.
 [DEVELOPER.md]: https://github.com/googleapis/genai-toolbox/blob/main/DEVELOPER.md
 [CONTRIBUTING.MD]: https://github.com/googleapis/genai-toolbox/blob/main/CONTRIBUTING.md

-
-## Can Toolbox support a feature to let me do _$FOO_? 
+## Can Toolbox support a feature to let me do _$FOO_?

 Maybe? The best place to start is by [opening an issue][github-issue] for
 discussion (or seeing if there is already one open), so we can better understand
 your use case and the best way to solve it. Generally we aim to prioritize the
-most popular issues, so make sure to +1 ones you are the most interested in. 
+most popular issues, so make sure to +1 ones you are the most interested in.

 [github-issue]: https://github.com/googleapis/genai-toolbox/issues

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

 Currently, Toolbox is primarily focused on making it easier to create and
 develop tools focused on interacting with Databases. We believe that there are a
@@ -55,21 +54,21 @@ GRPC tools might be helpful in assisting with migrating to Toolbox or in
 accomplishing more complicated workflows. We're looking into what that might
 best look like in Toolbox.

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

 Currently, Toolbox only supports a limited number of client SDKs at our initial
 launch. We are investigating support for more frameworks as well as more general
 approaches for users without a framework -- look forward to seeing an update
 soon.

-## Why does Toolbox use a server-client architecture pattern? 
+## Why does Toolbox use a server-client architecture pattern?

 Toolbox's server-client architecture allows us to more easily support a wide
 variety of languages and frameworks with a centralized implementation. It also
 allows us to tackle problems like connection pooling, auth, or caching more
 completely than entirely client-side solutions.

-## Why was Toolbox written in Go? 
+## Why was Toolbox written in Go?

 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
@@ -80,8 +79,9 @@ 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)?

-## Is Toolbox compatible with Model Context Protocol (MCP)? 
-
-Yes! Toolbox is compatible with [Anthropic's Model Context Protocol (MCP)](https://modelcontextprotocol.io/). Please checkout [Connect via MCP](../how-to/connect_via_mcp.md) on how to
-connect to Toolbox with an MCP client.
+Yes! Toolbox is compatible with [Anthropic's Model Context Protocol
+(MCP)](https://modelcontextprotocol.io/). Please checkout [Connect via
+MCP](../how-to/connect_via_mcp.md) on how to connect to Toolbox with an MCP
+client.
--- a/docs/en/concepts/telemetry/index.md
+++ b/docs/en/concepts/telemetry/index.md
@@ -3,7 +3,7 @@ title: "Telemetry"
 type: docs
 weight: 2
 description: >
-  An overview of telemetry and observability in Toolbox. 
+  An overview of telemetry and observability in Toolbox.
 ---

 ## About
@@ -17,7 +17,6 @@ through [OpenTelemetry](https://opentelemetry.io/). Additional flags can be
 passed to Toolbox to enable different logging behavior, or to export metrics
 through a specific [exporter](#exporter).

-
 ## Logging

 The following flags can be used to customize Toolbox logging:
@@ -27,7 +26,8 @@ The following flags can be used to customize Toolbox logging:
 | `--log-level`      | Preferred log level, allowed values: `debug`, `info`, `warn`, `error`. Default: `info`. |
 | `--logging-format` | Preferred logging format, allowed values: `standard`, `json`. Default: `standard`.      |

-__Example:__
+**Example:**
+
 ```bash
 ./toolbox --tools-file "tools.yaml" --log-level warn --logging-format json
 ```
@@ -35,6 +35,7 @@ __Example:__
 ### Level

 Toolbox supports the following log levels, including:
+
 | **Log level** | **Description**                                                                                                                                                                    |
 |---------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
 | Debug         | Debug logs typically contain information that is only useful during the debugging phase and may be of little value during production.                                              |
@@ -46,17 +47,18 @@ Toolbox will only output logs that are equal or more severe to the
 level that it is set. Below are the log levels that Toolbox supports in the
 order of severity.

-
 ### Format

 Toolbox supports both standard and structured logging format.

 The standard logging outputs log as string:
+
 ```
 2024-11-12T15:08:11.451377-08:00 INFO "Initialized 0 sources.\n"
 ```

 The structured logging outputs log as JSON:
+
 ```
 {
  "timestamp":"2024-11-04T16:45:11.987299-08:00",
@@ -66,9 +68,9 @@ The structured logging outputs log as JSON:
 }
 ```

-{{< notice tip >}} 
+{{< notice tip >}}
 `logging.googleapis.com/sourceLocation` shows the source code
-location information associated with the log entry, if any. 
+location information associated with the log entry, if any.
 {{< /notice >}}

 ## Telemetry
@@ -125,7 +127,6 @@ unified [resource][resource]. The list of resource attributes included are:
 | `service.name`                                                                            | Open telemetry service name. Defaulted to `toolbox`. User can set the service name via flag mentioned above to distinguish between different toolbox service. |
 | `service.version`                                                                         | The version of Toolbox used.                                                                                                                                  |

-
 [resource]: https://opentelemetry.io/docs/languages/go/resources/

 ### Exporter
@@ -151,12 +152,13 @@ Exporter][gcp-trace-exporter].
 [gcp-trace-exporter]:
    https://github.com/GoogleCloudPlatform/opentelemetry-operations-go/tree/main/exporter/trace

-{{< notice note >}} 
-If you're using Google Cloud Monitoring, the following APIs will need to be 
+{{< notice note >}}
+If you're using Google Cloud Monitoring, the following APIs will need to be
 enabled:
+
 - [Cloud Logging API](https://cloud.google.com/logging/docs/api/enable-api)
 - [Cloud Monitoring API](https://cloud.google.com/monitoring/api/enable-api)
- [Cloud Trace API](https://cloud.google.com/apis/enableflow?apiid=cloudtrace.googleapis.com)
+- [Cloud Trace API](https://console.cloud.google.com/apis/enableflow?apiid=cloudtrace.googleapis.com)
 {{< /notice >}}

 #### OTLP Exporter
@@ -175,7 +177,7 @@ It receives telemetry data, transforms it, and then exports data to backends
 that can store it permanently. Toolbox provide an option to export telemetry
 data to user's choice of backend(s) that are compatible with the Open Telemetry
 Protocol (OTLP). If you would like to use a collector, please refer to this
-[Export Telemetry using the Otel Collector](../how-to/export_telemetry.md).
+[Export Telemetry using the Otel Collector](../../how-to/export_telemetry.md).

 ### Flags

@@ -184,7 +186,7 @@ The following flags are used to determine Toolbox's telemetry configuration:
 | **flag**                   | **type** | **description**                                                                                                |
 |----------------------------|----------|----------------------------------------------------------------------------------------------------------------|
 | `--telemetry-gcp`          | bool     | Enable exporting directly to Google Cloud Monitoring. Default is `false`.                                      |
-| `--telemetry-otlp`         | string   | Enable exporting using OpenTelemetry Protocol (OTLP) to the specified endpoint (e.g. "http://127.0.0.1:4318"). |
+| `--telemetry-otlp`         | string   | Enable exporting using OpenTelemetry Protocol (OTLP) to the specified endpoint (e.g. "<http://127.0.0.1:4318>"). |
 | `--telemetry-service-name` | string   | Sets the value of the `service.name` resource attribute. Default is `toolbox`.                                 |

 In addition to the flags noted above, you can also make additional configuration
@@ -194,14 +196,16 @@ environmental variables.
 [sdk-configuration]:
    https://opentelemetry.io/docs/languages/sdk-configuration/general/

-__Examples:__
+**Examples:**

 To enable Google Cloud Exporter:
+
 ```bash
 ./toolbox --telemetry-gcp
 ```

 To enable OTLP Exporter, provide Collector endpoint:
+
 ```bash
 ./toolbox --telemetry-otlp="http://127.0.0.1:4553"
 ```
--- a/docs/en/getting-started/colab_quickstart.ipynb
+++ b/docs/en/getting-started/colab_quickstart.ipynb
@@ -190,6 +190,18 @@
        "!sudo lsof -i :5432"
      ]
    },
+    {
+      "cell_type": "markdown",
+      "metadata": {},
+      "source": [
+        "## Optional: Enable Vertex AI API for Google Cloud\n",
+        "\n",
+        "If you're using a model hosted on **Vertex AI**, run the following command to enable the API:\n",
+        "\n",
+        "```bash\n",
+        "!gcloud services enable aiplatform.googleapis.com\n"
+      ]
+    },
    {
      "cell_type": "markdown",
      "metadata": {
@@ -222,7 +234,7 @@
      },
      "outputs": [],
      "source": [
-        "version = \"0.6.0\" # x-release-please-version\n",
+        "version = \"0.13.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",
@@ -474,165 +486,12 @@
      "source": [
        "> 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 Google GenAI](#scrollTo=Fv2-uT4mvYtp)\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": {
@@ -695,7 +554,7 @@
        "\n",
        "session_service = InMemorySessionService()\n",
        "artifacts_service = InMemoryArtifactService()\n",
-        "session = session_service.create_session(\n",
+        "session = await session_service.create_session(\n",
        "    state={}, app_name='hotel_agent', user_id='123'\n",
        ")\n",
        "runner = Runner(\n",
@@ -931,6 +790,159 @@
        "await run_application()"
      ]
    },
+    {
+      "cell_type": "markdown",
+      "metadata": {
+        "id": "Fv2-uT4mvYtp"
+      },
+      "source": [
+        "### Connect Using Google GenAI"
+      ]
+    },
+    {
+      "cell_type": "code",
+      "execution_count": null,
+      "metadata": {
+        "id": "mHSvk5_AvYtu"
+      },
+      "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": "sO_7FGSYvYtu"
+      },
+      "source": [
+        "Create a Google GenAI Application which can Search, Book and Cancel hotels."
+      ]
+    },
+    {
+      "cell_type": "code",
+      "execution_count": null,
+      "metadata": {
+        "id": "-NVVBiLnvYtu"
+      },
+      "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": {
--- a/docs/en/getting-started/configure.md
+++ b/docs/en/getting-started/configure.md
@@ -1,7 +1,7 @@
 ---
 title: "Configuration"
 type: docs
-weight: 4
+weight: 6
 description: >
  How to configure Toolbox's tools.yaml file.
 ---
@@ -22,6 +22,11 @@ etc., you could use environment variables instead with the format `${ENV_NAME}`.
  user: ${USER_NAME}
  password: ${PASSWORD}
 ```
+A default value can be specified like `${ENV_NAME:default}`.
+
+```yaml
+  port: ${DB_PORT:3306}
+```

 ### Sources

@@ -45,7 +50,7 @@ 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
+The `tools` section of your `tools.yaml` defines the actions your agent can
 take: what kind of tool it is, which source(s) it affects, what parameters it
 uses, etc.

@@ -76,7 +81,7 @@ toolsets:
  my_first_toolset:
    - my_first_tool
    - my_second_tool
-   my_second_toolset:
+  my_second_toolset:
    - my_second_tool
    - my_third_tool
 ```
--- a/docs/en/getting-started/introduction/_index.md
+++ b/docs/en/getting-started/introduction/_index.md
@@ -10,17 +10,17 @@ 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?
+## Why Toolbox?

 Toolbox helps you build Gen AI tools that let your agents access data in your
 database. Toolbox provides:
+
 - **Simplified development**: Integrate tools to your agent in less than 10
  lines of code, reuse tools between multiple agents or frameworks, and deploy
  new versions of tools more easily.
@@ -30,17 +30,29 @@ database. Toolbox provides:
 - **End-to-end observability**: Out of the box metrics and tracing with built-in
  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.
+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.
+- **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].

@@ -60,6 +72,7 @@ redeploying your application.
 ## Getting Started

 ### Installing the server
+
 For the latest version, check the [releases page][releases] and use the
 following instructions for your OS and CPU architecture.

@@ -73,7 +86,7 @@ To install Toolbox as a binary:

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

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

+{{% /tab %}}
+{{% tab header="Homebrew" lang="en" %}}
+To install Toolbox using Homebrew on macOS or Linux:
+
+```sh
+brew install mcp-toolbox
+```
 {{% /tab %}}
 {{% tab header="Compile from source" lang="en" %}}

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

 ```sh
-go install github.com/googleapis/genai-toolbox@v0.6.0
+go install github.com/googleapis/genai-toolbox@v0.13.0
 ```

 {{% /tab %}}
@@ -111,17 +131,41 @@ execute `toolbox` to start the server:
 ./toolbox --tools-file "tools.yaml"
 ```

+{{< notice note >}}
+Toolbox enables dynamic reloading by default. To disable, use the
+`--disable-reload` flag.
+{{< /notice >}}
+
+#### Launching Toolbox UI
+
+To launch Toolbox's interactive UI, use the `--ui` flag. This allows you to test tools and toolsets
+with features such as authorized parameters. To learn more, visit [Toolbox UI](../../how-to/toolbox-ui/index.md).
+
+```sh
+./toolbox --ui
+```
+
+#### Homebrew Users
+
+If you installed Toolbox using Homebrew, the `toolbox` binary is available in your system path. You can start the server with the same command:
+
+```sh
+toolbox --tools-file "tools.yaml"
+```
+
 You can use `toolbox help` for a full list of flags! To stop the server, send a
 terminate signal (`ctrl+c` on most platforms).

 For more detailed documentation on deploying to different environments, check
-out the resources in the [How-to section](../../how-to/_index.md)
+out the resources in the [How-to section](../../how-to/)

 ### Integrating your application

 Once your server is up and running, you can load the tools into your
 application. See below the list of Client SDKs for using various frameworks:

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

@@ -133,6 +177,7 @@ tools:
 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!
@@ -153,6 +198,7 @@ tools:
 from toolbox_langchain 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!
@@ -173,9 +219,11 @@ tools:
 from toolbox_llamaindex 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!
+# these tools can be passed to your application
+
  tools = client.load_toolset()
 {{< /highlight >}}

@@ -184,3 +232,366 @@ For more detailed instructions on using the Toolbox Llamaindex SDK, see the

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

 [![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)
@@ -15,230 +14,17 @@ description: >
 This guide assumes you have already done the following:

 1. Installed [Python 3.9+][install-python] (including [pip][install-pip] and
-   your preferred virtual environment tool for managing dependencies e.g. [venv][install-venv])
-1. Installed [PostgreSQL 16+ and the `psql` client][install-postgres]
+   your preferred virtual environment tool for managing dependencies e.g. [venv][install-venv]).
+1. Installed [PostgreSQL 16+ and the `psql` client][install-postgres].

-[install-python]: https://wiki.python.org/moin/BeginnersGuide/Download
-[install-pip]: https://pip.pypa.io/en/stable/installation/
-[install-venv]: https://packaging.python.org/en/latest/tutorials/installing-packages/#creating-virtual-environments
-[install-postgres]: https://www.postgresql.org/download/
+### Cloud Setup (Optional)
+{{< regionInclude "quickstart/shared/cloud_setup.md" "cloud_setup" >}}

 ## Step 1: Set up your database
-
-In this section, we will create a database, insert some data that needs to be
-accessed by our agent, and create a database user for Toolbox to connect with.
-
-1. Connect to postgres using the `psql` command:
-
-    ```bash
-    psql -h 127.0.0.1 -U postgres
-    ```
-
-    Here, `postgres` denotes the default postgres superuser.
-
-    {{< notice info >}}
-#### **Having trouble connecting?**
-
-* **Password Prompt:** If you are prompted for a password for the `postgres` user and do not know it (or a blank password doesn't work), your PostgreSQL installation might require a password or a different authentication method.
-* **`FATAL: role "postgres" does not exist`:** This error means the default `postgres` superuser role isn't available under that name on your system.
-* **`Connection refused`:** Ensure your PostgreSQL server is actually running. You can typically check with `sudo systemctl status postgresql` and start it with `sudo systemctl start postgresql` on Linux systems.
-
-<br/>
-
-#### **Common Solution**
-
-For password issues or if the `postgres` role seems inaccessible directly, try switching to the `postgres` operating system user first. This user often has permission to connect without a password for local connections (this is called peer authentication).
-```bash
-sudo -i -u postgres
-psql -h 127.0.0.1
-```
-Once you are in the `psql` shell using this method, you can proceed with the database creation steps below. Afterwards, type `\q` to exit `psql`, and then `exit` to return to your normal user shell.
-
-If desired, once connected to `psql` as the `postgres` OS user, you can set a password for the `postgres` *database* user using: `ALTER USER postgres WITH PASSWORD 'your_chosen_password';`. This would allow direct connection with `-U postgres` and a password next time.
-    {{< /notice >}}
-
-1. Create a new database and a new user:
-
-    {{< notice tip >}}
-  For a real application, it's best to follow the principle of least permission
-  and only grant the privileges your application needs.
-    {{< /notice >}}
-
-    ```sql
-      CREATE USER toolbox_user WITH PASSWORD 'my-password';
-
-      CREATE DATABASE toolbox_db;
-      GRANT ALL PRIVILEGES ON DATABASE toolbox_db TO toolbox_user;
-
-      ALTER DATABASE toolbox_db OWNER TO toolbox_user;
-    ```
-
-1. End the database session:
-
-    ```bash
-    \q
-    ```
-    (If you used `sudo -i -u postgres` and then `psql`, remember you might also need to type `exit` after `\q` to leave the `postgres` user's shell session.)
-
-1. Connect to your database with your new user:
-
-    ```bash
-    psql -h 127.0.0.1 -U toolbox_user -d toolbox_db
-    ```
-
-1. Create a table using the following command:
-
-    ```sql
-    CREATE TABLE hotels(
-      id            INTEGER NOT NULL PRIMARY KEY,
-      name          VARCHAR NOT NULL,
-      location      VARCHAR NOT NULL,
-      price_tier    VARCHAR NOT NULL,
-      checkin_date  DATE    NOT NULL,
-      checkout_date DATE    NOT NULL,
-      booked        BIT     NOT NULL
-    );
-    ```
-
-1. Insert data into the table.
-
-    ```sql
-    INSERT INTO hotels(id, name, location, price_tier, checkin_date, checkout_date, booked)
-    VALUES 
-      (1, 'Hilton Basel', 'Basel', 'Luxury', '2024-04-22', '2024-04-20', B'0'),
-      (2, 'Marriott Zurich', 'Zurich', 'Upscale', '2024-04-14', '2024-04-21', B'0'),
-      (3, 'Hyatt Regency Basel', 'Basel', 'Upper Upscale', '2024-04-02', '2024-04-20', B'0'),
-      (4, 'Radisson Blu Lucerne', 'Lucerne', 'Midscale', '2024-04-24', '2024-04-05', B'0'),
-      (5, 'Best Western Bern', 'Bern', 'Upper Midscale', '2024-04-23', '2024-04-01', B'0'),
-      (6, 'InterContinental Geneva', 'Geneva', 'Luxury', '2024-04-23', '2024-04-28', B'0'),
-      (7, 'Sheraton Zurich', 'Zurich', 'Upper Upscale', '2024-04-27', '2024-04-02', B'0'),
-      (8, 'Holiday Inn Basel', 'Basel', 'Upper Midscale', '2024-04-24', '2024-04-09', B'0'),
-      (9, 'Courtyard Zurich', 'Zurich', 'Upscale', '2024-04-03', '2024-04-13', B'0'),
-      (10, 'Comfort Inn Bern', 'Bern', 'Midscale', '2024-04-04', '2024-04-16', B'0');
-    ```
-
-1. End the database session:
-
-    ```bash
-    \q
-    ```
+{{< regionInclude "quickstart/shared/database_setup.md" "database_setup" >}}

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

 ## Step 3: Connect your agent to Toolbox

@@ -253,10 +39,6 @@ you can connect to a
 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
@@ -269,15 +51,15 @@ pip install toolbox-langchain

 pip install toolbox-llamaindex
 {{< /tab >}}
+{{< tab header="Core" lang="bash" >}}
+
+pip install toolbox-core
+{{< /tab >}}
 {{< /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
@@ -301,12 +83,207 @@ pip install llama-index-llms-google-genai

 # pip install llama-index-llms-anthropic

+{{< /tab >}}
+{{< tab header="Core" lang="bash" >}}
+
+pip install google-genai
 {{< /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="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 asyncio
+import os
+
+# TODO(developer): replace this with your Google API key
+
+os.environ['GOOGLE_API_KEY'] = 'your-api-key'
+
+async def main():
+  with ToolboxSyncClient("<http://127.0.0.1:5000>") as toolbox_client:
+
+      prompt = """
+        You're a helpful hotel assistant. You handle hotel searching, booking and
+        cancellations. When the user searches for a hotel, mention it's name, id,
+        location and price tier. Always mention hotel ids while performing any
+        searches. This is very important for any operations. For any bookings or
+        cancellations, please provide the appropriate confirmation. Be sure to
+        update checkin or checkout dates if mentioned by the user.
+        Don't ask for confirmations from the user.
+      """
+
+      root_agent = Agent(
+          model='gemini-2.0-flash-001',
+          name='hotel_agent',
+          description='A helpful AI assistant.',
+          instruction=prompt,
+          tools=toolbox_client.load_toolset("my-toolset"),
+      )
+
+      session_service = InMemorySessionService()
+      artifacts_service = InMemoryArtifactService()
+      session = await session_service.create_session(
+          state={}, app_name='hotel_agent', user_id='123'
+      )
+      runner = Runner(
+          app_name='hotel_agent',
+          agent=root_agent,
+          artifact_service=artifacts_service,
+          session_service=session_service,
+      )
+
+      queries = [
+          "Find hotels in Basel with Basel in its name.",
+          "Can you book the Hilton Basel for me?",
+          "Oh wait, this is too expensive. Please cancel it and book the Hyatt Regency instead.",
+          "My check in dates would be from April 10, 2024 to April 19, 2024.",
+      ]
+
+      for query in queries:
+          content = types.Content(role='user', parts=[types.Part(text=query)])
+          events = runner.run(session_id=session.id,
+                              user_id='123', new_message=content)
+
+          responses = (
+            part.text
+            for event in events
+            for part in event.content.parts
+            if part.text is not None
+          )
+
+          for text in responses:
+            print(text)
+
+asyncio.run(main())
+{{< /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
+  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 its name.",
+    "Can you book the Hilton Basel for me?",
+    "Oh wait, this is too expensive. Please cancel it and book the Hyatt Regency instead.",
+    "My check in dates would be from April 10, 2024 to April 19, 2024.",
+]
+
+async def run_application():
+    # TODO(developer): replace this with another model if needed
+    model = ChatVertexAI(model_name="gemini-2.0-flash-001")
+    # model = ChatGoogleGenerativeAI(model="gemini-2.0-flash-001")
+    # model = ChatAnthropic(model="claude-3-5-sonnet-20240620")
+
+    # Load the tools from the Toolbox server
+    async with ToolboxClient("http://127.0.0.1:5000") as client:
+        tools = await client.aload_toolset()
+
+        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)
+
+asyncio.run(run_application())
+{{< /tab >}}
+{{< tab header="LlamaIndex" lang="python" >}}
+import asyncio
+import os
+
+from llama_index.core.agent.workflow import AgentWorkflow
+
+from llama_index.core.workflow import Context
+
+# 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
+  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 its name.",
+    "Can you book the Hilton Basel for me?",
+    "Oh wait, this is too expensive. Please cancel it and book the Hyatt Regency instead.",
+    "My check in dates would be from April 10, 2024 to April 19, 2024.",
+]
+
+async def run_application():
+    # TODO(developer): replace this with another model if needed
+    llm = GoogleGenAI(
+        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-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
+    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))
+
+asyncio.run(run_application())
+{{< /tab >}}
 {{< tab header="Core" lang="python" >}}
 import asyncio

@@ -332,7 +309,7 @@ prompt = """
 """

 queries = [
-    "Find hotels in Basel with Basel in it's name.",
+    "Find hotels in Basel with Basel in its name.",
    "Please book the hotel Hilton Basel for me.",
    "This is too expensive. Please cancel it.",
    "Please book Hyatt Regency for me",
@@ -340,7 +317,7 @@ queries = [
 ]

 async def run_application():
-    async with ToolboxClient("http://127.0.0.1:5000") as toolbox_client:
+    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
@@ -417,210 +394,27 @@ async def run_application():

 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
-  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.",
-    "Can you book the Hilton Basel for me?",
-    "Oh wait, this is too expensive. Please cancel it and book the Hyatt Regency instead.",
-    "My check in dates would be from April 10, 2024 to April 19, 2024.",
-]
-
-async def run_application():
-    # TODO(developer): replace this with another model if needed
-    model = ChatVertexAI(model_name="gemini-2.0-flash-001")
-    # model = ChatGoogleGenerativeAI(model="gemini-2.0-flash-001")
-    # model = ChatAnthropic(model="claude-3-5-sonnet-20240620")
-
-    # Load the tools from the Toolbox server
-    async with ToolboxClient("http://127.0.0.1:5000") as client:
-        tools = await client.aload_toolset()
-
-        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)
-
-asyncio.run(run_application())
-{{< /tab >}}
-{{< tab header="LlamaIndex" lang="python" >}}
-import asyncio
-import os
-
-from llama_index.core.agent.workflow import AgentWorkflow
-
-from llama_index.core.workflow import Context
-
-# 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
-  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.",
-    "Can you book the Hilton Basel for me?",
-    "Oh wait, this is too expensive. Please cancel it and book the Hyatt Regency instead.",
-    "My check in dates would be from April 10, 2024 to April 19, 2024.",
-]
-
-async def run_application():
-    # TODO(developer): replace this with another model if needed
-    llm = GoogleGenAI(
-        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-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
-    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))
-
-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/)
+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)
+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 %}}
+{{% 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 %}}
 {{< /tabpane >}}

@@ -629,3 +423,7 @@ To learn more about Agents in LlamaIndex, check out the
    ```sh
    python hotel_agent.py
    ```
+
+{{< notice info >}}
+For more information, visit the [Python SDK repo](https://github.com/googleapis/mcp-toolbox-sdk-python).
+{{</ notice >}}
--- a/docs/en/getting-started/local_quickstart_go.md
+++ b/docs/en/getting-started/local_quickstart_go.md
@@ -0,0 +1,679 @@
+---
+title: "Go Quickstart (Local)"
+type: docs
+weight: 4
+description: >
+  How to get started running Toolbox locally with [Go](https://github.com/googleapis/mcp-toolbox-sdk-go), PostgreSQL, and orchestration frameworks such as [LangChain Go](https://tmc.github.io/langchaingo/docs/), [GenkitGo](https://genkit.dev/go/docs/get-started-go/), [Go GenAI](https://github.com/googleapis/go-genai) and [OpenAI Go](https://github.com/openai/openai-go).
+---
+
+## Before you begin
+
+This guide assumes you have already done the following:
+
+1. Installed [Go (v1.24.2 or higher)].
+1. Installed [PostgreSQL 16+ and the `psql` client][install-postgres].
+
+[Go (v1.24.2 or higher)]: https://go.dev/doc/install
+[install-postgres]: https://www.postgresql.org/download/
+
+### Cloud Setup (Optional)
+{{< regionInclude "quickstart/shared/cloud_setup.md" "cloud_setup" >}}
+
+## Step 1: Set up your database
+{{< regionInclude "quickstart/shared/database_setup.md" "database_setup" >}}
+
+## Step 2: Install and configure Toolbox
+{{< regionInclude "quickstart/shared/configure_toolbox.md" "configure_toolbox" >}}
+
+## Step 3: Connect your agent to Toolbox
+
+In this section, we will write and run an agent that will load the Tools
+from Toolbox.
+
+1. Initialize a go module:
+
+    ```bash
+    go mod init main
+    ```
+
+1. In a new terminal, install the
+   [SDK](https://pkg.go.dev/github.com/googleapis/mcp-toolbox-sdk-go).
+
+    ```bash
+    go get github.com/googleapis/mcp-toolbox-sdk-go
+    ```
+
+1. Create a new file named `hotelagent.go` and copy the following code to create
+   an agent:
+
+    {{< tabpane persist=header >}}
+{{< tab header="LangChain Go" lang="go" >}}
+
+package main
+
+import (
+	"context"
+	"encoding/json"
+	"fmt"
+	"log"
+	"os"
+
+	"github.com/googleapis/mcp-toolbox-sdk-go/core"
+	"github.com/tmc/langchaingo/llms"
+	"github.com/tmc/langchaingo/llms/googleai"
+)
+
+// ConvertToLangchainTool converts a generic core.ToolboxTool into a LangChainGo llms.Tool.
+func ConvertToLangchainTool(toolboxTool *core.ToolboxTool) llms.Tool {
+
+	// Fetch the tool's input schema
+	inputschema, err := toolboxTool.InputSchema()
+	if err != nil {
+		return llms.Tool{}
+	}
+
+	var paramsSchema map[string]any
+	_ = json.Unmarshal(inputschema, &paramsSchema)
+
+	// Convert into LangChain's llms.Tool
+	return llms.Tool{
+		Type: "function",
+		Function: &llms.FunctionDefinition{
+			Name:        toolboxTool.Name(),
+			Description: toolboxTool.Description(),
+			Parameters:  paramsSchema,
+		},
+	}
+}
+
+const systemPrompt = `
+You're a helpful hotel assistant. You handle hotel searching, booking, and
+cancellations. When the user searches for a hotel, mention its name, id,
+location and price tier. Always mention hotel ids while performing any
+searches. This is very important for any operations. For any bookings or
+cancellations, please provide the appropriate confirmation. Be sure to
+update checkin or checkout dates if mentioned by the user.
+Don't ask for confirmations from the user.
+`
+
+var queries = []string{
+	"Find hotels in Basel with Basel in its name.",
+	"Can you book the hotel Hilton Basel for me?",
+	"Oh wait, this is too expensive. Please cancel it.",
+	"Please book the Hyatt Regency instead.",
+	"My check in dates would be from April 10, 2024 to April 19, 2024.",
+}
+
+func main() {
+	genaiKey := os.Getenv("GOOGLE_API_KEY")
+	toolboxURL := "http://localhost:5000"
+	ctx := context.Background()
+
+	// Initialize the Google AI client (LLM).
+	llm, err := googleai.New(ctx, googleai.WithAPIKey(genaiKey), googleai.WithDefaultModel("gemini-1.5-flash"))
+	if err != nil {
+		log.Fatalf("Failed to create Google AI client: %v", err)
+	}
+
+	// Initialize the MCP Toolbox client.
+	toolboxClient, err := core.NewToolboxClient(toolboxURL)
+	if err != nil {
+		log.Fatalf("Failed to create Toolbox client: %v", err)
+	}
+
+	// Load the tool using the MCP Toolbox SDK.
+	tools, err := toolboxClient.LoadToolset("my-toolset", ctx)
+	if err != nil {
+		log.Fatalf("Failed to load tools: %v\nMake sure your Toolbox server is running and the tool is configured.", err)
+	}
+
+	toolsMap := make(map[string]*core.ToolboxTool, len(tools))
+
+	langchainTools := make([]llms.Tool, len(tools))
+	// Convert the loaded ToolboxTools into the format LangChainGo requires.
+	for i, tool := range tools {
+		langchainTools[i] = ConvertToLangchainTool(tool)
+		toolsMap[tool.Name()] = tool
+	}
+
+	// Start the conversation history.
+	messageHistory := []llms.MessageContent{
+		llms.TextParts(llms.ChatMessageTypeSystem, systemPrompt),
+	}
+
+	for _, query := range queries {
+		messageHistory = append(messageHistory, llms.TextParts(llms.ChatMessageTypeHuman, query))
+
+		// Make the first call to the LLM, making it aware of the tool.
+		resp, err := llm.GenerateContent(ctx, messageHistory, llms.WithTools(langchainTools))
+		if err != nil {
+			log.Fatalf("LLM call failed: %v", err)
+		}
+		respChoice := resp.Choices[0]
+
+		assistantResponse := llms.TextParts(llms.ChatMessageTypeAI, respChoice.Content)
+		for _, tc := range respChoice.ToolCalls {
+			assistantResponse.Parts = append(assistantResponse.Parts, tc)
+		}
+		messageHistory = append(messageHistory, assistantResponse)
+
+		// Process each tool call requested by the model.
+		for _, tc := range respChoice.ToolCalls {
+			toolName := tc.FunctionCall.Name
+			tool := toolsMap[toolName]
+			var args map[string]any
+			if err := json.Unmarshal([]byte(tc.FunctionCall.Arguments), &args); err != nil {
+				log.Fatalf("Failed to unmarshal arguments for tool '%s': %v", toolName, err)
+			}
+			toolResult, err := tool.Invoke(ctx, args)
+			if err != nil {
+				log.Fatalf("Failed to execute tool '%s': %v", toolName, err)
+			}
+			if toolResult == "" || toolResult == nil {
+				toolResult = "Operation completed successfully with no specific return value."
+			}
+
+			// Create the tool call response message and add it to the history.
+			toolResponse := llms.MessageContent{
+				Role: llms.ChatMessageTypeTool,
+				Parts: []llms.ContentPart{
+					llms.ToolCallResponse{
+						Name:    toolName,
+						Content: fmt.Sprintf("%v", toolResult),
+					},
+				},
+			}
+			messageHistory = append(messageHistory, toolResponse)
+		}
+		finalResp, err := llm.GenerateContent(ctx, messageHistory)
+		if err != nil {
+			log.Fatalf("Final LLM call failed after tool execution: %v", err)
+		}
+
+		// Add the final textual response from the LLM to the history
+		messageHistory = append(messageHistory, llms.TextParts(llms.ChatMessageTypeAI, finalResp.Choices[0].Content))
+
+		fmt.Println(finalResp.Choices[0].Content)
+
+	}
+
+}
+
+{{< /tab >}}
+
+{{< tab header="Genkit Go" lang="go" >}}
+
+package main
+
+import (
+	"context"
+	"fmt"
+	"log"
+
+	"github.com/googleapis/mcp-toolbox-sdk-go/core"
+	"github.com/googleapis/mcp-toolbox-sdk-go/tbgenkit"
+
+	"github.com/firebase/genkit/go/ai"
+	"github.com/firebase/genkit/go/genkit"
+	"github.com/firebase/genkit/go/plugins/googlegenai"
+)
+
+const systemPrompt = `
+You're a helpful hotel assistant. You handle hotel searching, booking, and
+cancellations. When the user searches for a hotel, mention its name, id,
+location and price tier. Always mention hotel ids while performing any
+searches. This is very important for any operations. For any bookings or
+cancellations, please provide the appropriate confirmation. Be sure to
+update checkin or checkout dates if mentioned by the user.
+Don't ask for confirmations from the user.
+`
+
+var queries = []string{
+	"Find hotels in Basel with Basel in its name.",
+	"Can you book the hotel Hilton Basel for me?",
+	"Oh wait, this is too expensive. Please cancel it and book the Hyatt Regency instead.",
+	"My check in dates would be from April 10, 2024 to April 19, 2024.",
+}
+
+func main() {
+	ctx := context.Background()
+
+	// Create Toolbox Client
+	toolboxClient, err := core.NewToolboxClient("http://127.0.0.1:5000")
+	if err != nil {
+		log.Fatalf("Failed to create Toolbox client: %v", err)
+	}
+
+	// Load the tools using the MCP Toolbox SDK.
+	tools, err := toolboxClient.LoadToolset("my-toolset", ctx)
+	if err != nil {
+		log.Fatalf("Failed to load tools: %v\nMake sure your Toolbox server is running and the tool is configured.", err)
+	}
+
+	// Initialize Genkit
+	g, err := genkit.Init(ctx,
+		genkit.WithPlugins(&googlegenai.GoogleAI{}),
+		genkit.WithDefaultModel("googleai/gemini-1.5-flash"),
+	)
+	if err != nil {
+		log.Fatalf("Failed to init genkit: %v\n", err)
+	}
+
+	// Create a conversation history
+	conversationHistory := []*ai.Message{
+		ai.NewSystemTextMessage(systemPrompt),
+	}
+
+	// Convert your tool to a Genkit tool.
+	genkitTools := make([]ai.Tool, len(tools))
+	for i, tool := range tools {
+		newTool, err := tbgenkit.ToGenkitTool(tool, g)
+		if err != nil {
+			log.Fatalf("Failed to convert tool: %v\n", err)
+		}
+		genkitTools[i] = newTool
+	}
+
+	toolRefs := make([]ai.ToolRef, len(genkitTools))
+
+	for i, tool := range genkitTools {
+		toolRefs[i] = tool
+	}
+
+	for _, query := range queries {
+		conversationHistory = append(conversationHistory, ai.NewUserTextMessage(query))
+		response, err := genkit.Generate(ctx, g,
+			ai.WithMessages(conversationHistory...),
+			ai.WithTools(toolRefs...),
+			ai.WithReturnToolRequests(true),
+		)
+
+		if err != nil {
+			log.Fatalf("%v\n", err)
+		}
+		conversationHistory = append(conversationHistory, response.Message)
+
+		parts := []*ai.Part{}
+
+		for _, req := range response.ToolRequests() {
+			tool := genkit.LookupTool(g, req.Name)
+			if tool == nil {
+				log.Fatalf("tool %q not found", req.Name)
+			}
+
+			output, err := tool.RunRaw(ctx, req.Input)
+			if err != nil {
+				log.Fatalf("tool %q execution failed: %v", tool.Name(), err)
+			}
+
+			parts = append(parts,
+				ai.NewToolResponsePart(&ai.ToolResponse{
+					Name:   req.Name,
+					Ref:    req.Ref,
+					Output: output,
+				}))
+
+		}
+
+		if len(parts) > 0 {
+			resp, err := genkit.Generate(ctx, g,
+				ai.WithMessages(append(response.History(), ai.NewMessage(ai.RoleTool, nil, parts...))...),
+				ai.WithTools(toolRefs...),
+			)
+			if err != nil {
+				log.Fatal(err)
+			}
+			fmt.Println("\n", resp.Text())
+			conversationHistory = append(conversationHistory, resp.Message)
+		} else {
+			fmt.Println("\n", response.Text())
+		}
+
+	}
+
+}
+
+{{< /tab >}}
+
+{{< tab header="Go GenAI" lang="go" >}}
+
+package main
+
+import (
+	"context"
+	"encoding/json"
+	"fmt"
+	"log"
+	"os"
+
+	"github.com/googleapis/mcp-toolbox-sdk-go/core"
+	"google.golang.org/genai"
+)
+
+// ConvertToGenaiTool translates a ToolboxTool into the genai.FunctionDeclaration format.
+func ConvertToGenaiTool(toolboxTool *core.ToolboxTool) *genai.Tool {
+
+	inputschema, err := toolboxTool.InputSchema()
+	if err != nil {
+		return &genai.Tool{}
+	}
+
+	var paramsSchema *genai.Schema
+	_ = json.Unmarshal(inputschema, &paramsSchema)
+	// First, create the function declaration.
+	funcDeclaration := &genai.FunctionDeclaration{
+		Name:        toolboxTool.Name(),
+		Description: toolboxTool.Description(),
+		Parameters:  paramsSchema,
+	}
+
+	// Then, wrap the function declaration in a genai.Tool struct.
+	return &genai.Tool{
+		FunctionDeclarations: []*genai.FunctionDeclaration{funcDeclaration},
+	}
+}
+
+func printResponse(resp *genai.GenerateContentResponse) {
+	for _, cand := range resp.Candidates {
+		if cand.Content != nil {
+			for _, part := range cand.Content.Parts {
+				fmt.Println(part.Text)
+			}
+		}
+	}
+}
+
+const systemPrompt = `
+You're a helpful hotel assistant. You handle hotel searching, booking, and
+cancellations. When the user searches for a hotel, mention its name, id,
+location and price tier. Always mention hotel ids while performing any
+searches. This is very important for any operations. For any bookings or
+cancellations, please provide the appropriate confirmation. Be sure to
+update checkin or checkout dates if mentioned by the user.
+Don't ask for confirmations from the user.
+`
+
+var queries = []string{
+	"Find hotels in Basel with Basel in its name.",
+	"Can you book the hotel Hilton Basel for me?",
+	"Oh wait, this is too expensive. Please cancel it.",
+	"Please book the Hyatt Regency instead.",
+	"My check in dates would be from April 10, 2024 to April 19, 2024.",
+}
+
+func main() {
+	// Setup
+	ctx := context.Background()
+	apiKey := os.Getenv("GOOGLE_API_KEY")
+	toolboxURL := "http://localhost:5000"
+
+	// Initialize the Google GenAI client using the explicit ClientConfig.
+	client, err := genai.NewClient(ctx, &genai.ClientConfig{
+		APIKey: apiKey,
+	})
+	if err != nil {
+		log.Fatalf("Failed to create Google GenAI client: %v", err)
+	}
+
+	// Initialize the MCP Toolbox client.
+	toolboxClient, err := core.NewToolboxClient(toolboxURL)
+	if err != nil {
+		log.Fatalf("Failed to create Toolbox client: %v", err)
+	}
+
+	// Load the tool using the MCP Toolbox SDK.
+	tools, err := toolboxClient.LoadToolset("my-toolset", ctx)
+	if err != nil {
+		log.Fatalf("Failed to load tools: %v\nMake sure your Toolbox server is running and the tool is configured.", err)
+	}
+
+	genAITools := make([]*genai.Tool, len(tools))
+	toolsMap := make(map[string]*core.ToolboxTool, len(tools))
+
+	for i, tool := range tools {
+		genAITools[i] = ConvertToGenaiTool(tool)
+		toolsMap[tool.Name()] = tool
+	}
+
+	// Set up the generative model with the available tool.
+	modelName := "gemini-2.0-flash"
+
+	// Create the initial content prompt for the model.
+	messageHistory := []*genai.Content{
+		genai.NewContentFromText(systemPrompt, genai.RoleUser),
+	}
+	config := &genai.GenerateContentConfig{
+		Tools: genAITools,
+		ToolConfig: &genai.ToolConfig{
+			FunctionCallingConfig: &genai.FunctionCallingConfig{
+				Mode: genai.FunctionCallingConfigModeAny,
+			},
+		},
+	}
+
+	for _, query := range queries {
+
+		messageHistory = append(messageHistory, genai.NewContentFromText(query, genai.RoleUser))
+
+		genContentResp, err := client.Models.GenerateContent(ctx, modelName, messageHistory, config)
+		if err != nil {
+			log.Fatalf("LLM call failed for query '%s': %v", query, err)
+		}
+
+		if len(genContentResp.Candidates) > 0 && genContentResp.Candidates[0].Content != nil {
+			messageHistory = append(messageHistory, genContentResp.Candidates[0].Content)
+		}
+
+		functionCalls := genContentResp.FunctionCalls()
+
+		toolResponseParts := []*genai.Part{}
+
+		for _, fc := range functionCalls {
+
+			toolToInvoke, found := toolsMap[fc.Name]
+			if !found {
+				log.Fatalf("Tool '%s' not found in loaded tools map. Check toolset configuration.", fc.Name)
+			}
+
+			toolResult, invokeErr := toolToInvoke.Invoke(ctx, fc.Args)
+			if invokeErr != nil {
+				log.Fatalf("Failed to execute tool '%s': %v", fc.Name, invokeErr)
+			}
+
+			// Enhanced Tool Result Handling (retained to prevent nil issues)
+			toolResultString := ""
+			if toolResult != nil {
+				jsonBytes, marshalErr := json.Marshal(toolResult)
+				if marshalErr == nil {
+					toolResultString = string(jsonBytes)
+				} else {
+					toolResultString = fmt.Sprintf("%v", toolResult)
+				}
+			}
+
+			responseMap := map[string]any{"result": toolResultString}
+
+			toolResponseParts = append(toolResponseParts, genai.NewPartFromFunctionResponse(fc.Name, responseMap))
+		}
+		// Add all accumulated tool responses for this turn to the message history.
+		toolResponseContent := genai.NewContentFromParts(toolResponseParts, "function")
+		messageHistory = append(messageHistory, toolResponseContent)
+
+		finalResponse, err := client.Models.GenerateContent(ctx, modelName, messageHistory, &genai.GenerateContentConfig{})
+		if err != nil {
+			log.Fatalf("Error calling GenerateContent (with function result): %v", err)
+		}
+
+		printResponse(finalResponse)
+		// Add the final textual response from the LLM to the history
+		if len(finalResponse.Candidates) > 0 && finalResponse.Candidates[0].Content != nil {
+			messageHistory = append(messageHistory, finalResponse.Candidates[0].Content)
+		}
+	}
+}
+
+{{< /tab >}}
+
+{{< tab header="OpenAI Go" lang="go" >}}
+
+package main
+
+import (
+	"context"
+	"encoding/json"
+	"log"
+	"fmt
+
+	"github.com/googleapis/mcp-toolbox-sdk-go/core"
+	openai "github.com/openai/openai-go"
+)
+
+// ConvertToOpenAITool converts a ToolboxTool into the go-openai library's Tool format.
+func ConvertToOpenAITool(toolboxTool *core.ToolboxTool) openai.ChatCompletionToolParam {
+	// Get the input schema
+	jsonSchemaBytes, err := toolboxTool.InputSchema()
+	if err != nil {
+		return openai.ChatCompletionToolParam{}
+	}
+
+	// Unmarshal the JSON bytes into FunctionParameters
+	var paramsSchema openai.FunctionParameters
+	if err := json.Unmarshal(jsonSchemaBytes, &paramsSchema); err != nil {
+		return openai.ChatCompletionToolParam{}
+	}
+
+	// Create and return the final tool parameter struct.
+	return openai.ChatCompletionToolParam{
+		Function: openai.FunctionDefinitionParam{
+			Name:        toolboxTool.Name(),
+			Description: openai.String(toolboxTool.Description()),
+			Parameters:  paramsSchema,
+		},
+	}
+}
+
+const systemPrompt = `
+You're a helpful hotel assistant. You handle hotel searching, booking, and
+cancellations. When the user searches for a hotel, mention its name, id,
+location and price tier. Always mention hotel ids while performing any
+searches. This is very important for any operations. For any bookings or
+cancellations, please provide the appropriate confirmation. Be sure to
+update checkin or checkout dates if mentioned by the user.
+Don't ask for confirmations from the user.
+`
+
+var queries = []string{
+	"Find hotels in Basel with Basel in its name.",
+	"Can you book the hotel Hilton Basel for me?",
+	"Oh wait, this is too expensive. Please cancel it and book the Hyatt Regency instead.",
+	"My check in dates would be from April 10, 2024 to April 19, 2024.",
+}
+
+func main() {
+	// Setup
+	ctx := context.Background()
+	toolboxURL := "http://localhost:5000"
+	openAIClient := openai.NewClient()
+
+	// Initialize the MCP Toolbox client.
+	toolboxClient, err := core.NewToolboxClient(toolboxURL)
+	if err != nil {
+		log.Fatalf("Failed to create Toolbox client: %v", err)
+	}
+
+	// Load the tools using the MCP Toolbox SDK.
+	tools, err := toolboxClient.LoadToolset("my-toolset", ctx)
+	if err != nil {
+		log.Fatalf("Failed to load tool : %v\nMake sure your Toolbox server is running and the tool is configured.", err)
+	}
+
+	openAITools := make([]openai.ChatCompletionToolParam, len(tools))
+	toolsMap := make(map[string]*core.ToolboxTool, len(tools))
+
+	for i, tool := range tools {
+		// Convert the Toolbox tool into the openAI FunctionDeclaration format.
+		openAITools[i] = ConvertToOpenAITool(tool)
+		// Add tool to a map for lookup later
+		toolsMap[tool.Name()] = tool
+
+	}
+
+	params := openai.ChatCompletionNewParams{
+		Messages: []openai.ChatCompletionMessageParamUnion{
+			openai.SystemMessage(systemPrompt),
+		},
+		Tools: openAITools,
+		Seed:  openai.Int(0),
+		Model: openai.ChatModelGPT4o,
+	}
+
+	for _, query := range queries {
+
+		params.Messages = append(params.Messages, openai.UserMessage(query))
+
+		// Make initial chat completion request
+		completion, err := openAIClient.Chat.Completions.New(ctx, params)
+		if err != nil {
+			panic(err)
+		}
+
+		toolCalls := completion.Choices[0].Message.ToolCalls
+
+		// Return early if there are no tool calls
+		if len(toolCalls) == 0 {
+			log.Println("No function call")
+		}
+
+		// If there was a function call, continue the conversation
+		params.Messages = append(params.Messages, completion.Choices[0].Message.ToParam())
+		for _, toolCall := range toolCalls {
+
+			toolName := toolCall.Function.Name
+			toolToInvoke := toolsMap[toolName]
+
+			var args map[string]any
+			err := json.Unmarshal([]byte(toolCall.Function.Arguments), &args)
+			if err != nil {
+				panic(err)
+			}
+
+			result, err := toolToInvoke.Invoke(ctx, args)
+			if err != nil {
+				log.Fatal("Could not invoke tool", err)
+			}
+
+			params.Messages = append(params.Messages, openai.ToolMessage(result.(string), toolCall.ID))
+		}
+
+		completion, err = openAIClient.Chat.Completions.New(ctx, params)
+		if err != nil {
+			panic(err)
+		}
+
+		params.Messages = append(params.Messages, openai.AssistantMessage(query))
+
+		fmt.println("\n", completion.Choices[0].Message.Content)
+
+	}
+
+}
+
+{{< /tab >}}
+{{< /tabpane >}}
+
+1. Ensure all dependencies are installed:
+
+    ```sh
+    go mod tidy
+    ```
+
+1. Run your agent, and observe the results:
+
+    ```sh
+    go run hotelagent.go
+    ```
+
+{{< notice info >}}
+For more information, visit the [Go SDK
+repo](https://github.com/googleapis/mcp-toolbox-sdk-go).
+{{</ notice >}}
--- a/docs/en/getting-started/local_quickstart_js.md
+++ b/docs/en/getting-started/local_quickstart_js.md
@@ -0,0 +1,457 @@
+---
+title: "JS Quickstart (Local)"
+type: docs
+weight: 3
+description: >
+  How to get started running Toolbox locally with [JavaScript](https://github.com/googleapis/mcp-toolbox-sdk-js), PostgreSQL, and orchestration frameworks such as [LangChain](https://js.langchain.com/docs/introduction/), [GenkitJS](https://genkit.dev/docs/get-started/),  [LlamaIndex](https://ts.llamaindex.ai/) and [GoogleGenAI](https://github.com/googleapis/js-genai).
+---
+
+## Before you begin
+
+This guide assumes you have already done the following:
+
+1. Installed [Node.js (v18 or higher)].
+1. Installed [PostgreSQL 16+ and the `psql` client][install-postgres].
+
+[Node.js (v18 or higher)]: https://nodejs.org/
+[install-postgres]: https://www.postgresql.org/download/
+
+### Cloud Setup (Optional)
+{{< regionInclude "quickstart/shared/cloud_setup.md" "cloud_setup" >}}
+
+## Step 1: Set up your database
+{{< regionInclude "quickstart/shared/database_setup.md" "database_setup" >}}
+
+## Step 2: Install and configure Toolbox
+{{< regionInclude "quickstart/shared/configure_toolbox.md" "configure_toolbox" >}}
+
+## Step 3: Connect your agent to Toolbox
+
+In this section, we will write and run an agent that will load the Tools
+from Toolbox.
+
+1. (Optional) Initialize a Node.js project:
+
+    ```bash
+    npm init -y
+    ```
+
+1. In a new terminal, install the [SDK](https://www.npmjs.com/package/@toolbox-sdk/core).
+
+    ```bash
+    npm install @toolbox-sdk/core
+    ```
+
+1. Install other required dependencies
+
+   {{< tabpane persist=header >}}
+{{< tab header="LangChain" lang="bash" >}}
+npm install langchain @langchain/google-genai
+{{< /tab >}}
+{{< tab header="GenkitJS" lang="bash" >}}
+npm install genkit @genkit-ai/googleai
+{{< /tab >}}
+{{< tab header="LlamaIndex" lang="bash" >}}
+npm install llamaindex @llamaindex/google @llamaindex/workflow
+{{< /tab >}}
+{{< tab header="GoogleGenAI" lang="bash" >}}
+npm install @google/genai 
+{{< /tab >}}
+{{< /tabpane >}}
+
+1. Create a new file named `hotelAgent.js` and copy the following code to create an agent:
+
+    {{< tabpane persist=header >}}
+{{< tab header="LangChain" lang="js" >}}
+
+import { ChatGoogleGenerativeAI } from "@langchain/google-genai";
+import { ToolboxClient } from "@toolbox-sdk/core";
+import { tool } from "@langchain/core/tools";
+import { createReactAgent } from "@langchain/langgraph/prebuilt";
+import { MemorySaver } from "@langchain/langgraph";
+
+// Replace it with your API key
+process.env.GOOGLE_API_KEY = 'your-api-key';
+
+const prompt = `
+You're a helpful hotel assistant. You handle hotel searching, booking, and
+cancellations. When the user searches for a hotel, mention its name, id,
+location and price tier. Always mention hotel ids while performing any
+searches. This is very important for any operations. For any bookings or
+cancellations, please provide the appropriate confirmation. Be sure to
+update checkin or checkout dates if mentioned by the user.
+Don't ask for confirmations from the user.
+`;
+
+const queries = [
+  "Find hotels in Basel with Basel in its name.",
+  "Can you book the Hilton Basel for me?",
+  "Oh wait, this is too expensive. Please cancel it and book the Hyatt Regency instead.",
+  "My check in dates would be from April 10, 2024 to April 19, 2024.",
+];
+
+async function runApplication() {
+  const model = new ChatGoogleGenerativeAI({
+    model: "gemini-2.0-flash",
+  });
+
+  const client = new ToolboxClient("http://127.0.0.1:5000");
+  const toolboxTools = await client.loadToolset("my-toolset");
+
+  // Define the basics of the tool: name, description, schema and core logic
+  const getTool = (toolboxTool) => tool(toolboxTool, {
+    name: toolboxTool.getName(),
+    description: toolboxTool.getDescription(),
+    schema: toolboxTool.getParamSchema()
+  });
+  const tools = toolboxTools.map(getTool);
+
+  const agent = createReactAgent({
+    llm: model,
+    tools: tools,
+    checkpointer: new MemorySaver(),
+    systemPrompt: prompt,
+  });
+
+  const langGraphConfig = {
+    configurable: {
+        thread_id: "test-thread",
+    },
+  };
+
+  for (const query of queries) {
+    const agentOutput = await agent.invoke(
+    {
+        messages: [
+        {
+            role: "user",
+            content: query,
+        },
+        ],
+        verbose: true,
+    },
+    langGraphConfig
+    );
+    const response = agentOutput.messages[agentOutput.messages.length - 1].content;
+    console.log(response);
+  }
+}
+
+runApplication()
+  .catch(console.error)
+  .finally(() => console.log("\nApplication finished."));
+
+{{< /tab >}}
+
+{{< tab header="GenkitJS" lang="js" >}}
+
+import { ToolboxClient } from "@toolbox-sdk/core";
+import { genkit } from "genkit";
+import { googleAI } from '@genkit-ai/googleai';
+
+// Replace it with your API key
+process.env.GOOGLE_API_KEY = 'your-api-key';
+
+const systemPrompt = `
+You're a helpful hotel assistant. You handle hotel searching, booking, and
+cancellations. When the user searches for a hotel, mention its name, id,
+location and price tier. Always mention hotel ids while performing any
+searches. This is very important for any operations. For any bookings or
+cancellations, please provide the appropriate confirmation. Be sure to
+update checkin or checkout dates if mentioned by the user.
+Don't ask for confirmations from the user.
+`;
+
+const queries = [
+  "Find hotels in Basel with Basel in its name.",
+  "Can you book the Hilton Basel for me?",
+  "Oh wait, this is too expensive. Please cancel it and book the Hyatt Regency instead.",
+  "My check in dates would be from April 10, 2024 to April 19, 2024.",
+];
+
+async function run() {
+  const toolboxClient = new ToolboxClient("http://127.0.0.1:5000");
+
+  const ai = genkit({
+    plugins: [
+      googleAI({
+        apiKey: process.env.GEMINI_API_KEY || process.env.GOOGLE_API_KEY
+      })
+    ],
+    model: googleAI.model('gemini-2.0-flash'),
+  });
+
+  const toolboxTools = await toolboxClient.loadToolset("my-toolset");
+  const toolMap = Object.fromEntries(
+    toolboxTools.map((tool) => {
+      const definedTool = ai.defineTool(
+        {
+          name: tool.getName(),
+          description: tool.getDescription(),
+          inputSchema: tool.getParamSchema(),
+        },
+        tool
+      );
+      return [tool.getName(), definedTool];
+    })
+  );
+  const tools = Object.values(toolMap);
+
+  let conversationHistory = [{ role: "system", content: [{ text: systemPrompt }] }];
+
+  for (const query of queries) {
+    conversationHistory.push({ role: "user", content: [{ text: query }] });
+    const response = await ai.generate({
+      messages: conversationHistory,
+      tools: tools,
+    });
+    conversationHistory.push(response.message);
+
+    const toolRequests = response.toolRequests;
+    if (toolRequests?.length > 0) {
+      // Execute tools concurrently and collect their responses.
+      const toolResponses = await Promise.all(
+        toolRequests.map(async (call) => {
+          try {
+            const toolOutput = await toolMap[call.name].invoke(call.input);
+            return { role: "tool", content: [{ toolResponse: { name: call.name, output: toolOutput } }] };
+          } catch (e) {
+            console.error(`Error executing tool ${call.name}:`, e);
+            return { role: "tool", content: [{ toolResponse: { name: call.name, output: { error: e.message } } }] };
+          }
+        })
+      );
+
+      conversationHistory.push(...toolResponses);
+
+      // Call the AI again with the tool results.
+      response = await ai.generate({ messages: conversationHistory, tools });
+      conversationHistory.push(response.message);
+    }
+
+    console.log(response.text);
+  }
+}
+
+run();
+{{< /tab >}}
+
+{{< tab header="LlamaIndex" lang="js" >}}
+
+import { gemini, GEMINI_MODEL } from "@llamaindex/google";
+import { agent } from "@llamaindex/workflow";
+import { createMemory, staticBlock, tool } from "llamaindex";
+import { ToolboxClient } from "@toolbox-sdk/core";
+
+const TOOLBOX_URL = "http://127.0.0.1:5000"; // Update if needed
+process.env.GOOGLE_API_KEY = 'your-api-key'; // Replace it with your API key
+
+const prompt = `
+
+You're a helpful hotel assistant. You handle hotel searching, booking and cancellations.
+When the user searches for a hotel, mention its name, id, location and price tier.
+Always mention hotel ids while performing any searches â€” this is very important for operations.
+For any bookings or cancellations, please provide the appropriate confirmation.
+Update check-in or check-out dates if mentioned by the user.
+Don't ask for confirmations from the user.
+
+`;
+
+const queries = [
+  "Find hotels in Basel with Basel in its name.",
+  "Can you book the Hilton Basel for me?",
+  "Oh wait, this is too expensive. Please cancel it and book the Hyatt Regency instead.",
+  "My check in dates would be from April 10, 2024 to April 19, 2024.",
+];
+
+async function main() {
+  // Connect to MCP Toolbox
+  const client = new ToolboxClient(TOOLBOX_URL);
+  const toolboxTools = await client.loadToolset("my-toolset");
+  const tools = toolboxTools.map((toolboxTool) => {
+    return tool({
+      name: toolboxTool.getName(),
+      description: toolboxTool.getDescription(),
+      parameters: toolboxTool.getParamSchema(),
+      execute: toolboxTool,
+    });
+  });
+
+  // Initialize LLM
+  const llm = gemini({
+    model: GEMINI_MODEL.GEMINI_2_0_FLASH,
+    apiKey: process.env.GOOGLE_API_KEY,
+  });
+
+  const memory = createMemory({
+    memoryBlocks: [
+      staticBlock({
+        content: prompt,
+      }),
+    ],
+  });
+
+  // Create the Agent
+  const myAgent = agent({
+    tools: tools,
+    llm,
+    memory,
+    systemPrompt: prompt,
+  });
+
+  for (const query of queries) {
+    const result = await myAgent.run(query);
+    const output = result.data.result;
+
+    console.log(`\nUser: ${query}`);
+    if (typeof output === "string") {
+      console.log(output.trim());
+    } else if (typeof output === "object" && "text" in output) {
+      console.log(output.text.trim());
+    } else {
+      console.log(JSON.stringify(output));
+    }
+  }
+  //You may observe some extra logs during execution due to the run method provided by Llama.
+  console.log("Agent run finished.");
+}
+
+main();
+
+{{< /tab >}}
+
+{{< tab header="GoogleGenAI" lang="js" >}}
+import { GoogleGenAI } from "@google/genai";
+import { ToolboxClient } from "@toolbox-sdk/core";
+
+
+const TOOLBOX_URL = "http://127.0.0.1:5000"; // Update if needed
+const GOOGLE_API_KEY = 'enter your api here'; // Replace it with your API key
+
+const prompt = `
+You're a helpful hotel assistant. You handle hotel searching, booking, and
+cancellations. When the user searches for a hotel, you MUST use the available tools to find information. Mention its name, id,
+location and price tier. Always mention hotel id while performing any
+searches. This is very important for any operations. For any bookings or
+cancellations, please provide the appropriate confirmation. Be sure to
+update checkin or checkout dates if mentioned by the user.
+Don't ask for confirmations from the user.
+`;
+
+const queries = [
+  "Find hotels in Basel with Basel in its name.",
+  "Can you book the Hilton Basel for me?",
+  "Oh wait, this is too expensive. Please cancel it and book the Hyatt Regency instead.",
+  "My check in dates would be from April 10, 2024 to April 19, 2024.",
+];
+
+function mapZodTypeToOpenAPIType(zodTypeName) {
+
+    console.log(zodTypeName)
+    const typeMap = {
+        'ZodString': 'string',
+        'ZodNumber': 'number',
+        'ZodBoolean': 'boolean',
+        'ZodArray': 'array',
+        'ZodObject': 'object',
+    };
+    return typeMap[zodTypeName] || 'string';
+}
+
+async function runApplication() {
+   
+    const toolboxClient = new ToolboxClient(TOOLBOX_URL); 
+    const toolboxTools = await toolboxClient.loadToolset("my-toolset");
+    
+    const geminiTools = [{
+        functionDeclarations: toolboxTools.map(tool => {
+            
+            const schema = tool.getParamSchema();
+            const properties = {};
+            const required = [];
+
+         
+            for (const [key, param] of Object.entries(schema.shape)) {
+                properties[key] = {
+                        type: mapZodTypeToOpenAPIType(param.constructor.name),
+                        description: param.description || '',
+                    };
+                required.push(key)
+                }
+            
+            return {
+                name: tool.getName(),
+                description: tool.getDescription(),
+                parameters: { type: 'object', properties, required },
+            };
+        })
+    }];
+
+
+    const genAI = new GoogleGenAI({ apiKey: GOOGLE_API_KEY });
+    
+    const chat = genAI.chats.create({
+        model: "gemini-2.5-flash",
+        config: {
+            systemInstruction: prompt,
+            tools: geminiTools,
+        }
+    });
+
+    for (const query of queries) {
+        
+        let currentResult = await chat.sendMessage({ message: query });
+        
+        let finalResponseGiven = false
+        while (!finalResponseGiven) {
+            
+            const response = currentResult;
+            const functionCalls = response.functionCalls || [];
+
+            if (functionCalls.length === 0) {
+                console.log(response.text)
+                finalResponseGiven = true;
+            } else {
+                const toolResponses = [];
+                for (const call of functionCalls) {
+                    const toolName = call.name
+                    const toolToExecute = toolboxTools.find(t => t.getName() === toolName);
+                    
+                    if (toolToExecute) {
+                        try {
+                            const functionResult = await toolToExecute(call.args);
+                            toolResponses.push({
+                                functionResponse: { name: call.name, response: { result: functionResult } }
+                            });
+                        } catch (e) {
+                            console.error(`Error executing tool '${toolName}':`, e);
+                            toolResponses.push({
+                                functionResponse: { name: call.name, response: { error: e.message } }
+                            });
+                        }
+                    }
+                }
+                
+                currentResult = await chat.sendMessage({ message: toolResponses });
+            }
+        }
+        
+    }
+}
+
+runApplication()
+  .catch(console.error)
+  .finally(() => console.log("\nApplication finished."));
+{{< /tab >}}
+
+{{< /tabpane >}}
+
+1. Run your agent, and observe the results:
+
+    ```sh
+    node hotelAgent.js
+    ```
+
+{{< notice info >}}
+For more information, visit the [JS SDK repo](https://github.com/googleapis/mcp-toolbox-sdk-js).
+{{</ notice >}}
--- a/docs/en/getting-started/mcp_quickstart/_index.md
+++ b/docs/en/getting-started/mcp_quickstart/_index.md
@@ -1,9 +1,9 @@
 ---
 title: "Quickstart (MCP)"
 type: docs
-weight: 3
+weight: 5
 description: >
-  How to get started running Toolbox locally with MCP Inspector. 
+  How to get started running Toolbox locally with MCP Inspector.
 ---

 ## Overview
@@ -71,7 +71,7 @@ access by our agent, and create a database user for Toolbox to connect with.

    ```sql
    INSERT INTO hotels(id, name, location, price_tier, checkin_date, checkout_date, booked)
-    VALUES 
+    VALUES
      (1, 'Hilton Basel', 'Basel', 'Luxury', '2024-04-22', '2024-04-20', B'0'),
      (2, 'Marriott Zurich', 'Zurich', 'Upscale', '2024-04-14', '2024-04-21', B'0'),
      (3, 'Hyatt Regency Basel', 'Basel', 'Upper Upscale', '2024-04-02', '2024-04-20', B'0'),
@@ -105,7 +105,7 @@ In this section, we will download Toolbox, configure our tools in a
    <!-- {x-release-please-start-version} -->
    ```bash
    export OS="linux/amd64" # one of linux/amd64, darwin/arm64, darwin/amd64, or windows/amd64
-    curl -O https://storage.googleapis.com/genai-toolbox/v0.6.0/$OS/toolbox
+    curl -O https://storage.googleapis.com/genai-toolbox/v0.13.0/$OS/toolbox
    ```
    <!-- {x-release-please-end} -->

@@ -199,7 +199,8 @@ In this section, we will download Toolbox, configure our tools in a
        - cancel-hotel
    ```

-    For more info on tools, check out the [Tools](../../resources/tools/_index.md) section.
+    For more info on tools, check out the
+    [Tools](../../resources/tools/) section.

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

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

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

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

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

 1. Open the above link in your browser.

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

-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`.
+
+1. For `Configuration` -> `Proxy Session Token`, make sure
+   `<YOUR_SESSION_TOKEN>` is present.

 1. Click Connect.

--- a/docs/en/getting-started/mcp_quickstart/inspector.png
+++ b/docs/en/getting-started/mcp_quickstart/inspector.png
--- a/docs/en/getting-started/quickstart/shared/cloud_setup.md
+++ b/docs/en/getting-started/quickstart/shared/cloud_setup.md
@@ -0,0 +1,20 @@
+<!-- This file has been used in local_quickstart.md, local_quickstart_go.md & local_quickstart_js.md -->
+<!-- [START cloud_setup] -->
+If you plan to use **Google Cloud’s Vertex AI** with your agent (e.g., using
+`vertexai=True` or a Google GenAI model), follow these one-time setup steps for
+local development:
+
+1. [Install the Google Cloud CLI](https://cloud.google.com/sdk/docs/install)
+1. [Set up Application Default Credentials (ADC)](https://cloud.google.com/docs/authentication/set-up-adc-local-dev-environment)
+1. Set your project and enable Vertex AI
+
+    ```bash
+    gcloud config set project YOUR_PROJECT_ID
+    gcloud services enable aiplatform.googleapis.com
+    ```
+
+[install-python]: https://wiki.python.org/moin/BeginnersGuide/Download
+[install-pip]: https://pip.pypa.io/en/stable/installation/
+[install-venv]: https://packaging.python.org/en/latest/tutorials/installing-packages/#creating-virtual-environments
+[install-postgres]: https://www.postgresql.org/download/
+<!-- [END cloud_setup] -->
--- a/docs/en/getting-started/quickstart/shared/configure_toolbox.md
+++ b/docs/en/getting-started/quickstart/shared/configure_toolbox.md
@@ -0,0 +1,122 @@
+<!-- This file has been used in local_quickstart.md, local_quickstart_go.md & local_quickstart_js.md -->
+<!-- [START configure_toolbox] -->
+In this section, we will download Toolbox, configure our tools in a
+`tools.yaml`, and then run the Toolbox server.
+
+1. Download the latest version of Toolbox as a binary:
+
+    {{< notice tip >}}
+  Select the
+  [correct binary](https://github.com/googleapis/genai-toolbox/releases)
+  corresponding to your OS and CPU architecture.
+    {{< /notice >}}
+    <!-- {x-release-please-start-version} -->
+    ```bash
+    export OS="linux/amd64" # one of linux/amd64, darwin/arm64, darwin/amd64, or windows/amd64
+    curl -O https://storage.googleapis.com/genai-toolbox/v0.12.0/$OS/toolbox
+    ```
+    <!-- {x-release-please-end} -->
+
+1. Make the binary executable:
+
+    ```bash
+    chmod +x toolbox
+    ```
+
+1. Write the following into a `tools.yaml` file. Be sure to update any fields
+   such as `user`, `password`, or `database` that you may have customized in the
+   previous step.
+
+    {{< notice tip >}}
+  In practice, use environment variable replacement with the format ${ENV_NAME}
+  instead of hardcoding your secrets into the configuration file.
+    {{< /notice >}}
+
+    ```yaml
+    sources:
+      my-pg-source:
+        kind: postgres
+        host: 127.0.0.1
+        port: 5432
+        database: toolbox_db
+        user: ${USER_NAME}
+        password: ${PASSWORD}
+    tools:
+      search-hotels-by-name:
+        kind: postgres-sql
+        source: my-pg-source
+        description: Search for hotels based on name.
+        parameters:
+          - name: name
+            type: string
+            description: The name of the hotel.
+        statement: SELECT * FROM hotels WHERE name ILIKE '%' || $1 || '%';
+      search-hotels-by-location:
+        kind: postgres-sql
+        source: my-pg-source
+        description: Search for hotels based on location.
+        parameters:
+          - name: location
+            type: string
+            description: The location of the hotel.
+        statement: SELECT * FROM hotels WHERE location ILIKE '%' || $1 || '%';
+      book-hotel:
+        kind: postgres-sql
+        source: my-pg-source
+        description: >-
+           Book a hotel by its ID. If the hotel is successfully booked, returns a NULL, raises an error if not.
+        parameters:
+          - name: hotel_id
+            type: string
+            description: The ID of the hotel to book.
+        statement: UPDATE hotels SET booked = B'1' WHERE id = $1;
+      update-hotel:
+        kind: postgres-sql
+        source: my-pg-source
+        description: >-
+          Update a hotel's check-in and check-out dates by its ID. Returns a message
+          indicating  whether the hotel was successfully updated or not.
+        parameters:
+          - name: hotel_id
+            type: string
+            description: The ID of the hotel to update.
+          - name: checkin_date
+            type: string
+            description: The new check-in date of the hotel.
+          - name: checkout_date
+            type: string
+            description: The new check-out date of the hotel.
+        statement: >-
+          UPDATE hotels SET checkin_date = CAST($2 as date), checkout_date = CAST($3
+          as date) WHERE id = $1;
+      cancel-hotel:
+        kind: postgres-sql
+        source: my-pg-source
+        description: Cancel a hotel by its ID.
+        parameters:
+          - name: hotel_id
+            type: string
+            description: The ID of the hotel to cancel.
+        statement: UPDATE hotels SET booked = B'0' WHERE id = $1;
+   toolsets:
+      my-toolset:
+        - search-hotels-by-name
+        - search-hotels-by-location
+        - book-hotel
+        - update-hotel
+        - cancel-hotel
+    ```
+
+    For more info on tools, check out the `Resources` section of the docs.
+
+1. Run the Toolbox server, pointing to the `tools.yaml` file created earlier:
+
+    ```bash
+    ./toolbox --tools-file "tools.yaml"
+    ```
+
+    {{< notice note >}}
+    Toolbox enables dynamic reloading by default. To disable, use the
+    `--disable-reload` flag.
+    {{< /notice >}}
+<!-- [END configure_toolbox] -->
--- a/docs/en/getting-started/quickstart/shared/database_setup.md
+++ b/docs/en/getting-started/quickstart/shared/database_setup.md
@@ -0,0 +1,119 @@
+<!-- This file has been used in local_quickstart.md, local_quickstart_go.md & local_quickstart_js.md -->
+<!-- [START database_setup] -->
+In this section, we will create a database, insert some data that needs to be
+accessed by our agent, and create a database user for Toolbox to connect with.
+
+1. Connect to postgres using the `psql` command:
+
+    ```bash
+    psql -h 127.0.0.1 -U postgres
+    ```
+
+    Here, `postgres` denotes the default postgres superuser.
+
+    {{< notice info >}}
+
+#### **Having trouble connecting?**
+
+* **Password Prompt:** If you are prompted for a password for the `postgres`
+  user and do not know it (or a blank password doesn't work), your PostgreSQL
+  installation might require a password or a different authentication method.
+* **`FATAL: role "postgres" does not exist`:** This error means the default
+  `postgres` superuser role isn't available under that name on your system.
+* **`Connection refused`:** Ensure your PostgreSQL server is actually running.
+  You can typically check with `sudo systemctl status postgresql` and start it
+  with `sudo systemctl start postgresql` on Linux systems.
+
+<br/>
+
+#### **Common Solution**
+
+For password issues or if the `postgres` role seems inaccessible directly, try
+switching to the `postgres` operating system user first. This user often has
+permission to connect without a password for local connections (this is called
+peer authentication).
+
+```bash
+sudo -i -u postgres
+psql -h 127.0.0.1
+```
+
+Once you are in the `psql` shell using this method, you can proceed with the
+database creation steps below. Afterwards, type `\q` to exit `psql`, and then
+`exit` to return to your normal user shell.
+
+If desired, once connected to `psql` as the `postgres` OS user, you can set a
+password for the `postgres` *database* user using: `ALTER USER postgres WITH
+PASSWORD 'your_chosen_password';`. This would allow direct connection with `-U
+postgres` and a password next time.
+    {{< /notice >}}
+
+1. Create a new database and a new user:
+
+    {{< notice tip >}}
+  For a real application, it's best to follow the principle of least permission
+  and only grant the privileges your application needs.
+    {{< /notice >}}
+
+    ```sql
+      CREATE USER toolbox_user WITH PASSWORD 'my-password';
+
+      CREATE DATABASE toolbox_db;
+      GRANT ALL PRIVILEGES ON DATABASE toolbox_db TO toolbox_user;
+
+      ALTER DATABASE toolbox_db OWNER TO toolbox_user;
+    ```
+
+1. End the database session:
+
+    ```bash
+    \q
+    ```
+
+    (If you used `sudo -i -u postgres` and then `psql`, remember you might also
+    need to type `exit` after `\q` to leave the `postgres` user's shell
+    session.)
+
+1. Connect to your database with your new user:
+
+    ```bash
+    psql -h 127.0.0.1 -U toolbox_user -d toolbox_db
+    ```
+
+1. Create a table using the following command:
+
+    ```sql
+    CREATE TABLE hotels(
+      id            INTEGER NOT NULL PRIMARY KEY,
+      name          VARCHAR NOT NULL,
+      location      VARCHAR NOT NULL,
+      price_tier    VARCHAR NOT NULL,
+      checkin_date  DATE    NOT NULL,
+      checkout_date DATE    NOT NULL,
+      booked        BIT     NOT NULL
+    );
+    ```
+
+1. Insert data into the table.
+
+    ```sql
+    INSERT INTO hotels(id, name, location, price_tier, checkin_date, checkout_date, booked)
+    VALUES
+      (1, 'Hilton Basel', 'Basel', 'Luxury', '2024-04-22', '2024-04-20', B'0'),
+      (2, 'Marriott Zurich', 'Zurich', 'Upscale', '2024-04-14', '2024-04-21', B'0'),
+      (3, 'Hyatt Regency Basel', 'Basel', 'Upper Upscale', '2024-04-02', '2024-04-20', B'0'),
+      (4, 'Radisson Blu Lucerne', 'Lucerne', 'Midscale', '2024-04-24', '2024-04-05', B'0'),
+      (5, 'Best Western Bern', 'Bern', 'Upper Midscale', '2024-04-23', '2024-04-01', B'0'),
+      (6, 'InterContinental Geneva', 'Geneva', 'Luxury', '2024-04-23', '2024-04-28', B'0'),
+      (7, 'Sheraton Zurich', 'Zurich', 'Upper Upscale', '2024-04-27', '2024-04-02', B'0'),
+      (8, 'Holiday Inn Basel', 'Basel', 'Upper Midscale', '2024-04-24', '2024-04-09', B'0'),
+      (9, 'Courtyard Zurich', 'Zurich', 'Upscale', '2024-04-03', '2024-04-13', B'0'),
+      (10, 'Comfort Inn Bern', 'Bern', 'Midscale', '2024-04-04', '2024-04-16', B'0');
+    ```
+
+1. End the database session:
+
+    ```bash
+    \q
+    ```
+<!-- [END database_setup] -->
--- a/docs/en/how-to/connect-ide/alloydb_pg_admin_mcp.md
+++ b/docs/en/how-to/connect-ide/alloydb_pg_admin_mcp.md
@@ -0,0 +1,14 @@
+---
+title: "AlloyDB Admin API using MCP"
+type: docs
+weight: 2
+description: >
+  Create your AlloyDB database with MCP Toolbox.
+---
+
+<html>
+  <head>
+    <link rel="canonical" href="https://cloud.google.com/alloydb/docs/create-database-with-mcp-toolbox"/>
+    <meta http-equiv="refresh" content="0;url=https://cloud.google.com/alloydb/docs/create-database-with-mcp-toolbox"/>
+  </head>
+</html>
--- a/docs/en/how-to/connect-ide/alloydb_pg_mcp.md
+++ b/docs/en/how-to/connect-ide/alloydb_pg_mcp.md
@@ -5,266 +5,9 @@ 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.6.0/linux/amd64/toolbox
-{{< /tab >}}
-
-{{< tab header="darwin/arm64" lang="bash" >}}
-curl -O https://storage.googleapis.com/genai-toolbox/v0.6.0/darwin/arm64/toolbox
-{{< /tab >}}
-
-{{< tab header="darwin/amd64" lang="bash" >}}
-curl -O https://storage.googleapis.com/genai-toolbox/v0.6.0/darwin/amd64/toolbox
-{{< /tab >}}
-
-{{< tab header="windows/amd64" lang="bash" >}}
-curl -O https://storage.googleapis.com/genai-toolbox/v0.6.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 >}}
+<html>
+  <head>
+    <link rel="canonical" href="https://cloud.google.com/alloydb/docs/connect-ide-using-mcp-toolbox"/>
+    <meta http-equiv="refresh" content="0;url=https://cloud.google.com/alloydb/docs/connect-ide-using-mcp-toolbox"/>
+  </head>
+</html>
--- a/docs/en/how-to/connect-ide/bigquery_mcp.md
+++ b/docs/en/how-to/connect-ide/bigquery_mcp.md
@@ -5,235 +5,9 @@ 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.6.0/linux/amd64/toolbox
-{{< /tab >}}
-
-{{< tab header="darwin/arm64" lang="bash" >}}
-curl -O https://storage.googleapis.com/genai-toolbox/v0.6.0/darwin/arm64/toolbox
-{{< /tab >}}
-
-{{< tab header="darwin/amd64" lang="bash" >}}
-curl -O https://storage.googleapis.com/genai-toolbox/v0.6.0/darwin/amd64/toolbox
-{{< /tab >}}
-
-{{< tab header="windows/amd64" lang="bash" >}}
-curl -O https://storage.googleapis.com/genai-toolbox/v0.6.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 >}}
+<html>
+  <head>
+    <link rel="canonical" href="https://cloud.google.com/bigquery/docs/pre-built-tools-with-mcp-toolbox"/>
+    <meta http-equiv="refresh" content="0;url=https://cloud.google.com/bigquery/docs/pre-built-tools-with-mcp-toolbox"/>
+  </head>
+</html>
--- a/docs/en/how-to/connect-ide/cloud_sql_mssql_mcp.md
+++ b/docs/en/how-to/connect-ide/cloud_sql_mssql_mcp.md
@@ -3,267 +3,11 @@ title: "Cloud SQL for SQL Server using MCP"
 type: docs
 weight: 2
 description: >
-  Connect your IDE to Cloud SQl for SQL Server using Toolbox.
+  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.6.0/linux/amd64/toolbox
-{{< /tab >}}
-
-{{< tab header="darwin/arm64" lang="bash" >}}
-curl -O https://storage.googleapis.com/genai-toolbox/v0.6.0/darwin/arm64/toolbox
-{{< /tab >}}
-
-{{< tab header="darwin/amd64" lang="bash" >}}
-curl -O https://storage.googleapis.com/genai-toolbox/v0.6.0/darwin/amd64/toolbox
-{{< /tab >}}
-
-{{< tab header="windows/amd64" lang="bash" >}}
-curl -O https://storage.googleapis.com/genai-toolbox/v0.6.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 >}}
+<html>
+  <head>
+    <link rel="canonical" href="https://cloud.google.com/sql/docs/sqlserver/pre-built-tools-with-mcp-toolbox"/>
+    <meta http-equiv="refresh" content="0;url=https://cloud.google.com/sql/docs/sqlserver/pre-built-tools-with-mcp-toolbox"/>
+  </head>
+</html>
--- a/docs/en/how-to/connect-ide/cloud_sql_mysql_mcp.md
+++ b/docs/en/how-to/connect-ide/cloud_sql_mysql_mcp.md
@@ -3,261 +3,11 @@ title: "Cloud SQL for MySQL using MCP"
 type: docs
 weight: 2
 description: >
-  Connect your IDE to Cloud SQl for MySQL using Toolbox.
+  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.6.0/linux/amd64/toolbox
-{{< /tab >}}
-
-{{< tab header="darwin/arm64" lang="bash" >}}
-curl -O https://storage.googleapis.com/genai-toolbox/v0.6.0/darwin/arm64/toolbox
-{{< /tab >}}
-
-{{< tab header="darwin/amd64" lang="bash" >}}
-curl -O https://storage.googleapis.com/genai-toolbox/v0.6.0/darwin/amd64/toolbox
-{{< /tab >}}
-
-{{< tab header="windows/amd64" lang="bash" >}}
-curl -O https://storage.googleapis.com/genai-toolbox/v0.6.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 >}}
+<html>
+  <head>
+    <link rel="canonical" href="https://cloud.google.com/sql/docs/mysql/pre-built-tools-with-mcp-toolbox"/>
+    <meta http-equiv="refresh" content="0;url=https://cloud.google.com/sql/docs/mysql/pre-built-tools-with-mcp-toolbox"/>
+  </head>
+</html>
--- a/docs/en/how-to/connect-ide/cloud_sql_pg_mcp.md
+++ b/docs/en/how-to/connect-ide/cloud_sql_pg_mcp.md
@@ -3,262 +3,11 @@ title: "Cloud SQL for Postgres using MCP"
 type: docs
 weight: 2
 description: >
-  Connect your IDE to Cloud SQl for Postgres using Toolbox.
+  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.6.0/linux/amd64/toolbox
-{{< /tab >}}
-
-{{< tab header="darwin/arm64" lang="bash" >}}
-curl -O https://storage.googleapis.com/genai-toolbox/v0.6.0/darwin/arm64/toolbox
-{{< /tab >}}
-
-{{< tab header="darwin/amd64" lang="bash" >}}
-curl -O https://storage.googleapis.com/genai-toolbox/v0.6.0/darwin/amd64/toolbox
-{{< /tab >}}
-
-{{< tab header="windows/amd64" lang="bash" >}}
-curl -O https://storage.googleapis.com/genai-toolbox/v0.6.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 >}}
+<html>
+  <head>
+    <link rel="canonical" href="https://cloud.google.com/sql/docs/postgres/pre-built-tools-with-mcp-toolbox"/>
+    <meta http-equiv="refresh" content="0;url=https://cloud.google.com/sql/docs/postgres/pre-built-tools-with-mcp-toolbox"/>
+  </head>
+</html>
--- a/docs/en/how-to/connect-ide/firestore_mcp.md
+++ b/docs/en/how-to/connect-ide/firestore_mcp.md
@@ -0,0 +1,333 @@
+---
+title: "Firestore using MCP"
+type: docs
+weight: 2
+description: >
+  Connect your IDE to Firestore using Toolbox.
+---
+
+[Model Context Protocol (MCP)](https://modelcontextprotocol.io/introduction) is
+an open protocol for connecting Large Language Models (LLMs) to data sources
+like Firestore. This guide covers how to use [MCP Toolbox for Databases][toolbox]
+to expose your developer assistant tools to a Firestore instance:
+
+* [Cursor][cursor]
+* [Windsurf][windsurf] (Codium)
+* [Visual Studio Code][vscode] (Copilot)
+* [Cline][cline]  (VS Code extension)
+* [Claude desktop][claudedesktop]
+* [Claude code][claudecode]
+* [Gemini CLI][geminicli]
+* [Gemini Code Assist][geminicodeassist]
+
+[toolbox]: https://github.com/googleapis/genai-toolbox
+[cursor]: #configure-your-mcp-client
+[windsurf]: #configure-your-mcp-client
+[vscode]: #configure-your-mcp-client
+[cline]: #configure-your-mcp-client
+[claudedesktop]: #configure-your-mcp-client
+[claudecode]: #configure-your-mcp-client
+[geminicli]: #configure-your-mcp-client
+[geminicodeassist]: #configure-your-mcp-client
+
+## Set up Firestore
+
+1. Create or select a Google Cloud project.
+
+    * [Create a new
+      project](https://cloud.google.com/resource-manager/docs/creating-managing-projects)
+    * [Select an existing
+      project](https://cloud.google.com/resource-manager/docs/creating-managing-projects#identifying_projects)
+
+1. [Enable the Firestore
+   API](https://console.cloud.google.com/apis/library/firestore.googleapis.com)
+   for your project.
+
+1. [Create a Firestore
+   database](https://cloud.google.com/firestore/docs/create-database-web-mobile-client-library)
+   if you haven't already.
+
+1. Set up authentication for your local environment.
+
+    * [Install gcloud CLI](https://cloud.google.com/sdk/docs/install)
+    * Run `gcloud auth application-default login` to authenticate
+
+## Install MCP Toolbox
+
+1. Download the latest version of Toolbox as a binary. Select the [correct
+   binary](https://github.com/googleapis/genai-toolbox/releases) corresponding
+   to your OS and CPU architecture. You are required to use Toolbox version
+   V0.10.0+:
+
+   <!-- {x-release-please-start-version} -->
+   {{< tabpane persist=header >}}
+{{< tab header="linux/amd64" lang="bash" >}}
+curl -O https://storage.googleapis.com/genai-toolbox/v0.13.0/linux/amd64/toolbox
+{{< /tab >}}
+
+{{< tab header="darwin/arm64" lang="bash" >}}
+curl -O https://storage.googleapis.com/genai-toolbox/v0.13.0/darwin/arm64/toolbox
+{{< /tab >}}
+
+{{< tab header="darwin/amd64" lang="bash" >}}
+curl -O https://storage.googleapis.com/genai-toolbox/v0.13.0/darwin/amd64/toolbox
+{{< /tab >}}
+
+{{< tab header="windows/amd64" lang="bash" >}}
+curl -O https://storage.googleapis.com/genai-toolbox/v0.13.0/windows/amd64/toolbox
+{{< /tab >}}
+{{< /tabpane >}}
+    <!-- {x-release-please-end} -->
+
+1. Make the binary executable:
+
+    ```bash
+    chmod +x toolbox
+    ```
+
+1. Verify the installation:
+
+    ```bash
+    ./toolbox --version
+    ```
+
+## Configure your MCP Client
+
+{{< tabpane text=true >}}
+{{% tab header="Claude code" lang="en" %}}
+
+1. Install [Claude
+   Code](https://docs.anthropic.com/en/docs/agents-and-tools/claude-code/overview).
+1. Create a `.mcp.json` file in your project root if it doesn't exist.
+1. Add the following configuration, replace the environment variables with your
+   values, and save:
+
+    ```json
+    {
+      "mcpServers": {
+        "firestore": {
+          "command": "./PATH/TO/toolbox",
+          "args": ["--prebuilt","firestore","--stdio"],
+          "env": {
+            "FIRESTORE_PROJECT": "your-project-id",
+            "FIRESTORE_DATABASE": "(default)"
+          }
+        }
+      }
+    }
+    ```
+
+1. Restart Claude code to apply the new configuration.
+{{% /tab %}}
+
+{{% tab header="Claude desktop" lang="en" %}}
+
+1. Open [Claude desktop](https://claude.ai/download) and navigate to Settings.
+1. Under the Developer tab, tap Edit Config to open the configuration file.
+1. Add the following configuration, replace the environment variables with your
+   values, and save:
+
+    ```json
+    {
+      "mcpServers": {
+        "firestore": {
+          "command": "./PATH/TO/toolbox",
+          "args": ["--prebuilt","firestore","--stdio"],
+          "env": {
+            "FIRESTORE_PROJECT": "your-project-id",
+            "FIRESTORE_DATABASE": "(default)"
+          }
+        }
+      }
+    }
+    ```
+
+1. Restart Claude desktop.
+1. From the new chat screen, you should see a hammer (MCP) icon appear with the
+   new MCP server available.
+{{% /tab %}}
+
+{{% tab header="Cline" lang="en" %}}
+
+1. Open the [Cline](https://github.com/cline/cline) extension in VS Code and tap
+   the **MCP Servers** icon.
+1. Tap Configure MCP Servers to open the configuration file.
+1. Add the following configuration, replace the environment variables with your
+   values, and save:
+
+    ```json
+    {
+      "mcpServers": {
+        "firestore": {
+          "command": "./PATH/TO/toolbox",
+          "args": ["--prebuilt","firestore","--stdio"],
+          "env": {
+            "FIRESTORE_PROJECT": "your-project-id",
+            "FIRESTORE_DATABASE": "(default)"
+          }
+        }
+      }
+    }
+    ```
+
+1. You should see a green active status after the server is successfully
+   connected.
+{{% /tab %}}
+
+{{% tab header="Cursor" lang="en" %}}
+
+1. Create a `.cursor` directory in your project root if it doesn't exist.
+1. Create a `.cursor/mcp.json` file if it doesn't exist and open it.
+1. Add the following configuration, replace the environment variables with your
+   values, and save:
+
+    ```json
+    {
+      "mcpServers": {
+        "firestore": {
+          "command": "./PATH/TO/toolbox",
+          "args": ["--prebuilt","firestore","--stdio"],
+          "env": {
+            "FIRESTORE_PROJECT": "your-project-id",
+            "FIRESTORE_DATABASE": "(default)"
+          }
+        }
+      }
+    }
+    ```
+
+1. [Cursor](https://www.cursor.com/) and navigate to **Settings > Cursor
+   Settings > MCP**. You should see a green active status after the server is
+   successfully connected.
+{{% /tab %}}
+
+{{% tab header="Visual Studio Code (Copilot)" lang="en" %}}
+
+1. Open [VS Code](https://code.visualstudio.com/docs/copilot/overview) and
+   create a `.vscode` directory in your project root if it doesn't exist.
+1. Create a `.vscode/mcp.json` file if it doesn't exist and open it.
+1. Add the following configuration, replace the environment variables with your
+   values, and save:
+
+    ```json
+    {
+      "mcpServers": {
+        "firestore": {
+          "command": "./PATH/TO/toolbox",
+          "args": ["--prebuilt","firestore","--stdio"],
+          "env": {
+            "FIRESTORE_PROJECT": "your-project-id",
+            "FIRESTORE_DATABASE": "(default)"
+          }
+        }
+      }
+    }
+    ```
+
+{{% /tab %}}
+
+{{% tab header="Windsurf" lang="en" %}}
+
+1. Open [Windsurf](https://docs.codeium.com/windsurf) and navigate to the
+   Cascade assistant.
+1. Tap on the hammer (MCP) icon, then Configure to open the configuration file.
+1. Add the following configuration, replace the environment variables with your
+   values, and save:
+
+    ```json
+    {
+      "mcpServers": {
+        "firestore": {
+          "command": "./PATH/TO/toolbox",
+          "args": ["--prebuilt","firestore","--stdio"],
+          "env": {
+            "FIRESTORE_PROJECT": "your-project-id",
+            "FIRESTORE_DATABASE": "(default)"
+          }
+        }
+      }
+    }
+
+    ```
+
+{{% /tab %}}
+{{% tab header="Gemini CLI" lang="en" %}}
+
+1. Install the [Gemini
+   CLI](https://github.com/google-gemini/gemini-cli?tab=readme-ov-file#quickstart).
+1. In your working directory, create a folder named `.gemini`. Within it, create
+   a `settings.json` file.
+1. Add the following configuration, replace the environment variables with your
+   values, and then save:
+
+    ```json
+    {
+      "mcpServers": {
+        "firestore": {
+          "command": "./PATH/TO/toolbox",
+          "args": ["--prebuilt","firestore","--stdio"],
+          "env": {
+            "FIRESTORE_PROJECT": "your-project-id",
+            "FIRESTORE_DATABASE": "(default)"
+          }
+        }
+      }
+    }
+
+    ```
+
+{{% /tab %}}
+{{% tab header="Gemini Code Assist" lang="en" %}}
+
+1. Install the [Gemini Code
+   Assist](https://marketplace.visualstudio.com/items?itemName=Google.geminicodeassist)
+   extension in Visual Studio Code.
+1. Enable Agent Mode in Gemini Code Assist chat.
+1. In your working directory, create a folder named `.gemini`. Within it, create
+   a `settings.json` file.
+1. Add the following configuration, replace the environment variables with your
+   values, and then save:
+
+    ```json
+    {
+      "mcpServers": {
+        "firestore": {
+          "command": "./PATH/TO/toolbox",
+          "args": ["--prebuilt","firestore","--stdio"],
+          "env": {
+            "FIRESTORE_PROJECT": "your-project-id",
+            "FIRESTORE_DATABASE": "(default)"
+          }
+        }
+      }
+    }
+
+    ```
+
+{{% /tab %}}
+{{< /tabpane >}}
+
+## Use Tools
+
+Your AI tool is now connected to Firestore using MCP. Try asking your AI
+assistant to list collections, get documents, query collections, or manage
+security rules.
+
+The following tools are available to the LLM:
+
+1. **firestore-get-documents**: Gets multiple documents from Firestore by their
+   paths
+1. **firestore-list-collections**: List Firestore collections for a given parent
+   path
+1. **firestore-delete-documents**: Delete multiple documents from Firestore
+1. **firestore-query-collection**: Query documents from a collection with
+   filtering, ordering, and limit options
+1. **firestore-get-rules**: Retrieves the active Firestore security rules for
+   the current project
+1. **firestore-validate-rules**: Validates Firestore security rules syntax and
+   errors
+
+{{< notice note >}}
+Prebuilt tools are pre-1.0, so expect some tool changes between versions. LLMs
+will adapt to the tools available, so this shouldn't affect most users.
+{{< /notice >}}
--- a/docs/en/how-to/connect-ide/looker_mcp.md
+++ b/docs/en/how-to/connect-ide/looker_mcp.md
@@ -0,0 +1,311 @@
+---
+title: "Looker using MCP"
+type: docs
+weight: 2
+description: >
+  Connect your IDE to Looker using Toolbox.
+---
+
+[Model Context Protocol (MCP)](https://modelcontextprotocol.io/introduction) is
+an open protocol for connecting Large Language Models (LLMs) to data sources
+like Postgres. This guide covers how to use [MCP Toolbox for Databases][toolbox]
+to expose your developer assistant tools to a Looker instance:
+
+* [Gemini-CLI][gemini-cli]
+* [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
+[gemini-cli]: #configure-your-mcp-client
+[cursor]: #configure-your-mcp-client
+[windsurf]: #configure-your-mcp-client
+[vscode]: #configure-your-mcp-client
+[cline]: #configure-your-mcp-client
+[claudedesktop]: #configure-your-mcp-client
+[claudecode]: #configure-your-mcp-client
+
+## Set up Looker
+
+1. Get a Looker Client ID and Client Secret. Follow the directions
+   [here](https://cloud.google.com/looker/docs/api-auth#authentication_with_an_sdk).
+
+1. Have the base URL of your Looker instance available. It is likely
+   something like `https://looker.example.com`. In some cases the API is
+   listening at a different port, and you will need to use
+   `https://looker.example.com:19999` instead.
+
+## Install MCP Toolbox
+
+1. Download the latest version of Toolbox as a binary. Select the [correct
+   binary](https://github.com/googleapis/genai-toolbox/releases) corresponding
+   to your OS and CPU architecture. You are required to use Toolbox version
+   v0.10.0+:
+
+   <!-- {x-release-please-start-version} -->
+{{< tabpane persist=header >}}
+{{< tab header="linux/amd64" lang="bash" >}}
+curl -O https://storage.googleapis.com/genai-toolbox/v0.13.0/linux/amd64/toolbox
+{{< /tab >}}
+
+{{< tab header="darwin/arm64" lang="bash" >}}
+curl -O https://storage.googleapis.com/genai-toolbox/v0.13.0/darwin/arm64/toolbox
+{{< /tab >}}
+
+{{< tab header="darwin/amd64" lang="bash" >}}
+curl -O https://storage.googleapis.com/genai-toolbox/v0.13.0/darwin/amd64/toolbox
+{{< /tab >}}
+
+{{< tab header="windows/amd64" lang="bash" >}}
+curl -O https://storage.googleapis.com/genai-toolbox/v0.13.0/windows/amd64/toolbox.exe
+{{< /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="Gemini-CLI" lang="en" %}}
+
+1. Install [Gemini-CLI](https://github.com/google-gemini/gemini-cli#install-globally-with-npm).
+1. Create a directory `.gemini` in your home directory if it doesn't exist.
+1. Create the file `.gemini/settings.json` if it doesn't exist.
+1. Add the following configuration, or add the mcpServers stanza if you already
+   have a `settings.json` with content. Replace the path to the toolbox
+   executable and the environment variables with your values, and save:
+
+    ```json
+    {
+      "mcpServers": {
+        "looker-toolbox": {
+          "command": "./PATH/TO/toolbox",
+          "args": ["--stdio", "--prebuilt", "looker"],
+          "env": {
+            "LOOKER_BASE_URL": "https://looker.example.com",
+            "LOOKER_CLIENT_ID": "",
+            "LOOKER_CLIENT_SECRET": "",
+            "LOOKER_VERIFY_SSL": "true"
+          }
+        }
+      }
+    }
+    ```
+
+1. Start Gemini-CLI with the `gemini` command and use the command `/mcp` to see
+   the configured MCP tools.
+{{% /tab %}}
+
+{{% tab header="Claude code" lang="en" %}}
+
+1. Install [Claude
+   Code](https://docs.anthropic.com/en/docs/agents-and-tools/claude-code/overview).
+1. Create a `.mcp.json` file in your project root if it doesn't exist.
+1. Add the following configuration, replace the environment variables with your
+   values, and save:
+
+    ```json
+    {
+      "mcpServers": {
+        "looker-toolbox": {
+          "command": "./PATH/TO/toolbox",
+          "args": ["--stdio", "--prebuilt", "looker"],
+          "env": {
+            "LOOKER_BASE_URL": "https://looker.example.com",
+            "LOOKER_CLIENT_ID": "",
+            "LOOKER_CLIENT_SECRET": "",
+            "LOOKER_VERIFY_SSL": "true"
+          }
+        }
+      }
+    }
+    ```
+
+1. Restart Claude Code to apply the new configuration.
+{{% /tab %}}
+
+{{% tab header="Claude desktop" lang="en" %}}
+
+1. Open [Claude desktop](https://claude.ai/download) and navigate to Settings.
+1. Under the Developer tab, tap Edit Config to open the configuration file.
+1. Add the following configuration, replace the environment variables with your
+   values, and save:
+
+    ```json
+    {
+      "mcpServers": {
+        "looker-toolbox": {
+          "command": "./PATH/TO/toolbox",
+          "args": ["--stdio", "--prebuilt", "looker"],
+          "env": {
+            "LOOKER_BASE_URL": "https://looker.example.com",
+            "LOOKER_CLIENT_ID": "",
+            "LOOKER_CLIENT_SECRET": "",
+            "LOOKER_VERIFY_SSL": "true"
+          }
+        }
+      }
+    }
+    ```
+
+1. Restart Claude desktop.
+1. From the new chat screen, you should see a hammer (MCP) icon appear with the
+   new MCP server available.
+{{% /tab %}}
+
+{{% tab header="Cline" lang="en" %}}
+
+1. Open the [Cline](https://github.com/cline/cline) extension in VS Code and tap
+   the **MCP Servers** icon.
+1. Tap Configure MCP Servers to open the configuration file.
+1. Add the following configuration, replace the environment variables with your
+   values, and save:
+
+    ```json
+    {
+      "mcpServers": {
+        "looker-toolbox": {
+          "command": "./PATH/TO/toolbox",
+          "args": ["--stdio", "--prebuilt", "looker"],
+          "env": {
+            "LOOKER_BASE_URL": "https://looker.example.com",
+            "LOOKER_CLIENT_ID": "",
+            "LOOKER_CLIENT_SECRET": "",
+            "LOOKER_VERIFY_SSL": "true"
+          }
+        }
+      }
+    }
+    ```
+
+1. You should see a green active status after the server is successfully
+   connected.
+{{% /tab %}}
+
+{{% tab header="Cursor" lang="en" %}}
+
+1. Create a `.cursor` directory in your project root if it doesn't exist.
+1. Create a `.cursor/mcp.json` file if it doesn't exist and open it.
+1. Add the following configuration, replace the environment variables with your
+   values, and save:
+
+    ```json
+    {
+      "mcpServers": {
+        "looker-toolbox": {
+          "command": "./PATH/TO/toolbox",
+          "args": ["--stdio", "--prebuilt", "looker"],
+          "env": {
+            "LOOKER_BASE_URL": "https://looker.example.com",
+            "LOOKER_CLIENT_ID": "",
+            "LOOKER_CLIENT_SECRET": "",
+            "LOOKER_VERIFY_SSL": "true"
+          }
+        }
+      }
+    }
+    ```
+
+1. Open [Cursor](https://www.cursor.com/) and navigate to **Settings > Cursor
+   Settings > MCP**. You should see a green active status after the server is
+   successfully connected.
+{{% /tab %}}
+
+{{% tab header="Visual Studio Code (Copilot)" lang="en" %}}
+
+1. Open [VS Code](https://code.visualstudio.com/docs/copilot/overview) and
+   create a `.vscode` directory in your project root if it doesn't exist.
+1. Create a `.vscode/mcp.json` file if it doesn't exist and open it.
+1. Add the following configuration, replace the environment variables with your
+   values, and save:
+
+    ```json
+    {
+      "mcpServers": {
+        "looker-toolbox": {
+          "command": "./PATH/TO/toolbox",
+          "args": ["--stdio", "--prebuilt", "looker"],
+          "env": {
+            "LOOKER_BASE_URL": "https://looker.example.com",
+            "LOOKER_CLIENT_ID": "",
+            "LOOKER_CLIENT_SECRET": "",
+            "LOOKER_VERIFY_SSL": "true"
+          }
+        }
+      }
+    }
+    ```
+
+{{% /tab %}}
+
+{{% tab header="Windsurf" lang="en" %}}
+
+1. Open [Windsurf](https://docs.codeium.com/windsurf) and navigate to the
+   Cascade assistant.
+1. Tap on the hammer (MCP) icon, then Configure to open the configuration file.
+1. Add the following configuration, replace the environment variables with your
+   values, and save:
+
+    ```json
+    {
+      "mcpServers": {
+        "looker-toolbox": {
+          "command": "./PATH/TO/toolbox",
+          "args": ["--stdio", "--prebuilt", "looker"],
+          "env": {
+            "LOOKER_BASE_URL": "https://looker.example.com",
+            "LOOKER_CLIENT_ID": "",
+            "LOOKER_CLIENT_SECRET": "",
+            "LOOKER_VERIFY_SSL": "true"
+          }
+        }
+      }
+    }
+
+    ```
+
+{{% /tab %}}
+{{< /tabpane >}}
+
+## Use Tools
+
+Your AI tool is now connected to Looker using MCP. Try asking your AI
+assistant to list models, explores, dimensions, and measures. Run a
+query, retrieve the SQL for a query, and run a saved Look.
+
+The following tools are available to the LLM:
+
+1. **get_models**: list the LookML models in Looker
+1. **get_explores**: list the explores in a given model
+1. **get_dimensions**: list the dimensions in a given explore
+1. **get_measures**: list the measures in a given explore
+1. **get_filters**: list the filters in a given explore
+1. **get_parameters**: list the parameters in a given explore
+1. **query**: Run a query and return the data
+1. **query_sql**: Return the SQL generated by Looker for a query
+1. **query_url**: Return a link to the query in Looker for further exploration
+1. **get_looks**: Return the saved Looks that match a title or description
+1. **run_look**: Run a saved Look and return the data
+1. **make_look**: Create a saved Look in Looker and return the URL
+1. **get_dashboards**: Return the saved dashboards that match a title or description
+1. **make_dashboard**: Create a saved dashboard in Looker and return the URL
+1. **add_dashboard_element**: Add a tile to a dashboard
+
+{{< notice note >}}
+Prebuilt tools are pre-1.0, so expect some tool changes between versions. LLMs
+will adapt to the tools available, so this shouldn't affect most users.
+{{< /notice >}}
--- a/docs/en/how-to/connect-ide/mssql_mcp.md
+++ b/docs/en/how-to/connect-ide/mssql_mcp.md
@@ -0,0 +1,289 @@
+---
+title: SQL Server using MCP
+type: docs
+weight: 2
+description: "Connect your IDE to 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 SQL Server. This guide covers how to use [MCP Toolbox for Databases][toolbox] to expose your developer assistant tools to a SQL Server instance:
+
+* [Cursor][cursor]
+* [Windsurf][windsurf] (Codium)
+* [Visual Studio Code][vscode] (Copilot)
+* [Cline][cline] (VS Code extension)
+* [Claude desktop][claudedesktop]
+* [Claude code][claudecode]
+* [Gemini CLI][geminicli]
+* [Gemini Code Assist][geminicodeassist]
+
+[toolbox]: https://github.com/googleapis/genai-toolbox
+[cursor]: #configure-your-mcp-client
+[windsurf]: #configure-your-mcp-client
+[vscode]: #configure-your-mcp-client
+[cline]: #configure-your-mcp-client
+[claudedesktop]: #configure-your-mcp-client
+[claudecode]: #configure-your-mcp-client
+[geminicli]: #configure-your-mcp-client
+[geminicodeassist]: #configure-your-mcp-client
+
+## Set up the database
+
+1.  [Create or select a SQL Server instance.](https://www.microsoft.com/en-us/sql-server/sql-server-downloads)
+
+## Install MCP Toolbox
+
+1. Download the latest version of Toolbox as a binary. Select the [correct binary](https://github.com/googleapis/genai-toolbox/releases) corresponding to your OS and CPU architecture. You are required to use Toolbox version V0.10.0+:
+
+   <!-- {x-release-please-start-version} -->
+   {{< tabpane persist=header >}}
+{{< tab header="linux/amd64" lang="bash" >}}
+curl -O https://storage.googleapis.com/genai-toolbox/v0.13.0/linux/amd64/toolbox
+{{< /tab >}}
+
+{{< tab header="darwin/arm64" lang="bash" >}}
+curl -O https://storage.googleapis.com/genai-toolbox/v0.13.0/darwin/arm64/toolbox
+{{< /tab >}}
+
+{{< tab header="darwin/amd64" lang="bash" >}}
+curl -O https://storage.googleapis.com/genai-toolbox/v0.13.0/darwin/amd64/toolbox
+{{< /tab >}}
+
+{{< tab header="windows/amd64" lang="bash" >}}
+curl -O https://storage.googleapis.com/genai-toolbox/v0.13.0/windows/amd64/toolbox.exe
+{{< /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": {
+        "sqlserver": {
+          "command": "./PATH/TO/toolbox",
+          "args": ["--prebuilt","mssql","--stdio"],
+          "env": {
+            "MSSQL_HOST": "",
+            "MSSQL_PORT": "",
+            "MSSQL_DATABASE": "",
+            "MSSQL_USER": "",
+            "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": {
+        "sqlserver": {
+          "command": "./PATH/TO/toolbox",
+          "args": ["--prebuilt","mssql","--stdio"],
+          "env": {
+            "MSSQL_HOST": "",
+            "MSSQL_PORT": "",
+            "MSSQL_DATABASE": "",
+            "MSSQL_USER": "",
+            "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": {
+        "sqlserver": {
+          "command": "./PATH/TO/toolbox",
+          "args": ["--prebuilt","mssql","--stdio"],
+          "env": {
+            "MSSQL_HOST": "",
+            "MSSQL_PORT": "",
+            "MSSQL_DATABASE": "",
+            "MSSQL_USER": "",
+            "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": {
+        "sqlserver": {
+          "command": "./PATH/TO/toolbox",
+          "args": ["--prebuilt","mssql","--stdio"],
+          "env": {
+            "MSSQL_HOST": "",
+            "MSSQL_PORT": "",
+            "MSSQL_DATABASE": "",
+            "MSSQL_USER": "",
+            "MSSQL_PASSWORD": ""
+          }
+        }
+      }
+    }
+    ```
+
+1.  Open [Cursor](https://www.cursor.com/) and navigate to **Settings > Cursor Settings > MCP**. You should see a green active status after the server is successfully connected.
+{{% /tab %}}
+{{% tab header="Visual Studio Code (Copilot)" lang="en" %}}
+
+1.  Open [VS Code](https://code.visualstudio.com/docs/copilot/overview) and create a `.vscode` directory in your project root if it doesn't exist.
+1.  Create a `.vscode/mcp.json` file if it doesn't exist and open it.
+1.  Add the following configuration, replace the environment variables with your values, and save:
+
+    ```json
+    {
+    "mcp" : {
+        "servers": {
+        "cloud-sql-sqlserver": {
+            "command": "./PATH/TO/toolbox",
+            "args": ["--prebuilt","cloud-sql-mssql","--stdio"],
+            "env": {
+              "MSSQL_HOST": "",
+              "MSSQL_PORT": "",
+              "MSSQL_DATABASE": "",
+              "MSSQL_USER": "",
+              "MSSQL_PASSWORD": ""
+            }
+         }
+        }
+      }
+    }
+    ```
+{{% /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": {
+        "sqlserver": {
+          "command": "./PATH/TO/toolbox",
+          "args": ["--prebuilt","mssql","--stdio"],
+          "env": {
+            "MSSQL_HOST": "",
+            "MSSQL_PORT": "",
+            "MSSQL_DATABASE": "",
+            "MSSQL_USER": "",
+            "MSSQL_PASSWORD": ""
+          }
+        }
+      }
+    }
+    ```
+{{% /tab %}}
+{{% tab header="Gemini CLI" lang="en" %}}
+
+1.  Install the [Gemini CLI](https://github.com/google-gemini/gemini-cli?tab=readme-ov-file#quickstart).
+1.  In your working directory, create a folder named `.gemini`. Within it, create a `settings.json` file.
+1.  Add the following configuration, replace the environment variables with your values, and then save:
+
+    ```json
+    {
+      "mcpServers": {
+        "sqlserver": {
+          "command": "./PATH/TO/toolbox",
+          "args": ["--prebuilt","mssql","--stdio"],
+          "env": {
+            "MSSQL_HOST": "",
+            "MSSQL_PORT": "",
+            "MSSQL_DATABASE": "",
+            "MSSQL_USER": "",
+            "MSSQL_PASSWORD": ""
+          }
+        }
+      }
+    }
+    ```
+{{% /tab %}}
+{{% tab header="Gemini Code Assist" lang="en" %}}
+
+1.  Install the [Gemini Code Assist](https://marketplace.visualstudio.com/items?itemName=Google.geminicodeassist) extension in Visual Studio Code.
+1.  Enable Agent Mode in Gemini Code Assist chat.
+1.  In your working directory, create a folder named `.gemini`. Within it, create a `settings.json` file.
+1.  Add the following configuration, replace the environment variables with your values, and then save:
+
+    ```json
+    {
+      "mcpServers": {
+        "sqlserver": {
+          "command": "./PATH/TO/toolbox",
+          "args": ["--prebuilt","mssql","--stdio"],
+          "env": {
+            "MSSQL_HOST": "",
+            "MSSQL_PORT": "",
+            "MSSQL_DATABASE": "",
+            "MSSQL_USER": "",
+            "MSSQL_PASSWORD": ""
+          }
+        }
+      }
+    }
+    ```
+{{% /tab %}}
+{{< /tabpane >}}
+
+## Use Tools
+
+Your AI tool is now connected to 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/mysql_mcp.md
+++ b/docs/en/how-to/connect-ide/mysql_mcp.md
@@ -0,0 +1,287 @@
+---
+title: MySQL using MCP
+type: docs
+weight: 2
+description: "Connect your IDE to 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 MySQL. This guide covers how to use [MCP Toolbox for Databases][toolbox] to expose your developer assistant tools to a MySQL instance:
+
+* [Cursor][cursor]
+* [Windsurf][windsurf] (Codium)
+* [Visual Studio Code][vscode] (Copilot)
+* [Cline][cline] (VS Code extension)
+* [Claude desktop][claudedesktop]
+* [Claude code][claudecode]
+* [Gemini CLI][geminicli]
+* [Gemini Code Assist][geminicodeassist]
+
+[toolbox]: https://github.com/googleapis/genai-toolbox
+[cursor]: #configure-your-mcp-client
+[windsurf]: #configure-your-mcp-client
+[vscode]: #configure-your-mcp-client
+[cline]: #configure-your-mcp-client
+[claudedesktop]: #configure-your-mcp-client
+[claudecode]: #configure-your-mcp-client
+[geminicli]: #configure-your-mcp-client
+[geminicodeassist]: #configure-your-mcp-client
+
+## Set up the database
+
+1.  [Create or select a MySQL instance.](https://dev.mysql.com/downloads/installer/)
+
+## Install MCP Toolbox
+
+1. Download the latest version of Toolbox as a binary. Select the [correct binary](https://github.com/googleapis/genai-toolbox/releases) corresponding to your OS and CPU architecture. You are required to use Toolbox version V0.10.0+:
+
+   <!-- {x-release-please-start-version} -->
+   {{< tabpane persist=header >}}
+{{< tab header="linux/amd64" lang="bash" >}}
+curl -O https://storage.googleapis.com/genai-toolbox/v0.13.0/linux/amd64/toolbox
+{{< /tab >}}
+
+{{< tab header="darwin/arm64" lang="bash" >}}
+curl -O https://storage.googleapis.com/genai-toolbox/v0.13.0/darwin/arm64/toolbox
+{{< /tab >}}
+
+{{< tab header="darwin/amd64" lang="bash" >}}
+curl -O https://storage.googleapis.com/genai-toolbox/v0.13.0/darwin/amd64/toolbox
+{{< /tab >}}
+
+{{< tab header="windows/amd64" lang="bash" >}}
+curl -O https://storage.googleapis.com/genai-toolbox/v0.13.0/windows/amd64/toolbox.exe
+{{< /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": {
+        "mysql": {
+          "command": "./PATH/TO/toolbox",
+          "args": ["--prebuilt", "mysql", "--stdio"],
+          "env": {
+            "MYSQL_HOST": "",
+            "MYSQL_PORT": "",
+            "MYSQL_DATABASE": "",
+            "MYSQL_USER": "",
+            "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": {
+        "mysql": {
+          "command": "./PATH/TO/toolbox",
+          "args": ["--prebuilt", "mysql", "--stdio"],
+          "env": {
+            "MYSQL_HOST": "",
+            "MYSQL_PORT": "",
+            "MYSQL_DATABASE": "",
+            "MYSQL_USER": "",
+            "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": {
+        "mysql": {
+          "command": "./PATH/TO/toolbox",
+          "args": ["--prebuilt", "mysql", "--stdio"],
+          "env": {
+            "MYSQL_HOST": "",
+            "MYSQL_PORT": "",
+            "MYSQL_DATABASE": "",
+            "MYSQL_USER": "",
+            "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": {
+        "mysql": {
+          "command": "./PATH/TO/toolbox",
+          "args": ["--prebuilt", "mysql", "--stdio"],
+          "env": {
+            "MYSQL_HOST": "",
+            "MYSQL_PORT": "",
+            "MYSQL_DATABASE": "",
+            "MYSQL_USER": "",
+            "MYSQL_PASSWORD": ""
+          }
+        }
+      }
+    }
+    ```
+
+1.  Open [Cursor](https://www.cursor.com/) and navigate to **Settings > Cursor Settings > MCP**. You should see a green active status after the server is successfully connected.
+{{% /tab %}}
+{{% tab header="Visual Studio Code (Copilot)" lang="en" %}}
+
+1.  Open [VS Code](https://code.visualstudio.com/docs/copilot/overview) and create a `.vscode` directory in your project root if it doesn't exist.
+1.  Create a `.vscode/mcp.json` file if it doesn't exist and open it.
+1.  Add the following configuration, replace the environment variables with your values, and save:
+
+    ```json
+    {
+      "mcpServers": {
+        "mysql": {
+          "command": "./PATH/TO/toolbox",
+          "args": ["--prebuilt","mysql","--stdio"],
+          "env": {
+            "MYSQL_HOST": "",
+            "MYSQL_PORT": "",
+            "MYSQL_DATABASE": "",
+            "MYSQL_USER": "",
+            "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": {
+        "mysql": {
+          "command": "./PATH/TO/toolbox",
+          "args": ["--prebuilt","mysql","--stdio"],
+          "env": {
+            "MYSQL_HOST": "",
+            "MYSQL_PORT": "",
+            "MYSQL_DATABASE": "",
+            "MYSQL_USER": "",
+            "MYSQL_PASSWORD": ""
+          }
+        }
+      }
+    }
+    ```
+{{% /tab %}}
+{{% tab header="Gemini CLI" lang="en" %}}
+
+1.  Install the [Gemini CLI](https://github.com/google-gemini/gemini-cli?tab=readme-ov-file#quickstart).
+1.  In your working directory, create a folder named `.gemini`. Within it, create a `settings.json` file.
+1.  Add the following configuration, replace the environment variables with your values, and then save:
+
+    ```json
+    {
+      "mcpServers": {
+        "mysql": {
+          "command": "./PATH/TO/toolbox",
+          "args": ["--prebuilt","mysql","--stdio"],
+          "env": {
+            "MYSQL_HOST": "",
+            "MYSQL_PORT": "",
+            "MYSQL_DATABASE": "",
+            "MYSQL_USER": "",
+            "MYSQL_PASSWORD": ""
+          }
+        }
+      }
+    }
+    ```
+{{% /tab %}}
+{{% tab header="Gemini Code Assist" lang="en" %}}
+
+1.  Install the [Gemini Code Assist](https://marketplace.visualstudio.com/items?itemName=Google.geminicodeassist) extension in Visual Studio Code.
+1.  Enable Agent Mode in Gemini Code Assist chat.
+1.  In your working directory, create a folder named `.gemini`. Within it, create a `settings.json` file.
+1.  Add the following configuration, replace the environment variables with your values, and then save:
+
+    ```json
+    {
+      "mcpServers": {
+        "mysql": {
+          "command": "./PATH/TO/toolbox",
+          "args": ["--prebuilt","mysql","--stdio"],
+          "env": {
+            "MYSQL_HOST": "",
+            "MYSQL_PORT": "",
+            "MYSQL_DATABASE": "",
+            "MYSQL_USER": "",
+            "MYSQL_PASSWORD": ""
+          }
+        }
+      }
+    }
+    ```
+{{% /tab %}}
+{{< /tabpane >}}
+
+## Use Tools
+
+Your AI tool is now connected to 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/postgres_mcp.md
+++ b/docs/en/how-to/connect-ide/postgres_mcp.md
@@ -6,14 +6,19 @@ 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:
+[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)
+* [Visual Studio Code][vscode] (Copilot)
 * [Cline][cline]  (VS Code extension)
 * [Claude desktop][claudedesktop]
 * [Claude code][claudecode]
+* [Gemini CLI][geminicli]
+* [Gemini Code Assist][geminicodeassist]

 [toolbox]: https://github.com/googleapis/genai-toolbox
 [cursor]: #configure-your-mcp-client
@@ -22,9 +27,12 @@ description: >
 [cline]: #configure-your-mcp-client
 [claudedesktop]: #configure-your-mcp-client
 [claudecode]: #configure-your-mcp-client
+[geminicli]: #configure-your-mcp-client
+[geminicodeassist]: #configure-your-mcp-client

 {{< notice tip >}}
-This guide can be used with [AlloyDB Omni](https://cloud.google.com/alloydb/omni/current/docs/overview).
+This guide can be used with [AlloyDB
+Omni](https://cloud.google.com/alloydb/omni/current/docs/overview).
 {{< /notice >}}

 ## Set up the database
@@ -34,34 +42,37 @@ This guide can be used with [AlloyDB Omni](https://cloud.google.com/alloydb/omni
    * [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.
-
+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+:
+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.6.0/linux/amd64/toolbox
+curl -O https://storage.googleapis.com/genai-toolbox/v0.13.0/linux/amd64/toolbox
 {{< /tab >}}

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

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

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

-
 1. Make the binary executable:

    ```bash
@@ -79,9 +90,11 @@ curl -O https://storage.googleapis.com/genai-toolbox/v0.6.0/windows/amd64/toolbo
 {{< 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. 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:
+1. Add the following configuration, replace the environment variables with your
+   values, and save:

    ```json
    {
@@ -108,7 +121,8 @@ curl -O https://storage.googleapis.com/genai-toolbox/v0.6.0/windows/amd64/toolbo

 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:
+1. Add the following configuration, replace the environment variables with your
+   values, and save:

    ```json
    {
@@ -129,14 +143,17 @@ curl -O https://storage.googleapis.com/genai-toolbox/v0.6.0/windows/amd64/toolbo
    ```

 1. Restart Claude desktop.
-1. From the new chat screen, you should see a hammer (MCP) icon appear with the new MCP server available.
+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. 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:
+1. Add the following configuration, replace the environment variables with your
+   values, and save:

    ```json
    {
@@ -156,14 +173,16 @@ curl -O https://storage.googleapis.com/genai-toolbox/v0.6.0/windows/amd64/toolbo
    }
    ```

-1. You should see a green active status after the server is successfully connected.
+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:
+1. Add the following configuration, replace the environment variables with your
+   values, and save:

    ```json
    {
@@ -183,14 +202,73 @@ curl -O https://storage.googleapis.com/genai-toolbox/v0.6.0/windows/amd64/toolbo
    }
    ```

-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.
+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. 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:
+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 %}}
+
+{{% tab header="Gemini CLI" lang="en" %}}
+
+1.  Install the [Gemini CLI](https://github.com/google-gemini/gemini-cli?tab=readme-ov-file#quickstart).
+1.  In your working directory, create a folder named `.gemini`. Within it, create a `settings.json` file.
+1.  Add the following configuration, replace the environment variables with your values, and then save:

    ```json
    {
@@ -211,11 +289,12 @@ curl -O https://storage.googleapis.com/genai-toolbox/v0.6.0/windows/amd64/toolbo
    ```
 {{% /tab %}}

-{{% tab header="Windsurf" lang="en" %}}
+{{% tab header="Gemini Code Assist" 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:
+1.  Install the [Gemini Code Assist](https://marketplace.visualstudio.com/items?itemName=Google.geminicodeassist) extension in Visual Studio Code.
+1.  Enable Agent Mode in Gemini Code Assist chat.
+1.  In your working directory, create a folder named `.gemini`. Within it, create a `settings.json` file.
+1.  Add the following configuration, replace the environment variables with your values, and then save:

    ```json
    {
@@ -233,14 +312,15 @@ curl -O https://storage.googleapis.com/genai-toolbox/v0.6.0/windows/amd64/toolbo
        }
      }
    }
-
    ```
 {{% /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.
+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:

@@ -248,5 +328,6 @@ The following tools are available to the LLM:
 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 >}}
+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
@@ -5,354 +5,9 @@ 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.6.0/linux/amd64/toolbox
-{{< /tab >}}
-
-{{< tab header="darwin/arm64" lang="bash" >}}
-curl -O https://storage.googleapis.com/genai-toolbox/v0.6.0/darwin/arm64/toolbox
-{{< /tab >}}
-
-{{< tab header="darwin/amd64" lang="bash" >}}
-curl -O https://storage.googleapis.com/genai-toolbox/v0.6.0/darwin/amd64/toolbox
-{{< /tab >}}
-
-{{< tab header="windows/amd64" lang="bash" >}}
-curl -O https://storage.googleapis.com/genai-toolbox/v0.6.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 >}}
+<html>
+  <head>
+    <link rel="canonical" href="https://cloud.google.com/spanner/docs/pre-built-tools-with-mcp-toolbox"/>
+    <meta http-equiv="refresh" content="0;url=https://cloud.google.com/spanner/docs/pre-built-tools-with-mcp-toolbox"/>
+  </head>
+</html>
--- a/docs/en/how-to/connect_via_mcp.md
+++ b/docs/en/how-to/connect_via_mcp.md
@@ -7,36 +7,48 @@ 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 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. 
+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.

 ### Protocol Versions
+
 Toolbox currently supports the following versions of MCP specification:
-* [2024-11-05](https://spec.modelcontextprotocol.io/specification/2024-11-05/)

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

+### Toolbox AuthZ/AuthN Not Supported by MCP
+
+The auth implementation in Toolbox is not supported in MCP's auth specification.
+This includes:
+
+* [Authenticated Parameters](../resources/tools/#authenticated-parameters)
+* [Authorized Invocations](../resources/tools/#authorized-invocations)

 ## Connecting to Toolbox with an MCP client
+
 ### Before you begin

-{{< notice note >}} 
+{{< notice note >}}
 MCP is only compatible with Toolbox version 0.3.0 and above.
 {{< /notice >}}

-1. [Install](../getting-started/introduction/_index.md#installing-the-server) Toolbox version 0.3.0+.
+1. [Install](../getting-started/introduction/#installing-the-server)
+   Toolbox version 0.3.0+.

 1. Make sure you've set up and initialized your database.

 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
@@ -47,14 +59,21 @@ transport protocol. Users that wish to use stdio will have to include the
 ```

 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.
+remote HTTP server. Logs will be set to the `warn` level by default. `debug` and
+`info` logs are not supported with stdio.
+
+{{< notice note >}}
+Toolbox enables dynamic reloading by default. To disable, use the
+`--disable-reload` flag.
+{{< /notice >}}

 ### Connecting via HTTP
+
 Toolbox supports the HTTP transport protocol with and without SSE.

-{{< tabpane text=true >}} {{% tab header="HTTP with SSE" lang="en" %}}
+{{< tabpane text=true >}} {{% tab header="HTTP with SSE (deprecated)" lang="en" %}}
 Add the following configuration to your MCP client configuration:
+
 ```bash
 {
  "mcpServers": {
@@ -66,11 +85,27 @@ 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, replace `url` with
+`"http://127.0.0.1:5000/mcp/{toolset_name}/sse"`.

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

 ### Using the MCP Inspector with Toolbox
@@ -80,6 +115,7 @@ testing and debugging Toolbox server.

 {{< tabpane text=true >}}
 {{% tab header="STDIO" lang="en" %}}
+
 1. Run Inspector with Toolbox as a subprocess:

   ```bash
@@ -88,15 +124,16 @@ testing and debugging Toolbox server.

 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 `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).
+{{% tab header="HTTP with SSE (deprecated)" lang="en" %}}
+1. [Run Toolbox](../getting-started/introduction/#running-the-server).

 1. In a separate terminal, run Inspector directly through `npx`:

@@ -109,6 +146,23 @@ testing and debugging Toolbox server.
 1. For `URL`, type in `http://127.0.0.1:5000/mcp/sse` to use all tool or
   `http//127.0.0.1:5000/mcp/{toolset_name}/sse` to use a specific toolset.

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

 | 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 |
+| 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
@@ -8,7 +8,6 @@ description: >

 <!-- Contributor: Sujith R Pillai <sujithrpillai@gmail.com> -->

-
 ## Before you begin

 1. [Install Docker Compose.](https://docs.docker.com/compose/install/)
@@ -74,16 +73,13 @@ networks:
    docker-compose up -d
    ```

-
 {{< notice tip >}}

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

 {{< /notice >}}

-
-
 ## Connecting with Toolbox Client SDK

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

 # Replace with the cloud run service URL generated above
+
 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
+
 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
@@ -9,7 +9,6 @@ description: >

 ## Before you begin

-
 1. Set the PROJECT_ID environment variable:

    ```bash
@@ -41,7 +40,6 @@ description: >
    kubectl version --client
    ```

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

   ```bash
@@ -62,8 +60,8 @@ description: >
    gcloud iam service-accounts create $SA_NAME
    ```

-1.  Grant any IAM roles necessary to the IAM service account. Each source have a
-    list of necessary IAM permissions listed on it's page. The example below is
+1. Grant any IAM roles necessary to the IAM service account. Each source has a
+    list of necessary IAM permissions listed on its page. The example below is
    for cloud sql postgres source:

    ```bash
@@ -254,6 +252,7 @@ description: >
    ```

 ## Clean up resources
+
 1. Delete secret.

    ```bash
--- a/docs/en/how-to/deploy_toolbox.md
+++ b/docs/en/how-to/deploy_toolbox.md
@@ -54,7 +54,6 @@ AlloyDB or Cloud SQL over private IP), make sure your Cloud Run service and the
 database are in the same VPC network.
 {{< /notice >}}

-
 ## Create a service account

 1. Create a backend service account if you don't already have one:
@@ -63,7 +62,7 @@ database are in the same VPC network.
    gcloud iam service-accounts create toolbox-identity
    ```

-1.  Grant permissions to use secret manager:
+1. Grant permissions to use secret manager:

    ```bash
    gcloud projects add-iam-policy-binding $PROJECT_ID \
@@ -71,7 +70,8 @@ database are in the same VPC network.
        --role roles/secretmanager.secretAccessor
    ```

-1. Grant additional permissions to the service account that are specific to the source, e.g.:
+1. Grant additional permissions to the service account that are specific to the
+   source, e.g.:
    - [AlloyDB for PostgreSQL](../resources/sources/alloydb-pg.md#iam-permissions)
    - [Cloud SQL for PostgreSQL](../resources/sources/cloud-sql-pg.md#iam-permissions)

@@ -79,7 +79,7 @@ database are in the same VPC network.

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

 ## Deploy to Cloud Run
@@ -97,11 +97,20 @@ section.
    gcloud secrets versions add tools --data-file=tools.yaml
    ```

-1. Set an environment variable to the container image that you want to use for cloud run:
+1. Set an environment variable to the container image that you want to use for
+   cloud run:

    ```bash
    export IMAGE=us-central1-docker.pkg.dev/database-toolbox/toolbox/toolbox:latest
    ```
+{{< notice note >}}  
+**The `$PORT` Environment Variable**  
+Google Cloud Run dictates the port your application must listen on by setting the
+`$PORT` environment variable inside your container. This value defaults to
+**8080**. Your application's `--port` argument **must** be set to listen on this
+port. If there is a mismatch, the container will fail to start and the
+deployment will time out.  
+{{< /notice >}}

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

@@ -124,7 +133,7 @@ section.
        --region us-central1 \
        --set-secrets "/app/tools.yaml=tools:latest" \
        --args="--tools-file=/app/tools.yaml","--address=0.0.0.0","--port=8080" \
-        # TODO(dev): update the following to match your VPC if necessary 
+        # 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
@@ -132,19 +141,15 @@ section.

 ## Connecting with Toolbox Client SDK

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

-1. [Set up `Cloud Run Invoker` role access](https://cloud.google.com/run/docs/securing/managing-access#service-add-principals) to your Cloud Run service.
+1. [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
+1. (Only for local runs) 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 >}}
+   for the principal you set up the `Cloud Run Invoker` role access to.

 1. Run the following to retrieve a non-deterministic URL for the cloud run service:

@@ -154,16 +159,68 @@ You can connect to Toolbox Cloud Run instances directly through the SDK

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

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

-    auth_token_provider = auth_methods.aget_google_id_token # can also use sync method
+# Replace with the Cloud Run service URL generated in the previous step.
+URL = "https://cloud-run-url.app"

-    # Replace with the Cloud Run service URL generated in the previous step.
-    async with ToolboxClient(
+auth_token_provider = auth_methods.aget_google_id_token(URL) # can also use sync method
+
+async with ToolboxClient(
+    URL,
+    client_headers={"Authorization": auth_token_provider},
+) as toolbox:
+{{< /tab >}}
+{{< tab header="Javascript" lang="javascript" >}}
+import { ToolboxClient } from '@toolbox-sdk/core';
+import {getGoogleIdToken} from '@toolbox-sdk/core/auth'
+
+// Replace with the Cloud Run service URL generated in the previous step.
+const URL = 'http://127.0.0.1:5000';
+const authTokenProvider = () => getGoogleIdToken(URL);
+
+const client = new ToolboxClient(URL, null, {"Authorization": authTokenProvider});
+{{< /tab >}}
+{{< tab header="Go" lang="go" >}}
+import "github.com/googleapis/mcp-toolbox-sdk-go/core"
+
+func main() {
+    // Replace with the Cloud Run service URL generated in the previous step.
+    URL := "http://127.0.0.1:5000"
+    auth_token_provider, err := core.GetGoogleIDToken(ctx, URL)
+    if err != nil {
+        log.Fatalf("Failed to fetch token %v", err)
+    }
+    toolboxClient, err := core.NewToolboxClient(
        URL,
-        client_headers={"Authorization": auth_token_provider},
-    ) as toolbox:
-    ```
+        core.WithClientHeaderString("Authorization", auth_token_provider))
+    if err != nil {
+        log.Fatalf("Failed to create Toolbox client: %v", err)
+    }
+}
+{{< /tab >}}
+{{< /tabpane >}}
+

 Now, you can use this client to connect to the deployed Cloud Run instance!
+
+## Troubleshooting
+
+{{< notice note >}}  
+For any deployment or runtime error, the best first step is to check the logs for your service in the Google Cloud Console's Cloud Run section. They often contain the specific error message needed to diagnose the problem.  
+{{< /notice >}}
+
+* **Deployment Fails with "Container failed to start":** This is almost always
+    caused by a port mismatch. Ensure your container's `--port` argument is set to
+    `8080` to match the `$PORT` environment variable provided by Cloud Run.
+
+* **Client Receives Permission Denied Error (401 or 403):** If your client application (e.g., your local SDK) gets a `401 Unauthorized` or `403 Forbidden` error when trying to call your Cloud Run service, it means the client is not properly authenticated as an invoker.
+    * Ensure the user or service account calling the service has the **Cloud Run Invoker** (`roles/run.invoker`) IAM role.
+    * If running locally, make sure your Application Default Credentials are set up correctly by running `gcloud auth application-default login`.
+
+* **Service Fails to Access Secrets (in logs):** If your application starts but the logs show errors like "permission denied" when trying to access Secret Manager, it means the Toolbox service account is missing permissions.
+    * Ensure the `toolbox-identity` service account has the **Secret Manager Secret Accessor** (`roles/secretmanager.secretAccessor`) IAM role.
+
+
--- a/docs/en/how-to/export_telemetry.md
+++ b/docs/en/how-to/export_telemetry.md
@@ -20,6 +20,7 @@ the need to run, operate, and maintain multiple agents/collectors.
 To configure the collector, you will have to provide a configuration file. The
 configuration file consists of four classes of pipeline component that access
 telemetry data.
+
 - `Receivers`
 - `Processors`
 - `Exporters`
--- a/docs/en/how-to/toolbox-ui/edit-headers.gif
+++ b/docs/en/how-to/toolbox-ui/edit-headers.gif
--- a/docs/en/how-to/toolbox-ui/edit-headers.png
+++ b/docs/en/how-to/toolbox-ui/edit-headers.png
--- a/docs/en/how-to/toolbox-ui/index.md
+++ b/docs/en/how-to/toolbox-ui/index.md
@@ -0,0 +1,109 @@
+---
+title: "Toolbox UI"
+type: docs
+weight: 1
+description: >
+  How to effectively use Toolbox UI.
+---
+
+Toolbox UI is a built-in web interface that allows users to visually inspect and test out configured resources such as tools and toolsets.
+
+## Launching Toolbox UI
+
+To launch Toolbox's interactive UI, use the `--ui` flag.
+
+```sh
+./toolbox --ui
+```
+
+Toolbox UI will be served from the same host and port as the Toolbox Server, with the `/ui` suffix. Once Toolbox
+is launched, the following INFO log with Toolbox UI's url will be shown:
+
+```bash
+INFO "Toolbox UI is up and running at: http://localhost:5000/ui"
+```
+
+## Navigating the Tools Page
+
+The tools page shows all tools loaded from your configuration file. This corresponds to the default toolset (represented by an empty string). Each tool's name on this page will exactly match its name in the configuration 
+file.
+
+To view details for a specific tool, click on the tool name. The main content area will be populated
+with the tool name, description, and available parameters.
+
+![Tools Page](./tools.png)
+
+### Invoking a Tool
+
+1. Click on a Tool
+1. Enter appropriate parameters in each parameter field
+1. Click "Run Tool"
+1. Done! Your results will appear in the response field
+1. (Optional) Uncheck "Prettify JSON" to format the response as plain text
+
+![Run Tool Demo GIF](./run-tool.gif)
+
+### Optional Parameters
+
+Toolbox allows users to add [optional parameters](../../resources/tools/#basic-parameters) with or without a default value. 
+
+To exclude a parameter, uncheck the box to the right of an associated parameter, and that parameter will not be
+included in the request body. If the parameter is not sent, Toolbox will either use it as `nil` value or the `default` value, if configured. If the parameter is required, Toolbox will throw an error.
+
+When the box is checked, parameter will be sent exactly as entered in the response field (e.g. empty string).
+
+![Optional Parameter checked example](./optional-param-checked.png)
+
+![Optional Parameter unchecked example](./optional-param-unchecked.png)
+
+### Editing Headers
+
+To edit headers, press the "Edit Headers" button to display the header modal. Within this modal,
+users can make direct edits by typing into the header's text area. 
+
+Toolbox UI validates that the headers are in correct JSON format. Other header-related errors (e.g.,
+incorrect header names or values required by the tool) will be reported in the Response section 
+after running the tool.
+
+![Edit Headers](./edit-headers.png)
+
+#### Google OAuth
+
+Currently, Toolbox supports Google OAuth 2.0 as an AuthService, which allows tools to utilize 
+authorized parameters. When a tool uses an authorized parameter, the parameter will be displayed
+but not editable, as it will be populated from the authentication token.  
+
+To provide the token, add your Google OAuth ID Token to the request header using the "Edit Headers"
+button and modal described above. The key should be the name of your AuthService as defined in 
+your tool configuration file, suffixed with `_token`. The value should be your ID token as a string.
+
+1. Select a tool that requires [authenticated parameters]()
+1. The auth parameter's text field is greyed out. This is because it cannot be entered manually and will
+be parsed from the resolved auth token
+1. To update request headers with the token, select "Edit Headers"
+1. (Optional) If you wish to manually edit the header, checkout the dropdown "How to extract Google OAuth ID Token manually" for guidance on retrieving ID token
+1. To edit the header automatically, click the "Auto Setup" button that is associated with your Auth Profile
+1. Enter the Client ID defined in your tools configuration file
+1. Click "Continue"
+1. Click "Sign in With Google" and login with your associated google account. This should automatically populate the header text area with your token
+1. Click "Save"
+1. Click "Run Tool"
+
+```json
+{
+  "Content-Type": "application/json",
+  "my-google-auth_token": "YOUR_ID_TOKEN_HERE"
+}
+```
+
+![Using Authenticated Parameter GIF](./edit-headers.gif)
+
+## Navigating the Toolsets Page
+
+Through the toolsets page, users can search for a specific toolset to retrieve tools from. Simply
+enter the toolset name in the search bar, and press "Enter" to retrieve the associated tools.
+
+If the toolset name is not defined within the tools configuration file, an error message will be 
+displayed.
+
+![Toolsets Page](./toolsets.png)
--- a/docs/en/how-to/toolbox-ui/optional-param-checked.png
+++ b/docs/en/how-to/toolbox-ui/optional-param-checked.png
--- a/docs/en/how-to/toolbox-ui/optional-param-unchecked.png
+++ b/docs/en/how-to/toolbox-ui/optional-param-unchecked.png
--- a/docs/en/how-to/toolbox-ui/run-tool.gif
+++ b/docs/en/how-to/toolbox-ui/run-tool.gif
--- a/docs/en/how-to/toolbox-ui/tools.png
+++ b/docs/en/how-to/toolbox-ui/tools.png
--- a/docs/en/how-to/toolbox-ui/toolsets.png
+++ b/docs/en/how-to/toolbox-ui/toolsets.png
--- a/docs/en/reference/_index.md
+++ b/docs/en/reference/_index.md
@@ -0,0 +1,8 @@
+---
+title: "Reference"
+type: docs
+weight: 7
+description: >
+  This section contains reference documentation.
+---
+
--- a/docs/en/reference/cli.md
+++ b/docs/en/reference/cli.md
@@ -0,0 +1,75 @@
+---
+title: "CLI"
+type: docs
+weight: 1
+description: >
+  This page describes the `toolbox` command-line options.
+---
+
+## Reference
+
+| Flag (Short) | Flag (Long) | Description | Default |
+|---|---|---|---|
+| `-a` | `--address` | Address of the interface the server will listen on. | `127.0.0.1` |
+| | `--disable-reload` | Disables dynamic reloading of tools file. | |
+| `-h` | `--help` | help for toolbox | |
+| | `--log-level` | Specify the minimum level logged. Allowed: 'DEBUG', 'INFO', 'WARN', 'ERROR'. | `info` |
+| | `--logging-format` | Specify logging format to use. Allowed: 'standard' or 'JSON'. | `standard` |
+| `-p` | `--port` | Port the server will listen on. | `5000` |
+| | `--prebuilt` | Use a prebuilt tool configuration by source type. Cannot be used with --tools-file. See [Prebuilt Tools Reference](prebuilt-tools.md) for allowed values. | |
+| | `--stdio` | Listens via MCP STDIO instead of acting as a remote HTTP server. | |
+| | `--telemetry-gcp` | Enable exporting directly to Google Cloud Monitoring. | |
+| | `--telemetry-otlp` | Enable exporting using OpenTelemetry Protocol (OTLP) to the specified endpoint (e.g. 'http://127.0.0.1:4318') | |
+| | `--telemetry-service-name` | Sets the value of the service.name resource attribute for telemetry data. | `toolbox` |
+| | `--tools-file` | File path specifying the tool configuration. Cannot be used with --prebuilt, --tools-files, or --tools-folder. | |
+| | `--tools-files` | Multiple file paths specifying tool configurations. Files will be merged. Cannot be used with --prebuilt, --tools-file, or --tools-folder. | |
+| | `--tools-folder` | Directory path containing YAML tool configuration files. All .yaml and .yml files in the directory will be loaded and merged. Cannot be used with --prebuilt, --tools-file, or --tools-files. | |
+| | `--ui` | Launches the Toolbox UI web server. | |
+| `-v` | `--version` | version for toolbox | |
+
+## Examples
+
+### Transport Configuration
+
+**Server Settings:**
+- `--address`, `-a`: Server listening address (default: "127.0.0.1")
+- `--port`, `-p`: Server listening port (default: 5000)
+
+**STDIO:**
+- `--stdio`: Run in MCP STDIO mode instead of HTTP server
+
+#### Usage Examples
+
+```bash
+# Basic server with custom port configuration
+./toolbox --tools-file "tools.yaml" --port 8080
+```
+
+### Tool Configuration Sources
+
+The CLI supports multiple mutually exclusive ways to specify tool configurations:
+
+**Single File:** (default)
+- `--tools-file`: Path to a single YAML configuration file (default: `tools.yaml`)
+
+**Multiple Files:**
+- `--tools-files`: Comma-separated list of YAML files to merge
+
+**Directory:**
+- `--tools-folder`: Directory containing YAML files to load and merge
+
+**Prebuilt Configurations:**
+- `--prebuilt`: Use predefined configurations for specific database types (e.g., 'bigquery', 'postgres', 'spanner'). See [Prebuilt Tools Reference](prebuilt-tools.md) for allowed values.
+
+{{< notice tip >}}
+The CLI enforces mutual exclusivity between configuration source flags, preventing simultaneous use of `--prebuilt` with file-based options, and ensuring only one of `--tools-file`, `--tools-files`, or `--tools-folder` is used at a time.
+{{< /notice >}}
+
+### Hot Reload
+
+Toolbox enables dynamic reloading by default. To disable, use the
+`--disable-reload` flag.
+
+### Toolbox UI
+
+To launch Toolbox's interactive UI, use the `--ui` flag. This allows you to test tools and toolsets with features such as authorized parameters. To learn more, visit [Toolbox UI](../how-to/toolbox-ui/index.md).
--- a/docs/en/reference/prebuilt-tools.md
+++ b/docs/en/reference/prebuilt-tools.md
@@ -0,0 +1,263 @@
+---
+title: "Prebuilt Tools"
+type: docs
+weight: 1
+description: >
+    This page lists all the prebuilt tools available.
+---
+
+Prebuilt tools are reusable, pre-packaged toolsets that are designed to extend the capabilities of agents. These tools are built to be generic and adaptable, allowing developers to interact with and take action on databases.
+
+See guides, [Connect from your IDE](../how-to/connect-ide/_index.md), for details on how to connect your AI tools (IDEs) to databases via Toolbox and MCP.
+
+## AlloyDB Postgres
+
+*   `--prebuilt` value: `alloydb-postgres`
+*   **Environment Variables:**
+    *   `ALLOYDB_POSTGRES_PROJECT`: The GCP project ID.
+    *   `ALLOYDB_POSTGRES_REGION`: The region of your AlloyDB instance.
+    *   `ALLOYDB_POSTGRES_CLUSTER`: The ID of your AlloyDB cluster.
+    *   `ALLOYDB_POSTGRES_INSTANCE`: The ID of your AlloyDB instance.
+    *   `ALLOYDB_POSTGRES_DATABASE`: The name of the database to connect to.
+    *   `ALLOYDB_POSTGRES_USER`: The database username.
+    *   `ALLOYDB_POSTGRES_PASSWORD`: The password for the database user.
+*   **Permissions:**
+    *   **AlloyDB Client** (`roles/alloydb.client`) to connect to the instance.
+    *   Database-level permissions (e.g., `SELECT`, `INSERT`) are required to execute queries.
+*   **Tools:**
+    *   `execute_sql`: Executes a SQL query.
+    *   `list_tables`: Lists tables in the database.
+
+## AlloyDB Postgres Admin
+
+* `--prebuilt` value: `alloydb-postgres-admin`
+*   **Environment Variables:**
+    *   `API_KEY`: Your API key for the AlloyDB API.
+*   **Permissions:**
+    *   **AlloyDB Admin** (`roles/alloydb.admin`) IAM role is required on the project.
+*   **Tools:**
+    *   `alloydb-create-cluster`: Creates a new AlloyDB cluster.
+    *   `alloydb-operations-get`: Polls the operations API to track the status of long-running operations.
+    *   `alloydb-create-instance`: Creates a new AlloyDB instance within a cluster.
+    *   `alloydb-list-clusters`: Lists all AlloyDB clusters in a project.
+    *   `alloydb-list-instances`: Lists all instances within an AlloyDB cluster.
+    *   `alloydb-list-users`: Lists all database users within an AlloyDB cluster.
+    *   `alloydb-create-user`: Creates a new database user in an AlloyDB cluster.
+
+## BigQuery
+
+*   `--prebuilt` value: `bigquery`
+*   **Environment Variables:**
+    *   `BIGQUERY_PROJECT`: The GCP project ID.
+*   **Permissions:**
+    *   **BigQuery User** (`roles/bigquery.user`) to execute queries and view metadata.
+    *   **BigQuery Metadata Viewer** (`roles/bigquery.metadataViewer`) to view all datasets.
+    *   **BigQuery Data Editor** (`roles/bigquery.dataEditor`) to create or modify datasets and tables.
+    *   **Gemini for Google Cloud** (`roles/cloudaicompanion.user`) to use the conversational analytics API.
+*   **Tools:**
+    *   `ask_data_insights`: Use this tool to perform data analysis, get insights, or answer complex questions about the contents of specific BigQuery tables. For more information on required roles, API setup, and IAM configuration, see the setup and authentication section of the [Conversational Analytics API documentation](https://cloud.google.com/gemini/docs/conversational-analytics-api/overview).
+    *   `execute_sql`: Executes a SQL statement.
+    *   `forecast`: Use this tool to forecast time series data.
+    *   `get_dataset_info`: Gets dataset metadata.
+    *   `get_table_info`: Gets table metadata.
+    *   `list_dataset_ids`: Lists datasets.
+    *   `list_table_ids`: Lists tables.
+
+## Cloud SQL for MySQL
+
+*   `--prebuilt` value: `cloud-sql-mysql`
+*   **Environment Variables:**
+    *   `CLOUD_SQL_MYSQL_PROJECT`: The GCP project ID.
+    *   `CLOUD_SQL_MYSQL_REGION`: The region of your Cloud SQL instance.
+    *   `CLOUD_SQL_MYSQL_INSTANCE`: The ID of your Cloud SQL instance.
+    *   `CLOUD_SQL_MYSQL_DATABASE`: The name of the database to connect to.
+    *   `CLOUD_SQL_MYSQL_USER`: The database username.
+    *   `CLOUD_SQL_MYSQL_PASSWORD`: The password for the database user.
+*   **Permissions:**
+    *   **Cloud SQL Client** (`roles/cloudsql.client`) to connect to the instance.
+    *   Database-level permissions (e.g., `SELECT`, `INSERT`) are required to execute queries.
+*   **Tools:**
+    *   `execute_sql`: Executes a SQL query.
+    *   `list_tables`: Lists tables in the database.
+
+## Cloud SQL for PostgreSQL
+
+*   `--prebuilt` value: `cloud-sql-postgres`
+*   **Environment Variables:**
+    *   `CLOUD_SQL_POSTGRES_PROJECT`: The GCP project ID.
+    *   `CLOUD_SQL_POSTGRES_REGION`: The region of your Cloud SQL instance.
+    *   `CLOUD_SQL_POSTGRES_INSTANCE`: The ID of your Cloud SQL instance.
+    *   `CLOUD_SQL_POSTGRES_DATABASE`: The name of the database to connect to.
+    *   `CLOUD_SQL_POSTGRES_USER`: The database username.
+    *   `CLOUD_SQL_POSTGRES_PASSWORD`: The password for the database user.
+*   **Permissions:**
+    *   **Cloud SQL Client** (`roles/cloudsql.client`) to connect to the instance.
+    *   Database-level permissions (e.g., `SELECT`, `INSERT`) are required to execute queries.
+*   **Tools:**
+    *   `execute_sql`: Executes a SQL query.
+    *   `list_tables`: Lists tables in the database.
+
+## Cloud SQL for SQL Server
+
+*   `--prebuilt` value: `cloud-sql-mssql`
+*   **Environment Variables:**
+    *   `CLOUD_SQL_MSSQL_PROJECT`: The GCP project ID.
+    *   `CLOUD_SQL_MSSQL_REGION`: The region of your Cloud SQL instance.
+    *   `CLOUD_SQL_MSSQL_INSTANCE`: The ID of your Cloud SQL instance.
+    *   `CLOUD_SQL_MSSQL_DATABASE`: The name of the database to connect to.
+    *   `CLOUD_SQL_MSSQL_IP_ADDRESS`: The IP address of the Cloud SQL instance.
+    *   `CLOUD_SQL_MSSQL_USER`: The database username.
+    *   `CLOUD_SQL_MSSQL_PASSWORD`: The password for the database user.
+*   **Permissions:**
+    *   **Cloud SQL Client** (`roles/cloudsql.client`) to connect to the instance.
+    *   Database-level permissions (e.g., `SELECT`, `INSERT`) are required to execute queries.
+*   **Tools:**
+    *   `execute_sql`: Executes a SQL query.
+    *   `list_tables`: Lists tables in the database.
+
+## Dataplex
+
+*   `--prebuilt` value: `dataplex`
+*   **Environment Variables:**
+    *   `DATAPLEX_PROJECT`: The GCP project ID.
+*   **Permissions:**
+    *   **Dataplex Reader** (`roles/dataplex.viewer`) to search and look up entries.
+    *   **Dataplex Editor** (`roles/dataplex.editor`) to modify entries.
+*   **Tools:**
+    *   `dataplex_search_entries`: Searches for entries in Dataplex Catalog.
+    *   `dataplex_lookup_entry`: Retrieves a specific entry from Dataplex Catalog.
+    *   `dataplex_search_aspect_types`: Finds aspect types relevant to the query.
+
+## Firestore
+
+*   `--prebuilt` value: `firestore`
+*   **Environment Variables:**
+    *   `FIRESTORE_PROJECT`: The GCP project ID.
+    *   `FIRESTORE_DATABASE`: The Firestore database ID.
+*   **Permissions:**
+    *   **Cloud Datastore User** (`roles/datastore.user`) to get documents, list collections, and query collections.
+    *   **Firebase Rules Viewer** (`roles/firebaserules.viewer`) to get and validate Firestore rules.
+*   **Tools:**
+    *   `firestore-get-documents`: Gets multiple documents from Firestore by their paths.
+    *   `firestore-list-collections`: Lists Firestore collections for a given parent path.
+    *   `firestore-delete-documents`: Deletes multiple documents from Firestore.
+    *   `firestore-query-collection`: Retrieves one or more Firestore documents from a collection.
+    *   `firestore-get-rules`: Retrieves the active Firestore security rules.
+    *   `firestore-validate-rules`: Checks the provided Firestore Rules source for syntax and validation errors.
+
+## Looker
+
+*   `--prebuilt` value: `looker`
+*   **Environment Variables:**
+    *   `LOOKER_BASE_URL`: The URL of your Looker instance.
+    *   `LOOKER_CLIENT_ID`: The client ID for the Looker API.
+    *   `LOOKER_CLIENT_SECRET`: The client secret for the Looker API.
+    *   `LOOKER_VERIFY_SSL`: Whether to verify SSL certificates.
+*   **Permissions:**
+    *   A Looker account with permissions to access the desired models, explores, and data is required.
+*   **Tools:**
+    *   `get_models`: Retrieves the list of LookML models.
+    *   `get_explores`: Retrieves the list of explores in a model.
+    *   `get_dimensions`: Retrieves the list of dimensions in an explore.
+    *   `get_measures`: Retrieves the list of measures in an explore.
+    *   `get_filters`: Retrieves the list of filters in an explore.
+    *   `get_parameters`: Retrieves the list of parameters in an explore.
+    *   `query`: Runs a query against the LookML model.
+    *   `query_sql`: Generates the SQL for a query.
+    *   `query_url`: Generates a URL for a query in Looker.
+    *   `get_looks`: Searches for saved looks.
+    *   `run_look`: Runs the query associated with a look.
+    *   `make_look`: Creates a new look.
+    *   `get_dashboards`: Searches for saved dashboards.
+    *   `make_dashboard`: Creates a new dashboard.
+    *   `add_dashboard_element`: Adds a tile to a dashboard.
+
+## Microsoft SQL Server
+
+*   `--prebuilt` value: `mssql`
+*   **Environment Variables:**
+    *   `MSSQL_HOST`: The hostname or IP address of the SQL Server instance.
+    *   `MSSQL_PORT`: The port number for the SQL Server instance.
+    *   `MSSQL_DATABASE`: The name of the database to connect to.
+    *   `MSSQL_USER`: The database username.
+    *   `MSSQL_PASSWORD`: The password for the database user.
+*   **Permissions:**
+    *   Database-level permissions (e.g., `SELECT`, `INSERT`) are required to execute queries.
+*   **Tools:**
+    *   `execute_sql`: Executes a SQL query.
+    *   `list_tables`: Lists tables in the database.
+
+## MySQL
+
+*   `--prebuilt` value: `mysql`
+*   **Environment Variables:**
+    *   `MYSQL_HOST`: The hostname or IP address of the MySQL server.
+    *   `MYSQL_PORT`: The port number for the MySQL server.
+    *   `MYSQL_DATABASE`: The name of the database to connect to.
+    *   `MYSQL_USER`: The database username.
+    *   `MYSQL_PASSWORD`: The password for the database user.
+*   **Permissions:**
+    *   Database-level permissions (e.g., `SELECT`, `INSERT`) are required to execute queries.
+*   **Tools:**
+    *   `execute_sql`: Executes a SQL query.
+    *   `list_tables`: Lists tables in the database.
+
+## OceanBase
+
+*   `--prebuilt` value: `oceanbase`
+*   **Environment Variables:**
+    *   `OCEANBASE_HOST`: The hostname or IP address of the OceanBase server.
+    *   `OCEANBASE_PORT`: The port number for the OceanBase server.
+    *   `OCEANBASE_DATABASE`: The name of the database to connect to.
+    *   `OCEANBASE_USER`: The database username.
+    *   `OCEANBASE_PASSWORD`: The password for the database user.
+*   **Permissions:**
+    *   Database-level permissions (e.g., `SELECT`, `INSERT`) are required to execute queries.
+*   **Tools:**
+    *   `execute_sql`: Executes a SQL query.
+    *   `list_tables`: Lists tables in the database.
+
+## PostgreSQL
+
+*   `--prebuilt` value: `postgres`
+*   **Environment Variables:**
+    *   `POSTGRES_HOST`: The hostname or IP address of the PostgreSQL server.
+    *   `POSTGRES_PORT`: The port number for the PostgreSQL server.
+    *   `POSTGRES_DATABASE`: The name of the database to connect to.
+    *   `POSTGRES_USER`: The database username.
+    *   `POSTGRES_PASSWORD`: The password for the database user.
+*   **Permissions:**
+    *   Database-level permissions (e.g., `SELECT`, `INSERT`) are required to execute queries.
+*   **Tools:**
+    *   `execute_sql`: Executes a SQL query.
+    *   `list_tables`: Lists tables in the database.
+
+## Spanner (GoogleSQL dialect)
+
+*   `--prebuilt` value: `spanner`
+*   **Environment Variables:**
+    *   `SPANNER_PROJECT`: The GCP project ID.
+    *   `SPANNER_INSTANCE`: The Spanner instance ID.
+    *   `SPANNER_DATABASE`: The Spanner database ID.
+*   **Permissions:**
+    *   **Cloud Spanner Database Reader** (`roles/spanner.databaseReader`) to execute DQL queries and list tables.
+    *   **Cloud Spanner Database User** (`roles/spanner.databaseUser`) to execute DML queries.
+*   **Tools:**
+    *   `execute_sql`: Executes a DML SQL query.
+    *   `execute_sql_dql`: Executes a DQL SQL query.
+    *   `list_tables`: Lists tables in the database.
+
+## Spanner (PostgreSQL dialect)
+
+*   `--prebuilt` value: `spanner-postgres`
+*   **Environment Variables:**
+    *   `SPANNER_PROJECT`: The GCP project ID.
+    *   `SPANNER_INSTANCE`: The Spanner instance ID.
+    *   `SPANNER_DATABASE`: The Spanner database ID.
+*   **Permissions:**
+    *   **Cloud Spanner Database Reader** (`roles/spanner.databaseReader`) to execute DQL queries and list tables.
+    *   **Cloud Spanner Database User** (`roles/spanner.databaseUser`) to execute DML queries.
+*   **Tools:**
+    *   `execute_sql`: Executes a DML SQL query using the PostgreSQL interface for Spanner.
+    *   `execute_sql_dql`: Executes a DQL SQL query using the PostgreSQL interface for Spanner.
+    *   `list_tables`: Lists tables in the database.
--- a/docs/en/resources/authServices/_index.md
+++ b/docs/en/resources/authServices/_index.md
@@ -3,11 +3,11 @@ title: "AuthServices"
 type: docs
 weight: 1
 description: >
-  AuthServices represent services that handle authentication and authorization. 
+  AuthServices represent services that handle authentication and authorization.
 ---

 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
  is validated by the auth service before the call can be invoked. Toolbox
@@ -62,52 +62,171 @@ 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.

+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

+#### Python
+
+Use the [Python SDK](https://github.com/googleapis/mcp-toolbox-sdk-python/tree/main).
+
 {{< 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
+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)

-authorized_tool = toolbox.load_tool("my-tool-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

-# for a toolset use
+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

-authorized_tools = toolbox.load_toolset("my-toolset-name", auth_tokens={"my_auth": get_auth_token})
+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
+async def main():
+    toolbox = ToolboxClient("<http://127.0.0.1:5000>")

-authorized_tool = toolbox.load_tool("my-tool-name", auth_tokens={"my_auth": get_auth_token})
+    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)

-# for a toolset use
-
-authorized_tools = toolbox.load_toolset("my-toolset-name", auth_tokens={"my_auth": get_auth_token})
-{{< /tab >}}
+if **name** == "**main**":
+    asyncio.run(main()){{< /tab >}}
 {{< /tabpane >}}

+#### Javascript/Typescript
+
+Use the [JS SDK](https://github.com/googleapis/mcp-toolbox-sdk-js/tree/main).
+
+```javascript
+import { ToolboxClient } from '@toolbox-sdk/core';
+
+async function getAuthToken() {
+    // ... 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
+}
+
+const URL = 'http://127.0.0.1:5000';
+let client = new ToolboxClient(URL);
+const authTool = await client.loadTool("my-tool", {"my_auth_app_1": getAuthToken});
+const result = await authTool({param:"value"});
+console.log(result);
+print(result)
+```
+
+#### Go
+
+Use the [Go SDK](https://github.com/googleapis/mcp-toolbox-sdk-go/tree/main).
+
+```go
+import "github.com/googleapis/mcp-toolbox-sdk-go/core"
+import "fmt"
+
+func getAuthToken() string {
+	// ... 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
+}
+
+func main() {
+	URL := 'http://127.0.0.1:5000'
+	client, err := core.NewToolboxClient(URL)
+	if err != nil {
+		log.Fatalf("Failed to create Toolbox client: %v", err)
+  	}
+	dynamicTokenSource := core.NewCustomTokenSource(getAuthToken)
+	authTool, err := client.LoadTool(
+		"my-tool",
+		ctx,
+		core.WithAuthTokenSource("my_auth_app_1", dynamicTokenSource))
+	if err != nil {
+		log.Fatalf("Failed to load tool: %v", err)
+	}
+	inputs := map[string]any{"param": "value"}
+	result, err := authTool.Invoke(ctx, inputs)
+	if err != nil {
+		log.Fatalf("Failed to invoke tool: %v", err)
+	}
+	fmt.Println(result)
+}
+```
+
 ### Specifying tokens for existing tools

+#### Python
+Use the [Python SDK](https://github.com/googleapis/mcp-toolbox-sdk-python/tree/main).
+
 {{< tabpane persist=header >}}
+{{< tab header="Core" lang="Python" >}}
+tools = await 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="LangChain" 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,
 })
@@ -117,15 +236,68 @@ 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 >}}

+#### Javascript/Typescript
+
+Use the [JS SDK](https://github.com/googleapis/mcp-toolbox-sdk-js/tree/main).
+
+```javascript
+const URL = 'http://127.0.0.1:5000';
+let client = new ToolboxClient(URL);
+let tool = await client.loadTool("my-tool")
+
+// for a single token
+const authorizedTool = tool.addAuthTokenGetter("my_auth", get_auth_token)
+
+// OR, if multiple tokens are needed
+const multiAuthTool = tool.addAuthTokenGetters({
+    "my_auth_1": getAuthToken1,
+    "my_auth_2": getAuthToken2,
+})
+
+```
+
+#### Go
+
+Use the [Go SDK](https://github.com/googleapis/mcp-toolbox-sdk-go/tree/main).
+
+```go
+import "github.com/googleapis/mcp-toolbox-sdk-go/core"
+
+func main() {
+	URL := 'http://127.0.0.1:5000'
+	client, err := core.NewToolboxClient(URL)
+	if err != nil {
+		log.Fatalf("Failed to create Toolbox client: %v", err)
+	}
+	tool, err := client.LoadTool("my-tool", ctx))
+	if err != nil {
+		log.Fatalf("Failed to load tool: %v", err)
+	}
+	dynamicTokenSource1 := core.NewCustomTokenSource(getAuthToken1)
+	dynamicTokenSource2 := core.NewCustomTokenSource(getAuthToken1)
+
+	// For a single token
+	authTool, err := tool.ToolFrom(
+		core.WithAuthTokenSource("my-auth", dynamicTokenSource),
+	)
+
+	// OR, if multiple tokens are needed
+	authTool, err := tool.ToolFrom(
+		core.WithAuthTokenSource("my-auth_1", dynamicTokenSource1),
+		core.WithAuthTokenSource("my-auth_2", dynamicTokenSource2),
+	)
+}
+```
+
 ## Kinds of Auth Services
--- a/docs/en/resources/authServices/google.md
+++ b/docs/en/resources/authServices/google.md
@@ -3,7 +3,7 @@ title: "Google Sign-In"
 type: docs
 weight: 1
 description: >
-  Use Google Sign-In for Oauth 2.0 flow and token lifecycle. 
+  Use Google Sign-In for Oauth 2.0 flow and token lifecycle.
 ---

 ## Getting Started
@@ -33,7 +33,7 @@ ID.
 When using [Authenticated Parameters][auth-params], any [claim provided by the
 id-token][provided-claims] can be used for the parameter.

-[auth-params]: ../tools/#authenticated-phugarameters
+[auth-params]: ../tools/#authenticated-parameters
 [provided-claims]:
    https://developers.google.com/identity/openid-connect/openid-connect#obtaininguserprofileinformation

--- a/docs/en/resources/sources/alloydb-pg.md
+++ b/docs/en/resources/sources/alloydb-pg.md
@@ -22,6 +22,25 @@ cluster][alloydb-free-trial].
 [alloydb-docs]: https://cloud.google.com/alloydb/docs
 [alloydb-free-trial]: https://cloud.google.com/alloydb/docs/create-free-trial-cluster

+## Available Tools
+
+- [`alloydb-ai-nl`](../tools/alloydbainl/alloydb-ai-nl.md)  
+  Use natural language queries on AlloyDB, powered by AlloyDB AI.
+
+- [`postgres-sql`](../tools/postgres/postgres-sql.md)  
+  Execute SQL queries as prepared statements in AlloyDB Postgres.
+
+- [`postgres-execute-sql`](../tools/postgres/postgres-execute-sql.md)  
+  Run parameterized SQL statements in AlloyDB Postgres.
+
+### Pre-built Configurations
+
+- [AlloyDB using MCP](https://googleapis.github.io/genai-toolbox/how-to/connect-ide/alloydb_pg_mcp/)  
+Connect your IDE to AlloyDB using Toolbox.
+
+- [AlloyDB Admin API using MCP](https://googleapis.github.io/genai-toolbox/how-to/connect-ide/alloydb_pg_admin_mcp/)  
+Create your AlloyDB database with MCP Toolbox.
+
 ## Requirements

 ### IAM Permissions
@@ -81,8 +100,8 @@ 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.
+    - 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
--- a/docs/en/resources/sources/bigquery.md
+++ b/docs/en/resources/sources/bigquery.md
@@ -34,29 +34,71 @@ avoiding full table scans or complex filters.
 [bigquery-quickstart-cli]: https://cloud.google.com/bigquery/docs/quickstarts/quickstart-command-line
 [bigquery-googlesql]: https://cloud.google.com/bigquery/docs/reference/standard-sql/

+## Available Tools
+
+- [`bigquery-sql`](../tools/bigquery/bigquery-sql.md)  
+  Run SQL queries directly against BigQuery datasets.
+
+- [`bigquery-execute-sql`](../tools/bigquery/bigquery-execute-sql.md)  
+  Execute structured queries using parameters.
+
+- [`bigquery-get-dataset-info`](../tools/bigquery/bigquery-get-dataset-info.md)  
+  Retrieve metadata for a specific dataset.
+
+- [`bigquery-get-table-info`](../tools/bigquery/bigquery-get-table-info.md)  
+  Retrieve metadata for a specific table.
+
+- [`bigquery-list-dataset-ids`](../tools/bigquery/bigquery-list-dataset-ids.md)  
+  List available dataset IDs.
+
+- [`bigquery-list-table-ids`](../tools/bigquery/bigquery-list-table-ids.md)  
+  List tables in a given dataset.
+
+### Pre-built Configurations
+
+- [BigQuery using MCP](https://googleapis.github.io/genai-toolbox/how-to/connect-ide/bigquery_mcp/)  
+Connect your IDE to BigQuery using Toolbox.
+
 ## 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.
+### Authentication via Application Default Credentials (ADC)
+
+By **default**, Toolbox will use your [Application Default Credentials (ADC)][adc] to authorize and authenticate when interacting with [BigQuery][bigquery-docs].
+
+When using this method, you need to ensure the IAM identity associated with your
+ADC (such as a service account) has the correct permissions for the queries you
+intend to run. Common roles include `roles/bigquery.user` (which includes
+permissions to run jobs and read data) or `roles/bigbigquery.dataViewer`.
+Follow this [guide][set-adc] to set up your ADC.
+
+### Authentication via User's OAuth Access Token
+
+If the `useClientOAuth` parameter is set to `true`, Toolbox will instead use the
+OAuth access token for authentication. This token is parsed from the
+`Authorization` header passed in with the tool invocation request. This method
+allows Toolbox to make queries to [BigQuery][bigquery-docs] on behalf of the
+client or the end-user.
+
+When using this on-behalf-of authentication, you must ensure that the
+identity used has been granted the correct IAM permissions. Currently,
+this option is only supported by the following BigQuery tools:
+
+- [`bigquery-sql`](../tools/bigquery/bigquery-sql.md)  
+  Run SQL queries directly against BigQuery datasets.

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

 ## Example

+Initialize a BigQuery source that uses ADC:
+
 ```yaml
 sources:
  my-bigquery-source:
@@ -64,10 +106,21 @@ sources:
    project: "my-project-id"
 ```

+Initialize a BigQuery source that uses the client's access token:
+
+```yaml
+sources:
+  my-bigquery-client-auth-source:
+    kind: "bigquery"
+    project: "my-project-id"
+    useClientOAuth: true
+```
+
 ## 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 |
+| **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 |
+| useClientOAuth |   bool   |    false     | If true, forwards the client's OAuth access token from the "Authorization" header to downstream queries.                                                                                                                                |
--- a/docs/en/resources/sources/bigtable.md
+++ b/docs/en/resources/sources/bigtable.md
@@ -32,6 +32,11 @@ such as avoiding full table scans or complex filters.
 [bigtable-googlesql]:
    https://cloud.google.com/bigtable/docs/googlesql-overview

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

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

+## Available Tools
+
+- [`mssql-sql`](../tools/mssql/mssql-sql.md)  
+  Execute pre-defined SQL Server queries with placeholder parameters.
+
+- [`mssql-execute-sql`](../tools/mssql/mssql-execute-sql.md)  
+  Run parameterized SQL Server queries in Cloud SQL for SQL Server.
+
+### Pre-built Configurations
+
+- [Cloud SQL for SQL Server using MCP](https://googleapis.github.io/genai-toolbox/how-to/connect-ide/cloud_sql_mssql_mcp/)  
+Connect your IDE to Cloud SQL for SQL Server using Toolbox.
+
 ## Requirements

 ### IAM Permissions
@@ -63,8 +76,8 @@ mTLS.

 ### Database User

-Currently, this source only uses standard authentication. You will need to [create a
-SQL Server user][cloud-sql-users] to login to the database with.
+Currently, this source only uses standard authentication. You will need to
+[create a SQL Server user][cloud-sql-users] to login to the database with.

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

@@ -96,7 +109,7 @@ instead of hardcoding your secrets into the configuration file.
 | kind      |  string  |     true     | Must be "cloud-sql-mssql".                                                                  |
 | project   |  string  |     true     | Id of the GCP project that the cluster was created in (e.g. "my-project-id").               |
 | region    |  string  |     true     | Name of the GCP region that the cluster was created in (e.g. "us-central1").                |
-| instance  |  string  |     true     | Name of the Cloud SQL instance within the cluster (e.g. "my-instance").                      |
+| instance  |  string  |     true     | Name of the Cloud SQL instance within the cluster (e.g. "my-instance").                     |
 | database  |  string  |     true     | Name of the Cloud SQL database to connect to (e.g. "my_db").                                |
 | ipAddress |  string  |     true     | IP address of the Cloud SQL instance to connect to.                                         |
 | user      |  string  |     true     | Name of the SQL Server user to connect as (e.g. "my-pg-user").                              |
--- a/docs/en/resources/sources/cloud-sql-mysql.md
+++ b/docs/en/resources/sources/cloud-sql-mysql.md
@@ -20,6 +20,19 @@ to a database by following these instructions][csql-mysql-quickstart].
 [csql-mysql-docs]: https://cloud.google.com/sql/docs/mysql
 [csql-mysql-quickstart]: https://cloud.google.com/sql/docs/mysql/connect-instance-local-computer

+## Available Tools
+
+- [`mysql-sql`](../tools/mysql/mysql-sql.md)  
+  Execute pre-defined prepared SQL queries in MySQL.
+
+- [`mysql-execute-sql`](../tools/mysql/mysql-execute-sql.md)  
+  Run parameterized SQL queries in Cloud SQL for MySQL.
+
+### Pre-built Configurations
+
+- [Cloud SQL for MySQL using MCP](https://googleapis.github.io/genai-toolbox/how-to/connect-ide/cloud_sql_mysql_mcp/)  
+Connect your IDE to Cloud SQL for MySQL using Toolbox.
+
 ## Requirements

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

+## Available Tools
+
+- [`postgres-sql`](../tools/postgres/postgres-sql.md)  
+  Execute SQL queries as prepared statements in PostgreSQL.
+
+- [`postgres-execute-sql`](../tools/postgres/postgres-execute-sql.md)  
+  Run parameterized SQL statements in PostgreSQL.
+
+### Pre-built Configurations
+
+- [Cloud SQL for Postgres using MCP](https://googleapis.github.io/genai-toolbox/how-to/connect-ide/cloud_sql_pg_mcp/)  
+Connect your IDE to Cloud SQL for Postgres using Toolbox.
+
+
 ## Requirements

 ### IAM Permissions
@@ -85,8 +99,8 @@ 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.
+    - 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.

@@ -115,13 +129,13 @@ instead of hardcoding your secrets into the configuration file.

 ## Reference

-| **field** | **type** | **required** | **description**                                                                             |
-|-----------|:--------:|:------------:|---------------------------------------------------------------------------------------------|
-| kind      |  string  |     true     | Must be "cloud-sql-postgres".                                                               |
-| project   |  string  |     true     | Id of the GCP project that the cluster was created in (e.g. "my-project-id").               |
-| region    |  string  |     true     | Name of the GCP region that the cluster was created in (e.g. "us-central1").                |
-| instance  |  string  |     true     | Name of the Cloud SQL instance within the cluster (e.g. "my-instance").                     |
-| 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 Cloud SQL instance; must be one of `public` or `private`. Default: `public`. |
+| **field** | **type** | **required** | **description**                                                                                                          |
+|-----------|:--------:|:------------:|--------------------------------------------------------------------------------------------------------------------------|
+| kind      |  string  |     true     | Must be "cloud-sql-postgres".                                                                                            |
+| project   |  string  |     true     | Id of the GCP project that the cluster was created in (e.g. "my-project-id").                                            |
+| region    |  string  |     true     | Name of the GCP region that the cluster was created in (e.g. "us-central1").                                             |
+| instance  |  string  |     true     | Name of the Cloud SQL instance within the cluster (e.g. "my-instance").                                                  |
+| 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 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
@@ -8,7 +8,13 @@ description: >

 ## About

-A `couchbase` source establishes a connection to a Couchbase database cluster, allowing tools to execute SQL queries against it.
+A `couchbase` source establishes a connection to a Couchbase database cluster,
+allowing tools to execute SQL queries against it.
+
+## Available Tools
+
+- [`couchbase-sql`](../tools/couchbase/couchbase-sql.md)  
+  Run SQL++ statements on Couchbase with parameterized input.

 ## Example

@@ -16,28 +22,32 @@ A `couchbase` source establishes a connection to a Couchbase database cluster, a
 sources:
    my-couchbase-instance:
        kind: couchbase
-        connectionString: couchbase://localhost:8091
+        connectionString: couchbase://localhost
        bucket: travel-sample
        scope: inventory
        username: Administrator
        password: password
 ```

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

-| **field**           | **type** | **required** | **description**                                                                                                             |
-|---------------------|:--------:|:------------:|-----------------------------------------------------------------------------------------------------------------------------|
-| 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.                                                                                    |
+| **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/dataplex.md
+++ b/docs/en/resources/sources/dataplex.md
@@ -0,0 +1,324 @@
+---
+title: "Dataplex"
+type: docs
+weight: 1
+description: >
+  Dataplex Universal Catalog is a unified, intelligent governance solution for data and AI assets in Google Cloud. Dataplex Universal Catalog powers AI, analytics, and business intelligence at scale.
+---
+
+# Dataplex Source
+
+[Dataplex][dataplex-docs] Universal Catalog is a unified, intelligent governance
+solution for data and AI assets in Google Cloud. Dataplex Universal Catalog
+powers AI, analytics, and business intelligence at scale.
+
+At the heart of these governance capabilities is a catalog that contains a
+centralized inventory of the data assets in your organization. Dataplex
+Universal Catalog holds business, technical, and runtime metadata for all of
+your data. It helps you discover relationships and semantics in the metadata by
+applying artificial intelligence and machine learning.
+
+[dataplex-docs]: https://cloud.google.com/dataplex/docs
+
+## Example
+
+```yaml
+sources:
+  my-dataplex-source:
+    kind: "dataplex"
+    project: "my-project-id"
+```
+
+## Sample System Prompt
+
+You can use the following system prompt as "Custom Instructions" in your client
+application.
+
+```
+# Objective
+Your primary objective is to help discover, organize and manage metadata related to data assets. 
+
+# Tone and Style
+1. Adopt the persona of a senior subject matter expert
+2. Your communication style must be:
+    1. Concise: Always favor brevity.
+    2. Direct: Avoid greetings (e.g., "Hi there!", "Certainly!"). Get straight to the point.  
+        Example (Incorrect): Hi there! I see that you are looking for...  
+        Example (Correct): This problem likely stems from...
+3. Do not reiterate or summarize the question in the answer.
+4. Crucially, always convey a tone of uncertainty and caution. Since you are interpreting metadata and have no way to externally verify your answers, never express complete confidence. Frame your responses as interpretations based solely on the provided metadata. Use a suggestive tone, not a prescriptive one:  
+    Example (Correct): "The entry describes..."  
+    Example (Correct): "According to catalog,..."  
+    Example (Correct): "Based on the metadata,..."  
+    Example (Correct): "Based on the search results,..."  
+5. Do not make assumptions
+
+# Data Model
+## Entries
+Entry represents a specific data asset. Entry acts as a metadata record for something that is managed by Catalog, such as:
+
+- A BigQuery table or dataset
+- A Cloud Storage bucket or folder
+- An on-premises SQL table
+
+## Aspects
+While the Entry itself is a container, the rich descriptive information about the asset (e.g., schema, data types, business descriptions, classifications) is stored in associated components called Aspects. Aspects are created based on pre-defined blueprints known as Aspect Types.
+
+## Aspect Types
+Aspect Type is a reusable template that defines the schema for a set of metadata fields. Think of an Aspect Type as a structure for the kind of metadata that is organized in the catalog within the Entry. 
+
+Examples:
+- projects/dataplex-types/locations/global/aspectTypes/analytics-hub-exchange
+- projects/dataplex-types/locations/global/aspectTypes/analytics-hub
+- projects/dataplex-types/locations/global/aspectTypes/analytics-hub-listing
+- projects/dataplex-types/locations/global/aspectTypes/bigquery-connection
+- projects/dataplex-types/locations/global/aspectTypes/bigquery-data-policy
+- projects/dataplex-types/locations/global/aspectTypes/bigquery-dataset
+- projects/dataplex-types/locations/global/aspectTypes/bigquery-model
+- projects/dataplex-types/locations/global/aspectTypes/bigquery-policy
+- projects/dataplex-types/locations/global/aspectTypes/bigquery-routine
+- projects/dataplex-types/locations/global/aspectTypes/bigquery-row-access-policy
+- projects/dataplex-types/locations/global/aspectTypes/bigquery-table
+- projects/dataplex-types/locations/global/aspectTypes/bigquery-view
+- projects/dataplex-types/locations/global/aspectTypes/cloud-bigtable-instance
+- projects/dataplex-types/locations/global/aspectTypes/cloud-bigtable-table
+- projects/dataplex-types/locations/global/aspectTypes/cloud-spanner-database
+- projects/dataplex-types/locations/global/aspectTypes/cloud-spanner-instance
+- projects/dataplex-types/locations/global/aspectTypes/cloud-spanner-table
+- projects/dataplex-types/locations/global/aspectTypes/cloud-spanner-view
+- projects/dataplex-types/locations/global/aspectTypes/cloudsql-database
+- projects/dataplex-types/locations/global/aspectTypes/cloudsql-instance
+- projects/dataplex-types/locations/global/aspectTypes/cloudsql-schema
+- projects/dataplex-types/locations/global/aspectTypes/cloudsql-table
+- projects/dataplex-types/locations/global/aspectTypes/cloudsql-view
+- projects/dataplex-types/locations/global/aspectTypes/contacts
+- projects/dataplex-types/locations/global/aspectTypes/dataform-code-asset
+- projects/dataplex-types/locations/global/aspectTypes/dataform-repository
+- projects/dataplex-types/locations/global/aspectTypes/dataform-workspace
+- projects/dataplex-types/locations/global/aspectTypes/dataproc-metastore-database
+- projects/dataplex-types/locations/global/aspectTypes/dataproc-metastore-service
+- projects/dataplex-types/locations/global/aspectTypes/dataproc-metastore-table
+- projects/dataplex-types/locations/global/aspectTypes/data-product
+- projects/dataplex-types/locations/global/aspectTypes/data-quality-scorecard
+- projects/dataplex-types/locations/global/aspectTypes/external-connection
+- projects/dataplex-types/locations/global/aspectTypes/overview
+- projects/dataplex-types/locations/global/aspectTypes/pubsub-topic
+- projects/dataplex-types/locations/global/aspectTypes/schema
+- projects/dataplex-types/locations/global/aspectTypes/sensitive-data-protection-job-result
+- projects/dataplex-types/locations/global/aspectTypes/sensitive-data-protection-profile
+- projects/dataplex-types/locations/global/aspectTypes/sql-access
+- projects/dataplex-types/locations/global/aspectTypes/storage-bucket
+- projects/dataplex-types/locations/global/aspectTypes/storage-folder
+- projects/dataplex-types/locations/global/aspectTypes/storage
+- projects/dataplex-types/locations/global/aspectTypes/usage
+
+## Entry Types
+Every Entry must conform to an Entry Type. The Entry Type acts as a template, defining the structure, required aspects, and constraints for Entries of that type. 
+
+Examples:
+- projects/dataplex-types/locations/global/entryTypes/analytics-hub-exchange
+- projects/dataplex-types/locations/global/entryTypes/analytics-hub-listing
+- projects/dataplex-types/locations/global/entryTypes/bigquery-connection
+- projects/dataplex-types/locations/global/entryTypes/bigquery-data-policy
+- projects/dataplex-types/locations/global/entryTypes/bigquery-dataset
+- projects/dataplex-types/locations/global/entryTypes/bigquery-model
+- projects/dataplex-types/locations/global/entryTypes/bigquery-routine
+- projects/dataplex-types/locations/global/entryTypes/bigquery-row-access-policy
+- projects/dataplex-types/locations/global/entryTypes/bigquery-table
+- projects/dataplex-types/locations/global/entryTypes/bigquery-view
+- projects/dataplex-types/locations/global/entryTypes/cloud-bigtable-instance
+- projects/dataplex-types/locations/global/entryTypes/cloud-bigtable-table
+- projects/dataplex-types/locations/global/entryTypes/cloud-spanner-database
+- projects/dataplex-types/locations/global/entryTypes/cloud-spanner-instance
+- projects/dataplex-types/locations/global/entryTypes/cloud-spanner-table
+- projects/dataplex-types/locations/global/entryTypes/cloud-spanner-view
+- projects/dataplex-types/locations/global/entryTypes/cloudsql-mysql-database
+- projects/dataplex-types/locations/global/entryTypes/cloudsql-mysql-instance
+- projects/dataplex-types/locations/global/entryTypes/cloudsql-mysql-table
+- projects/dataplex-types/locations/global/entryTypes/cloudsql-mysql-view
+- projects/dataplex-types/locations/global/entryTypes/cloudsql-postgresql-database
+- projects/dataplex-types/locations/global/entryTypes/cloudsql-postgresql-instance
+- projects/dataplex-types/locations/global/entryTypes/cloudsql-postgresql-schema
+- projects/dataplex-types/locations/global/entryTypes/cloudsql-postgresql-table
+- projects/dataplex-types/locations/global/entryTypes/cloudsql-postgresql-view
+- projects/dataplex-types/locations/global/entryTypes/cloudsql-sqlserver-database
+- projects/dataplex-types/locations/global/entryTypes/cloudsql-sqlserver-instance
+- projects/dataplex-types/locations/global/entryTypes/cloudsql-sqlserver-schema
+- projects/dataplex-types/locations/global/entryTypes/cloudsql-sqlserver-table
+- projects/dataplex-types/locations/global/entryTypes/cloudsql-sqlserver-view
+- projects/dataplex-types/locations/global/entryTypes/dataform-code-asset
+- projects/dataplex-types/locations/global/entryTypes/dataform-repository
+- projects/dataplex-types/locations/global/entryTypes/dataform-workspace
+- projects/dataplex-types/locations/global/entryTypes/dataproc-metastore-database
+- projects/dataplex-types/locations/global/entryTypes/dataproc-metastore-service
+- projects/dataplex-types/locations/global/entryTypes/dataproc-metastore-table
+- projects/dataplex-types/locations/global/entryTypes/pubsub-topic
+- projects/dataplex-types/locations/global/entryTypes/storage-bucket
+- projects/dataplex-types/locations/global/entryTypes/storage-folder
+- projects/dataplex-types/locations/global/entryTypes/vertexai-dataset
+- projects/dataplex-types/locations/global/entryTypes/vertexai-feature-group
+- projects/dataplex-types/locations/global/entryTypes/vertexai-feature-online-store
+
+## Entry Groups
+Entries are organized within Entry Groups, which are logical groupings of Entries. An Entry Group acts as a namespace for its Entries.
+
+## Entry Links
+Entries can be linked together using EntryLinks to represent relationships between data assets (e.g. foreign keys).
+
+# Tool instructions
+## Tool: dataplex_search_entries
+## General
+- Do not try to search within search results on your own.
+- Do not fetch multiple pages of results unless explicitly asked.
+
+## Search syntax
+
+### Simple search
+In its simplest form, a search query consists of a single predicate. Such a predicate can match several pieces of metadata:
+
+- A substring of a name, display name, or description of a resource
+- A substring of the type of a resource
+- A substring of a column name (or nested column name) in the schema of a resource
+- A substring of a project ID
+- A string from an overview description
+
+For example, the predicate foo matches the following resources:
+- Resource with the name foo.bar
+- Resource with the display name Foo Bar
+- Resource with the description This is the foo script
+- Resource with the exact type foo
+- Column foo_bar in the schema of a resource
+- Nested column foo_bar in the schema of a resource
+- Project prod-foo-bar
+- Resource with an overview containing the word foo
+
+
+### Qualified predicates
+You can qualify a predicate by prefixing it with a key that restricts the matching to a specific piece of metadata:
+- An equal sign (=) restricts the search to an exact match.
+- A colon (:) after the key matches the predicate to either a substring or a token within the value in the search results.
+
+Tokenization splits the stream of text into a series of tokens, with each token usually corresponding to a single word. For example:
+- name:foo selects resources with names that contain the foo substring, like foo1 and barfoo.
+- description:foo selects resources with the foo token in the description, like bar and foo.
+- location=foo matches resources in a specified location with foo as the location name.
+
+The predicate keys type, system, location, and orgid support only the exact match (=) qualifier, not the substring qualifier (:). For example, type=foo or orgid=number.
+
+Search syntax supports the following qualifiers:
+- "name:x" - Matches x as a substring of the resource ID.
+- "displayname:x" - Match x as a substring of the resource display name.
+- "column:x" - Matches x as a substring of the column name (or nested column name) in the schema of the resource.
+- "description:x" - Matches x as a token in the resource description.
+- "label:bar" - Matches BigQuery resources that have a label (with some value) and the label key has bar as a substring.
+- "label=bar" - Matches BigQuery resources that have a label (with some value) and the label key equals bar as a string.
+- "label:bar:x" - Matches x as a substring in the value of a label with a key bar attached to a BigQuery resource.
+- "label=foo:bar" - Matches BigQuery resources where the key equals foo and the key value equals bar.
+- "label.foo=bar" - Matches BigQuery resources where the key equals foo and the key value equals bar.
+- "label.foo" - Matches BigQuery resources that have a label whose key equals foo as a string.
+- "type=TYPE" - Matches resources of a specific entry type or its type alias.
+- "projectid:bar" - Matches resources within Google Cloud projects that match bar as a substring in the ID.
+- "parent:x" - Matches x as a substring of the hierarchical path of a resource. It supports same syntax as `name` predicate.
+- "orgid=number" - Matches resources within a Google Cloud organization with the exact ID value of the number.
+- "system=SYSTEM" - Matches resources from a specified system. For example, system=bigquery matches BigQuery resources.
+- "location=LOCATION" - Matches resources in a specified location with an exact name. For example, location=us-central1 matches assets hosted in Iowa. BigQuery Omni assets support this qualifier by using the BigQuery Omni location name. For example, location=aws-us-east-1 matches BigQuery Omni assets in Northern Virginia.
+- "createtime" -
+Finds resources that were created within, before, or after a given date or time. For example "createtime:2019-01-01" matches resources created on 2019-01-01. 
+- "updatetime" - Finds resources that were updated within, before, or after a given date or time. For example "updatetime>2019-01-01" matches resources updated after 2019-01-01.
+
+### Aspect Search
+To search for entries based on their attached aspects, use the following query syntax.
+
+aspect:x	Matches x as a substring of the full path to the aspect type of an aspect that is attached to the entry, in the format projectid.location.ASPECT_TYPE_ID
+aspect=x	Matches x as the full path to the aspect type of an aspect that is attached to the entry, in the format projectid.location.ASPECT_TYPE_ID
+aspect:xOPERATORvalue	
+Searches for aspect field values. Matches x as a substring of the full path to the aspect type and field name of an aspect that is attached to the entry, in the format projectid.location.ASPECT_TYPE_ID.FIELD_NAME
+
+The list of supported {OPERATOR}s depends on the type of field in the aspect, as follows:
+- String: = (exact match) and : (substring)
+- All number types: =, :, <, >, <=, >=, =>, =<
+- Enum: =
+- Datetime: same as for numbers, but the values to compare are treated as datetimes instead of numbers
+- Boolean: =
+
+Only top-level fields of the aspect are searchable. For example, all of the following queries match entries where the value of the is-enrolled field in the employee-info aspect type is true. Other entries that match on the substring are also returned.
+- aspect:example-project.us-central1.employee-info.is-enrolled=true
+- aspect:example-project.us-central1.employee=true
+- aspect:employee=true
+
+Example:-
+You can use following filters
+- dataplex-types.global.bigquery-table.type={BIGLAKE_TABLE, BIGLAKE_OBJECT_TABLE, EXTERNAL_TABLE, TABLE}
+- dataplex-types.global.storage.type={STRUCTURED, UNSTRUCTURED}
+
+### Logical operators
+A query can consist of several predicates with logical operators. If you don't specify an operator, logical AND is implied. For example, foo bar returns resources that match both predicate foo and predicate bar.
+Logical AND and logical OR are supported. For example, foo OR bar.
+
+You can negate a predicate with a - (hyphen) or NOT prefix. For example, -name:foo returns resources with names that don't match the predicate foo.
+Logical operators are case-sensitive. `OR` and `AND` are acceptable whereas `or` and `and` are not.
+
+### Request
+1. Always try to rewrite the prompt using search syntax.
+
+### Response
+1. If there are multiple search results found
+    1. Present the list of search results
+    2. Format the output in nested ordered list, for example:  
+    Given
+    ```
+    {
+        results: [
+            {
+                name: "projects/test-project/locations/us/entryGroups/@bigquery-aws-us-east-1/entries/users"
+                entrySource: {
+                displayName: "Users"
+                description: "Table contains list of users."
+                location: "aws-us-east-1"
+                system: "BigQuery"
+                }
+            },
+            {
+                name: "projects/another_project/locations/us-central1/entryGroups/@bigquery/entries/top_customers"
+                entrySource: {
+                displayName: "Top customers",
+                description: "Table contains list of best customers."
+                location: "us-central1"
+                system: "BigQuery"
+                }
+            },
+        ]
+    }
+    ```
+    Return output formatted as markdown nested list:
+    ```
+    * Users:
+        - projectId: test_project
+        - location: aws-us-east-1
+        - description: Table contains list of users.
+    * Top customers:
+        - projectId: another_project
+        - location: us-central1
+        - description: Table contains list of best customers.
+    ```
+    3. Ask to select one of the presented search results
+2. If there is only one search result found
+    1. Present the search result immediately.
+3. If there are no search result found
+    1. Explain that no search result was found
+    2. Suggest to provide a more specific search query.
+
+## Tool: dataplex_lookup_entry
+### Request
+1. Always try to limit the size of the response by specifying `aspect_types` parameter. Make sure to include to select view=CUSTOM when using aspect_types parameter. If you do not know the name of the aspect type, use the `dataplex_search_aspect_types` tool.
+2. If you do not know the name of the entry, use `dataplex_search_entries` tool
+### Response
+1. Unless asked for a specific aspect, respond with all aspects attached to the entry.
+```
+
+## Reference
+
+| **field** | **type** | **required** | **description**                                                                  |
+|-----------|:--------:|:------------:|----------------------------------------------------------------------------------|
+| kind      |  string  |     true     | Must be "dataplex".                                                              |
+| project   |  string  |     true     | ID of the GCP project used for quota and billing purposes (e.g. "my-project-id").|
--- a/docs/en/resources/sources/dgraph.md
+++ b/docs/en/resources/sources/dgraph.md
@@ -9,7 +9,10 @@ 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,6 +21,11 @@ Dgraph Cloud. If you're new to Dgraph, the fastest way to get started is to
 [dgraph-docs]: https://dgraph.io/docs
 [dgraph-login]: https://cloud.dgraph.io/login

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

 ### Database User
@@ -52,7 +60,7 @@ instead of hardcoding your secrets into the configuration file.
 | **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/firebird.md
+++ b/docs/en/resources/sources/firebird.md
@@ -0,0 +1,59 @@
+---
+title: "Firebird"
+type: docs
+weight: 1
+description: >
+  Firebird is a powerful, cross-platform, and open-source relational database.
+
+---
+
+## About
+
+[Firebird][fb-docs] is a relational database management system offering many ANSI SQL standard features that runs on Linux, Windows, and a variety of Unix platforms. It is known for its small footprint, powerful features, and easy maintenance.
+
+[fb-docs]: https://firebirdsql.org/
+
+## Available Tools
+
+- [`firebird-sql`](../tools/firebird/firebird-sql.md)  
+  Execute SQL queries as prepared statements in Firebird.
+
+- [`firebird-execute-sql`](../tools/firebird/firebird-execute-sql.md)  
+  Run parameterized SQL statements in Firebird.
+
+## Requirements
+
+### Database User
+
+This source uses standard authentication. You will need to [create a Firebird user][fb-users] to login to the database with.
+
+[fb-users]: https://firebirdsql.org/refdocs/langrefupd25-sql-create-user.html
+
+## Example
+
+```yaml
+sources:
+    my_firebird_db:
+        kind: firebird
+        host: "localhost"
+        port: 3050
+        database: "/path/to/your/database.fdb"
+        user: ${FIREBIRD_USER}
+        password: ${FIREBIRD_PASS}
+```
+
+{{< notice tip >}}
+Use environment variable replacement with the format ${ENV_NAME}
+instead of hardcoding your secrets into the configuration file.
+{{< /notice >}}
+
+## Reference
+
+| **field** | **type** | **required** | **description**                                                        |
+|-----------|:--------:|:------------:|------------------------------------------------------------------------|
+| kind      |  string  |     true     | Must be "firebird".                                                    |
+| host      |  string  |     true     | IP address to connect to (e.g. "127.0.0.1")                            |
+| port      |  string  |     true     | Port to connect to (e.g. "3050")                                       |
+| database  |  string  |     true     | Path to the Firebird database file (e.g. "/var/lib/firebird/data/test.fdb"). |
+| user      |  string  |     true     | Name of the Firebird user to connect as (e.g. "SYSDBA").               |
+| password  |  string  |     true     | Password of the Firebird user (e.g. "masterkey").                      |
--- a/docs/en/resources/sources/firestore.md
+++ b/docs/en/resources/sources/firestore.md
@@ -0,0 +1,77 @@
+---
+title: "Firestore"
+type: docs
+weight: 1
+description: >
+  Firestore is a NoSQL document database built for automatic scaling, high performance, and ease of application development. It's a fully managed, serverless database that supports mobile, web, and server development.
+
+---
+
+# Firestore Source
+
+[Firestore][firestore-docs] is a NoSQL document database built for automatic
+scaling, high performance, and ease of application development. While the
+Firestore interface has many of the same features as traditional databases,
+as a NoSQL database it differs from them in the way it describes relationships
+between data objects.
+
+If you are new to Firestore, you can [create a database and learn the
+basics][firestore-quickstart].
+
+[firestore-docs]: https://cloud.google.com/firestore/docs
+[firestore-quickstart]: https://cloud.google.com/firestore/docs/quickstart-servers
+
+## Requirements
+
+### IAM Permissions
+
+Firestore uses [Identity and Access Management (IAM)][iam-overview] to control
+user and group access to Firestore resources. Toolbox will use your [Application
+Default Credentials (ADC)][adc] to authorize and authenticate when interacting
+with [Firestore][firestore-docs].
+
+In addition to [setting the ADC for your server][set-adc], you need to ensure
+the IAM identity has been given the correct IAM permissions for accessing
+Firestore. Common roles include:
+
+- `roles/datastore.user` - Read and write access to Firestore
+- `roles/datastore.viewer` - Read-only access to Firestore
+- `roles/firebaserules.admin` - Full management of Firebase Security Rules for
+  Firestore. This role is required for operations that involve creating,
+  updating, or managing Firestore security rules (see [Firebase Security Rules
+  roles][firebaserules-roles])
+
+See [Firestore access control][firestore-iam] for more information on
+applying IAM permissions and roles to an identity.
+
+[iam-overview]: https://cloud.google.com/firestore/docs/security/iam
+[adc]: https://cloud.google.com/docs/authentication#adc
+[set-adc]: https://cloud.google.com/docs/authentication/provide-credentials-adc
+[firestore-iam]: https://cloud.google.com/firestore/docs/security/iam
+[firebaserules-roles]:
+    https://cloud.google.com/iam/docs/roles-permissions/firebaserules
+
+### Database Selection
+
+Firestore allows you to create multiple databases within a single project. Each
+database is isolated from the others and has its own set of documents and
+collections. If you don't specify a database in your configuration, the default
+database named `(default)` will be used.
+
+## Example
+
+```yaml
+sources:
+  my-firestore-source:
+    kind: "firestore"
+    project: "my-project-id"
+    # database: "my-database"  # Optional, defaults to "(default)"
+```
+
+## Reference
+
+| **field** | **type** | **required** | **description**                                                                                          |
+|-----------|:--------:|:------------:|----------------------------------------------------------------------------------------------------------|
+| kind      |  string  |     true     | Must be "firestore".                                                                                     |
+| project   |  string  |     true     | Id of the GCP project that contains the Firestore database (e.g. "my-project-id").                       |
+| database  |  string  |     false    | Name of the Firestore database to connect to. Defaults to "(default)" if not specified.                  |
--- a/docs/en/resources/sources/http.md
+++ b/docs/en/resources/sources/http.md
@@ -13,6 +13,11 @@ The HTTP Source allows Toolbox to retrieve data from arbitrary HTTP
 endpoints. This enables Generative AI applications to access data from web APIs
 and other HTTP-accessible resources.

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

 ```yaml
@@ -27,6 +32,7 @@ sources:
    queryParams:
      param1: value1
      param2: value2
+    # disableSslVerification: false
 ```

 {{< notice tip >}}
@@ -36,12 +42,13 @@ instead of hardcoding your secrets into the configuration file.

 ## Reference

-| **field**   |     **type**      | **required** | **description**                                                                                                                   |
-|-------------|:-----------------:|:------------:|-----------------------------------------------------------------------------------------------------------------------------------|
-| kind        |      string       |     true     | Must be "http".                                                                                                                   |
-| baseUrl     |      string       |     true     | The base URL for the HTTP requests (e.g., `https://api.example.com`).                                                             |
-| timeout     |      string       |    false     | The timeout for HTTP requests (e.g., "5s", "1m", refer to [ParseDuration][parse-duration-doc] for more examples). Defaults to 30s. |
-| headers     | map[string]string |    false     | Default headers to include in the HTTP requests.                                                                                  |
-| queryParams | map[string]string |    false     | Default query parameters to include in the HTTP requests.                                                                         |
+| **field**              |     **type**      | **required** | **description**                                                                                                                    |
+|------------------------|:-----------------:|:------------:|------------------------------------------------------------------------------------------------------------------------------------|
+| kind                   |      string       |     true     | Must be "http".                                                                                                                    |
+| baseUrl                |      string       |     true     | The base URL for the HTTP requests (e.g., `https://api.example.com`).                                                              |
+| timeout                |      string       |    false     | The timeout for HTTP requests (e.g., "5s", "1m", refer to [ParseDuration][parse-duration-doc] for more examples). Defaults to 30s. |
+| headers                | map[string]string |    false     | Default headers to include in the HTTP requests.                                                                                   |
+| queryParams            | map[string]string |    false     | Default query parameters to include in the HTTP requests.                                                                          |
+| disableSslVerification |       bool        |    false     | Disable SSL certificate verification. This should only be used for local development. Defaults to `false`.                         |

 [parse-duration-doc]: https://pkg.go.dev/time#ParseDuration
--- a/docs/en/resources/sources/looker.md
+++ b/docs/en/resources/sources/looker.md
@@ -0,0 +1,69 @@
+---
+title: "Looker"
+type: docs
+weight: 1
+description: >
+  Looker is a business intelligence tool that also provides a semantic layer.
+---
+
+## About
+
+[Looker][looker-docs] is a web based business intelligence and data management
+tool that provides a semantic layer to facilitate querying. It can be deployed
+in the cloud, on GCP, or on premises.
+
+[looker-docs]: https://cloud.google.com/looker/docs
+
+## Requirements
+
+### Database User
+
+This source only uses API authentication. You will need to
+[create an API user][looker-user] to login to Looker.
+
+[looker-user]:
+    https://cloud.google.com/looker/docs/api-auth#authentication_with_an_sdk
+
+## Example
+
+```yaml
+sources:
+    my-looker-source:
+        kind: looker
+        base_url: http://looker.example.com
+        client_id: ${LOOKER_CLIENT_ID}
+        client_secret: ${LOOKER_CLIENT_SECRET}
+        verify_ssl: true
+        timeout: 600s
+```
+
+The Looker base url will look like "https://looker.example.com", don't include
+a trailing "/". In some cases, especially if your Looker is deployed
+on-premises, you may need to add the API port number like
+"https://looker.example.com:19999".
+
+Verify ssl should almost always be "true" (all lower case) unless you are using
+a self-signed ssl certificate for the Looker server. Anything other than "true"
+will be interpreted as false.
+
+The client id and client secret are seemingly random character sequences
+assigned by the looker server.
+
+{{< notice tip >}}
+Use environment variable replacement with the format ${ENV_NAME}
+instead of hardcoding your secrets into the configuration file.
+{{< /notice >}}
+
+## Reference
+
+| **field**            | **type** | **required** | **description**                                                                           |
+| -------------------- | :------: | :----------: | ----------------------------------------------------------------------------------------- |
+| kind                 |  string  |     true     | Must be "looker".                                                                         |
+| base_url             |  string  |     true     | The URL of your Looker server with no trailing /).                                        |
+| client_id            |  string  |     true     | The client id assigned by Looker.                                                         |
+| client_secret        |  string  |     true     | The client secret assigned by Looker.                                                     |
+| verify_ssl           |  string  |     true     | Whether to check the ssl certificate of the server.                                       |
+| timeout              |  string  |    false     | Maximum time to wait for query execution (e.g. "30s", "2m"). By default, 120s is applied. |
+| show_hidden_models   |  string  |    false     | Show or hide hidden models. (default: true)                                               |
+| show_hidden_explores |  string  |    false     | Show or hide hidden explores. (default: true)                                             |
+| show_hidden_fields   |  string  |    false     | Show or hide hidden fields. (default: true)                                               |
--- a/docs/en/resources/sources/mongodb.md
+++ b/docs/en/resources/sources/mongodb.md
@@ -0,0 +1,32 @@
+---
+title: "MongoDB"
+type: docs
+weight: 1
+description: >
+  MongoDB is a no-sql data platform that can not only serve general purpose data requirements also perform VectorSearch where both operational data and embeddings used of search can reside in same document.
+
+---
+
+## About
+
+[MongoDB][mongodb-docs] is a popular NoSQL database that stores data in
+flexible, JSON-like documents, making it easy to develop and scale applications.
+
+[mongodb-docs]: https://www.mongodb.com/docs/atlas/getting-started/
+
+## Example
+
+```yaml
+sources:
+    my-mongodb:
+        kind: mongodb
+        uri: "mongodb+srv://username:password@host.mongodb.net"       
+
+```
+
+## Reference
+
+| **field** | **type** | **required** | **description**                                                   |
+|-----------|:--------:|:------------:|-------------------------------------------------------------------|
+| kind      |  string  |     true     | Must be "mongodb".                                                |
+| uri       |  string  |     true     | connection string to connect to MongoDB                           |
--- a/docs/en/resources/sources/mssql.md
+++ b/docs/en/resources/sources/mssql.md
@@ -15,6 +15,14 @@ amount of data through a structured format.

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

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

 ### Database User
@@ -35,6 +43,7 @@ sources:
        database: my_db
        user: ${USER_NAME}
        password: ${PASSWORD}
+        # encrypt: strict
 ```

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

 ## Reference

-| **field** | **type** | **required** | **description**                                                        |
-|-----------|:--------:|:------------:|------------------------------------------------------------------------|
-| kind      |  string  |     true     | Must be "mssql".                                                       |
-| host      |  string  |     true     | IP address to connect to (e.g. "127.0.0.1").                           |
-| port      |  string  |     true     | Port to connect to (e.g. "1433").                                      |
-| database  |  string  |     true     | Name of the SQL Server database to connect to (e.g. "my_db").          |
-| user      |  string  |     true     | Name of the SQL Server user to connect as (e.g. "my-user").            |
-| password  |  string  |     true     | Password of the SQL Server user (e.g. "my-password").                  |
+| **field** | **type** | **required** | **description**                                                                                                                                                                            |
+|-----------|:--------:|:------------:|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| kind      |  string  |     true     | Must be "mssql".                                                                                                                                                                           |
+| host      |  string  |     true     | IP address to connect to (e.g. "127.0.0.1").                                                                                                                                               |
+| port      |  string  |     true     | Port to connect to (e.g. "1433").                                                                                                                                                          |
+| database  |  string  |     true     | Name of the SQL Server database to connect to (e.g. "my_db").                                                                                                                              |
+| user      |  string  |     true     | Name of the SQL Server user to connect as (e.g. "my-user").                                                                                                                                |
+| password  |  string  |     true     | Password of the SQL Server user (e.g. "my-password").                                                                                                                                      |
+| encrypt   |  string  |    false     | Encryption level for data transmitted between the client and server (e.g., "strict"). If not specified, defaults to the [github.com/microsoft/go-mssqldb](https://github.com/microsoft/go-mssqldb?tab=readme-ov-file#common-parameters) package's default encrypt value. |
--- a/docs/en/resources/sources/mysql.md
+++ b/docs/en/resources/sources/mysql.md
@@ -4,7 +4,6 @@ type: docs
 weight: 1
 description: >
  MySQL is a relational database management system that stores and manages data.
-
 ---

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

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

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

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

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

 ## Reference

-| **field** | **type** | **required** | **description**                                                                             |
-|-----------|:--------:|:------------:|---------------------------------------------------------------------------------------------|
-| kind      |  string  |     true     | Must be "mysql".                                                                            |
-| host      |  string  |     true     | IP address to connect to (e.g. "127.0.0.1").                                                |
-| port      |  string  |     true     | Port to connect to (e.g. "3306").                                                           |
-| database  |  string  |     true     | Name of the MySQL database to connect to (e.g. "my_db").                                    |
-| user      |  string  |     true     | Name of the MySQL user to connect as (e.g. "my-mysql-user").                                |
-| password  |  string  |     true     | Password of the MySQL user (e.g. "my-password").                                            |
+| **field**    | **type** | **required** | **description**                                                                                 |
+| ------------ | :------: | :----------: | ----------------------------------------------------------------------------------------------- |
+| kind         |  string  |     true     | Must be "mysql".                                                                                |
+| host         |  string  |     true     | IP address to connect to (e.g. "127.0.0.1").                                                    |
+| port         |  string  |     true     | Port to connect to (e.g. "3306").                                                               |
+| database     |  string  |     true     | Name of the MySQL database to connect to (e.g. "my_db").                                        |
+| user         |  string  |     true     | Name of the MySQL user to connect as (e.g. "my-mysql-user").                                    |
+| password     |  string  |     true     | Password of the MySQL user (e.g. "my-password").                                                |
+| queryTimeout |  string  |    false     | Maximum time to wait for query execution (e.g. "30s", "2m"). By default, no timeout is applied. |
--- a/docs/en/resources/sources/neo4j.md
+++ b/docs/en/resources/sources/neo4j.md
@@ -7,12 +7,19 @@ description: >

 ---

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

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

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

 ### Database User
--- a/docs/en/resources/sources/oceanbase.md
+++ b/docs/en/resources/sources/oceanbase.md
@@ -0,0 +1,72 @@
+---
+title: "OceanBase"
+type: docs
+weight: 1
+description: >
+  OceanBase is a distributed relational database that provides high availability, scalability, and compatibility with MySQL.
+---
+
+## About
+
+[OceanBase][oceanbase-docs] is a distributed relational database management system (RDBMS) that provides high availability, scalability, and strong consistency. It's designed to handle large-scale data processing and is compatible with MySQL, making it easy for developers to migrate from MySQL to OceanBase.
+
+[oceanbase-docs]: https://www.oceanbase.com/
+
+## Requirements
+
+### Database User
+
+This source only uses standard authentication. You will need to create an OceanBase user to login to the database with. OceanBase supports MySQL-compatible user management syntax.
+
+### Network Connectivity
+
+Ensure that your application can connect to the OceanBase cluster. OceanBase typically runs on ports 2881 (for MySQL protocol) or 3881 (for MySQL protocol with SSL).
+
+## Example
+
+```yaml
+sources:
+    my-oceanbase-source:
+        kind: oceanbase
+        host: 127.0.0.1
+        port: 2881
+        database: my_db
+        user: ${USER_NAME}
+        password: ${PASSWORD}
+        queryTimeout: 30s # Optional: query timeout duration
+```
+
+{{< 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 "oceanbase".                                                                            |
+| host         |  string  |     true     | IP address to connect to (e.g. "127.0.0.1").                                                    |
+| port         |  string  |     true     | Port to connect to (e.g. "2881").                                                               |
+| database     |  string  |     true     | Name of the OceanBase database to connect to (e.g. "my_db").                                    |
+| user         |  string  |     true     | Name of the OceanBase user to connect as (e.g. "my-oceanbase-user").                            |
+| password     |  string  |     true     | Password of the OceanBase user (e.g. "my-password").                                            |
+| queryTimeout |  string  |    false     | Maximum time to wait for query execution (e.g. "30s", "2m"). By default, no timeout is applied. |
+
+## Features
+
+### MySQL Compatibility
+
+OceanBase is highly compatible with MySQL, supporting most MySQL SQL syntax, data types, and functions. This makes it easy to migrate existing MySQL applications to OceanBase.
+
+### High Availability
+
+OceanBase provides automatic failover and data replication across multiple nodes, ensuring high availability and data durability.
+
+### Scalability
+
+OceanBase can scale horizontally by adding more nodes to the cluster, making it suitable for large-scale applications.
+
+### Strong Consistency
+
+OceanBase provides strong consistency guarantees, ensuring that all transactions are ACID compliant. 
--- a/docs/en/resources/sources/postgres.md
+++ b/docs/en/resources/sources/postgres.md
@@ -15,6 +15,19 @@ reputation for reliability, feature robustness, and performance.

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

+## Available Tools
+
+- [`postgres-sql`](../tools/postgres/postgres-sql.md)  
+  Execute SQL queries as prepared statements in PostgreSQL.
+
+- [`postgres-execute-sql`](../tools/postgres/postgres-execute-sql.md)  
+  Run parameterized SQL statements in PostgreSQL.
+
+### Pre-built Configurations
+
+- [PostgreSQL using MCP](https://googleapis.github.io/genai-toolbox/how-to/connect-ide/postgres_mcp/)  
+Connect your IDE to PostgreSQL using Toolbox.
+
 ## Requirements

 ### Database User
@@ -44,11 +57,12 @@ instead of hardcoding your secrets into the configuration file.

 ## Reference

-| **field** | **type** | **required** | **description**                                                        |
-|-----------|:--------:|:------------:|------------------------------------------------------------------------|
-| kind      |  string  |     true     | Must be "postgres".                                                    |
-| host      |  string  |     true     | IP address to connect to (e.g. "127.0.0.1")                            |
-| port      |  string  |     true     | Port to connect to (e.g. "5432")                                       |
-| database  |  string  |     true     | Name of the Postgres database to connect to (e.g. "my_db").            |
-| 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").                    |
+|  **field**  |      **type**      | **required** | **description**                                                        |
+|-------------|:------------------:|:------------:|------------------------------------------------------------------------|
+| kind        |       string       |     true     | Must be "postgres".                                                    |
+| host        |       string       |     true     | IP address to connect to (e.g. "127.0.0.1")                            |
+| port        |       string       |     true     | Port to connect to (e.g. "5432")                                       |
+| database    |       string       |     true     | Name of the Postgres database to connect to (e.g. "my_db").            |
+| 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").                    |
+| queryParams |  map[string]string |     false    | Raw query to be added to the db connection string.                     |
--- a/docs/en/resources/sources/redis.md
+++ b/docs/en/resources/sources/redis.md
@@ -0,0 +1,102 @@
+---
+title: "Redis"
+linkTitle: "Redis"
+type: docs
+weight: 1
+description: >
+    Redis is a in-memory data structure store.
+    
+---
+
+## About
+
+Redis is a 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/).
+
+## Available Tools
+
+- [`redis`](../tools/redis/redis.md)  
+  Run Redis commands and interact with key-value pairs.
+
+## 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:6379
+     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:6379
+     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:6379
+     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/Show More
+++ b/Show More
@@ -1 +1 @@
 .6.0
 .13.0