chore: add preprocessing layer to convert tools file

chore!: update kind field to type
2026-02-12 08:05:06 -05:00 · 2025-09-05 17:40:07 -07:00 · 2025-09-04 19:16:53 -07:00
1084 changed files with 23376 additions and 134201 deletions
--- a/.ci/continuous.release.cloudbuild.yaml
+++ b/.ci/continuous.release.cloudbuild.yaml
@@ -18,9 +18,7 @@ steps:
    script: |
        #!/usr/bin/env bash
        docker buildx create --name container-builder --driver docker-container --bootstrap --use
-
-        export TAGS="-t ${_DOCKER_URI}:$SHORT_SHA -t ${_DOCKER_URI}:$REF_NAME"
-        docker buildx build --platform linux/amd64,linux/arm64 --build-arg COMMIT_SHA=$(git rev-parse --short HEAD) $TAGS --push .
+        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
@@ -33,56 +31,19 @@ steps:
    script: |
        go get -d ./...

-  - id: "install-zig"
-    name: golang:1
-    waitFor: ['-']
-    volumes:
-      - name: 'zig'
-        path: '/zig-tools'
-    script: |
-        #!/usr/bin/env bash
-        set -e
-        apt-get update && apt-get install -y xz-utils
-        curl -fL "https://ziglang.org/download/0.15.2/zig-x86_64-linux-0.15.2.tar.xz" -o zig.tar.xz
-        tar -xf zig.tar.xz -C /zig-tools --strip-components=1
-
-  - id: "install-macos-sdk"
-    name: golang:1
-    waitFor: ['-']
-    volumes:
-      - name: 'macos-sdk'
-        path: '/macos-sdk'
-    script: |
-        #!/usr/bin/env bash
-        set -e
-        apt-get update && apt-get install -y xz-utils
-        echo "Downloading macOS 14.5 SDK..."
-        curl -fL -o sdk.tar.xz https://github.com/alexey-lysiuk/macos-sdk/releases/download/14.5/MacOSX14.5.tar.xz
-        
-        mkdir -p /macos-sdk/MacOSX14.5.sdk
-        echo "Unpacking macOS 14.5 SDK..."
-        tar -xf sdk.tar.xz -C /macos-sdk/MacOSX14.5.sdk --strip-components=1
-
  - id: "build-linux-amd64"
    name: golang:1
-    waitFor:
+    waitFor: 
      - "install-dependencies"
-      - "install-zig"
    env:
      - 'GOPATH=/gopath'
-      - 'CGO_ENABLED=1'
-      - 'GOOS=linux'
-      - 'GOARCH=amd64'
-      - 'CC=/zig-tools/zig cc -target x86_64-linux-gnu'
-      - 'CXX=/zig-tools/zig c++ -target x86_64-linux-gnu'
    volumes:
      - name: 'go'
        path: '/gopath'
-      - name: 'zig'
-        path: '/zig-tools'
    script: |
        #!/usr/bin/env bash
-        go build -ldflags "-X github.com/googleapis/genai-toolbox/cmd.commitSha=$(git rev-parse --short HEAD)" -o toolbox.linux.amd64
+        CGO_ENABLED=0 GOOS=linux GOARCH=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"
@@ -92,55 +53,19 @@ steps:
        #!/usr/bin/env bash
        gcloud storage cp toolbox.linux.amd64 gs://$_BUCKET_NAME/$REF_NAME/linux/amd64/toolbox

-  - id: "build-linux-amd64-geminicli"
-    name: golang:1
-    waitFor:
-      - "install-dependencies"
-      - "install-zig"
-    env:
-      - 'GOPATH=/gopath'
-      - 'CGO_ENABLED=1'
-      - 'GOOS=linux'
-      - 'GOARCH=amd64'
-      - 'CC=/zig-tools/zig cc -target x86_64-linux-gnu'
-      - 'CXX=/zig-tools/zig c++ -target x86_64-linux-gnu'
-    volumes:
-      - name: 'go'
-        path: '/gopath'
-      - name: 'zig'
-        path: '/zig-tools'
-    script: |
-        #!/usr/bin/env bash
-        export VERSION=$(cat ./cmd/version.txt)
-        go build -ldflags "-X github.com/googleapis/genai-toolbox/cmd.commitSha=$(git rev-parse --short HEAD)" -o toolbox.geminicli.linux.amd64
-
  - id: "build-darwin-arm64"
    name: golang:1
-    waitFor:
+    waitFor: 
      - "install-dependencies"
-      - "install-zig"
-      - "install-macos-sdk"
    env:
      - 'GOPATH=/gopath'
-      - 'CGO_ENABLED=1'
-      - 'GOOS=darwin'
-      - 'GOARCH=arm64'
-      - 'SDK_PATH=/macos-sdk/MacOSX14.5.sdk'
-      - 'MACOS_MIN_VER=10.14'
-      - 'CGO_LDFLAGS=-mmacosx-version-min=10.14 --sysroot /macos-sdk/MacOSX14.5.sdk -F/macos-sdk/MacOSX14.5.sdk/System/Library/Frameworks -L/usr/lib'
-      - 'COMMON_FLAGS=-mmacosx-version-min=10.14 -target aarch64-macos.11.0.0-none -isysroot /macos-sdk/MacOSX14.5.sdk -iwithsysroot /usr/include -iframeworkwithsysroot /System/Library/Frameworks'
-      - 'CC=/zig-tools/zig cc -mmacosx-version-min=10.14 -target aarch64-macos.11.0.0-none -isysroot /macos-sdk/MacOSX14.5.sdk -iwithsysroot /usr/include -iframeworkwithsysroot /System/Library/Frameworks'
-      - 'CXX=/zig-tools/zig c++ -mmacosx-version-min=10.14 -target aarch64-macos.11.0.0-none -isysroot /macos-sdk/MacOSX14.5.sdk -iwithsysroot /usr/include -iframeworkwithsysroot /System/Library/Frameworks'
    volumes:
      - name: 'go'
        path: '/gopath'
-      - name: 'zig'
-        path: '/zig-tools'
-      - name: 'macos-sdk'
-        path: '/macos-sdk'
    script: |
        #!/usr/bin/env bash
-         go build -trimpath -buildmode=pie -ldflags "-s -w -X github.com/googleapis/genai-toolbox/cmd.commitSha=$(git rev-parse --short HEAD)" -o toolbox.darwin.arm64
+        CGO_ENABLED=0 GOOS=darwin GOARCH=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"
@@ -150,61 +75,19 @@ steps:
        #!/usr/bin/env bash
        gcloud storage cp toolbox.darwin.arm64 gs://$_BUCKET_NAME/$REF_NAME/darwin/arm64/toolbox

-  - id: "build-darwin-arm64-geminicli"
-    name: golang:1
-    waitFor:
-      - "install-dependencies"
-      - "install-zig"
-      - "install-macos-sdk"
-    env:
-      - 'GOPATH=/gopath'
-      - 'CGO_ENABLED=1'
-      - 'GOOS=darwin'
-      - 'GOARCH=arm64'
-      - 'SDK_PATH=/macos-sdk/MacOSX14.5.sdk'
-      - 'MACOS_MIN_VER=10.14'
-      - 'CGO_LDFLAGS=-mmacosx-version-min=10.14 --sysroot /macos-sdk/MacOSX14.5.sdk -F/macos-sdk/MacOSX14.5.sdk/System/Library/Frameworks -L/usr/lib'
-      - 'COMMON_FLAGS=-mmacosx-version-min=10.14 -target aarch64-macos.11.0.0-none -isysroot /macos-sdk/MacOSX14.5.sdk -iwithsysroot /usr/include -iframeworkwithsysroot /System/Library/Frameworks'
-      - 'CC=/zig-tools/zig cc -mmacosx-version-min=10.14 -target aarch64-macos.11.0.0-none -isysroot /macos-sdk/MacOSX14.5.sdk -iwithsysroot /usr/include -iframeworkwithsysroot /System/Library/Frameworks'
-      - 'CXX=/zig-tools/zig c++ -mmacosx-version-min=10.14 -target aarch64-macos.11.0.0-none -isysroot /macos-sdk/MacOSX14.5.sdk -iwithsysroot /usr/include -iframeworkwithsysroot /System/Library/Frameworks'
-    volumes:
-      - name: 'go'
-        path: '/gopath'
-      - name: 'zig'
-        path: '/zig-tools'
-      - name: 'macos-sdk'
-        path: '/macos-sdk'
-    script: |
-        #!/usr/bin/env bash
-         go build -trimpath -buildmode=pie -ldflags "-s -w -X github.com/googleapis/genai-toolbox/cmd.commitSha=$(git rev-parse --short HEAD)" -o toolbox.geminicli.darwin.arm64
-
  - id: "build-darwin-amd64"
    name: golang:1
-    waitFor:
+    waitFor: 
      - "install-dependencies"
-      - "install-zig"
-      - "install-macos-sdk"
    env:
      - 'GOPATH=/gopath'
-      - 'CGO_ENABLED=1'
-      - 'GOOS=darwin'
-      - 'GOARCH=amd64'
-      - 'SDK_PATH=/macos-sdk/MacOSX14.5.sdk'
-      - 'MACOS_MIN_VER=10.14'
-      - 'CGO_LDFLAGS=-mmacosx-version-min=10.14 --sysroot /macos-sdk/MacOSX14.5.sdk -F/macos-sdk/MacOSX14.5.sdk/System/Library/Frameworks -L/usr/lib'
-      - 'COMMON_FLAGS=-mmacosx-version-min=10.14 -target x86_64-macos.11.0.0-none -isysroot /macos-sdk/MacOSX14.5.sdk -iwithsysroot /usr/include -iframeworkwithsysroot /System/Library/Frameworks'
-      - 'CC=/zig-tools/zig cc -mmacosx-version-min=10.14 -target x86_64-macos.11.0.0-none -isysroot /macos-sdk/MacOSX14.5.sdk -iwithsysroot /usr/include -iframeworkwithsysroot /System/Library/Frameworks'
-      - 'CXX=/zig-tools/zig c++ -mmacosx-version-min=10.14 -target x86_64-macos.11.0.0-none -isysroot /macos-sdk/MacOSX14.5.sdk -iwithsysroot /usr/include -iframeworkwithsysroot /System/Library/Frameworks'
    volumes:
      - name: 'go'
        path: '/gopath'
-      - name: 'zig'
-        path: '/zig-tools'
-      - name: 'macos-sdk'
-        path: '/macos-sdk'
    script: |
        #!/usr/bin/env bash
-         go build -trimpath -buildmode=pie -ldflags "-s -w -X github.com/googleapis/genai-toolbox/cmd.commitSha=$(git rev-parse --short HEAD)" -o toolbox.darwin.amd64
+        CGO_ENABLED=0 GOOS=darwin GOARCH=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"
@@ -214,54 +97,19 @@ steps:
        #!/usr/bin/env bash
        gcloud storage cp toolbox.darwin.amd64 gs://$_BUCKET_NAME/$REF_NAME/darwin/amd64/toolbox

-  - id: "build-darwin-amd64-geminicli"
-    name: golang:1
-    waitFor:
-      - "install-dependencies"
-      - "install-zig"
-      - "install-macos-sdk"
-    env:
-      - 'GOPATH=/gopath'
-      - 'CGO_ENABLED=1'
-      - 'GOOS=darwin'
-      - 'GOARCH=amd64'
-      - 'SDK_PATH=/macos-sdk/MacOSX14.5.sdk'
-      - 'MACOS_MIN_VER=10.14'
-      - 'CGO_LDFLAGS=-mmacosx-version-min=10.14 --sysroot /macos-sdk/MacOSX14.5.sdk -F/macos-sdk/MacOSX14.5.sdk/System/Library/Frameworks -L/usr/lib'
-      - 'COMMON_FLAGS=-mmacosx-version-min=10.14 -target x86_64-macos.11.0.0-none -isysroot /macos-sdk/MacOSX14.5.sdk -iwithsysroot /usr/include -iframeworkwithsysroot /System/Library/Frameworks'
-      - 'CC=/zig-tools/zig cc -mmacosx-version-min=10.14 -target x86_64-macos.11.0.0-none -isysroot /macos-sdk/MacOSX14.5.sdk -iwithsysroot /usr/include -iframeworkwithsysroot /System/Library/Frameworks'
-      - 'CXX=/zig-tools/zig c++ -mmacosx-version-min=10.14 -target x86_64-macos.11.0.0-none -isysroot /macos-sdk/MacOSX14.5.sdk -iwithsysroot /usr/include -iframeworkwithsysroot /System/Library/Frameworks'
-    volumes:
-      - name: 'go'
-        path: '/gopath'
-      - name: 'zig'
-        path: '/zig-tools'
-      - name: 'macos-sdk'
-        path: '/macos-sdk'
-    script: |
-        #!/usr/bin/env bash
-         go build -trimpath -buildmode=pie -ldflags "-s -w -X github.com/googleapis/genai-toolbox/cmd.commitSha=$(git rev-parse --short HEAD)" -o toolbox.geminicli.darwin.amd64
-
  - id: "build-windows-amd64"
    name: golang:1
-    waitFor:
+    waitFor: 
      - "install-dependencies"
-      - "install-zig"
    env:
      - 'GOPATH=/gopath'
-      - 'CGO_ENABLED=1'
-      - 'GOOS=windows'
-      - 'GOARCH=amd64'
-      - 'CC=/zig-tools/zig cc -target x86_64-windows-gnu'
-      - 'CXX=/zig-tools/zig c++ -target x86_64-windows-gnu'
    volumes:
      - name: 'go'
        path: '/gopath'
-      - name: 'zig'
-        path: '/zig-tools'
    script: |
        #!/usr/bin/env bash
-        go build -ldflags "-X github.com/googleapis/genai-toolbox/cmd.commitSha=$(git rev-parse --short HEAD)" -o toolbox.windows.amd64
+        CGO_ENABLED=0 GOOS=windows GOARCH=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"
@@ -271,38 +119,15 @@ steps:
        #!/usr/bin/env bash
        gcloud storage cp toolbox.windows.amd64 gs://$_BUCKET_NAME/$REF_NAME/windows/amd64/toolbox.exe

-  - id: "build-windows-amd64-geminicli"
-    name: golang:1
-    waitFor:
-      - "install-dependencies"
-      - "install-zig"
-    env:
-      - 'GOPATH=/gopath'
-      - 'CGO_ENABLED=1'
-      - 'GOOS=windows'
-      - 'GOARCH=amd64'
-      - 'CC=/zig-tools/zig cc -target x86_64-windows-gnu'
-      - 'CXX=/zig-tools/zig c++ -target x86_64-windows-gnu'
-    volumes:
-      - name: 'go'
-        path: '/gopath'
-      - name: 'zig'
-        path: '/zig-tools'
-    script: |
-        #!/usr/bin/env bash
-        export VERSION=$(cat ./cmd/version.txt)
-        go build -ldflags "-X github.com/googleapis/genai-toolbox/cmd.commitSha=$(git rev-parse --short HEAD)" -o toolbox.geminicli.windows.amd64
-
 options:
  automapSubstitutions: true
  dynamicSubstitutions: true
  logging: CLOUD_LOGGING_ONLY # Necessary for custom service account
-  pool:
-    name: projects/$PROJECT_ID/locations/us-central1/workerPools/run-release # to increase resource for running releases
+  machineType: 'E2_HIGHCPU_32'

 substitutions:
  _REGION: us-central1
  _AR_HOSTNAME: ${_REGION}-docker.pkg.dev
  _AR_REPO_NAME: toolbox-dev
  _BUCKET_NAME: genai-toolbox-dev
-  _DOCKER_URI: ${_AR_HOSTNAME}/${PROJECT_ID}/${_AR_REPO_NAME}/toolbox
+  _DOCKER_URI: ${_AR_HOSTNAME}/${PROJECT_ID}/${_AR_REPO_NAME}/toolbox
--- a/.ci/integration.cloudbuild.yaml
+++ b/.ci/integration.cloudbuild.yaml
@@ -34,47 +34,9 @@ steps:
        path: "/gopath"
    script: |
      go test -c -race -cover \
-      -coverpkg=./internal/sources/...,./internal/tools/... \
-      $(go list ./tests/... | grep -v '/tests/prompts')
+      -coverpkg=./internal/sources/...,./internal/tools/... ./tests/...
      chmod +x .ci/test_with_coverage.sh

-  - id: "compile-prompt-test-binary"
-    name: golang:1
-    waitFor: ["install-dependencies"]
-    env:
-      - "GOPATH=/gopath"
-    volumes:
-      - name: "go"
-        path: "/gopath"
-    script: |
-      for dir in ./tests/prompts/*; do
-        if [ -d "$dir" ]; then
-          PROMPT_TYPE=$(basename "$dir")
-          echo "--- Compiling prompt test for ${PROMPT_TYPE} with targeted coverage ---"
-
-          go test -c -race -cover \
-            -coverpkg=./internal/prompts/... \
-            -o "prompt.${PROMPT_TYPE}.test" \
-            "${dir}"
-        fi
-      done
-
-      chmod +x .ci/test_prompts_with_coverage.sh
-
-  - id: "prompts-custom"
-    name: golang:1
-    waitFor: ["compile-prompt-test-binary"]
-    entrypoint: /bin/bash
-    env:
-      - "GOPATH=/gopath"
-    volumes:
-      - name: "go"
-        path: "/gopath"
-    args:
-      - -c
-      - |
-        .ci/test_prompts_with_coverage.sh "custom"
-
  - id: "cloud-sql-pg"
    name: golang:1
    waitFor: ["compile-test-binary"]
@@ -87,7 +49,7 @@ steps:
      - "CLOUD_SQL_POSTGRES_REGION=$_REGION"
      - "SERVICE_ACCOUNT_EMAIL=$SERVICE_ACCOUNT_EMAIL"
    secretEnv:
-      ["CLOUD_SQL_POSTGRES_USER", "CLOUD_SQL_POSTGRES_PASS", "CLIENT_ID", "API_KEY"]
+      ["CLOUD_SQL_POSTGRES_USER", "CLOUD_SQL_POSTGRES_PASS", "CLIENT_ID"]
    volumes:
      - name: "go"
        path: "/gopath"
@@ -100,28 +62,6 @@ steps:
          postgressql \
          postgresexecutesql

-  - id: "alloydb"
-    name: golang:1
-    waitFor: ["compile-test-binary"]
-    entrypoint: /bin/bash
-    env:
-      - "GOPATH=/gopath"
-      - "ALLOYDB_PROJECT=$PROJECT_ID"
-      - "ALLOYDB_CLUSTER=$_ALLOYDB_POSTGRES_CLUSTER"
-      - "ALLOYDB_INSTANCE=$_ALLOYDB_POSTGRES_INSTANCE"
-      - "ALLOYDB_REGION=$_REGION"
-    secretEnv: ["ALLOYDB_POSTGRES_USER"]
-    volumes:
-      - name: "go"
-        path: "/gopath"
-    args:
-      - -c
-      - |
-        .ci/test_with_coverage.sh \
-          "AlloyDB" \
-          alloydb \
-          alloydb
-
  - id: "alloydb-pg"
    name: golang:1
    waitFor: ["compile-test-binary"]
@@ -134,7 +74,7 @@ steps:
      - "ALLOYDB_POSTGRES_DATABASE=$_DATABASE_NAME"
      - "ALLOYDB_POSTGRES_REGION=$_REGION"
      - "SERVICE_ACCOUNT_EMAIL=$SERVICE_ACCOUNT_EMAIL"
-    secretEnv: ["ALLOYDB_POSTGRES_USER", "ALLOYDB_POSTGRES_PASS", "CLIENT_ID", "API_KEY"]
+    secretEnv: ["ALLOYDB_POSTGRES_USER", "ALLOYDB_POSTGRES_PASS", "CLIENT_ID"]
    volumes:
      - name: "go"
        path: "/gopath"
@@ -171,23 +111,6 @@ steps:
          alloydbainl \
          alloydbainl

-  - id: "alloydb-omni"
-    name: golang:1
-    waitFor: ["compile-test-binary"]
-    entrypoint: /bin/bash
-    env:
-      - "GOPATH=/gopath"
-    volumes:
-      - name: "go"
-        path: "/gopath"
-    args:
-      - -c
-      - |
-        .ci/test_with_coverage.sh \
-          "AlloyDB Omni" \
-          alloydbomni \
-          postgres
-
  - id: "bigtable"
    name: golang:1
    waitFor: ["compile-test-binary"]
@@ -229,26 +152,6 @@ steps:
          bigquery \
          bigquery

-  - id: "cloud-gda"
-    name: golang:1
-    waitFor: ["compile-test-binary"]
-    entrypoint: /bin/bash
-    env:
-      - "GOPATH=/gopath"
-      - "CLOUD_GDA_PROJECT=$PROJECT_ID"
-      - "SERVICE_ACCOUNT_EMAIL=$SERVICE_ACCOUNT_EMAIL"
-    secretEnv: ["CLIENT_ID"]
-    volumes:
-      - name: "go"
-        path: "/gopath"
-    args:
-      - -c
-      - |
-        .ci/test_with_coverage.sh \
-          "Cloud Gemini Data Analytics" \
-          cloudgda \
-          cloudgda
-
  - id: "dataplex"
    name: golang:1
    waitFor: ["compile-test-binary"]
@@ -269,68 +172,6 @@ steps:
          dataplex \
          dataplex

-  - id: "dataform"
-    name: golang:1
-    waitFor: ["compile-test-binary"]
-    entrypoint: /bin/bash
-    env:
-      - "GOPATH=/gopath"
-    secretEnv: ["CLIENT_ID"]
-    volumes:
-      - name: "go"
-        path: "/gopath"
-    args:
-      - -c
-      - |
-        apt-get update && apt-get install -y npm && \
-        npm install -g @dataform/cli && \
-        .ci/test_with_coverage.sh \
-          "Dataform" \
-          dataform \
-          dataform
-
-  - id: "cloud-healthcare"
-    name: golang:1
-    waitFor: ["compile-test-binary"]
-    entrypoint: /bin/bash
-    env:
-      - "GOPATH=/gopath"
-      - "HEALTHCARE_PROJECT=$PROJECT_ID"
-      - "SERVICE_ACCOUNT_EMAIL=$SERVICE_ACCOUNT_EMAIL"
-      - "HEALTHCARE_REGION=$_REGION"
-      - "HEALTHCARE_DATASET=$_HEALTHCARE_DATASET"
-      - "HEALTHCARE_PREPOPULATED_DICOM_STORE=$_HEALTHCARE_PREPOPULATED_DICOM_STORE"
-    secretEnv: ["CLIENT_ID"]
-    volumes:
-      - name: "go"
-        path: "/gopath"
-    args:
-      - -c
-      - |
-        .ci/test_with_coverage.sh \
-          "Cloud Healthcare API" \
-          cloudhealthcare \
-          cloudhealthcare
-
-  - id: "cloud-logging-admin"
-    name: golang:1
-    waitFor: ["compile-test-binary"]
-    entrypoint: /bin/bash
-    env:
-      - "GOPATH=/gopath"
-      - "LOGADMIN_PROJECT=$PROJECT_ID"
-    secretEnv: ["CLIENT_ID"]
-    volumes:
-      - name: "go"
-        path: "/gopath"
-    args:
-      - -c
-      - |
-        .ci/test_with_coverage.sh \
-          "Cloud Logging Admin" \
-          cloudloggingadmin \
-          cloudloggingadmin
-
  - id: "postgres"
    name: golang:1
    waitFor: ["compile-test-binary"]
@@ -341,7 +182,7 @@ steps:
      - "POSTGRES_HOST=$_POSTGRES_HOST"
      - "POSTGRES_PORT=$_POSTGRES_PORT"
      - "SERVICE_ACCOUNT_EMAIL=$SERVICE_ACCOUNT_EMAIL"
-    secretEnv: ["POSTGRES_USER", "POSTGRES_PASS", "CLIENT_ID", "API_KEY"]
+    secretEnv: ["POSTGRES_USER", "POSTGRES_PASS", "CLIENT_ID"]
    volumes:
      - name: "go"
        path: "/gopath"
@@ -354,30 +195,6 @@ steps:
          postgressql \
          postgresexecutesql

-  - id: "cockroachdb"
-    name: golang:1
-    waitFor: ["compile-test-binary"]
-    entrypoint: /bin/bash
-    env:
-      - "GOPATH=/gopath"
-      - "COCKROACHDB_DATABASE=$_DATABASE_NAME"
-      - "COCKROACHDB_PORT=$_COCKROACHDB_PORT"
-      - "SERVICE_ACCOUNT_EMAIL=$SERVICE_ACCOUNT_EMAIL"
-    secretEnv: ["COCKROACHDB_USER", "COCKROACHDB_HOST","CLIENT_ID"]
-    volumes:
-      - name: "go"
-        path: "/gopath"
-    args:
-      - -c
-      - |
-        .ci/test_with_coverage.sh \
-          "CockroachDB" \
-          cockroachdb \
-          cockroachdbsql \
-          cockroachdbexecutesql \
-          cockroachdblisttables \
-          cockroachdblistschemas
-
  - id: "spanner"
    name: golang:1
    waitFor: ["compile-test-binary"]
@@ -398,7 +215,7 @@ steps:
        .ci/test_with_coverage.sh \
          "Spanner" \
          spanner \
-          spanner || echo "Integration tests failed." # ignore test failures
+          spanner

  - id: "neo4j"
    name: golang:1
@@ -511,23 +328,23 @@ steps:
          mssql \
          mssql

-  # - id: "dgraph"
-  #   name: golang:1
-  #   waitFor: ["compile-test-binary"]
-  #   entrypoint: /bin/bash
-  #   env:
-  #     - "GOPATH=/gopath"
-  #     - "DGRAPH_URL=$_DGRAPHURL"
-  #   volumes:
-  #     - name: "go"
-  #       path: "/gopath"
-  #   args:
-  #     - -c
-  #     - |
-  #       .ci/test_with_coverage.sh \
-  #         "Dgraph" \
-  #         dgraph \
-  #         dgraph
+  - id: "dgraph"
+    name: golang:1
+    waitFor: ["compile-test-binary"]
+    entrypoint: /bin/bash
+    env:
+      - "GOPATH=/gopath"
+      - "DGRAPH_URL=$_DGRAPHURL"
+    volumes:
+      - name: "go"
+        path: "/gopath"
+    args:
+      - -c
+      - |
+        .ci/test_with_coverage.sh \
+          "Dgraph" \
+          dgraph \
+          dgraph

  - id: "http"
    name: golang:1
@@ -636,8 +453,7 @@ steps:
      - "OCEANBASE_PORT=$_OCEANBASE_PORT"
      - "OCEANBASE_DATABASE=$_OCEANBASE_DATABASE"
      - "SERVICE_ACCOUNT_EMAIL=$SERVICE_ACCOUNT_EMAIL"
-    secretEnv:
-      ["CLIENT_ID", "OCEANBASE_HOST", "OCEANBASE_USER", "OCEANBASE_PASSWORD"]
+    secretEnv: ["CLIENT_ID", "OCEANBASE_HOST", "OCEANBASE_USER", "OCEANBASE_PASSWORD"]
    volumes:
      - name: "go"
        path: "/gopath"
@@ -669,26 +485,6 @@ steps:
          firestore \
          firestore

-  - id: "mongodb"
-    name: golang:1
-    waitFor: ["compile-test-binary"]
-    entrypoint: /bin/bash
-    env:
-      - "GOPATH=/gopath"
-      - "MONGODB_DATABASE=$_DATABASE_NAME"
-      - "SERVICE_ACCOUNT_EMAIL=$SERVICE_ACCOUNT_EMAIL"
-    secretEnv: ["MONGODB_URI", "CLIENT_ID"]
-    volumes:
-      - name: "go"
-        path: "/gopath"
-    args:
-      - -c
-      - |
-        .ci/test_with_coverage.sh \
-          "MongoDB" \
-          mongodb \
-          mongodb
-
  - id: "looker"
    name: golang:1
    waitFor: ["compile-test-binary"]
@@ -698,8 +494,6 @@ steps:
      - "FIRESTORE_PROJECT=$PROJECT_ID"
      - "SERVICE_ACCOUNT_EMAIL=$SERVICE_ACCOUNT_EMAIL"
      - "LOOKER_VERIFY_SSL=$_LOOKER_VERIFY_SSL"
-      - "LOOKER_PROJECT=$_LOOKER_PROJECT"
-      - "LOOKER_LOCATION=$_LOOKER_LOCATION"
    secretEnv:
      [
        "CLIENT_ID",
@@ -718,33 +512,13 @@ steps:
          looker \
          looker

-  - id: "mindsdb"
-    name: golang:1
-    waitFor: ["compile-test-binary"]
-    entrypoint: /bin/bash
-    env:
-      - "GOPATH=/gopath"
-      - "MINDSDB_PORT=$_MINDSDB_PORT"
-      - "MINDSDB_DATABASE=$_MINDSDB_DATABASE"
-      - "SERVICE_ACCOUNT_EMAIL=$SERVICE_ACCOUNT_EMAIL"
-    secretEnv: ["MINDSDB_HOST", "MINDSDB_USER", "MINDSDB_PASS", "CLIENT_ID"]
-    volumes:
-      - name: "go"
-        path: "/gopath"
-    args:
-      - -c
-      - |
-        .ci/test_with_coverage.sh \
-          "MindsDB" \
-          mindsdb \
-          mindsdb
-
-  - id: "cloud-sql"
+  - 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"
@@ -753,9 +527,9 @@ steps:
      - -c
      - |
        .ci/test_with_coverage.sh \
-          "Cloud SQL Wait for Operation" \
-          cloudsql \
-          cloudsql
+          "Alloydb Wait for Operation" \
+          utility \
+          utility/alloydbwaitforoperation

  - id: "tidb"
    name: golang:1
@@ -802,7 +576,7 @@ steps:
          firebirdsql firebirdexecutesql

  - id: "clickhouse"
-    name: golang:1
+    name : golang:1
    waitFor: ["compile-test-binary"]
    entrypoint: /bin/bash
    env:
@@ -846,191 +620,8 @@ steps:
          trino \
          trinosql trinoexecutesql

-  - id: "yugabytedb"
-    name: golang:1
-    waitFor: ["compile-test-binary"]
-    entrypoint: /bin/bash
-    env:
-      - "GOPATH=/gopath"
-      - "YUGABYTEDB_DATABASE=$_YUGABYTEDB_DATABASE"
-      - "YUGABYTEDB_PORT=$_YUGABYTEDB_PORT"
-      - "YUGABYTEDB_LOADBALANCE=$_YUGABYTEDB_LOADBALANCE"
-      - "SERVICE_ACCOUNT_EMAIL=$SERVICE_ACCOUNT_EMAIL"
-    secretEnv:
-      ["YUGABYTEDB_USER", "YUGABYTEDB_PASS", "YUGABYTEDB_HOST", "CLIENT_ID"]
-    volumes:
-      - name: "go"
-        path: "/gopath"
-    args:
-      - -c
-      - |
-        ./yugabytedb.test -test.v
-
-  - id: "elasticsearch"
-    name: golang:1
-    waitFor: ["compile-test-binary"]
-    entrypoint: /bin/bash
-    env:
-      - "GOPATH=/gopath"
-      - "SERVICE_ACCOUNT_EMAIL=$SERVICE_ACCOUNT_EMAIL"
-    secretEnv: ["CLIENT_ID", "ELASTICSEARCH_USER", "ELASTICSEARCH_PASS", "ELASTICSEARCH_HOST"]
-    volumes:
-      - name: "go"
-        path: "/gopath"
-    args:
-      - -c
-      - |
-        .ci/test_with_coverage.sh \
-          "Elasticsearch" \
-          elasticsearch \
-          elasticsearch
-
-  - id: "snowflake"
-    name: golang:1
-    waitFor: ["compile-test-binary"]
-    entrypoint: /bin/bash
-    env:
-      - "GOPATH=/gopath"
-      - "SERVICE_ACCOUNT_EMAIL=$SERVICE_ACCOUNT_EMAIL"
-      - "SNOWFLAKE_DATABASE=$_SNOWFLAKE_DATABASE"
-      - "SNOWFLAKE_SCHEMA=$_SNOWFLAKE_SCHEMA"
-    secretEnv: ["CLIENT_ID", "SNOWFLAKE_USER", "SNOWFLAKE_PASS", "SNOWFLAKE_ACCOUNT"]
-    volumes:
-      - name: "go"
-        path: "/gopath"
-    args:
-      - -c
-      - |
-        .ci/test_with_coverage.sh \
-          "Snowflake" \
-          snowflake \
-          snowflake
-
-  - id: "cassandra"
-    name: golang:1
-    waitFor: ["compile-test-binary"]
-    entrypoint: /bin/bash
-    env:
-      - "GOPATH=/gopath"
-      - "SERVICE_ACCOUNT_EMAIL=$SERVICE_ACCOUNT_EMAIL"
-    secretEnv: ["CLIENT_ID", "CASSANDRA_USER", "CASSANDRA_PASS", "CASSANDRA_HOST"]
-    volumes:
-      - name: "go"
-        path: "/gopath"
-    args:
-      - -c
-      - |
-        .ci/test_with_coverage.sh \
-          "Cassandra" \
-          cassandra \
-          cassandra
-
-  - id: "oracle"
-    name: ghcr.io/oracle/oraclelinux9-instantclient:23
-    waitFor: ["install-dependencies"]
-    entrypoint: /bin/bash
-    env:
-      - "GOPATH=/gopath"
-      - "SERVICE_ACCOUNT_EMAIL=$SERVICE_ACCOUNT_EMAIL"
-      - "ORACLE_SERVER_NAME=$_ORACLE_SERVER_NAME"
-    secretEnv: ["CLIENT_ID", "ORACLE_USER", "ORACLE_PASS", "ORACLE_HOST"]
-    volumes:
-      - name: "go"
-        path: "/gopath"
-    args:
-      - -c
-      - |
-        # Install the C compiler and Oracle SDK headers needed for cgo
-        dnf install -y gcc oracle-instantclient-devel
-        # Install Go
-        curl -L -o go.tar.gz "https://go.dev/dl/go1.25.1.linux-amd64.tar.gz"
-        tar -C /usr/local -xzf go.tar.gz
-        export PATH="/usr/local/go/bin:$$PATH"
-
-        go test -v ./tests/oracle/... \
-          -coverprofile=oracle_coverage.out \
-          -coverpkg=./internal/sources/oracle/...,./internal/tools/oracle/...
-
-        # Coverage check
-        total_coverage=$(go tool cover -func=oracle_coverage.out | grep "total:" | awk '{print $3}')
-        echo "Oracle total coverage: $total_coverage"
-        coverage_numeric=$(echo "$total_coverage" | sed 's/%//')
-        if awk -v cov="$coverage_numeric" 'BEGIN {exit !(cov < 60)}'; then
-            echo "Coverage failure: $total_coverage is below 60%."
-            exit 1
-        fi
-
-  - id: "serverless-spark"
-    name: golang:1
-    waitFor: ["compile-test-binary"]
-    entrypoint: /bin/bash
-    env:
-      - "GOPATH=/gopath"
-      - "SERVERLESS_SPARK_LOCATION=$_REGION"
-      - "SERVERLESS_SPARK_PROJECT=$PROJECT_ID"
-      - "SERVERLESS_SPARK_SERVICE_ACCOUNT=$SERVICE_ACCOUNT_EMAIL"
-    secretEnv: ["CLIENT_ID"]
-    volumes:
-      - name: "go"
-        path: "/gopath"
-    args:
-      - -c
-      - |
-        .ci/test_with_coverage.sh \
-          "Serverless Spark" \
-          serverlessspark
-
-  - id: "singlestore"
-    name: golang:1
-    waitFor: ["compile-test-binary"]
-    entrypoint: /bin/bash
-    env:
-      - "GOPATH=/gopath"
-      - "SINGLESTORE_PORT=$_SINGLESTORE_PORT"
-      - "SINGLESTORE_USER=$_SINGLESTORE_USER"
-      - "SINGLESTORE_DATABASE=$_SINGLESTORE_DATABASE"
-      - "SERVICE_ACCOUNT_EMAIL=$SERVICE_ACCOUNT_EMAIL"
-    secretEnv: ["SINGLESTORE_PASSWORD", "SINGLESTORE_HOST", "CLIENT_ID"]
-    volumes:
-      - name: "go"
-        path: "/gopath"
-    args:
-      - -c
-      - |
-        .ci/test_with_coverage.sh \
-          "SingleStore" \
-          singlestore \
-          singlestore
-
-  - id: "mariadb"
-    name: golang:1
-    waitFor: ["compile-test-binary"]
-    entrypoint: /bin/bash
-    env:
-      - "GOPATH=/gopath"
-      - "MARIADB_DATABASE=$_MARIADB_DATABASE"
-      - "MARIADB_PORT=$_MARIADB_PORT"
-      - "SERVICE_ACCOUNT_EMAIL=$SERVICE_ACCOUNT_EMAIL"
-    secretEnv: ["MARIADB_USER", "MARIADB_PASS", "MARIADB_HOST", "CLIENT_ID"]
-    volumes:
-      - name: "go"
-        path: "/gopath"
-    args:
-      - -c
-      - |
-        # skip coverage check as it re-uses current MySQL implementation
-        go test ./tests/mariadb
-
-
 availableSecrets:
  secretManager:
-    # Common secrets
-    - versionName: projects/$PROJECT_ID/secrets/client_id/versions/latest
-      env: CLIENT_ID
-    - versionName: projects/$PROJECT_ID/secrets/api_key/versions/latest
-      env: API_KEY
-
-    # Resource-specific secrets
    - versionName: projects/$PROJECT_ID/secrets/cloud_sql_pg_user/versions/latest
      env: CLOUD_SQL_POSTGRES_USER
    - versionName: projects/$PROJECT_ID/secrets/cloud_sql_pg_pass/versions/latest
@@ -1047,6 +638,8 @@ availableSecrets:
      env: POSTGRES_USER
    - versionName: projects/$PROJECT_ID/secrets/postgres_pass/versions/latest
      env: POSTGRES_PASS
+    - versionName: projects/$PROJECT_ID/secrets/client_id/versions/latest
+      env: CLIENT_ID
    - versionName: projects/$PROJECT_ID/secrets/neo4j_user/versions/latest
      env: NEO4J_USER
    - versionName: projects/$PROJECT_ID/secrets/neo4j_pass/versions/latest
@@ -1105,59 +698,6 @@ availableSecrets:
      env: OCEANBASE_USER
    - versionName: projects/$PROJECT_ID/secrets/oceanbase_pass/versions/latest
      env: OCEANBASE_PASSWORD
-    - versionName: projects/$PROJECT_ID/secrets/mindsdb_host/versions/latest
-      env: MINDSDB_HOST
-    - versionName: projects/$PROJECT_ID/secrets/mindsdb_user/versions/latest
-      env: MINDSDB_USER
-    - versionName: projects/$PROJECT_ID/secrets/mindsdb_pass/versions/latest
-      env: MINDSDB_PASS
-    - versionName: projects/$PROJECT_ID/secrets/yugabytedb_host/versions/latest
-      env: YUGABYTEDB_HOST
-    - versionName: projects/$PROJECT_ID/secrets/yugabytedb_user/versions/latest
-      env: YUGABYTEDB_USER
-    - versionName: projects/$PROJECT_ID/secrets/yugabytedb_pass/versions/latest
-      env: YUGABYTEDB_PASS
-    - versionName: projects/$PROJECT_ID/secrets/elastic_search_host/versions/latest
-      env: ELASTICSEARCH_HOST
-    - versionName: projects/$PROJECT_ID/secrets/elastic_search_user/versions/latest
-      env: ELASTICSEARCH_USER
-    - versionName: projects/$PROJECT_ID/secrets/elastic_search_pass/versions/latest
-      env: ELASTICSEARCH_PASS
-    - versionName: projects/$PROJECT_ID/secrets/snowflake_account/versions/latest
-      env: SNOWFLAKE_ACCOUNT
-    - versionName: projects/$PROJECT_ID/secrets/snowflake_user/versions/latest
-      env: SNOWFLAKE_USER
-    - versionName: projects/$PROJECT_ID/secrets/snowflake_pass/versions/latest
-      env: SNOWFLAKE_PASS
-    - versionName: projects/$PROJECT_ID/secrets/cassandra_user/versions/latest
-      env: CASSANDRA_USER
-    - versionName: projects/$PROJECT_ID/secrets/cassandra_pass/versions/latest
-      env: CASSANDRA_PASS
-    - versionName: projects/$PROJECT_ID/secrets/cassandra_host/versions/latest
-      env: CASSANDRA_HOST
-    - versionName: projects/$PROJECT_ID/secrets/oracle_user/versions/latest
-      env: ORACLE_USER
-    - versionName: projects/$PROJECT_ID/secrets/oracle_pass/versions/latest
-      env: ORACLE_PASS
-    - versionName: projects/$PROJECT_ID/secrets/oracle_host/versions/latest
-      env: ORACLE_HOST
-    - versionName: projects/$PROJECT_ID/secrets/singlestore_pass/versions/latest
-      env: SINGLESTORE_PASSWORD
-    - versionName: projects/$PROJECT_ID/secrets/singlestore_host/versions/latest
-      env: SINGLESTORE_HOST
-    - versionName: projects/$PROJECT_ID/secrets/mariadb_user/versions/latest
-      env: MARIADB_USER
-    - versionName: projects/$PROJECT_ID/secrets/mariadb_pass/versions/latest
-      env: MARIADB_PASS
-    - versionName: projects/$PROJECT_ID/secrets/mariadb_host/versions/latest
-      env: MARIADB_HOST
-    - versionName: projects/$PROJECT_ID/secrets/mongodb_uri/versions/latest
-      env: MONGODB_URI
-    - versionName: projects/$PROJECT_ID/secrets/cockroachdb_user/versions/latest
-      env: COCKROACHDB_USER
-    - versionName: projects/$PROJECT_ID/secrets/cockroachdb_host/versions/latest
-      env: COCKROACHDB_HOST
-

 options:
  logging: CLOUD_LOGGING_ONLY
@@ -1177,8 +717,6 @@ substitutions:
  _ALLOYDB_AI_NL_CLUSTER: "alloydb-ai-nl-testing"
  _ALLOYDB_AI_NL_INSTANCE: "alloydb-ai-nl-testing-instance"
  _BIGTABLE_INSTANCE: "bigtable-testing-instance"
-  _HEALTHCARE_DATASET: "test-dataset"
-  _HEALTHCARE_PREPOPULATED_DICOM_STORE: "prepopulated-test-dicom-store"
  _POSTGRES_HOST: 127.0.0.1
  _POSTGRES_PORT: "5432"
  _SPANNER_INSTANCE: "spanner-testing"
@@ -1192,8 +730,6 @@ substitutions:
  _DGRAPHURL: "https://play.dgraph.io"
  _COUCHBASE_BUCKET: "couchbase-bucket"
  _COUCHBASE_SCOPE: "couchbase-scope"
-  _LOOKER_LOCATION: "us"
-  _LOOKER_PROJECT: "149671255749"
  _LOOKER_VERIFY_SSL: "true"
  _TIDB_HOST: 127.0.0.1
  _TIDB_PORT: "4000"
@@ -1208,20 +744,3 @@ substitutions:
  _TRINO_SCHEMA: "default"
  _OCEANBASE_PORT: "2883"
  _OCEANBASE_DATABASE: "oceanbase"
-  _MINDSDB_PORT: "47335"
-  _MINDSDB_DATABASE: "mindsdb_test"
-  _YUGABYTEDB_DATABASE: "yugabyte"
-  _YUGABYTEDB_PORT: "5433"
-  _YUGABYTEDB_LOADBALANCE: "false"
-  _ORACLE_SERVER_NAME: "FREEPDB1"
-  _SINGLESTORE_HOST: 127.0.0.1
-  _SINGLESTORE_PORT: "3308"
-  _SINGLESTORE_DATABASE: "singlestore"
-  _SINGLESTORE_USER: "root"
-  _COCKROACHDB_HOST: 127.0.0.1
-  _COCKROACHDB_PORT: "26257"
-  _COCKROACHDB_USER: "root"
-  _MARIADB_PORT: "3307"
-  _MARIADB_DATABASE: test_database
-  _SNOWFLAKE_DATABASE: "test"
-  _SNOWFLAKE_SCHEMA: "PUBLIC"
--- a/.ci/sample_tests/pre_post_processing/py.integration.cloudbuild.yaml
+++ b/.ci/sample_tests/pre_post_processing/py.integration.cloudbuild.yaml
@@ -1,57 +0,0 @@
-# Copyright 2026 Google LLC
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-steps:
-  - name: "${_IMAGE}"
-    id: "py-pre-post-processing-test"
-    entrypoint: "bash"
-    args:
-      - -c
-      - |
-        set -ex
-        chmod +x .ci/sample_tests/run_tests.sh
-        .ci/sample_tests/run_tests.sh
-    env:
-      - "CLOUD_SQL_INSTANCE=${_CLOUD_SQL_INSTANCE}"
-      - "GCP_PROJECT=${_GCP_PROJECT}"
-      - "DATABASE_NAME=${_DATABASE_NAME}"
-      - "DB_USER=${_DB_USER}"
-      - "TARGET_ROOT=${_TARGET_ROOT}"
-      - "TARGET_LANG=${_TARGET_LANG}"
-      - "TABLE_NAME=${_TABLE_NAME}"
-      - "SQL_FILE=${_SQL_FILE}"
-      - "AGENT_FILE_PATTERN=${_AGENT_FILE_PATTERN}"
-    secretEnv: ["TOOLS_YAML_CONTENT", "GOOGLE_API_KEY", "DB_PASSWORD"]
-
-availableSecrets:
-  secretManager:
-    - versionName: projects/${_GCP_PROJECT}/secrets/${_TOOLS_YAML_SECRET}/versions/5
-      env: "TOOLS_YAML_CONTENT"
-    - versionName: projects/${_GCP_PROJECT_NUMBER}/secrets/${_API_KEY_SECRET}/versions/latest
-      env: "GOOGLE_API_KEY"
-    - versionName: projects/${_GCP_PROJECT}/secrets/${_DB_PASS_SECRET}/versions/latest
-      env: "DB_PASSWORD"
-
-timeout: 1200s
-
-substitutions:
-  _TARGET_LANG: "python"
-  _IMAGE: "gcr.io/google.com/cloudsdktool/cloud-sdk:537.0.0"
-  _TARGET_ROOT: "docs/en/samples/pre_post_processing/python"
-  _TABLE_NAME: "hotels_py_pre_post_processing"
-  _SQL_FILE: ".ci/sample_tests/setup_hotels.sql"
-  _AGENT_FILE_PATTERN: "agent.py"
-
-options:
-  logging: CLOUD_LOGGING_ONLY
--- a/.ci/sample_tests/quickstart/go.integration.cloudbuild.yaml
+++ b/.ci/sample_tests/quickstart/go.integration.cloudbuild.yaml
@@ -1,52 +0,0 @@
-# Copyright 2025 Google LLC
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-steps:
-  - name: 'golang:1.25.1'
-    id: 'go-quickstart-test'
-    entrypoint: 'bash'
-    args:
-      # The '-c' flag tells bash to execute the following string as a command.
-      # The 'set -ex' enables debug output and exits on error for easier troubleshooting.
-      - -c
-      - |
-        set -ex
-        export VERSION=$(cat ./cmd/version.txt)
-        chmod +x .ci/sample_tests/run_tests.sh
-        .ci/sample_tests/run_tests.sh
-    env:
-      - 'CLOUD_SQL_INSTANCE=${_CLOUD_SQL_INSTANCE}'
-      - 'GCP_PROJECT=${_GCP_PROJECT}'
-      - 'DATABASE_NAME=${_DATABASE_NAME}'
-      - 'DB_USER=${_DB_USER}'
-      - 'TARGET_ROOT=docs/en/getting-started/quickstart/go'
-      - 'TARGET_LANG=go'
-      - 'TABLE_NAME=hotels_go'
-      - 'SQL_FILE=.ci/sample_tests/setup_hotels.sql'
-      - 'AGENT_FILE_PATTERN=quickstart.go'
-    secretEnv: ['TOOLS_YAML_CONTENT', 'GOOGLE_API_KEY', 'DB_PASSWORD']
-
-availableSecrets:
-  secretManager:
-  - versionName: projects/${_GCP_PROJECT}/secrets/${_TOOLS_YAML_SECRET}/versions/7
-    env: 'TOOLS_YAML_CONTENT'
-  - versionName: projects/${_GCP_PROJECT_NUMBER}/secrets/${_API_KEY_SECRET}/versions/latest
-    env: 'GOOGLE_API_KEY'
-  - versionName: projects/${_GCP_PROJECT}/secrets/${_DB_PASS_SECRET}/versions/latest
-    env: 'DB_PASSWORD'
-
-timeout: 1000s
-
-options:
-  logging: CLOUD_LOGGING_ONLY
--- a/.ci/sample_tests/quickstart/js.integration.cloudbuild.yaml
+++ b/.ci/sample_tests/quickstart/js.integration.cloudbuild.yaml
@@ -1,52 +0,0 @@
-# Copyright 2025 Google LLC
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-steps:
-  - name: 'node:22'
-    id: 'js-quickstart-test'
-    entrypoint: 'bash'
-    args:
-      # The '-c' flag tells bash to execute the following string as a command.
-      # The 'set -ex' enables debug output and exits on error for easier troubleshooting.
-      - -c
-      - |
-        set -ex
-        export VERSION=$(cat ./cmd/version.txt)
-        chmod +x .ci/sample_tests/run_tests.sh
-        .ci/sample_tests/run_tests.sh
-    env:
-      - 'CLOUD_SQL_INSTANCE=${_CLOUD_SQL_INSTANCE}'
-      - 'GCP_PROJECT=${_GCP_PROJECT}'
-      - 'DATABASE_NAME=${_DATABASE_NAME}'
-      - 'DB_USER=${_DB_USER}'
-      - 'TARGET_ROOT=docs/en/getting-started/quickstart/js'
-      - 'TARGET_LANG=js'
-      - 'TABLE_NAME=hotels_js'
-      - 'SQL_FILE=.ci/sample_tests/setup_hotels.sql'
-      - 'AGENT_FILE_PATTERN=quickstart.js'
-    secretEnv: ['TOOLS_YAML_CONTENT', 'GOOGLE_API_KEY', 'DB_PASSWORD']
-
-availableSecrets:
-  secretManager:
-  - versionName: projects/${_GCP_PROJECT}/secrets/${_TOOLS_YAML_SECRET}/versions/6
-    env: 'TOOLS_YAML_CONTENT'
-  - versionName: projects/${_GCP_PROJECT_NUMBER}/secrets/${_API_KEY_SECRET}/versions/latest
-    env: 'GOOGLE_API_KEY'
-  - versionName: projects/${_GCP_PROJECT}/secrets/${_DB_PASS_SECRET}/versions/latest
-    env: 'DB_PASSWORD'
-
-timeout: 1000s
-
-options:
-  logging: CLOUD_LOGGING_ONLY
--- a/.ci/sample_tests/quickstart/py.integration.cloudbuild.yaml
+++ b/.ci/sample_tests/quickstart/py.integration.cloudbuild.yaml
@@ -1,52 +0,0 @@
-# Copyright 2025 Google LLC
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-steps:
-  - name: 'gcr.io/google.com/cloudsdktool/cloud-sdk:537.0.0'
-    id: 'python-quickstart-test'
-    entrypoint: 'bash'
-    args:
-      # The '-c' flag tells bash to execute the following string as a command.
-      # The 'set -ex' enables debug output and exits on error for easier troubleshooting.
-      - -c
-      - |
-        set -ex
-        export VERSION=$(cat ./cmd/version.txt)
-        chmod +x .ci/sample_tests/run_tests.sh
-        .ci/sample_tests/run_tests.sh
-    env:
-      - 'CLOUD_SQL_INSTANCE=${_CLOUD_SQL_INSTANCE}'
-      - 'GCP_PROJECT=${_GCP_PROJECT}'
-      - 'DATABASE_NAME=${_DATABASE_NAME}'
-      - 'DB_USER=${_DB_USER}'
-      - 'TARGET_ROOT=docs/en/getting-started/quickstart/python'
-      - 'TARGET_LANG=python'
-      - 'TABLE_NAME=hotels_python'
-      - 'SQL_FILE=.ci/sample_tests/setup_hotels.sql'
-      - 'AGENT_FILE_PATTERN=quickstart.py'
-    secretEnv: ['TOOLS_YAML_CONTENT', 'GOOGLE_API_KEY', 'DB_PASSWORD']
-
-availableSecrets:
-  secretManager:
-  - versionName: projects/${_GCP_PROJECT}/secrets/${_TOOLS_YAML_SECRET}/versions/5
-    env: 'TOOLS_YAML_CONTENT'
-  - versionName: projects/${_GCP_PROJECT_NUMBER}/secrets/${_API_KEY_SECRET}/versions/latest
-    env: 'GOOGLE_API_KEY'
-  - versionName: projects/${_GCP_PROJECT}/secrets/${_DB_PASS_SECRET}/versions/latest
-    env: 'DB_PASSWORD'
-
-timeout: 1000s
-
-options:
-  logging: CLOUD_LOGGING_ONLY
--- a/.ci/sample_tests/run_tests.sh
+++ b/.ci/sample_tests/run_tests.sh
@@ -1,202 +0,0 @@
-# Copyright 2026 Google LLC
-# 
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-# 
-#      http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-set -e
-
-# --- Configuration (from Environment Variables) ---
-# TARGET_ROOT: The directory to search for tests (e.g., docs/en/getting-started/quickstart/js)
-# TARGET_LANG: python, js, go
-# TABLE_NAME: Database table name to use
-# SQL_FILE: Path to the SQL setup file
-# AGENT_FILE_PATTERN: Filename to look for (e.g., quickstart.js or agent.py)
-
-VERSION=$(cat ./cmd/version.txt)
-
-# Process IDs & Logs
-PROXY_PID=""
-TOOLBOX_PID=""
-PROXY_LOG="cloud_sql_proxy.log"
-TOOLBOX_LOG="toolbox_server.log"
-
-install_system_packages() {
-  echo "Installing system packages..."
-  apt-get update && apt-get install -y \
-    postgresql-client \
-    wget \
-    gettext-base  \
-    netcat-openbsd
-    
-  if [[ "$TARGET_LANG" == "python" ]]; then
-    apt-get install -y python3-venv
-  fi
-}
-
-start_cloud_sql_proxy() {
-  echo "Starting Cloud SQL Proxy..."
-  wget -q "https://storage.googleapis.com/cloud-sql-connectors/cloud-sql-proxy/v2.10.0/cloud-sql-proxy.linux.amd64" -O /usr/local/bin/cloud-sql-proxy
-  chmod +x /usr/local/bin/cloud-sql-proxy
-  cloud-sql-proxy "${CLOUD_SQL_INSTANCE}" > "$PROXY_LOG" 2>&1 &
-  PROXY_PID=$!
-
-  # Health Check
-  for i in {1..30}; do
-    if nc -z 127.0.0.1 5432; then
-      echo "Cloud SQL Proxy is up and running."
-      return
-    fi
-    sleep 1
-  done
-  echo "ERROR: Cloud SQL Proxy failed to start. Logs:"
-  cat "$PROXY_LOG"
-  exit 1
-}
-
-setup_toolbox() {
-  echo "Setting up Toolbox server..."
-  TOOLBOX_YAML="/tools.yaml"
-  echo "${TOOLS_YAML_CONTENT}" > "$TOOLBOX_YAML"
-  wget -q "https://storage.googleapis.com/genai-toolbox/v${VERSION}/linux/amd64/toolbox" -O "/toolbox"
-  chmod +x "/toolbox"
-  /toolbox --tools-file "$TOOLBOX_YAML" > "$TOOLBOX_LOG" 2>&1 &
-  TOOLBOX_PID=$!
-  
-  # Health Check
-  for i in {1..15}; do
-    if nc -z 127.0.0.1 5000; then
-      echo "Toolbox server is up and running."
-      return
-    fi
-    sleep 1
-  done
-  echo "ERROR: Toolbox server failed to start. Logs:"
-  cat "$TOOLBOX_LOG"
-  exit 1
-}
-
-setup_db_table() {
-  echo "Setting up database table $TABLE_NAME using $SQL_FILE..."
-  export TABLE_NAME
-  envsubst < "$SQL_FILE" | psql -h 127.0.0.1 -p 5432 -U "$DB_USER" -d "$DATABASE_NAME"
-}
-
-run_python_test() {
-  local dir=$1
-  local name=$(basename "$dir")
-  echo "--- Running Python Test: $name ---"
-  (
-    cd "$dir"
-    python3 -m venv .venv
-    source .venv/bin/activate
-    pip install -q -r requirements.txt pytest
-    
-    cd ..
-    local test_file=$(find . -maxdepth 1 -name "*test.py" | head -n 1)
-    if [ -n "$test_file" ]; then
-        echo "Found native test: $test_file. Running pytest..."
-        export ORCH_NAME="$name"
-        export PYTHONPATH="../"
-        pytest "$test_file"
-    else
-        echo "No native test found. running agent directly..."
-        export PYTHONPATH="../"
-        python3 "${name}/${AGENT_FILE_PATTERN}"
-    fi
-    rm -rf "${name}/.venv"
-  )
-}
-
-run_js_test() {
-  local dir=$1
-  local name=$(basename "$dir")
-  echo "--- Running JS Test: $name ---"
-  (
-    cd "$dir"
-    if [ -f "package-lock.json" ]; then npm ci -q; else npm install -q; fi
-    
-    cd ..
-    # Looking for a JS test file in the parent directory
-    local test_file=$(find . -maxdepth 1 -name "*test.js" | head -n 1)
-    if [ -n "$test_file" ]; then
-        echo "Found native test: $test_file. Running node --test..."
-        export ORCH_NAME="$name"
-        node --test "$test_file"
-    else
-        echo "No native test found. running agent directly..."
-        node "${name}/${AGENT_FILE_PATTERN}"
-    fi
-    rm -rf "${name}/node_modules"
-  )
-}
-
-run_go_test() {
-  local dir=$1
-  local name=$(basename "$dir")
-
-  if [ "$name" == "openAI" ]; then
-      echo -e "\nSkipping framework '${name}': Temporarily excluded."
-      return
-  fi
-
-  echo "--- Running Go Test: $name ---"
-  (
-    cd "$dir"
-    if [ -f "go.mod" ]; then
-      go mod tidy
-    fi
-    
-    cd ..
-    local test_file=$(find . -maxdepth 1 -name "*test.go" | head -n 1)
-    if [ -n "$test_file" ]; then
-        echo "Found native test: $test_file. Running go test..."
-        export ORCH_NAME="$name"
-        go test -v ./...
-    else
-        echo "No native test found. running agent directly..."
-        cd "$name"
-        go run "."
-    fi
-  )
-}
-
-cleanup() {
-  echo "Cleaning up background processes..."
-  [ -n "$TOOLBOX_PID" ] && kill "$TOOLBOX_PID" || true
-  [ -n "$PROXY_PID" ] && kill "$PROXY_PID" || true
-}
-trap cleanup EXIT
-
-# --- Execution ---
-install_system_packages
-start_cloud_sql_proxy
-
-export PGHOST=127.0.0.1
-export PGPORT=5432
-export PGPASSWORD="$DB_PASSWORD"
-export GOOGLE_API_KEY="$GOOGLE_API_KEY"
-
-setup_toolbox
-setup_db_table
-
-echo "Scanning $TARGET_ROOT for tests with pattern $AGENT_FILE_PATTERN..."
-
-find "$TARGET_ROOT" -name "$AGENT_FILE_PATTERN" | while read -r agent_file; do
-    sample_dir=$(dirname "$agent_file")
-    if [[ "$TARGET_LANG" == "python" ]]; then
-        run_python_test "$sample_dir"
-    elif [[ "$TARGET_LANG" == "js" ]]; then
-        run_js_test "$sample_dir"
-    elif [[ "$TARGET_LANG" == "go" ]]; then
-        run_go_test "$sample_dir"
-    fi
-done
--- a/.ci/sample_tests/setup_hotels.sql
+++ b/.ci/sample_tests/setup_hotels.sql
@@ -1,28 +0,0 @@
-- Copyright 2025 Google LLC
-- 
-- Licensed under the Apache License, Version 2.0 (the "License");
-- you may not use this file except in compliance with the License.
-- You may obtain a copy of the License at
-- 
--      http://www.apache.org/licenses/LICENSE-2.0
-- 
-- Unless required by applicable law or agreed to in writing, software
-- distributed under the License is distributed on an "AS IS" BASIS,
-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-- See the License for the specific language governing permissions and
-- limitations under the License.
-
-TRUNCATE TABLE $TABLE_NAME;
-
-INSERT INTO $TABLE_NAME (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');
--- a/.ci/test_prompts_with_coverage.sh
+++ b/.ci/test_prompts_with_coverage.sh
@@ -1,75 +0,0 @@
-#!/bin/bash
-# .ci/test_prompts_with_coverage.sh
-#
-# This script runs a specific prompt integration test, calculates its
-# code coverage, and checks if it meets a minimum threshold.
-#
-# It is called with one argument: the type of the prompt.
-# Example usage: .ci/test_prompts_with_coverage.sh "custom"
-
-# Exit immediately if a command fails.
-set -e
-
-# --- 1. Define Variables ---
-
-# The first argument is the prompt type (e.g., "custom").
-PROMPT_TYPE=$1
-COVERAGE_THRESHOLD=80 # Minimum coverage percentage required.
-
-if [ -z "$PROMPT_TYPE" ]; then
-    echo "Error: No prompt type provided. Please call this script with an argument."
-    echo "Usage: .ci/test_prompts_with_coverage.sh <prompt_type>"
-    exit 1
-fi
-
-# Construct names based on the prompt type.
-TEST_BINARY="./prompt.${PROMPT_TYPE}.test"
-TEST_NAME="$(tr '[:lower:]' '[:upper:]' <<< ${PROMPT_TYPE:0:1})${PROMPT_TYPE:1} Prompts"
-COVERAGE_FILE="coverage.prompts-${PROMPT_TYPE}.out"
-
-
-# --- 2. Run Integration Tests ---
-
-echo "--- Running integration tests for ${TEST_NAME} ---"
-
-# Safety check for the binary's existence.
-if [ ! -f "$TEST_BINARY" ]; then
-    echo "Error: Test binary not found at ${TEST_BINARY}. Aborting."
-    exit 1
-fi
-
-# Execute the test binary and generate the coverage file.
-# If the tests fail, the 'set -e' command will cause the script to exit here.
-if ! ./"${TEST_BINARY}" -test.v -test.coverprofile="${COVERAGE_FILE}"; then
-  echo "Error: Tests for ${TEST_NAME} failed. Exiting."
-  exit 1
-fi
-
-echo "--- Tests for ${TEST_NAME} passed successfully ---"
-
-
-# --- 3. Calculate and Check Coverage ---
-
-echo "Calculating coverage for ${TEST_NAME}..."
-
-# Calculate the total coverage percentage from the generated file.
-# The '2>/dev/null' suppresses warnings if the coverage file is empty.
-total_coverage=$(go tool cover -func="${COVERAGE_FILE}" 2>/dev/null | grep "total:" | awk '{print $3}')
-
-if [ -z "$total_coverage" ]; then
-    echo "Warning: Could not calculate coverage for ${TEST_NAME}. The coverage report might be empty."
-    total_coverage="0%"
-fi
-
-echo "${TEST_NAME} total coverage: $total_coverage"
-
-# Remove the '%' sign for numerical comparison.
-coverage_numeric=$(echo "$total_coverage" | sed 's/%//')
-
-# Check if the coverage is below the defined threshold.
-if awk -v coverage="$coverage_numeric" -v threshold="$COVERAGE_THRESHOLD" 'BEGIN {exit !(coverage < threshold)}'; then
-    echo "Coverage failure: ${TEST_NAME} total coverage (${total_coverage}) is below the ${COVERAGE_THRESHOLD}% threshold."
-    exit 1
-else
-    echo "Coverage for ${TEST_NAME} is sufficient."
-fi
--- a/.ci/versioned.release.cloudbuild.yaml
+++ b/.ci/versioned.release.cloudbuild.yaml
@@ -24,12 +24,12 @@ steps:
        if [[ $_PUSH_LATEST == 'true' ]]; then
          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 --short HEAD) $TAGS --push .
+        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
    waitFor: ['-']
-    env:
+    env: 
      - 'GOPATH=/gopath'
    volumes:
      - name: 'go'
@@ -37,56 +37,20 @@ steps:
    script: |
        go get -d ./...

-  - id: "install-zig"
-    name: golang:1
-    waitFor: ['-']
-    volumes:
-      - name: 'zig'
-        path: '/zig-tools'
-    script: |
-        #!/usr/bin/env bash
-        set -e
-        apt-get update && apt-get install -y xz-utils
-        curl -fL "https://ziglang.org/download/0.15.2/zig-x86_64-linux-0.15.2.tar.xz" -o zig.tar.xz
-        tar -xf zig.tar.xz -C /zig-tools --strip-components=1
-
-  - id: "install-macos-sdk"
-    name: golang:1
-    waitFor: ['-']
-    volumes:
-      - name: 'macos-sdk'
-        path: '/macos-sdk'
-    script: |
-        #!/usr/bin/env bash
-        set -e
-        apt-get update && apt-get install -y xz-utils
-        echo "Downloading macOS 14.5 SDK..."
-        curl -fL -o sdk.tar.xz https://github.com/alexey-lysiuk/macos-sdk/releases/download/14.5/MacOSX14.5.tar.xz
-        
-        mkdir -p /macos-sdk/MacOSX14.5.sdk
-        echo "Unpacking macOS 14.5 SDK..."
-        tar -xf sdk.tar.xz -C /macos-sdk/MacOSX14.5.sdk --strip-components=1
-
  - id: "build-linux-amd64"
    name: golang:1
-    waitFor:
+    waitFor: 
      - "install-dependencies"
-      - "install-zig"
-    env:
+    env: 
      - 'GOPATH=/gopath'
-      - 'CGO_ENABLED=1'
-      - 'GOOS=linux'
-      - 'GOARCH=amd64'
-      - 'CC=/zig-tools/zig cc -target x86_64-linux-gnu'
-      - 'CXX=/zig-tools/zig c++ -target x86_64-linux-gnu'
    volumes:
      - name: 'go'
        path: '/gopath'
-      - name: 'zig'
-        path: '/zig-tools'
    script: |
        #!/usr/bin/env bash
-        go build -ldflags "-X github.com/googleapis/genai-toolbox/cmd.buildType=binary -X github.com/googleapis/genai-toolbox/cmd.commitSha=$(git rev-parse --short HEAD)" -o toolbox.linux.amd64
+        export VERSION=$(cat ./cmd/version.txt)
+        CGO_ENABLED=0 GOOS=linux GOARCH=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"
@@ -97,63 +61,20 @@ steps:
        export VERSION=v$(cat ./cmd/version.txt)
        gcloud storage cp toolbox.linux.amd64 gs://$_BUCKET_NAME/$VERSION/linux/amd64/toolbox

-  - id: "build-linux-amd64-geminicli"
-    name: golang:1
-    waitFor:
-      - "install-dependencies"
-      - "install-zig"
-    env:
-      - 'GOPATH=/gopath'
-      - 'CGO_ENABLED=1'
-      - 'GOOS=linux'
-      - 'GOARCH=amd64'
-      - 'CC=/zig-tools/zig cc -target x86_64-linux-gnu'
-      - 'CXX=/zig-tools/zig c++ -target x86_64-linux-gnu'
-    volumes:
-      - name: 'go'
-        path: '/gopath'
-      - name: 'zig'
-        path: '/zig-tools'
-    script: |
-        #!/usr/bin/env bash
-        go build -ldflags "-X github.com/googleapis/genai-toolbox/cmd.buildType=geminicli.binary -X github.com/googleapis/genai-toolbox/cmd.commitSha=$(git rev-parse --short HEAD)" -o toolbox.geminicli.linux.amd64
-
-  - id: "store-linux-amd64-geminicli"
-    name: "gcr.io/cloud-builders/gcloud:latest"
-    waitFor:
-      - "build-linux-amd64-geminicli"
-    script: |
-        #!/usr/bin/env bash
-        export VERSION=v$(cat ./cmd/version.txt)
-        gcloud storage cp toolbox.geminicli.linux.amd64 gs://$_BUCKET_NAME/geminicli/$VERSION/linux/amd64/toolbox
-
  - id: "build-darwin-arm64"
    name: golang:1
-    waitFor:
+    waitFor: 
      - "install-dependencies"
-      - "install-zig"
-      - "install-macos-sdk"
-    env:
+    env: 
      - 'GOPATH=/gopath'
-      - 'CGO_ENABLED=1'
-      - 'GOOS=darwin'
-      - 'GOARCH=arm64'
-      - 'SDK_PATH=/macos-sdk/MacOSX14.5.sdk'
-      - 'MACOS_MIN_VER=10.14'
-      - 'CGO_LDFLAGS=-mmacosx-version-min=10.14 --sysroot /macos-sdk/MacOSX14.5.sdk -F/macos-sdk/MacOSX14.5.sdk/System/Library/Frameworks -L/usr/lib'
-      - 'COMMON_FLAGS=-mmacosx-version-min=10.14 -target aarch64-macos.11.0.0-none -isysroot /macos-sdk/MacOSX14.5.sdk -iwithsysroot /usr/include -iframeworkwithsysroot /System/Library/Frameworks'
-      - 'CC=/zig-tools/zig cc -mmacosx-version-min=10.14 -target aarch64-macos.11.0.0-none -isysroot /macos-sdk/MacOSX14.5.sdk -iwithsysroot /usr/include -iframeworkwithsysroot /System/Library/Frameworks'
-      - 'CXX=/zig-tools/zig c++ -mmacosx-version-min=10.14 -target aarch64-macos.11.0.0-none -isysroot /macos-sdk/MacOSX14.5.sdk -iwithsysroot /usr/include -iframeworkwithsysroot /System/Library/Frameworks'
    volumes:
      - name: 'go'
        path: '/gopath'
-      - name: 'zig'
-        path: '/zig-tools'
-      - name: 'macos-sdk'
-        path: '/macos-sdk'
    script: |
        #!/usr/bin/env bash
-         go build -trimpath -buildmode=pie -ldflags "-s -w -X github.com/googleapis/genai-toolbox/cmd.buildType=binary -X github.com/googleapis/genai-toolbox/cmd.commitSha=$(git rev-parse --short HEAD)" -o toolbox.darwin.arm64
+        export VERSION=$(cat ./cmd/version.txt)
+        CGO_ENABLED=0 GOOS=darwin GOARCH=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"
@@ -162,73 +83,22 @@ steps:
    script: |
        #!/usr/bin/env bash
        export VERSION=v$(cat ./cmd/version.txt)
-        gcloud storage cp toolbox.darwin.arm64 \
-        gs://$_BUCKET_NAME/$VERSION/darwin/arm64/toolbox
-
-  - id: "build-darwin-arm64-geminicli"
-    name: golang:1
-    waitFor:
-      - "install-dependencies"
-      - "install-zig"
-      - "install-macos-sdk"
-    env:
-      - 'GOPATH=/gopath'
-      - 'CGO_ENABLED=1'
-      - 'GOOS=darwin'
-      - 'GOARCH=arm64'
-      - 'SDK_PATH=/macos-sdk/MacOSX14.5.sdk'
-      - 'MACOS_MIN_VER=10.14'
-      - 'CGO_LDFLAGS=-mmacosx-version-min=10.14 --sysroot /macos-sdk/MacOSX14.5.sdk -F/macos-sdk/MacOSX14.5.sdk/System/Library/Frameworks -L/usr/lib'
-      - 'COMMON_FLAGS=-mmacosx-version-min=10.14 -target aarch64-macos.11.0.0-none -isysroot /macos-sdk/MacOSX14.5.sdk -iwithsysroot /usr/include -iframeworkwithsysroot /System/Library/Frameworks'
-      - 'CC=/zig-tools/zig cc -mmacosx-version-min=10.14 -target aarch64-macos.11.0.0-none -isysroot /macos-sdk/MacOSX14.5.sdk -iwithsysroot /usr/include -iframeworkwithsysroot /System/Library/Frameworks'
-      - 'CXX=/zig-tools/zig c++ -mmacosx-version-min=10.14 -target aarch64-macos.11.0.0-none -isysroot /macos-sdk/MacOSX14.5.sdk -iwithsysroot /usr/include -iframeworkwithsysroot /System/Library/Frameworks'
-    volumes:
-      - name: 'go'
-        path: '/gopath'
-      - name: 'zig'
-        path: '/zig-tools'
-      - name: 'macos-sdk'
-        path: '/macos-sdk'
-    script: |
-        #!/usr/bin/env bash
-         go build -trimpath -buildmode=pie -ldflags "-s -w -X github.com/googleapis/genai-toolbox/cmd.buildType=geminicli.binary -X github.com/googleapis/genai-toolbox/cmd.commitSha=$(git rev-parse --short HEAD)" -o toolbox.geminicli.darwin.arm64
-
-  - id: "store-darwin-arm64-geminicli"
-    name: "gcr.io/cloud-builders/gcloud:latest"
-    waitFor:
-      - "build-darwin-arm64-geminicli"
-    script: |
-        #!/usr/bin/env bash
-        export VERSION=v$(cat ./cmd/version.txt)
-        gcloud storage cp toolbox.geminicli.darwin.arm64 gs://$_BUCKET_NAME/geminicli/$VERSION/darwin/arm64/toolbox
+        gcloud storage cp toolbox.darwin.arm64 gs://$_BUCKET_NAME/$VERSION/darwin/arm64/toolbox

  - id: "build-darwin-amd64"
    name: golang:1
-    waitFor:
+    waitFor: 
      - "install-dependencies"
-      - "install-zig"
-      - "install-macos-sdk"
-    env:
+    env: 
      - 'GOPATH=/gopath'
-      - 'CGO_ENABLED=1'
-      - 'GOOS=darwin'
-      - 'GOARCH=amd64'
-      - 'SDK_PATH=/macos-sdk/MacOSX14.5.sdk'
-      - 'MACOS_MIN_VER=10.14'
-      - 'CGO_LDFLAGS=-mmacosx-version-min=10.14 --sysroot /macos-sdk/MacOSX14.5.sdk -F/macos-sdk/MacOSX14.5.sdk/System/Library/Frameworks -L/usr/lib'
-      - 'COMMON_FLAGS=-mmacosx-version-min=10.14 -target x86_64-macos.11.0.0-none -isysroot /macos-sdk/MacOSX14.5.sdk -iwithsysroot /usr/include -iframeworkwithsysroot /System/Library/Frameworks'
-      - 'CC=/zig-tools/zig cc -mmacosx-version-min=10.14 -target x86_64-macos.11.0.0-none -isysroot /macos-sdk/MacOSX14.5.sdk -iwithsysroot /usr/include -iframeworkwithsysroot /System/Library/Frameworks'
-      - 'CXX=/zig-tools/zig c++ -mmacosx-version-min=10.14 -target x86_64-macos.11.0.0-none -isysroot /macos-sdk/MacOSX14.5.sdk -iwithsysroot /usr/include -iframeworkwithsysroot /System/Library/Frameworks'
    volumes:
      - name: 'go'
        path: '/gopath'
-      - name: 'zig'
-        path: '/zig-tools'
-      - name: 'macos-sdk'
-        path: '/macos-sdk'
    script: |
        #!/usr/bin/env bash
-         go build -trimpath -buildmode=pie -ldflags "-s -w -X github.com/googleapis/genai-toolbox/cmd.buildType=binary -X github.com/googleapis/genai-toolbox/cmd.commitSha=$(git rev-parse --short HEAD)" -o toolbox.darwin.amd64
+        export VERSION=$(cat ./cmd/version.txt)
+        CGO_ENABLED=0 GOOS=darwin GOARCH=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"
@@ -239,64 +109,20 @@ steps:
        export VERSION=v$(cat ./cmd/version.txt)
        gcloud storage cp toolbox.darwin.amd64 gs://$_BUCKET_NAME/$VERSION/darwin/amd64/toolbox

-  - id: "build-darwin-amd64-geminicli"
-    name: golang:1
-    waitFor:
-      - "install-dependencies"
-      - "install-zig"
-      - "install-macos-sdk"
-    env:
-      - 'GOPATH=/gopath'
-      - 'CGO_ENABLED=1'
-      - 'GOOS=darwin'
-      - 'GOARCH=amd64'
-      - 'SDK_PATH=/macos-sdk/MacOSX14.5.sdk'
-      - 'MACOS_MIN_VER=10.14'
-      - 'CGO_LDFLAGS=-mmacosx-version-min=10.14 --sysroot /macos-sdk/MacOSX14.5.sdk -F/macos-sdk/MacOSX14.5.sdk/System/Library/Frameworks -L/usr/lib'
-      - 'COMMON_FLAGS=-mmacosx-version-min=10.14 -target x86_64-macos.11.0.0-none -isysroot /macos-sdk/MacOSX14.5.sdk -iwithsysroot /usr/include -iframeworkwithsysroot /System/Library/Frameworks'
-      - 'CC=/zig-tools/zig cc -mmacosx-version-min=10.14 -target x86_64-macos.11.0.0-none -isysroot /macos-sdk/MacOSX14.5.sdk -iwithsysroot /usr/include -iframeworkwithsysroot /System/Library/Frameworks'
-      - 'CXX=/zig-tools/zig c++ -mmacosx-version-min=10.14 -target x86_64-macos.11.0.0-none -isysroot /macos-sdk/MacOSX14.5.sdk -iwithsysroot /usr/include -iframeworkwithsysroot /System/Library/Frameworks'
-    volumes:
-      - name: 'go'
-        path: '/gopath'
-      - name: 'zig'
-        path: '/zig-tools'
-      - name: 'macos-sdk'
-        path: '/macos-sdk'
-    script: |
-        #!/usr/bin/env bash
-         go build -trimpath -buildmode=pie -ldflags "-s -w -X github.com/googleapis/genai-toolbox/cmd.buildType=geminicli.binary -X github.com/googleapis/genai-toolbox/cmd.commitSha=$(git rev-parse --short HEAD)" -o toolbox.geminicli.darwin.amd64
-
-  - id: "store-darwin-amd64-geminicli"
-    name: "gcr.io/cloud-builders/gcloud:latest"
-    waitFor:
-      - "build-darwin-amd64-geminicli"
-    script: |
-        #!/usr/bin/env bash
-        export VERSION=v$(cat ./cmd/version.txt)
-        gcloud storage cp toolbox.geminicli.darwin.amd64 \
-        gs://$_BUCKET_NAME/geminicli/$VERSION/darwin/amd64/toolbox
-
  - id: "build-windows-amd64"
    name: golang:1
-    waitFor:
+    waitFor: 
      - "install-dependencies"
-      - "install-zig"
-    env:
+    env: 
      - 'GOPATH=/gopath'
-      - 'CGO_ENABLED=1'
-      - 'GOOS=windows'
-      - 'GOARCH=amd64'
-      - 'CC=/zig-tools/zig cc -target x86_64-windows-gnu'
-      - 'CXX=/zig-tools/zig c++ -target x86_64-windows-gnu'
    volumes:
      - name: 'go'
        path: '/gopath'
-      - name: 'zig'
-        path: '/zig-tools'
    script: |
        #!/usr/bin/env bash
-        go build -ldflags "-X github.com/googleapis/genai-toolbox/cmd.buildType=binary -X github.com/googleapis/genai-toolbox/cmd.commitSha=$(git rev-parse --short HEAD)" -o toolbox.windows.amd64
+        export VERSION=$(cat ./cmd/version.txt)
+        CGO_ENABLED=0 GOOS=windows GOARCH=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"
@@ -307,45 +133,11 @@ steps:
        export VERSION=v$(cat ./cmd/version.txt)
        gcloud storage cp toolbox.windows.amd64 gs://$_BUCKET_NAME/$VERSION/windows/amd64/toolbox.exe

-  - id: "build-windows-amd64-geminicli"
-    name: golang:1
-    waitFor:
-      - "install-dependencies"
-      - "install-zig"
-    env:
-      - 'GOPATH=/gopath'
-      - 'CGO_ENABLED=1'
-      - 'GOOS=windows'
-      - 'GOARCH=amd64'
-      - 'CC=/zig-tools/zig cc -target x86_64-windows-gnu'
-      - 'CXX=/zig-tools/zig c++ -target x86_64-windows-gnu'
-    volumes:
-      - name: 'go'
-        path: '/gopath'
-      - name: 'zig'
-        path: '/zig-tools'
-      - name: 'macos-sdk'
-        path: '/macos-sdk'
-    script: |
-        #!/usr/bin/env bash
-        go build -ldflags "-X github.com/googleapis/genai-toolbox/cmd.buildType=geminicli.binary -X github.com/googleapis/genai-toolbox/cmd.commitSha=$(git rev-parse --short HEAD)" -o toolbox.geminicli.windows.amd64
-
-  - id: "store-windows-amd64-geminicli"
-    name: "gcr.io/cloud-builders/gcloud:latest"
-    waitFor:
-      - "build-windows-amd64-geminicli"
-    script: |
-        #!/usr/bin/env bash
-        export VERSION=v$(cat ./cmd/version.txt)
-        gcloud storage cp toolbox.geminicli.windows.amd64 gs://$_BUCKET_NAME/geminicli/$VERSION/windows/amd64/toolbox.exe
-
 options:
  automapSubstitutions: true
  dynamicSubstitutions: true
  logging: CLOUD_LOGGING_ONLY # Necessary for custom service account
-  pool:
-    name: projects/$PROJECT_ID/locations/us-central1/workerPools/run-release # to increase resource for running releases
-
+  machineType: 'E2_HIGHCPU_32'

 substitutions:
  _REGION: us-central1
@@ -353,4 +145,4 @@ substitutions:
  _AR_REPO_NAME: toolbox
  _BUCKET_NAME: genai-toolbox
  _DOCKER_URI: ${_AR_HOSTNAME}/${PROJECT_ID}/${_AR_REPO_NAME}/toolbox
-  _PUSH_LATEST: "false" # Substituted in trigger
+  _PUSH_LATEST: "true"
--- a/.gemini/config.yaml
+++ b/.gemini/config.yaml
@@ -1,18 +0,0 @@
-# Copyright 2025 Google LLC
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# 	http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-ignore_patterns:
-  - "package-lock.json"
-  - "go.sum"
-  - "requirements.txt"
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -4,14 +4,3 @@
 # https://help.github.com/en/github/creating-cloning-and-archiving-repositories/about-code-owners#codeowners-syntax

 *   @googleapis/senseai-eco
-# Code & Tests
-**/alloydb*/ @googleapis/toolbox-alloydb
-**/bigquery/ @googleapis/toolbox-bigquery
-**/bigtable/ @googleapis/toolbox-bigtable
-**/cloudsqlmssql/ @googleapis/toolbox-cloud-sql-mssql
-**/cloudsqlmysql/ @googleapis/toolbox-cloud-sql-mysql
-**/cloudsqlpg/ @googleapis/toolbox-cloud-sql-postgres
-**/dataplex/ @googleapis/toolbox-dataplex
-**/firestore/ @googleapis/toolbox-firestore
-**/looker/ @googleapis/toolbox-looker
-**/spanner/ @googleapis/toolbox-spanner
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,10 +1,12 @@
 ## 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:

@@ -12,7 +14,7 @@
  [CONTRIBUTING.md](https://github.com/googleapis/genai-toolbox/blob/main/CONTRIBUTING.md)
 - [ ] Make sure to open an issue as a
  [bug/issue](https://github.com/googleapis/genai-toolbox/issues/new/choose)
-  before writing your code! That way we can discuss the change, evaluate
+  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)
--- a/.github/blunderbuss.yml
+++ b/.github/blunderbuss.yml
@@ -1,106 +1,19 @@
-# Copyright 2025 Google LLC
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
 assign_issues:
  - Yuan325
  - duwenxin99
-  - anubhav756
-  - twishabansal
-  - dishaprakash
+  - averikitsch
 assign_issues_by:
-  - labels:
-    - 'product: alloydb'
-    to:
-    - 'googleapis/toolbox-alloydb'
  - labels:
    - 'product: bigquery'
    to:
-    - 'googleapis/toolbox-bigquery'
-  - labels:
-    - 'product: bigtable'
-    to:
-    - 'googleapis/toolbox-bigtable'
-  - labels:
-    - 'product: mssql'
-    to:
-    - 'googleapis/toolbox-cloud-sql-mssql'
-  - labels:
-    - 'product: mysql'
-    to:
-    - 'googleapis/toolbox-cloud-sql-mysql'
-  - labels:
-    - 'product: postgres'
-    to:
-    - 'googleapis/toolbox-cloud-sql-postgres'
-  - labels:
-    - 'product: dataplex'
-    to:
-    - 'googleapis/toolbox-dataplex'
-  - labels:
-    - 'product: firestore'
-    to:
-    - 'googleapis/toolbox-firestore'
+    - Genesis929
+    - shobsi
+    - jiaxunwu
  - labels:
    - 'product: looker'
    to:
-    - 'googleapis/toolbox-looker'
-  - labels:
-    - 'product: spanner'
-    to:
-    - 'googleapis/toolbox-spanner'
+    - drstrangelooker
 assign_prs:
  - Yuan325
  - duwenxin99
-assign_prs_by:
-  - labels:
-    - 'product: alloydb'
-    to:
-    - 'googleapis/toolbox-alloydb'
-  - labels:
-    - 'product: bigquery'
-    to:
-    - 'googleapis/toolbox-bigquery'
-  - labels:
-    - 'product: bigtable'
-    to:
-    - 'googleapis/toolbox-bigtable'
-  - labels:
-    - 'product: mssql'
-    to:
-    - 'googleapis/toolbox-cloud-sql-mssql'
-  - labels:
-    - 'product: mysql'
-    to:
-    - 'googleapis/toolbox-cloud-sql-mysql'
-  - labels:
-    - 'product: postgres'
-    to:
-    - 'googleapis/toolbox-cloud-sql-postgres'
-  - labels:
-    - 'product: dataplex'
-    to:
-    - 'googleapis/toolbox-dataplex'
-  - labels:
-    - 'product: firestore'
-    to:
-    - 'googleapis/toolbox-firestore'
-  - labels:
-    - 'product: looker'
-    to:
-    - 'googleapis/toolbox-looker'
-  - labels:
-    - 'product: spanner'
-    to:
-    - 'googleapis/toolbox-spanner'
-
+  - averikitsch
--- a/.github/header-checker-lint.yml
+++ b/.github/header-checker-lint.yml
@@ -14,7 +14,6 @@

 allowedCopyrightHolders:
  - 'Google LLC'
-  - 'Oracle'
 allowedLicenses:
  - 'Apache-2.0'
 sourceFileExtensions:
@@ -23,5 +22,3 @@ sourceFileExtensions:
  - 'yml'
 ignoreFiles:
  - 'docs/en/getting-started/quickstart/**'
-  - '**/*oracle*'
-
--- a/.github/labels.yaml
+++ b/.github/labels.yaml
@@ -88,95 +88,11 @@
  color: 8befd7
  description: 'Status: reviewer is awaiting feedback or responses from the author before proceeding.'

- name: 'release candidate'
-  color: 32CD32
-  description: 'Use label to signal PR should be included in the next release.'
-
 # Product Labels
- name: 'product: alloydb'
-  color: 5065c7
-  description: 'AlloyDB'
 - name: 'product: bigquery'
  color: 5065c7
-  description: 'BigQuery'
- name: 'product: bigtable'
-  color: 5065c7
-  description: 'Bigtable'
- name: 'product: cassandra'
-  color: 5065c7
-  description: 'Cassandra'
- name: 'product: clickhouse'
-  color: 5065c7
-  description: 'ClickHouse'
- name: 'product: mssql'
-  color: 5065c7
-  description: 'SQL Server'
- name: 'product: mysql'
-  color: 5065c7
-  description: 'MySQL'
- name: 'product: postgres'
-  color: 5065c7
-  description: 'PostgreSQL'
- name: 'product: couchbase'
-  color: 5065c7
-  description: 'Couchbase'
- name: 'product: dataplex'
-  color: 5065c7
-  description: 'Dataplex'
- name: 'product: dgraph'
-  color: 5065c7
-  description: 'Dgraph'
- name: 'product: elasticsearch'
-  color: 5065c7
-  description: 'Elasticsearch'
- name: 'product: firebird'
-  color: 5065c7
-  description: 'Firebird'
- name: 'product: firestore'
-  color: 5065c7
-  description: 'Firestore'
+  description: 'Product: Assigned to the BigQuery team.'
+# Product Labels
 - name: 'product: looker'
  color: 5065c7
-  description: 'Looker'
- name: 'product: mindsdb'
-  color: 5065c7
-  description: 'MindsDB'
- name: 'product: mongodb'
-  color: 5065c7
-  description: 'MongoDB'
- name: 'product: neo4j'
-  color: 5065c7
-  description: 'Neo4j'
- name: 'product: oceanbase'
-  color: 5065c7
-  description: 'OceanBase'
- name: 'product: oracle'
-  color: 5065c7
-  description: 'Oracle'
- name: 'product: redis'
-  color: 5065c7
-  description: 'Redis'
- name: 'product: serverlessspark'
-  color: 5065c7
-  description: 'Serverless Spark'
- name: 'product: singlestore'
-  color: 5065c7
-  description: 'SingleStore'
- name: 'product: spanner'
-  color: 5065c7
-  description: 'Spanner'
- name: 'product: sqlite'
-  color: 5065c7
-  description: 'SQLite'
- name: 'product: tidb'
-  color: 5065c7
-  description: 'TiDB'
- name: 'product: trino'
-  color: 5065c7
-  description: 'Trino'
- name: 'product: valkey'
-  color: 5065c7
-  description: 'Valkey'
- name: 'product: yugabytedb'
-  color: 5065c7
-  description: 'YugabyteDB'
+  description: 'Product: Assigned to the Looker team.'
--- a/.github/release-please.yml
+++ b/.github/release-please.yml
@@ -20,32 +20,26 @@ 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/getting-started/quickstart/shared/configure_toolbox.md",
    "docs/en/samples/alloydb/_index.md",
-    "docs/en/samples/alloydb/mcp_quickstart.md",
-    "docs/en/samples/alloydb/ai-nl/alloydb_ai_nl.ipynb",
    "docs/en/samples/bigquery/local_quickstart.md",
    "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_gemini_oauth/_index.md",
-    "docs/en/samples/looker/looker_mcp_inspector/_index.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/neo4j_mcp.md",
-    "docs/en/how-to/connect-ide/sqlite_mcp.md",
-    "gemini-extension.json",
-    {
-        "type": "json",
-        "path": "server.json",
-        "jsonpath": "$.version"
-    },
-    {
-        "type": "json",
-        "path": "server.json",
-        "jsonpath": "$.packages[0].identifier"
-    },
+    "docs/en/how-to/connect-ide/spanner_mcp.md",
 ]
--- a/.github/renovate.json5
+++ b/.github/renovate.json5
@@ -24,23 +24,5 @@
      ],
      pinDigests: true,
    },
-    {
-      groupName: 'Go',
-      matchManagers: [
-        'gomod',
-      ],
-    },
-    {
-      groupName: 'Node',
-      matchManagers: [
-        'npm',
-      ],
-    },
-    {
-      groupName: 'Pip',
-      matchManagers: [
-        'pip_requirements',
-      ],
-    },
  ],
 }
--- a/.github/trusted-contribution.yml
+++ b/.github/trusted-contribution.yml
@@ -1,27 +0,0 @@
-# Copyright 2025 Google LLC
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# Trigger presubmit tests for trusted contributors
-# https://github.com/googleapis/repo-automation-bots/tree/main/packages/trusted-contribution
-# Install: https://github.com/apps/trusted-contributions-gcf
-
-trustedContributors:
-  - "dependabot[bot]"
-  - "renovate-bot"
-annotations:
-  # Trigger Cloud Build tests
-  - type: comment
-    text: "/gcbrun"
-  - type: label
-    text: "tests: run"
--- a/.github/workflows/cloud_build_failure_reporter.yml
+++ b/.github/workflows/cloud_build_failure_reporter.yml
@@ -37,7 +37,7 @@ jobs:
    runs-on: 'ubuntu-latest'

    steps:
-      - uses: 'actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd' # v8
+      - uses: 'actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea' # v7
        with:
          script: |-
                  // parse test names
--- a/.github/workflows/deploy_previous_version_docs.yaml
+++ b/.github/workflows/deploy_previous_version_docs.yaml
@@ -1,104 +0,0 @@
-# Copyright 2025 Google LLC
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-name: "Deploy Previous Version Docs"
-
-on:
-  workflow_dispatch:
-    inputs:
-      version_tag:
-        description: 'The old version tag to build docs for (e.g., v0.15.0)'
-        required: true
-        type: string
-
-jobs:
-  build_and_deploy:
-    runs-on: ubuntu-latest
-    permissions:
-      contents: write
-
-    steps:
-      - name: Checkout main branch (for latest templates and theme)
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
-        with:
-          ref: 'main'
-          submodules: 'recursive'
-          fetch-depth: 0
-
-      - name: Checkout old content from tag into a temporary directory
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
-        with:
-          ref: ${{ github.event.inputs.version_tag }}
-          path: 'old_version_source' # Checkout into a temp subdir
-          # Sparse checkout to only get the content directory
-          sparse-checkout: |
-            docs
-
-      - name: Replace content with old version
-        run: |
-          # Remove the current content directory from the main branch checkout
-          rm -rf docs/
-          # Move the old content directory into place
-          mv ./old_version_source/docs docs
-
-      - name: Setup Hugo and Node
-        uses: peaceiris/actions-hugo@75d2e84710de30f6ff7268e08f310b60ef14033f # v3
-        with:
-          hugo-version: "0.145.0"
-          extended: true
-      - uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6
-        with:
-          node-version: "22"
-
-      - name: Install Dependencies
-        run: npm ci
-        working-directory: .hugo
-
-      - name: Build Hugo Site for Archived Version
-        run: hugo --minify
-        working-directory: .hugo
-        env:
-          HUGO_BASEURL: https://${{ github.repository_owner }}.github.io/${{ github.event.repository.name }}/${{ github.event.inputs.version_tag }}/
-          HUGO_RELATIVEURLS: false
-
-      - name: Deploy to gh-pages
-        uses: peaceiris/actions-gh-pages@4f9cc6602d3f66b9c108549d475ec49e8ef4d45e # v4
-        with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          publish_dir: .hugo/public
-          publish_branch: versioned-gh-pages
-          destination_dir: ./${{ github.event.inputs.version_tag }}
-          keep_files: true
-          allow_empty_commit: true
-          commit_message: "docs(backport): deploy docs for ${{ github.event.inputs.version_tag }}"
-
-      - name: Clean Build Directory
-        run: rm -rf .hugo/public
-
-      - name: Build Hugo Site
-        run: hugo --minify
-        working-directory: .hugo
-        env:
-          HUGO_BASEURL: https://${{ github.repository_owner }}.github.io/${{ github.event.repository.name }}/
-          HUGO_RELATIVEURLS: false
-
-      - name: Deploy to root
-        uses: peaceiris/actions-gh-pages@4f9cc6602d3f66b9c108549d475ec49e8ef4d45e # v4
-        with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          publish_dir: .hugo/public
-          publish_branch: versioned-gh-pages
-          keep_files: true
-          allow_empty_commit: true
-          commit_message: "deploy: docs to root for ${{ github.event.inputs.version_tag }}"
--- a/.github/workflows/deploy_versioned_docs.yaml
+++ b/.github/workflows/deploy_versioned_docs.yaml
@@ -1,90 +0,0 @@
-# Copyright 2025 Google LLC
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-name: "Deploy Versioned Docs"
-
-permissions:
-  contents: write
-
-on:
-  release:
-    types: [published]
-
-jobs:
-  deploy:
-    runs-on: ubuntu-24.04
-    # This shared concurrency group ensures only one docs deployment runs at a time.
-    concurrency:
-      group: docs-deployment
-      cancel-in-progress: false
-    steps:
-      - name: Checkout Code at Tag
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
-        with:
-          ref: ${{ github.event.release.tag_name }}
-
-      - name: Get Version from Release Tag
-        run: echo "VERSION=${{ github.event.release.tag_name }}" >> $GITHUB_ENV
-
-      - name: Setup Hugo
-        uses: peaceiris/actions-hugo@75d2e84710de30f6ff7268e08f310b60ef14033f # v3
-        with:
-          hugo-version: "0.145.0"
-          extended: true
-
-      - name: Setup Node
-        uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6
-        with:
-          node-version: "22"
-
-      - name: Install Dependencies
-        run: npm ci
-        working-directory: .hugo
-
-      - name: Build Hugo Site
-        run: hugo --minify
-        working-directory: .hugo
-        env:
-          HUGO_BASEURL: https://${{ github.repository_owner }}.github.io/${{ github.event.repository.name }}/${{ env.VERSION }}/
-          HUGO_RELATIVEURLS: false
-
-      - name: Deploy
-        uses: peaceiris/actions-gh-pages@4f9cc6602d3f66b9c108549d475ec49e8ef4d45e # v4
-        with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          publish_dir: .hugo/public
-          publish_branch: versioned-gh-pages
-          destination_dir: ./${{ env.VERSION }}
-          keep_files: true
-          commit_message: "deploy: docs for ${{ env.VERSION }}"
-
-      - name: Clean Build Directory
-        run: rm -rf .hugo/public
-
-      - name: Build Hugo Site
-        run: hugo --minify
-        working-directory: .hugo
-        env:
-          HUGO_BASEURL: https://${{ github.repository_owner }}.github.io/${{ github.event.repository.name }}/
-          HUGO_RELATIVEURLS: false
-
-      - name: Deploy to root
-        uses: peaceiris/actions-gh-pages@4f9cc6602d3f66b9c108549d475ec49e8ef4d45e # v4
-        with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          publish_dir: .hugo/public
-          publish_branch: versioned-gh-pages
-          keep_files: true
-          allow_empty_commit: true
-          commit_message: "deploy: docs to root for ${{ env.VERSION }}"
--- a/.github/workflows/deploy_dev_docs.yaml
+++ b/.github/workflows/deploy_dev_docs.yaml
@@ -4,7 +4,7 @@
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
-#     http://www.apache.org/licenses/LICENSE-2.0
+#      http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.

-name: "Deploy In-development docs"
+name: "docs"

 permissions:
  contents: write
@@ -35,12 +35,11 @@ jobs:
    defaults:
      run:
        working-directory: .hugo
-    # This shared concurrency group ensures only one docs deployment runs at a time.
    concurrency:
-      group: docs-deployment
-      cancel-in-progress: false
+      group: ${{ github.workflow }}-${{ github.ref }}
+      cancel-in-progress: true
    steps:
-      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
        with:
          fetch-depth: 0 # Fetch all history for .GitInfo and .Lastmod

@@ -51,12 +50,12 @@ jobs:
          extended: true

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

      - name: Cache dependencies
-        uses: actions/cache@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5
+        uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4
        with:
          path: ~/.npm
          key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
@@ -66,20 +65,15 @@ jobs:
      - run: npm ci
      - run: hugo --minify
        env:
-          HUGO_BASEURL: https://${{ github.repository_owner }}.github.io/${{ github.event.repository.name }}/dev
+          HUGO_BASEURL: https://${{ github.repository_owner }}.github.io/${{ github.event.repository.name }}/
          HUGO_RELATIVEURLS: false

-      - name: Create Staging Directory
-        run: |
-          mkdir staging
-          mv public staging/dev
-          mv staging/dev/releases.releases staging/releases.releases
-
      - name: Deploy
        uses: peaceiris/actions-gh-pages@4f9cc6602d3f66b9c108549d475ec49e8ef4d45e # v4
        with:
          github_token: ${{ secrets.GITHUB_TOKEN }}
-          publish_dir: ./.hugo/staging
-          publish_branch: versioned-gh-pages
+          publish_dir: .hugo/public
+          # Do not delete previews on each production deploy.
+          # CSS or JS changes will require manual clean-up.
          keep_files: true
          commit_message: "deploy: ${{ github.event.head_commit.message }}"
--- a/.github/workflows/docs_preview_clean.yaml
+++ b/.github/workflows/docs_preview_clean.yaml
@@ -34,9 +34,9 @@ jobs:
      group: "preview-${{ github.event.number }}"
      cancel-in-progress: true
    steps:
-      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
        with:
-          ref: versioned-gh-pages
+          ref: gh-pages

      - name: Remove Preview
        run: |
@@ -48,7 +48,7 @@ jobs:
          git push

      - name: Comment
-        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8
+        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7
        with:
          script: |
            github.rest.issues.createComment({
@@ -56,4 +56,4 @@ jobs:
              owner: context.repo.owner,
              repo: context.repo.repo,
              body: "🧨 Preview deployments removed."
-            })
+            })
--- a/.github/workflows/docs_preview_deploy.yaml
+++ b/.github/workflows/docs_preview_deploy.yaml
@@ -49,7 +49,7 @@ jobs:
      group: "preview-${{ github.event.number }}"
      cancel-in-progress: true
    steps:
-      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
        with:
          # Checkout the PR's HEAD commit (supports forks).
          ref: ${{ github.event.pull_request.head.sha }}
@@ -62,12 +62,12 @@ jobs:
          extended: true

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

      - name: Cache dependencies
-        uses: actions/cache@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5
+        uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4
        with:
          path: ~/.npm
          key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
@@ -86,12 +86,11 @@ jobs:
        with:
          github_token: ${{ secrets.GITHUB_TOKEN }}
          publish_dir: .hugo/public
-          publish_branch: versioned-gh-pages
          destination_dir: ./previews/PR-${{ github.event.number }}
          commit_message: "stage: PR-${{ github.event.number }}: ${{ github.event.head_commit.message }}"

      - name: Comment
-        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8
+        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7
        with:
          script: |
            github.rest.issues.createComment({
--- a/.github/workflows/link_checker_workflow.yaml
+++ b/.github/workflows/link_checker_workflow.yaml
@@ -1,68 +0,0 @@
-# Copyright 2025 Google LLC
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-name: Link Checker
-
-on:
-  pull_request:
-
-
-jobs:
-  link-check:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout Repository
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
-
-      - name: Restore lychee cache
-        uses: actions/cache@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5
-        with:
-          path: .lycheecache
-          key: cache-lychee-${{ github.sha }}
-          restore-keys: cache-lychee-
-
-      - name: Link Checker
-        id: lychee-check       
-        uses: lycheeverse/lychee-action@a8c4c7cb88f0c7386610c35eb25108e448569cb0 # v2
-        continue-on-error: true 
-        with:
-          args: >
-            --quiet
-            --no-progress
-            --cache
-            --max-cache-age 1d
-            --exclude '^neo4j\+.*' --exclude '^bolt://.*'
-            README.md
-            docs/
-          output: lychee-report.md
-          format: markdown
-          fail: true           
-          jobSummary: false    
-          debug: false
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Display Failure Report
-        # Run this ONLY if the link checker failed
-        if: steps.lychee-check.outcome == 'failure'
-        run: |
-          echo "## Link Resolution Note" >> $GITHUB_STEP_SUMMARY
-          echo "Local links and directory changes work differently on GitHub than on the docsite." >> $GITHUB_STEP_SUMMARY
-          echo "You must ensure fixes pass the **GitHub check** and also work with **\`hugo server\`**." >> $GITHUB_STEP_SUMMARY
-          echo "See [Link Checking and Fixing with Lychee](https://github.com/googleapis/genai-toolbox/blob/main/DEVELOPER.md#link-checking-and-fixing-with-lychee) for more details." >> $GITHUB_STEP_SUMMARY
-          echo "---" >> $GITHUB_STEP_SUMMARY
-
-          echo "### Broken Links Found" >> $GITHUB_STEP_SUMMARY
-          cat ./lychee-report.md >> $GITHUB_STEP_SUMMARY
-
-          exit 1
--- a/.github/workflows/lint.yaml
+++ b/.github/workflows/lint.yaml
@@ -36,7 +36,7 @@ jobs:
    steps:
      - name: Remove PR Label
        if: "${{ github.event.action == 'labeled' && github.event.label.name == 'tests: run' }}"
-        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
+        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
        with:
          github-token: ${{ secrets.GITHUB_TOKEN }}
          script: |
@@ -51,11 +51,11 @@ jobs:
              console.log('Failed to remove label. Another job may have already removed it!');
            }
      - name: Setup Go
-        uses: actions/setup-go@7a3fe6cf4cb3a834922a1244abfce67bcef6a0c5 # v6.2.0
+        uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
        with:
-          go-version: "1.25"
+          go-version: "1.22"
      - name: Checkout code
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.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 }}
@@ -66,7 +66,7 @@ jobs:
        run: |
          go mod tidy && git diff --exit-code
      - name: golangci-lint
-        uses: golangci/golangci-lint-action@1e7e51e771db61008b38414a730f564565cf7c20 # v9.2.0
+        uses: golangci/golangci-lint-action@4afd733a84b1f43292c63897423277bb7f4313a9 # v8.0.0
        with:
          version: latest
-          args: --timeout 10m
+          args: --timeout 3m
--- a/.github/workflows/publish-mcp.yml
+++ b/.github/workflows/publish-mcp.yml
@@ -1,73 +0,0 @@
-# Copyright 2025 Google LLC
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-name: Publish to MCP Registry
-
-on:
-  push:
-    tags: ["v*"]  # Triggers on version tags like v1.0.0
-  # allow manual triggering with no inputs required
-  workflow_dispatch:
-
-jobs:
-  publish:
-    runs-on: ubuntu-latest
-    permissions:
-      id-token: write  # Required for OIDC authentication
-      contents: read
-
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
-
-      - name: Wait for image in Artifact Registry
-        shell: bash
-        run: |
-          MAX_ATTEMPTS=10
-          VERSION=$(jq -r '.version' server.json)
-          REGISTRY_URL="https://us-central1-docker.pkg.dev/v2/database-toolbox/toolbox/toolbox/manifests/${VERSION}"
-
-          # initially sleep time to wait for the version release
-          sleep 3m
-
-          for i in $(seq 1 ${MAX_ATTEMPTS}); do
-            echo "Attempt $i: Checking for image ${REGISTRY_URL}..."
-            # Use curl to check the manifest header
-            # Using -I to fetch headers only, -s silent, -f fail fast on errors.
-            curl -Isf "${REGISTRY_URL}" > /dev/null
-
-            if [ $? -eq 0 ]; then
-              echo "✅ Image found! Continuing to next steps."
-              exit 0
-            else
-              echo "❌ Image not found (likely 404 error) on attempt $i."
-              if [ $i -lt ${MAX_ATTEMPTS} ]; then
-                echo "Sleeping for 5 minutes before next attempt..."
-                sleep 2m
-              else
-                echo "Maximum attempts reached. Image not found."
-                exit 1
-              fi
-            fi
-          done
-
-      - name: Install MCP Publisher
-        run: |
-          curl -L "https://github.com/modelcontextprotocol/registry/releases/latest/download/mcp-publisher_$(uname -s | tr '[:upper:]' '[:lower:]')_$(uname -m | sed 's/x86_64/amd64/;s/aarch64/arm64/').tar.gz" | tar xz mcp-publisher
-
-      - name: Login to MCP Registry
-        run: ./mcp-publisher login github-oidc
-
-      - name: Publish to MCP Registry
-        run: ./mcp-publisher publish
--- 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@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.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
@@ -41,7 +41,7 @@ jobs:
    steps:
      - name: Remove PR label
        if: "${{ github.event.action == 'labeled' && github.event.label.name == 'tests: run' }}"
-        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
+        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
        with:
          github-token: ${{ secrets.GITHUB_TOKEN }}
          script: |
@@ -57,12 +57,12 @@ jobs:
            }

      - name: Setup Go
-        uses: actions/setup-go@7a3fe6cf4cb3a834922a1244abfce67bcef6a0c5 # v6.2.0
+        uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
        with:
-          go-version: "1.24"
+          go-version: "1.22"

      - name: Checkout code
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.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 }}
@@ -81,12 +81,11 @@ jobs:
        run: |
          source_dir="./internal/sources/*"
          tool_dir="./internal/tools/*"
-          prompt_dir="./internal/prompts/*"
          auth_dir="./internal/auth/*"
          int_test_dir="./tests/*"
-          included_packages=$(go list ./... | grep -v -e "$source_dir" -e "$tool_dir"  -e "$prompt_dir" -e "$auth_dir" -e "$int_test_dir")
+          included_packages=$(go list ./... | grep -v -e "$source_dir" -e "$tool_dir" -e "$auth_dir" -e "$int_test_dir")
          go test -race -cover -coverprofile=coverage.out -v $included_packages
-          go test -race -v ./internal/sources/... ./internal/tools/... ./internal/prompts/... ./internal/auth/...
+          go test -race -v ./internal/sources/... ./internal/tools/... ./internal/auth/...

      - name: Run tests without coverage
        if: ${{ runner.os != 'Linux' }}
--- a/.gitignore
+++ b/.gitignore
@@ -20,4 +20,4 @@ node_modules

 # executable
 genai-toolbox
-toolbox
+toolbox
--- a/.golangci.yaml
+++ b/.golangci.yaml
@@ -23,6 +23,8 @@ linters:
  exclusions:
    presets:
      - std-error-handling
+issues:
+  fix: true
 formatters:
  enable:
    - goimports
--- a/.hugo/assets/scss/_styles_project.scss
+++ b/.hugo/assets/scss/_styles_project.scss
@@ -1,9 +1 @@
-@import 'td/code-dark';
-
-// Make tabs scrollable horizontally instead of wrapping
-.nav-tabs {
-  flex-wrap: nowrap;
-  white-space: nowrap;
-  overflow-x: auto;
-  overflow-y: hidden;
-}
+@import 'td/code-dark';
--- a/.hugo/hugo.toml
+++ b/.hugo/hugo.toml
@@ -1,5 +1,5 @@
 title = 'MCP Toolbox for Databases'
-relativeURLs = false
+relativeURLs = true

 languageCode = 'en-us'
 defaultContentLanguage = "en"
@@ -36,7 +36,6 @@ ignoreFiles = ["quickstart/shared", "quickstart/python", "quickstart/js", "quick
  github_project_repo = "https://github.com/googleapis/genai-toolbox"
  github_subdir = "docs"
  offlineSearch = true
-  version_menu = "Releases"
  [params.ui]
    ul_show = 100
    showLightDarkModeMenu = true
@@ -44,90 +43,6 @@ ignoreFiles = ["quickstart/shared", "quickstart/python", "quickstart/js", "quick
    sidebar_menu_foldable = true
    sidebar_menu_compact = false

-[[params.versions]]
-  version = "Dev"
-  url = "https://googleapis.github.io/genai-toolbox/dev/"
-
-# Add a new version block here before every release
-# The order of versions in this file is mirrored into the dropdown
-
-[[params.versions]]
-  version = "v0.26.0"
-  url = "https://googleapis.github.io/genai-toolbox/v0.26.0/"
-
-[[params.versions]]
-  version = "v0.25.0"
-  url = "https://googleapis.github.io/genai-toolbox/v0.25.0/"
-
-[[params.versions]]
-  version = "v0.24.0"
-  url = "https://googleapis.github.io/genai-toolbox/v0.24.0/"
-
-[[params.versions]]
-  version = "v0.23.0"
-  url = "https://googleapis.github.io/genai-toolbox/v0.23.0/"
-
-[[params.versions]]
-  version = "v0.22.0"
-  url = "https://googleapis.github.io/genai-toolbox/v0.22.0/"
-
-[[params.versions]]
-  version = "v0.21.0"
-  url = "https://googleapis.github.io/genai-toolbox/v0.21.0/"
-  
-[[params.versions]]
-  version = "v0.20.0"
-  url = "https://googleapis.github.io/genai-toolbox/v0.20.0/"
-  
-[[params.versions]]
-  version = "v0.19.1"
-  url = "https://googleapis.github.io/genai-toolbox/v0.19.1/"
-  
-[[params.versions]]
-  version = "v0.18.0"
-  url = "https://googleapis.github.io/genai-toolbox/v0.18.0/"
-  
-[[params.versions]]
-  version = "v0.17.0"
-  url = "https://googleapis.github.io/genai-toolbox/v0.17.0/"
-  
-[[params.versions]]
-  version = "v0.16.0"
-  url = "https://googleapis.github.io/genai-toolbox/v0.16.0/"
-
-[[params.versions]]
-  version = "v0.15.0"
-  url = "https://googleapis.github.io/genai-toolbox/v0.15.0/"
-
-[[params.versions]]
-  version = "v0.14.0"
-  url = "https://googleapis.github.io/genai-toolbox/v0.14.0/"
-
-[[params.versions]]
-  version = "v0.13.0"
-  url = "https://googleapis.github.io/genai-toolbox/v0.13.0/"
-
-[[params.versions]]
-  version = "v0.12.0"
-  url = "https://googleapis.github.io/genai-toolbox/v0.12.0/"
-
-[[params.versions]]
-  version = "v0.11.0"
-  url = "https://googleapis.github.io/genai-toolbox/v0.11.0/"
-
-[[params.versions]]
-  version = "v0.10.0"
-  url = "https://googleapis.github.io/genai-toolbox/v0.10.0/"
-
-[[params.versions]]
-  version = "v0.9.0"
-  url = "https://googleapis.github.io/genai-toolbox/v0.9.0/"
-
-[[params.versions]]
-  version = "v0.8.0"
-  url = "https://googleapis.github.io/genai-toolbox/v0.8.0/"
-
-
 [[menu.main]]
  name = "GitHub"
  weight = 50
@@ -152,13 +67,6 @@ ignoreFiles = ["quickstart/shared", "quickstart/python", "quickstart/js", "quick
    baseName = "llms-full"
    isPlainText = true
    root = true
-  [outputFormats.releases]
-    baseName = 'releases'
-    isPlainText = true
-    mediaType = 'text/releases'
-
-[mediaTypes."text/releases"]
-  suffixes = ["releases"]

 [outputs]
-  home = ["HTML", "RSS", "LLMS", "LLMS-FULL", "releases"]
+  home = ["HTML", "RSS", "LLMS", "LLMS-FULL"]
--- a/.hugo/layouts/_default/home.releases.releases
+++ b/.hugo/layouts/_default/home.releases.releases
@@ -1,9 +0,0 @@
-{{ if .Site.Params.versions -}}
-  {{ $path := "" -}}
-  {{ if .Site.Params.version_menu_pagelinks -}}
-    {{ $path = .Page.RelPermalink -}}
-  {{ end -}}
-  {{ range .Site.Params.versions -}}
-  <a class="dropdown-item" href="{{ .url }}{{ $path }}">{{ .version }}</a>
-  {{ end -}}
-{{ end -}}
--- a/.hugo/layouts/partials/hooks/head-end.html
+++ b/.hugo/layouts/partials/hooks/head-end.html
@@ -1 +0,0 @@
-<script src='{{ .Site.BaseURL }}js/w3.js' type="application/x-javascript"></script>
--- a/.hugo/layouts/partials/navbar-version-selector.html
+++ b/.hugo/layouts/partials/navbar-version-selector.html
@@ -1,12 +0,0 @@
-{{ if .Site.Params.versions -}}
-<a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-bs-toggle="dropdown" aria-expanded="false">
-   {{ .Site.Params.version_menu }}
-</a>
-<div class="dropdown-menu" aria-labelledby="navbarDropdown">
-   <div w3-include-html="/genai-toolbox/releases.releases" w3-include-html-default='<a class="dropdown-item" href="/genai-toolbox/dev/">Dev</a>'></div>
-   <script>
-     // This must run after the w3.js script has loaded.
-     w3.includeHTML();
-   </script>
-</div>
-{{ end -}}
--- a/.hugo/package-lock.json
+++ b/.hugo/package-lock.json
@@ -1,5 +1,5 @@
 {
-  "name": ".hugo",
+  "name": "docs2",
  "lockfileVersion": 3,
  "requires": true,
  "packages": {
--- a/.hugo/static/js/w3.js
+++ b/.hugo/static/js/w3.js
@@ -1,405 +0,0 @@
-/* W3.JS 1.04 April 2019 by w3schools.com */
-"use strict";
-var w3 = {};
-w3.hide = function (sel) {
-  w3.hideElements(w3.getElements(sel));
-};
-w3.hideElements = function (elements) {
-  var i, l = elements.length;
-  for (i = 0; i < l; i++) {
-    w3.hideElement(elements[i]);
-  }
-};
-w3.hideElement = function (element) {
-  w3.styleElement(element, "display", "none");
-};
-w3.show = function (sel, a) {
-  var elements = w3.getElements(sel);
-  if (a) {w3.hideElements(elements);}
-  w3.showElements(elements);
-};
-w3.showElements = function (elements) {
-  var i, l = elements.length;
-  for (i = 0; i < l; i++) {
-    w3.showElement(elements[i]);
-  }
-};
-w3.showElement = function (element) {
-  w3.styleElement(element, "display", "block");
-};
-w3.addStyle = function (sel, prop, val) {
-  w3.styleElements(w3.getElements(sel), prop, val);
-};
-w3.styleElements = function (elements, prop, val) {
-  var i, l = elements.length;
-  for (i = 0; i < l; i++) {
-    w3.styleElement(elements[i], prop, val);
-  }
-};
-w3.styleElement = function (element, prop, val) {
-  element.style.setProperty(prop, val);
-};
-w3.toggleShow = function (sel) {
-  var i, x = w3.getElements(sel), l = x.length;
-  for (i = 0; i < l; i++) {
-    if (x[i].style.display == "none") {
-      w3.styleElement(x[i], "display", "block");
-    } else {
-      w3.styleElement(x[i], "display", "none");
-    }
-  }
-};
-w3.addClass = function (sel, name) {
-  w3.addClassElements(w3.getElements(sel), name);
-};
-w3.addClassElements = function (elements, name) {
-  var i, l = elements.length;
-  for (i = 0; i < l; i++) {
-    w3.addClassElement(elements[i], name);
-  }
-};
-w3.addClassElement = function (element, name) {
-  var i, arr1, arr2;
-  arr1 = element.className.split(" ");
-  arr2 = name.split(" ");
-  for (i = 0; i < arr2.length; i++) {
-    if (arr1.indexOf(arr2[i]) == -1) {element.className += " " + arr2[i];}
-  }
-};
-w3.removeClass = function (sel, name) {
-  w3.removeClassElements(w3.getElements(sel), name);
-};
-w3.removeClassElements = function (elements, name) {
-  var i, l = elements.length, arr1, arr2, j;
-  for (i = 0; i < l; i++) {
-    w3.removeClassElement(elements[i], name);
-  }
-};
-w3.removeClassElement = function (element, name) {
-  var i, arr1, arr2;
-  arr1 = element.className.split(" ");
-  arr2 = name.split(" ");
-  for (i = 0; i < arr2.length; i++) {
-    while (arr1.indexOf(arr2[i]) > -1) {
-      arr1.splice(arr1.indexOf(arr2[i]), 1);
-    }
-  }
-  element.className = arr1.join(" ");
-};
-w3.toggleClass = function (sel, c1, c2) {
-  w3.toggleClassElements(w3.getElements(sel), c1, c2);
-};
-w3.toggleClassElements = function (elements, c1, c2) {
-  var i, l = elements.length;
-  for (i = 0; i < l; i++) {
-    w3.toggleClassElement(elements[i], c1, c2);
-  }
-};
-w3.toggleClassElement = function (element, c1, c2) {
-  var t1, t2, t1Arr, t2Arr, j, arr, allPresent;
-  t1 = (c1 || "");
-  t2 = (c2 || "");
-  t1Arr = t1.split(" ");
-  t2Arr = t2.split(" ");
-  arr = element.className.split(" ");
-  if (t2Arr.length == 0) {
-    allPresent = true;
-    for (j = 0; j < t1Arr.length; j++) {
-      if (arr.indexOf(t1Arr[j]) == -1) {allPresent = false;}
-    }
-    if (allPresent) {
-      w3.removeClassElement(element, t1);
-    } else {
-      w3.addClassElement(element, t1);
-    }
-  } else {
-    allPresent = true;
-    for (j = 0; j < t1Arr.length; j++) {
-      if (arr.indexOf(t1Arr[j]) == -1) {allPresent = false;}
-    }
-    if (allPresent) {
-      w3.removeClassElement(element, t1);
-      w3.addClassElement(element, t2);
-    } else {
-      w3.removeClassElement(element, t2);
-      w3.addClassElement(element, t1);
-    }
-  }
-};
-w3.getElements = function (id) {
-  if (typeof id == "object") {
-    return [id];
-  } else {
-    return document.querySelectorAll(id);
-  }
-};
-w3.filterHTML = function(id, sel, filter) {
-  var a, b, c, i, ii, iii, hit;
-  a = w3.getElements(id);
-  for (i = 0; i < a.length; i++) {
-    b = a[i].querySelectorAll(sel);
-    for (ii = 0; ii < b.length; ii++) {
-      hit = 0;
-      if (b[ii].innerText.toUpperCase().indexOf(filter.toUpperCase()) > -1) {
-        hit = 1;
-      }
-      c = b[ii].getElementsByTagName("*");
-      for (iii = 0; iii < c.length; iii++) {
-        if (c[iii].innerText.toUpperCase().indexOf(filter.toUpperCase()) > -1) {
-          hit = 1;
-        }
-      }
-      if (hit == 1) {
-        b[ii].style.display = "";
-      } else {
-        b[ii].style.display = "none";
-      }
-    }
-  }
-};
-w3.sortHTML = function(id, sel, sortvalue) {
-  var a, b, i, ii, y, bytt, v1, v2, cc, j;
-  a = w3.getElements(id);
-  for (i = 0; i < a.length; i++) {
-    for (j = 0; j < 2; j++) {
-      cc = 0;
-      y = 1;
-      while (y == 1) {
-        y = 0;
-        b = a[i].querySelectorAll(sel);
-        for (ii = 0; ii < (b.length - 1); ii++) {
-          bytt = 0;
-          if (sortvalue) {
-            v1 = b[ii].querySelector(sortvalue).innerText;
-            v2 = b[ii + 1].querySelector(sortvalue).innerText;
-          } else {
-            v1 = b[ii].innerText;
-            v2 = b[ii + 1].innerText;
-          }
-          v1 = v1.toLowerCase();
-          v2 = v2.toLowerCase();
-          if ((j == 0 && (v1 > v2)) || (j == 1 && (v1 < v2))) {
-            bytt = 1;
-            break;
-          }
-        }
-        if (bytt == 1) {
-          b[ii].parentNode.insertBefore(b[ii + 1], b[ii]);
-          y = 1;
-          cc++;
-        }
-      }
-      if (cc > 0) {break;}
-    }
-  }
-};
-w3.slideshow = function (sel, ms, func) {
-  var i, ss, x = w3.getElements(sel), l = x.length;
-  ss = {};
-  ss.current = 1;
-  ss.x = x;
-  ss.ondisplaychange = func;
-  if (!isNaN(ms) || ms == 0) {
-    ss.milliseconds = ms;
-  } else {
-    ss.milliseconds = 1000;
-  }
-  ss.start = function() {
-    ss.display(ss.current)
-    if (ss.ondisplaychange) {ss.ondisplaychange();}
-    if (ss.milliseconds > 0) {
-      window.clearTimeout(ss.timeout);
-      ss.timeout = window.setTimeout(ss.next, ss.milliseconds);
-    }
-  };
-  ss.next = function() {
-    ss.current += 1;
-    if (ss.current > ss.x.length) {ss.current = 1;}
-    ss.start();
-  };
-  ss.previous = function() {
-    ss.current -= 1;
-    if (ss.current < 1) {ss.current = ss.x.length;}
-    ss.start();
-  };
-  ss.display = function (n) {
-    w3.styleElements(ss.x, "display", "none");
-    w3.styleElement(ss.x[n - 1], "display", "block");
-  }
-  ss.start();
-  return ss;
-};
-w3.includeHTML = function(cb) {
-  var z, i, elmnt, file, xhttp;
-  z = document.getElementsByTagName("*");
-  for (i = 0; i < z.length; i++) {
-    elmnt = z[i];
-    file = elmnt.getAttribute("w3-include-html");
-    if (file) {
-      xhttp = new XMLHttpRequest();
-      xhttp.onreadystatechange = function() {
-        if (this.readyState == 4) {
-          if (this.status == 200) {elmnt.innerHTML = this.responseText;}
-          if (this.status == 404) {
-            if (elmnt.getAttribute("w3-include-html-default")) {
-              elmnt.innerHTML = elmnt.getAttribute("w3-include-html-default");
-            }
-            else { elmnt.innerHTML = "Page not found."; }
-          }
-          elmnt.removeAttribute("w3-include-html");
-          w3.includeHTML(cb);
-        }
-      }
-      xhttp.open("GET", file, true);
-      xhttp.send();
-      return;
-    }
-  }
-  if (cb) cb();
-};
-w3.getHttpData = function (file, func) {
-  w3.http(file, function () {
-    if (this.readyState == 4 && this.status == 200) {
-      func(this.responseText);
-    }
-  });
-};
-w3.getHttpObject = function (file, func) {
-  w3.http(file, function () {
-    if (this.readyState == 4 && this.status == 200) {
-      func(JSON.parse(this.responseText));
-    }
-  });
-};
-w3.displayHttp = function (id, file) {
-  w3.http(file, function () {
-    if (this.readyState == 4 && this.status == 200) {
-      w3.displayObject(id, JSON.parse(this.responseText));
-    }
-  });
-};
-w3.http = function (target, readyfunc, xml, method) {
-  var httpObj;
-  if (!method) {method = "GET"; }
-  if (window.XMLHttpRequest) {
-    httpObj = new XMLHttpRequest();
-  } else if (window.ActiveXObject) {
-    httpObj = new ActiveXObject("Microsoft.XMLHTTP");
-  }
-  if (httpObj) {
-    if (readyfunc) {httpObj.onreadystatechange = readyfunc;}
-    httpObj.open(method, target, true);
-    httpObj.send(xml);
-  }
-};
-w3.getElementsByAttribute = function (x, att) {
-  var arr = [], arrCount = -1, i, l, y = x.getElementsByTagName("*"), z = att.toUpperCase();
-  l = y.length;
-  for (i = -1; i < l; i += 1) {
-    if (i == -1) {y[i] = x;}
-    if (y[i].getAttribute(z) !== null) {arrCount += 1; arr[arrCount] = y[i];}
-  }
-  return arr;
-};  
-w3.dataObject = {},
-w3.displayObject = function (id, data) {
-  var htmlObj, htmlTemplate, html, arr = [], a, l, rowClone, x, j, i, ii, cc, repeat, repeatObj, repeatX = "";
-  htmlObj = document.getElementById(id);
-  htmlTemplate = init_template(id, htmlObj);
-  html = htmlTemplate.cloneNode(true);
-  arr = w3.getElementsByAttribute(html, "w3-repeat");
-  l = arr.length;
-  for (j = (l - 1); j >= 0; j -= 1) {
-    cc = arr[j].getAttribute("w3-repeat").split(" ");
-    if (cc.length == 1) {
-      repeat = cc[0];
-    } else {
-      repeatX = cc[0];
-      repeat = cc[2];
-    }
-    arr[j].removeAttribute("w3-repeat");
-    repeatObj = data[repeat];
-    if (repeatObj && typeof repeatObj == "object" && repeatObj.length != "undefined") {
-      i = 0;
-      for (x in repeatObj) {
-        i += 1;
-        rowClone = arr[j];
-        rowClone = w3_replace_curly(rowClone, "element", repeatX, repeatObj[x]);
-        a = rowClone.attributes;
-        for (ii = 0; ii < a.length; ii += 1) {
-          a[ii].value = w3_replace_curly(a[ii], "attribute", repeatX, repeatObj[x]).value;
-        }
-        (i === repeatObj.length) ? arr[j].parentNode.replaceChild(rowClone, arr[j]) : arr[j].parentNode.insertBefore(rowClone, arr[j]);
-      }
-    } else {
-      console.log("w3-repeat must be an array. " + repeat + " is not an array.");
-      continue;
-    }
-  }
-  html = w3_replace_curly(html, "element");
-  htmlObj.parentNode.replaceChild(html, htmlObj);
-  function init_template(id, obj) {
-    var template;
-    template = obj.cloneNode(true);
-    if (w3.dataObject.hasOwnProperty(id)) {return w3.dataObject[id];}
-    w3.dataObject[id] = template;
-    return template;
-  }
-  function w3_replace_curly(elmnt, typ, repeatX, x) {
-    var value, rowClone, pos1, pos2, originalHTML, lookFor, lookForARR = [], i, cc, r;
-    rowClone = elmnt.cloneNode(true);
-    pos1 = 0;
-    while (pos1 > -1) {
-      originalHTML = (typ == "attribute") ? rowClone.value : rowClone.innerHTML;
-      pos1 = originalHTML.indexOf("{{", pos1);
-      if (pos1 === -1) {break;}
-      pos2 = originalHTML.indexOf("}}", pos1 + 1);
-      lookFor = originalHTML.substring(pos1 + 2, pos2);
-      lookForARR = lookFor.split("||");
-      value = undefined;
-      for (i = 0; i < lookForARR.length; i += 1) {
-        lookForARR[i] = lookForARR[i].replace(/^\s+|\s+$/gm, ''); //trim
-        if (x) {value = x[lookForARR[i]];}
-        if (value == undefined && data) {value = data[lookForARR[i]];}
-        if (value == undefined) {
-          cc = lookForARR[i].split(".");
-          if (cc[0] == repeatX) {value = x[cc[1]]; }
-        }
-        if (value == undefined) {
-          if (lookForARR[i] == repeatX) {value = x;}
-        }
-        if (value == undefined) {
-          if (lookForARR[i].substr(0, 1) == '"') {
-            value = lookForARR[i].replace(/"/g, "");
-          } else if (lookForARR[i].substr(0,1) == "'") {
-            value = lookForARR[i].replace(/'/g, "");
-          }
-        }
-        if (value != undefined) {break;}
-      }
-      if (value != undefined) {
-        r = "{{" + lookFor + "}}";
-        if (typ == "attribute") {
-          rowClone.value = rowClone.value.replace(r, value);
-        } else {
-          w3_replace_html(rowClone, r, value);
-        }
-      }
-      pos1 = pos1 + 1;
-    }
-    return rowClone;
-  }
-  function w3_replace_html(a, r, result) {
-    var b, l, i, a, x, j;
-    if (a.hasAttributes()) {
-      b = a.attributes;
-      l = b.length;
-      for (i = 0; i < l; i += 1) {
-        if (b[i].value.indexOf(r) > -1) {b[i].value = b[i].value.replace(r, result);}
-      }
-    }
-    x = a.getElementsByTagName("*");
-    l = x.length;
-    a.innerHTML = a.innerHTML.replace(r, result);
-  }
-};
--- a/.lycheeignore
+++ b/.lycheeignore
@@ -1,44 +0,0 @@
-# Ignore documentation placeholders and generic example domains
-^https?://([a-zA-Z0-9-]+\.)?example\.com(:\d+)?(/.*)?$
-^http://example\.net
-
-# Shields.io badges often trigger rate limits or intermittent 503s
-^https://img\.shields\.io/.*
-
-# PDF files are ignored as lychee cannot reliably parse internal PDF links
-\.pdf$
-
-# Standard mailto: protocol is not a web URL
-^mailto:
-
-# Ignore local development endpoints that won't resolve in CI/CD environments
-^https?://(127\.0\.0\.1|localhost)(:\d+)?(/.*)?$
-
-# Placeholder for Google Cloud Run service discovery
-https://cloud-run-url.app/
-
-# DGraph Cloud and private instance endpoints
-https://xxx.cloud.dgraph.io/
-https://cloud.dgraph.io/login
-https://dgraph.io/docs
-
-# MySQL Community downloads and main site (often protected by bot mitigation)
-^https?://(.*\.)?mysql\.com/.*
-
-# Claude desktop download link
-https://claude.ai/download
-
-# Google Cloud Run product page
-https://cloud.google.com/run
-
-# These specific deep links are known to cause redirect loops or 403s in automated scrapers
-https://dev.mysql.com/doc/refman/8.4/en/sql-prepared-statements.html
-https://dev.mysql.com/doc/refman/8.4/en/user-names.html
-
-# npmjs links can occasionally trigger rate limiting during high-frequency CI builds
-^https?://(www\.)?npmjs\.com/.*
-
-https://www.oceanbase.com/
-
-# Ignore social media and blog profiles to reduce external request overhead
-https://medium.com/@mcp_toolbox
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,384 +1,5 @@
 # Changelog

-## [0.26.0](https://github.com/googleapis/genai-toolbox/compare/v0.25.0...v0.26.0) (2026-01-22)
-
-
-### ⚠ BREAKING CHANGES
-
-* Validate tool naming ([#2305](https://github.com/googleapis/genai-toolbox/issues/2305)) ([5054212](https://github.com/googleapis/genai-toolbox/commit/5054212fa43017207fe83275d27b9fbab96e8ab5))
-* **tools/cloudgda:** Update description and parameter name for cloudgda tool ([#2288](https://github.com/googleapis/genai-toolbox/issues/2288)) ([6b02591](https://github.com/googleapis/genai-toolbox/commit/6b025917032394a66840488259db8ff2c3063016))
-
-### Features
-
-* Add new `user-agent-metadata` flag ([#2302](https://github.com/googleapis/genai-toolbox/issues/2302)) ([adc9589](https://github.com/googleapis/genai-toolbox/commit/adc9589766904d9e3cbe0a6399222f8d4bb9d0cc))
-* Add remaining flag to Toolbox server in MCP registry ([#2272](https://github.com/googleapis/genai-toolbox/issues/2272)) ([5e0999e](https://github.com/googleapis/genai-toolbox/commit/5e0999ebf5cdd9046e96857738254b2e0561b6d2))
-* **embeddingModel:** Add embedding model to MCP handler ([#2310](https://github.com/googleapis/genai-toolbox/issues/2310)) ([e4f60e5](https://github.com/googleapis/genai-toolbox/commit/e4f60e56335b755ef55b9553d3f40b31858ec8d9))
-* **sources/bigquery:** Make maximum rows returned from queries configurable ([#2262](https://github.com/googleapis/genai-toolbox/issues/2262)) ([4abf0c3](https://github.com/googleapis/genai-toolbox/commit/4abf0c39e717d53b22cc61efb65e09928c598236))
-* **prebuilt/cloud-sql:** Add create backup tool for Cloud SQL ([#2141](https://github.com/googleapis/genai-toolbox/issues/2141)) ([8e0fb03](https://github.com/googleapis/genai-toolbox/commit/8e0fb0348315a80f63cb47b3c7204869482448f4))
-* **prebuilt/cloud-sql:** Add restore backup tool for Cloud SQL ([#2171](https://github.com/googleapis/genai-toolbox/issues/2171)) ([00c3e6d](https://github.com/googleapis/genai-toolbox/commit/00c3e6d8cba54e2ab6cb271c7e6b378895df53e1))
-* Support combining multiple prebuilt configurations ([#2295](https://github.com/googleapis/genai-toolbox/issues/2295)) ([e535b37](https://github.com/googleapis/genai-toolbox/commit/e535b372ea81864d644a67135a1b07e4e519b4b4))
-* Support MCP specs version 2025-11-25 ([#2303](https://github.com/googleapis/genai-toolbox/issues/2303)) ([4d23a3b](https://github.com/googleapis/genai-toolbox/commit/4d23a3bbf2797b1f7fe328aeb5789e778121da23))
-* **tools:** Add `valueFromParam` support to Tool config ([#2333](https://github.com/googleapis/genai-toolbox/issues/2333)) ([15101b1](https://github.com/googleapis/genai-toolbox/commit/15101b1edbe2b85a4a5f9f819c23cf83138f4ee1))
-
-
-### Bug Fixes
-
-* **tools/cloudhealthcare:** Add check for client authorization before retrieving token string ([#2327](https://github.com/googleapis/genai-toolbox/issues/2327)) ([c25a233](https://github.com/googleapis/genai-toolbox/commit/c25a2330fea2ac382a398842c9e572e4e19bcb08))
-
-## [0.25.0](https://github.com/googleapis/genai-toolbox/compare/v0.24.0...v0.25.0) (2026-01-08)
-
-
-### Features
-
-* Add `embeddingModel` support ([#2121](https://github.com/googleapis/genai-toolbox/issues/2121)) ([9c62f31](https://github.com/googleapis/genai-toolbox/commit/9c62f313ff5edf0a3b5b8a3e996eba078fba4095))
-* Add `allowed-hosts` flag ([#2254](https://github.com/googleapis/genai-toolbox/issues/2254)) ([17b41f6](https://github.com/googleapis/genai-toolbox/commit/17b41f64531b8fe417c28ada45d1992ba430dc1b))
-* Add parameter default value to manifest ([#2264](https://github.com/googleapis/genai-toolbox/issues/2264)) ([9d1feca](https://github.com/googleapis/genai-toolbox/commit/9d1feca10810fa42cb4c94a409252f1bd373ee36))
-* **snowflake:** Add Snowflake Source and Tools ([#858](https://github.com/googleapis/genai-toolbox/issues/858)) ([b706b5b](https://github.com/googleapis/genai-toolbox/commit/b706b5bc685aeda277f277868bae77d38d5fd7b6))
-* **prebuilt/cloud-sql-mysql:** Update CSQL MySQL prebuilt tools to use IAM ([#2202](https://github.com/googleapis/genai-toolbox/issues/2202)) ([731a32e](https://github.com/googleapis/genai-toolbox/commit/731a32e5360b4d6862d81fcb27d7127c655679a8))
-* **sources/bigquery:** Make credentials scope configurable ([#2210](https://github.com/googleapis/genai-toolbox/issues/2210)) ([a450600](https://github.com/googleapis/genai-toolbox/commit/a4506009b93771b77fb05ae97044f914967e67ed))
-* **sources/trino:** Add ssl verification options and fix docs example ([#2155](https://github.com/googleapis/genai-toolbox/issues/2155)) ([4a4cf1e](https://github.com/googleapis/genai-toolbox/commit/4a4cf1e712b671853678dba99c4dc49dd4fc16a2))
-* **tools/looker:** Add ability to set destination folder with `make_look` and `make_dashboard`. ([#2245](https://github.com/googleapis/genai-toolbox/issues/2245)) ([eb79339](https://github.com/googleapis/genai-toolbox/commit/eb793398cd1cc4006d9808ccda5dc7aea5e92bd5))
-* **tools/postgressql:** Add tool to list store procedure ([#2156](https://github.com/googleapis/genai-toolbox/issues/2156)) ([cf0fc51](https://github.com/googleapis/genai-toolbox/commit/cf0fc515b57d9b84770076f3c0c5597c4597ef62))
-* **tools/postgressql:** Add Parameter `embeddedBy` config support ([#2151](https://github.com/googleapis/genai-toolbox/issues/2151)) ([17b70cc](https://github.com/googleapis/genai-toolbox/commit/17b70ccaa754d15bcc33a1a3ecb7e652520fa600))
-
-
-### Bug Fixes
-
-* **server:** Add `embeddingModel` config initialization ([#2281](https://github.com/googleapis/genai-toolbox/issues/2281)) ([a779975](https://github.com/googleapis/genai-toolbox/commit/a7799757c9345f99b6d2717841fbf792d364e1a2))
-* **sources/cloudgda:** Add import for cloudgda source ([#2217](https://github.com/googleapis/genai-toolbox/issues/2217)) ([7daa411](https://github.com/googleapis/genai-toolbox/commit/7daa4111f4ebfb0a35319fd67a8f7b9f0f99efcf))
-* **tools/alloydb-wait-for-operation:** Fix connection message generation ([#2228](https://github.com/googleapis/genai-toolbox/issues/2228)) ([7053fbb](https://github.com/googleapis/genai-toolbox/commit/7053fbb1953653143d39a8510916ea97a91022a6))
-* **tools/alloydbainl:** Only add psv when NL Config Param is defined ([#2265](https://github.com/googleapis/genai-toolbox/issues/2265)) ([ef8f3b0](https://github.com/googleapis/genai-toolbox/commit/ef8f3b02f2f38ce94a6ba9acf35d08b9469bef4e))
-* **tools/looker:** Looker client OAuth nil pointer error ([#2231](https://github.com/googleapis/genai-toolbox/issues/2231)) ([268700b](https://github.com/googleapis/genai-toolbox/commit/268700bdbf8281de0318d60ca613ed3672990b20))
-
-## [0.24.0](https://github.com/googleapis/genai-toolbox/compare/v0.23.0...v0.24.0) (2025-12-19)
-
-
-### Features
-
-* **sources/cloud-gemini-data-analytics:** Add the Gemini Data Analytics (GDA) integration for DB NL2SQL conversion to Toolbox ([#2181](https://github.com/googleapis/genai-toolbox/issues/2181)) ([aa270b2](https://github.com/googleapis/genai-toolbox/commit/aa270b2630da2e3d618db804ca95550445367dbc))
-* **source/cloudsqlmysql:** Add support for IAM authentication in Cloud SQL MySQL source ([#2050](https://github.com/googleapis/genai-toolbox/issues/2050)) ([af3d3c5](https://github.com/googleapis/genai-toolbox/commit/af3d3c52044bea17781b89ce4ab71ff0f874ac20))
-* **sources/oracle:** Add Oracle OCI and Wallet support ([#1945](https://github.com/googleapis/genai-toolbox/issues/1945)) ([8ea39ec](https://github.com/googleapis/genai-toolbox/commit/8ea39ec32fbbaa97939c626fec8c5d86040ed464))
-* Support combining prebuilt and custom tool configurations ([#2188](https://github.com/googleapis/genai-toolbox/issues/2188)) ([5788605](https://github.com/googleapis/genai-toolbox/commit/57886058188aa5d2a51d5846a98bc6d8a650edd1))
-* **tools/mysql-get-query-plan:** Add new `mysql-get-query-plan` tool for MySQL source ([#2123](https://github.com/googleapis/genai-toolbox/issues/2123)) ([0641da0](https://github.com/googleapis/genai-toolbox/commit/0641da0353857317113b2169e547ca69603ddfde))
-
-
-### Bug Fixes
-
-* **spanner:** Move list graphs validation to runtime ([#2154](https://github.com/googleapis/genai-toolbox/issues/2154)) ([914b3ee](https://github.com/googleapis/genai-toolbox/commit/914b3eefda40a650efe552d245369e007277dab5))
-
-
-## [0.23.0](https://github.com/googleapis/genai-toolbox/compare/v0.22.0...v0.23.0) (2025-12-11)
-
-
-### ⚠ BREAKING CHANGES
-
-* **serverless-spark:** add URLs to create batch tool outputs
-* **serverless-spark:** add URLs to list_batches output
-* **serverless-spark:** add Cloud Console and Logging URLs to get_batch
-* **tools/postgres:** Add additional filter params for existing postgres tools ([#2033](https://github.com/googleapis/genai-toolbox/issues/2033))
-
-### Features
-
-* **tools/postgres:** Add list-table-stats-tool to list table statistics. ([#2055](https://github.com/googleapis/genai-toolbox/issues/2055)) ([78b02f0](https://github.com/googleapis/genai-toolbox/commit/78b02f08c3cc3062943bb2f91cf60d5149c8d28d))
-* **looker/tools:** Enhance dashboard creation with dashboard filters ([#2133](https://github.com/googleapis/genai-toolbox/issues/2133)) ([285aa46](https://github.com/googleapis/genai-toolbox/commit/285aa46b887d9acb2da8766e107bbf1ab75b8812))
-* **serverless-spark:** Add Cloud Console and Logging URLs to get_batch ([e29c061](https://github.com/googleapis/genai-toolbox/commit/e29c0616d6b9ecda2badcaf7b69614e511ac031b))
-* **serverless-spark:** Add URLs to create batch tool outputs ([c6ccf4b](https://github.com/googleapis/genai-toolbox/commit/c6ccf4bd87026484143a2d0f5527b2edab03b54a))
-* **serverless-spark:** Add URLs to list_batches output ([5605eab](https://github.com/googleapis/genai-toolbox/commit/5605eabd696696ade07f52431a28ef65c0fb1f77))
-* **sources/mariadb:** Add MariaDB source and MySQL tools integration ([#1908](https://github.com/googleapis/genai-toolbox/issues/1908)) ([3b40fea](https://github.com/googleapis/genai-toolbox/commit/3b40fea25edae607e02c1e8fc2b0c957fa2c8e9a))
-* **tools/postgres:** Add additional filter params for existing postgres tools ([#2033](https://github.com/googleapis/genai-toolbox/issues/2033)) ([489117d](https://github.com/googleapis/genai-toolbox/commit/489117d74711ac9260e7547163ca463eb45eeaa2))
-* **tools/postgres:** Add list_pg_settings, list_database_stats tools for postgres ([#2030](https://github.com/googleapis/genai-toolbox/issues/2030)) ([32367a4](https://github.com/googleapis/genai-toolbox/commit/32367a472fae9653fed7f126428eba0252978bd5))
-* **tools/postgres:** Add new postgres-list-roles tool ([#2038](https://github.com/googleapis/genai-toolbox/issues/2038)) ([bea9705](https://github.com/googleapis/genai-toolbox/commit/bea97054502cfa236aa10e2ebc8ff58eb00ad035))
-
-
-### Bug Fixes
-
-* List tables tools null fix ([#2107](https://github.com/googleapis/genai-toolbox/issues/2107)) ([2b45266](https://github.com/googleapis/genai-toolbox/commit/2b452665983154041d4cd0ed7d82532e4af682eb))
-* **tools/mongodb:** Removed sortPayload and sortParams ([#1238](https://github.com/googleapis/genai-toolbox/issues/1238)) ([c5a6daa](https://github.com/googleapis/genai-toolbox/commit/c5a6daa7683d2f9be654300d977692c368e55e31))
-
-
-### Miscellaneous Chores
-* **looker:** Upgrade to latest go sdk ([#2159](https://github.com/googleapis/genai-toolbox/issues/2159)) ([78e015d](https://github.com/googleapis/genai-toolbox/commit/78e015d7dfd9cce7e2b444ed934da17eb355bc86))
-
-## [0.22.0](https://github.com/googleapis/genai-toolbox/compare/v0.21.0...v0.22.0) (2025-12-04)
-
-
-### Features
-
-* **tools/postgres:** Add allowed-origins flag ([#1984](https://github.com/googleapis/genai-toolbox/issues/1984)) ([862868f](https://github.com/googleapis/genai-toolbox/commit/862868f28476ea981575ce412faa7d6a03138f31))
-* **tools/postgres:** Add list-query-stats and get-column-cardinality functions ([#1976](https://github.com/googleapis/genai-toolbox/issues/1976)) ([9f76026](https://github.com/googleapis/genai-toolbox/commit/9f760269253a8cc92a357e995c6993ccc4a0fb7b))
-* **tools/spanner:** Add spanner list graphs to prebuiltconfigs ([#2056](https://github.com/googleapis/genai-toolbox/issues/2056)) ([0e7fbf4](https://github.com/googleapis/genai-toolbox/commit/0e7fbf465c488397aa9d8cab2e55165fff4eb53c))
-* **prebuilt/cloud-sql:** Add clone instance tool for cloud sql ([#1845](https://github.com/googleapis/genai-toolbox/issues/1845)) ([5e43630](https://github.com/googleapis/genai-toolbox/commit/5e43630907aa2d7bc6818142483a33272eab060b))
-* **serverless-spark:** Add create_pyspark_batch tool ([1bf0b51](https://github.com/googleapis/genai-toolbox/commit/1bf0b51f033c956790be1577bf5310d0b17e9c12))
-* **serverless-spark:** Add create_spark_batch tool ([17a9792](https://github.com/googleapis/genai-toolbox/commit/17a979207dbc4fe70acd0ebda164d1a8d34c1ed3))
-* Support alternate accessToken header name ([#1968](https://github.com/googleapis/genai-toolbox/issues/1968)) ([18017d6](https://github.com/googleapis/genai-toolbox/commit/18017d6545335a6fc1c472617101c35254d9a597))
-* Support for annotations ([#2007](https://github.com/googleapis/genai-toolbox/issues/2007)) ([ac21335](https://github.com/googleapis/genai-toolbox/commit/ac21335f4e88ca52d954d7f8143a551a35661b94))
-* **tool/mssql:** Set default host and port for MSSQL source ([#1943](https://github.com/googleapis/genai-toolbox/issues/1943)) ([7a9cc63](https://github.com/googleapis/genai-toolbox/commit/7a9cc633768d9ae9a7ff8230002da69d6a36ca86))
-* **tools/cloudsqlpg:** Add CloudSQL PostgreSQL pre-check tool ([#1722](https://github.com/googleapis/genai-toolbox/issues/1722)) ([8752e05](https://github.com/googleapis/genai-toolbox/commit/8752e05ab6e98812d95673a6f1ff67e9a6ae48d2))
-* **tools/postgres-list-publication-tables:** Add new postgres-list-publication-tables tool ([#1919](https://github.com/googleapis/genai-toolbox/issues/1919)) ([f4b1f0a](https://github.com/googleapis/genai-toolbox/commit/f4b1f0a68000ca2fc0325f55a1905705417c38a2))
-* **tools/postgres-list-tablespaces:** Add new postgres-list-tablespaces tool ([#1934](https://github.com/googleapis/genai-toolbox/issues/1934)) ([5ad7c61](https://github.com/googleapis/genai-toolbox/commit/5ad7c6127b3e47504fc4afda0b7f3de1dff78b8b))
-* **tools/spanner-list-graph:** Tool impl + docs + tests ([#1923](https://github.com/googleapis/genai-toolbox/issues/1923)) ([a0f44d3](https://github.com/googleapis/genai-toolbox/commit/a0f44d34ea3f044dd08501be616f70ddfd63ab45))
-
-
-### Bug Fixes
-
-* Add import for firebirdsql ([#2045](https://github.com/googleapis/genai-toolbox/issues/2045)) ([fb7aae9](https://github.com/googleapis/genai-toolbox/commit/fb7aae9d35b760d3471d8379642f835a0d84ec41))
-* Correct FAQ to mention HTTP tools ([#2036](https://github.com/googleapis/genai-toolbox/issues/2036)) ([7b44237](https://github.com/googleapis/genai-toolbox/commit/7b44237d4a21bfbf8d3cebe4d32a15affa29584d))
-* Format BigQuery numeric output as decimal strings ([#2084](https://github.com/googleapis/genai-toolbox/issues/2084)) ([155bff8](https://github.com/googleapis/genai-toolbox/commit/155bff80c1da4fae1e169e425fd82e1dc3373041))
-* Set default annotations for tools in code if annotation not provided in yaml ([#2049](https://github.com/googleapis/genai-toolbox/issues/2049)) ([565460c](https://github.com/googleapis/genai-toolbox/commit/565460c4ea8953dbe80070a8e469f957c0f7a70c))
-* **tools/alloydb-postgres-list-tables:** Exclude google_ml schema from list_tables ([#2046](https://github.com/googleapis/genai-toolbox/issues/2046)) ([a03984c](https://github.com/googleapis/genai-toolbox/commit/a03984cc15254c928f30085f8fa509ded6a79a0c))
-* **tools/alloydbcreateuser:** Remove duplication of project praram ([#2028](https://github.com/googleapis/genai-toolbox/issues/2028)) ([730ac6d](https://github.com/googleapis/genai-toolbox/commit/730ac6d22805fd50b4a675b74c1865f4e7689e7c))
-* **tools/mongodb:** Remove `required` tag from the `canonical` field ([#2099](https://github.com/googleapis/genai-toolbox/issues/2099)) ([744214e](https://github.com/googleapis/genai-toolbox/commit/744214e04cd12b11d166e6eb7da8ce4714904abc))
-
-## [0.21.0](https://github.com/googleapis/genai-toolbox/compare/v0.20.0...v0.21.0) (2025-11-19)
-
-
-### ⚠ BREAKING CHANGES
-
-* **tools/spanner-list-tables:** Unmarshal `object_details` json string into map to make response have nested json ([#1894](https://github.com/googleapis/genai-toolbox/issues/1894)) ([446d62a](https://github.com/googleapis/genai-toolbox/commit/446d62acd995d5128f52e9db254dd1c7138227c6))
-
-
-### Features
-
-* **tools/postgres:** Add `long_running_transactions`, `list_locks` and `replication_stats` tools ([#1751](https://github.com/googleapis/genai-toolbox/issues/1751)) ([5abad5d](https://github.com/googleapis/genai-toolbox/commit/5abad5d56c6cc5ba86adc5253b948bf8230fa830))
-
-
-### Bug Fixes
-
-* **tools/alloydbgetinstance:** Remove parameter duplication ([#1993](https://github.com/googleapis/genai-toolbox/issues/1993)) ([0e269a1](https://github.com/googleapis/genai-toolbox/commit/0e269a1d125eed16a51ead27db4398e6e48cb948))
-* **tools:** Check for query execution error for pgxpool.Pool ([#1969](https://github.com/googleapis/genai-toolbox/issues/1969)) ([2bff138](https://github.com/googleapis/genai-toolbox/commit/2bff1384a3570ef46bc03ebebc507923af261987))
-
-
-## [0.20.0](https://github.com/googleapis/genai-toolbox/compare/v0.19.1...v0.20.0) (2025-11-14)
-
-
-### Features
-
-* Added prompt support for toolbox ([#1798](https://github.com/googleapis/genai-toolbox/issues/1798)) ([cd56ea4](https://github.com/googleapis/genai-toolbox/commit/cd56ea44fbdd149fcb92324e70ee36ac747635db))
-* **source/alloydb, source/cloud-sql-postgres,source/cloud-sql-mysql,source/cloud-sql-mssql:** Use project from env for alloydb and cloud sql control plane tools ([#1588](https://github.com/googleapis/genai-toolbox/issues/1588)) ([12bdd95](https://github.com/googleapis/genai-toolbox/commit/12bdd954597e49d3ec6b247cc104584c5a4d1943))
-* **source/mysql:** Set default host and port for MySQL source ([#1922](https://github.com/googleapis/genai-toolbox/issues/1922)) ([2c228ef](https://github.com/googleapis/genai-toolbox/commit/2c228ef4f2d4cb8dfc41e845466bfe3566d141a1))
-* **source/Postgresql:** Set default host and port for Postgresql  source ([#1927](https://github.com/googleapis/genai-toolbox/issues/1927)) ([7e6e88a](https://github.com/googleapis/genai-toolbox/commit/7e6e88a21f2b9b60e0d645cdde33a95892d31a04))
-* **tool/looker-generate-embed-url:** Adding generate embed url tool ([#1877](https://github.com/googleapis/genai-toolbox/issues/1877)) ([ef63860](https://github.com/googleapis/genai-toolbox/commit/ef63860559798fbad54c1051d9f53bce42d66464))
-* **tools/postgres:** Add `list_triggers`, `database_overview` tools for postgres ([#1912](https://github.com/googleapis/genai-toolbox/issues/1912)) ([a4c9287](https://github.com/googleapis/genai-toolbox/commit/a4c9287aecf848faa98d973a9ce5b13fa309a58e))
-* **tools/postgres:** Add list_indexes, list_sequences tools for postgres ([#1765](https://github.com/googleapis/genai-toolbox/issues/1765)) ([897c63d](https://github.com/googleapis/genai-toolbox/commit/897c63dcea43226262d2062088c59f2d1068fca7))
-
-## [0.19.1](https://github.com/googleapis/genai-toolbox/compare/v0.18.0...v0.19.1) (2025-11-07)
-
-
-### ⚠ BREAKING CHANGES
-
-* **tools/alloydbainl:** update AlloyDB AI NL statement order ([#1753](https://github.com/googleapis/genai-toolbox/issues/1753))
-* **tools/bigquery-analyze-contribution:** Add allowed dataset support ([#1675](https://github.com/googleapis/genai-toolbox/issues/1675)) ([ef28e39](https://github.com/googleapis/genai-toolbox/commit/ef28e39e90b21287ca8e69b99f4e792c78e9d31f))
-* **tools/bigquery-get-dataset-info:** add allowed dataset support ([#1654](https://github.com/googleapis/genai-toolbox/issues/1654))
-
-### Features
-
-* Support `excludeValues` for parameters ([#1818](https://github.com/googleapis/genai-toolbox/issues/1818)) ([a8e98dc](https://github.com/googleapis/genai-toolbox/commit/a8e98dc99d208e8b37a3bc4d1ab4749b5154ed36))
-* **elasticsearch:** Add Elasticsearch source and tools ([#1109](https://github.com/googleapis/genai-toolbox/issues/1109)) ([5367285](https://github.com/googleapis/genai-toolbox/commit/5367285e91ddda99ae7261d8ed4b025f975d1453))
-* **mindsdb:** Add MindsDB Source and Tools  ([#878](https://github.com/googleapis/genai-toolbox/issues/878)) ([1b2cca9](https://github.com/googleapis/genai-toolbox/commit/1b2cca9faa6f7bacbeb5d25634ce3bf61067de16))
-* **cloud-healthcare:** Add support for healthcare source, tool and prebuilt config ([#1853](https://github.com/googleapis/genai-toolbox/issues/1853)) ([1f833fb](https://github.com/googleapis/genai-toolbox/commit/1f833fb1a124e23819ddfec476f2e63ef31dd22f))
-* **singlestore:** Add SingleStore Source and Tools ([#1333](https://github.com/googleapis/genai-toolbox/issues/1333)) ([40b9dba](https://github.com/googleapis/genai-toolbox/commit/40b9dbab088add05a66995abb1c71a9345b8f7e5))
-* **source/bigquery:** Add client cache for user-passed credentials ([#1119](https://github.com/googleapis/genai-toolbox/issues/1119)) ([cf7012a](https://github.com/googleapis/genai-toolbox/commit/cf7012a82bb5c77309da3a26e563a5015786aa69))
-* **source/bigquery:** Add service account impersonation support for bigquery ([#1641](https://github.com/googleapis/genai-toolbox/issues/1641)) ([e09d182](https://github.com/googleapis/genai-toolbox/commit/e09d182f88bf697a169428f477aebc9f1741e35f))
-* **tools/bigquery-analyze-contribution:** Add allowed dataset support ([#1675](https://github.com/googleapis/genai-toolbox/issues/1675)) ([ef28e39](https://github.com/googleapis/genai-toolbox/commit/ef28e39e90b21287ca8e69b99f4e792c78e9d31f))
-* **tools/bigquery-get-dataset-info:** Add allowed dataset support ([#1654](https://github.com/googleapis/genai-toolbox/issues/1654)) ([a2006ad](https://github.com/googleapis/genai-toolbox/commit/a2006ad57718ebad3de5c6850e9c6a5a763808ec))
-* **tools/looker-run-dashboard:** New `run_dashboard` tool ([#1858](https://github.com/googleapis/genai-toolbox/issues/1858)) ([30857c2](https://github.com/googleapis/genai-toolbox/commit/30857c2294bb14961d3be49e2c368c69ecf844ec))
-* **tools/looker-run-look:** Modify run_look to show query origin ([#1860](https://github.com/googleapis/genai-toolbox/issues/1860)) ([991e539](https://github.com/googleapis/genai-toolbox/commit/991e539f9c7978fa618ada3179a0b656c33ff501))
-* **tools/looker:** Tools to retrieve the connections, schemas, databases, and column metadata from a looker system. ([#1804](https://github.com/googleapis/genai-toolbox/issues/1804)) ([d7d1b03](https://github.com/googleapis/genai-toolbox/commit/d7d1b03f3b746ed748d67f67e833457d55c846ab))
-* **tools/mongodb:** Make MongoDB tools' `filterParams` field optional ([#1614](https://github.com/googleapis/genai-toolbox/issues/1614)) ([208ab92](https://github.com/googleapis/genai-toolbox/commit/208ab92eb377b538a99330a415ecc18790b077b7))
-* **tools/neo4j-execute-cypher:** Add dry_run parameter to validate Cypher queries ([#1769](https://github.com/googleapis/genai-toolbox/issues/1769)) ([f475da6](https://github.com/googleapis/genai-toolbox/commit/f475da63ce1b65387b503ac497eca47635452723))
-* **tools/postgres-list-schemas:** Add new postgres-list-schemas tool ([#1741](https://github.com/googleapis/genai-toolbox/issues/1741)) ([1a19cac](https://github.com/googleapis/genai-toolbox/commit/1a19cac7cd89ed70291eb55e190370fe7b2c1aba))
-* **tools/postgres-list-views:** Add new postgres-list-views tool ([#1709](https://github.com/googleapis/genai-toolbox/issues/1709)) ([e8c7fe0](https://github.com/googleapis/genai-toolbox/commit/e8c7fe0994fedcb9be78d461fab3c98cc6bd86b2))
-* **tools/serverless-spark:** Add cancel-batch tool ([#1827](https://github.com/googleapis/genai-toolbox/pull/1827))([2881683](https://github.com/googleapis/genai-toolbox/commit/28816832265250de97d84e6ba38bf6c35e040796))
-* **tools/serverless-spark:** Add get_batch tool ([#1783](https://github.com/googleapis/genai-toolbox/pull/1783))([7ad1072](https://github.com/googleapis/genai-toolbox/commit/7ad10720b4638324cd77d8aa410cbd1ccf0cc93f))
-* **tools/serverless-spark:** Add serverless-spark source with list_batches tool ([#1690](https://github.com/googleapis/genai-toolbox/pull/1690))([816dbce](https://github.com/googleapis/genai-toolbox/commit/816dbce268392046e54767732bd31488c6e89bdb))
-
-
-### Bug Fixes
-
-* Bigquery execute_sql to assign values to array ([#1884](https://github.com/googleapis/genai-toolbox/issues/1884)) ([559e2a2](https://github.com/googleapis/genai-toolbox/commit/559e2a22e0db20bb947702e13140ce869b5865a7))
-* **cloudmonitoring:** Populate `authRequired` in tool manifest ([#1800](https://github.com/googleapis/genai-toolbox/issues/1800)) ([954152c](https://github.com/googleapis/genai-toolbox/commit/954152c7928bf0da9be221e011e32f74bc4cebbc))
-* Update debug logs statements ([#1828](https://github.com/googleapis/genai-toolbox/issues/1828)) ([3cff915](https://github.com/googleapis/genai-toolbox/commit/3cff915e22c3a5e4e296607f83ae6409b896c9a9))
-* Instructions to quote filters that include commas ([#1794](https://github.com/googleapis/genai-toolbox/issues/1794)) ([4b01720](https://github.com/googleapis/genai-toolbox/commit/4b0172083c0dd4c71098d4e0ab5fa0b16ea0d830))
-* **source/cloud-sql-mssql:** Remove `ipAddress` field ([#1822](https://github.com/googleapis/genai-toolbox/issues/1822)) ([38d535d](https://github.com/googleapis/genai-toolbox/commit/38d535de34cfedd6828a01d9dcd25daf1bad7306))
-* **tools/alloydbainl:** AlloyDB AI NL execute_sql statement order ([#1753](https://github.com/googleapis/genai-toolbox/issues/1753)) ([9723cad](https://github.com/googleapis/genai-toolbox/commit/9723cadaa181a76d8fdda65a6254f6c887c3cf57))
-* **tools/postgres-execute-sql:** Do not ignore SQL failure ([#1829](https://github.com/googleapis/genai-toolbox/issues/1829)) ([8984287](https://github.com/googleapis/genai-toolbox/commit/898428759c2a1a384bea8939605cf0914d129bec))
-
-
-## [0.18.0](https://github.com/googleapis/genai-toolbox/compare/v0.17.0...v0.18.0) (2025-10-23)
-
-
-### Features
-
-* Support `allowedValues`, `escape`, `minValue` and `maxValue` for parameters ([#1770](https://github.com/googleapis/genai-toolbox/issues/1770)) ([eaf7740](https://github.com/googleapis/genai-toolbox/commit/eaf77406fd386c12315d67eb685dc69e0415c516))
-* **tools/looker:** Tools to allow the agent to retrieve, create, modify, and delete LookML project files. ([#1673](https://github.com/googleapis/genai-toolbox/issues/1673)) ([089081f](https://github.com/googleapis/genai-toolbox/commit/089081feb0e32f9eb65d00df5987392d413a4081))
-
-
-### Bug Fixes
-
-* **sources/mysql:** Escape mysql user agent ([#1707](https://github.com/googleapis/genai-toolbox/issues/1707)) ([eeb694c](https://github.com/googleapis/genai-toolbox/commit/eeb694c20facc40a38bfa67073c4cb1f3dd657ff))
-* **sources/mysql:** Escape program_name for MySQL ([#1717](https://github.com/googleapis/genai-toolbox/issues/1717)) ([02f7f8a](https://github.com/googleapis/genai-toolbox/commit/02f7f8af979057efe99fd138cb1b958130355b68))
-* **tools/http:** Allow 2xx status code on tool invocation ([#1761](https://github.com/googleapis/genai-toolbox/issues/1761)) ([a06d0d8](https://github.com/googleapis/genai-toolbox/commit/a06d0d8735fbec29bea97457248845a8c6b4aa3c))
-* **tools/http:** Omit optional nil query parameters ([#1762](https://github.com/googleapis/genai-toolbox/issues/1762)) ([bd16ba3](https://github.com/googleapis/genai-toolbox/commit/bd16ba3921e6177065780e5f29870859b8e18e4f))
-* **tools/looker:** Looker file content calls should not use url.QueryEscape ([#1758](https://github.com/googleapis/genai-toolbox/issues/1758)) ([336de1b](https://github.com/googleapis/genai-toolbox/commit/336de1bd04b869d322c0fd1f4667eb652159d791))
-
-
-## [0.17.0](https://github.com/googleapis/genai-toolbox/compare/v0.16.0...v0.17.0) (2025-10-10)
-
-
-### ⚠ BREAKING CHANGES
-
-* **tools/bigquery-get-table-info:** add allowed dataset support ([#1093](https://github.com/googleapis/genai-toolbox/issues/1093))
-* **tools/bigquery-list-dataset-ids:** add allowed datasets support ([#1573](https://github.com/googleapis/genai-toolbox/issues/1573))
-
-### Features
-
-* Add configs and workflows for docs versioning ([#1611](https://github.com/googleapis/genai-toolbox/issues/1611)) ([21ac98b](https://github.com/googleapis/genai-toolbox/commit/21ac98bc065e95bde911d66185c67d8380891bf8))
-* Add metadata in MCP Manifest for Toolbox auth ([#1395](https://github.com/googleapis/genai-toolbox/issues/1395)) ([0b3dac4](https://github.com/googleapis/genai-toolbox/commit/0b3dac41322f7aaa5a19df571686fa8fd4338ca5))
-* Add program name to MySQL connections ([#1617](https://github.com/googleapis/genai-toolbox/issues/1617)) ([c4a22b8](https://github.com/googleapis/genai-toolbox/commit/c4a22b8d3bd0307325215ebd2f30ba37927cd37e))
-* **source/bigquery:** Add optional write mode config ([#1157](https://github.com/googleapis/genai-toolbox/issues/1157)) ([63adc78](https://github.com/googleapis/genai-toolbox/commit/63adc78beae949dfe5e300c50e5ceef073e9652c))
-* **sources/alloydb,cloudsqlpg,cloudsqlmysql,cloudsqlmssql:** Support PSC connection ([#1686](https://github.com/googleapis/genai-toolbox/issues/1686)) ([9d2bf79](https://github.com/googleapis/genai-toolbox/commit/9d2bf79becfda104ef77f34b8d4b22cbedbc4bf3))
-* **sources/mssql:** Add app name to MSSQL ([#1620](https://github.com/googleapis/genai-toolbox/issues/1620)) ([1536d1f](https://github.com/googleapis/genai-toolbox/commit/1536d1fdabb9d7f73dbdeebeb05a83d9a3b78e1c))
-* **sources/oracle:** Add Oracle Source and Tool ([#1456](https://github.com/googleapis/genai-toolbox/issues/1456)) ([3a19a50](https://github.com/googleapis/genai-toolbox/commit/3a19a50ff211e33429de1d05338d353359a52987))
-* **sources/oracle:** Switch Oracle driver from godror to go-ora ([#1685](https://github.com/googleapis/genai-toolbox/issues/1685)) ([8faf376](https://github.com/googleapis/genai-toolbox/commit/8faf37667e371b4ed88ebb892e8784b67611ba64))
-* **tool/bigquery-list-dataset-ids:** Add allowed datasets support ([#1573](https://github.com/googleapis/genai-toolbox/issues/1573)) ([1a44c67](https://github.com/googleapis/genai-toolbox/commit/1a44c671ec593e764a2d2f67f70a98ceec20a168))
-* **tools/bigquery-get-table-info:** Add allowed dataset support ([#1093](https://github.com/googleapis/genai-toolbox/issues/1093)) ([acb205c](https://github.com/googleapis/genai-toolbox/commit/acb205ca4761d59ce97b804827230978c8c98ede))
-* **tools/dataform:** Add dataform compile tool ([#1470](https://github.com/googleapis/genai-toolbox/issues/1470)) ([3be9b7b](https://github.com/googleapis/genai-toolbox/commit/3be9b7b3bdf112fe7303706e56e9f39935cde661))
-* **tools/looker:** Add support for pulse, vacuum and analyze audit and performance functions on a Looker instance ([#1581](https://github.com/googleapis/genai-toolbox/issues/1581)) ([5aed4e1](https://github.com/googleapis/genai-toolbox/commit/5aed4e136d0091731d2ded10ec076ee789e1987c))
-* **tools/looker:** Enable access to the Conversational Analytics API for Looker ([#1596](https://github.com/googleapis/genai-toolbox/issues/1596)) ([2d5a93e](https://github.com/googleapis/genai-toolbox/commit/2d5a93e312990c8a9f3170c7e9c655f97cf11712))
-
-
-### Bug Fixes
-
-* Added google_ml_integration extension to use alloydb ai-nl support api ([#1445](https://github.com/googleapis/genai-toolbox/issues/1445)) ([dbc477a](https://github.com/googleapis/genai-toolbox/commit/dbc477ab0f832495cf51f73ea16ae363472d6eed))
-* Fix broken links ([#1625](https://github.com/googleapis/genai-toolbox/issues/1625)) ([36c6584](https://github.com/googleapis/genai-toolbox/commit/36c658472ccdeb6cddd8a4452a8b3438aeb0a744))
-* Remove duplicated build type in Dockerfile ([#1598](https://github.com/googleapis/genai-toolbox/issues/1598)) ([b43c945](https://github.com/googleapis/genai-toolbox/commit/b43c94575d86aa65b0528d59f9b41d30b439fee5))
-* **source/bigquery:** Allowed datasets project id issue with client oauth ([#1663](https://github.com/googleapis/genai-toolbox/issues/1663)) ([f4cf486](https://github.com/googleapis/genai-toolbox/commit/f4cf486fa929299fef076cf71689776e5dec19c1))
-* **sources/looker:** Allow Looker to be configured without setting a Client Id or Secret ([#1496](https://github.com/googleapis/genai-toolbox/issues/1496)) ([67d8221](https://github.com/googleapis/genai-toolbox/commit/67d8221a2e780df54a81f0f7e8f7e41e4bf1a82e))
-* **tools/looker:** Refactor run-inline-query logic to helper function ([#1497](https://github.com/googleapis/genai-toolbox/issues/1497)) ([62af39d](https://github.com/googleapis/genai-toolbox/commit/62af39d751443eb758586663969b162c868a233f))
-* **tools/mysql-list-tables:** Update sql query to resolve subquery scope error ([#1629](https://github.com/googleapis/genai-toolbox/issues/1629)) ([94e19d8](https://github.com/googleapis/genai-toolbox/commit/94e19d87e54e831b80eb766572e48bc7370305d8))
-
-## [0.16.0](https://github.com/googleapis/genai-toolbox/compare/v0.15.0...v0.16.0) (2025-09-25)
-
-
-### ⚠ BREAKING CHANGES
-
-* **tool/bigquery-execute-sql:** add allowed datasets support ([#1443](https://github.com/googleapis/genai-toolbox/issues/1443))
-* **tool/bigquery-forecast:** add allowed datasets support ([#1412](https://github.com/googleapis/genai-toolbox/issues/1412))
-
-### Features
-
-* **cassandra:** Add Cassandra Source and Tool ([#1012](https://github.com/googleapis/genai-toolbox/issues/1012)) ([6e42053](https://github.com/googleapis/genai-toolbox/commit/6e420534ee894da4a8d226acb6cdb63d0d5d9ce5))
-* **sources/postgres:** Add application_name ([#1504](https://github.com/googleapis/genai-toolbox/issues/1504)) ([72a2366](https://github.com/googleapis/genai-toolbox/commit/72a2366b28870aa6f81c4f890f4770ec5ecffdba))
-* **tool/bigquery-execute-sql:** Add allowed datasets support ([#1443](https://github.com/googleapis/genai-toolbox/issues/1443)) ([9501ebb](https://github.com/googleapis/genai-toolbox/commit/9501ebbdbcba871b98663185c690308dda1729b5))
-* **tool/bigquery-forecast:** Add allowed datasets support ([#1412](https://github.com/googleapis/genai-toolbox/issues/1412)) ([88bac7e](https://github.com/googleapis/genai-toolbox/commit/88bac7e36f5ebb6ad18773bff30b85ef678431e7))
-* **tools/clickhouse-list-tables:** Add list-tables tool ([#1446](https://github.com/googleapis/genai-toolbox/issues/1446)) ([69a3caf](https://github.com/googleapis/genai-toolbox/commit/69a3cafabec5a40e2776d71de3587c0d16c722a2))
-
-
-### Bug Fixes
-
-* **tool/mongodb-find:** Fix find tool `limit` field ([#1570](https://github.com/googleapis/genai-toolbox/issues/1570)) ([4166bf7](https://github.com/googleapis/genai-toolbox/commit/4166bf7ab85732f64b877d5f20235057df919049))
-* **tools/mongodb:** Concat filter params only once in mongodb update tools ([#1545](https://github.com/googleapis/genai-toolbox/issues/1545)) ([295f9dc](https://github.com/googleapis/genai-toolbox/commit/295f9dc41a43f0a4bdbd99e465bf2be01249084e))
-
-## [0.15.0](https://github.com/googleapis/genai-toolbox/compare/v0.14.0...v0.15.0) (2025-09-18)
-
-
-### ⚠ BREAKING CHANGES
-
-* **prebuilt:** update prebuilt tool names to use consistent guidance ([#1421](https://github.com/googleapis/genai-toolbox/issues/1421))
-* **tools/alloydb-wait-for-operation:** Add `alloydb-admin` source to `alloydb-wait-for-operation` tool ([#1449](https://github.com/googleapis/genai-toolbox/issues/1449))
-
-### Features
-
-* Add AlloyDB admin source ([#1369](https://github.com/googleapis/genai-toolbox/issues/1369)) ([33beb71](https://github.com/googleapis/genai-toolbox/commit/33beb7187d2e0f968fc949a00c780073d1bc7cdd))
-* Add Cloud monitoring source and tool ([#1311](https://github.com/googleapis/genai-toolbox/issues/1311)) ([d661f53](https://github.com/googleapis/genai-toolbox/commit/d661f5343f2ad28fbf0481db16440aec823eece6))
-* Add YugabyteDB Source and Tool ([#732](https://github.com/googleapis/genai-toolbox/issues/732)) ([664711f](https://github.com/googleapis/genai-toolbox/commit/664711f4b35409bd1c57af92f625b70a0dc9a4e6))
-* **prebuilt:** Update default values for prebuilt tools ([#1355](https://github.com/googleapis/genai-toolbox/issues/1355)) ([70e832b](https://github.com/googleapis/genai-toolbox/commit/70e832bd08a98a95b925e590f31c8d3f2d8b6aa0))
-* **prebuilt/cloud-sql:** Add  list instances tool for cloudsql ([#1310](https://github.com/googleapis/genai-toolbox/issues/1310)) ([0171228](https://github.com/googleapis/genai-toolbox/commit/01712284b480774ffa68930affae290ee2e3fcfd))
-* **prebuilt/cloud-sql:** Add cloud sql create database tool. ([#1453](https://github.com/googleapis/genai-toolbox/issues/1453)) ([a1bc044](https://github.com/googleapis/genai-toolbox/commit/a1bc04477b0f822ffaab039098682f1776b8a472))
-* **prebuilt/cloud-sql:** Add `cloud-sql-get-instances` tool ([#1383](https://github.com/googleapis/genai-toolbox/issues/1383)) ([77919c7](https://github.com/googleapis/genai-toolbox/commit/77919c7d8e4aac16eeb703c0cc61ca774dc4f94e))
-* **prebuilt/cloud-sql:** Add create user tool for cloud sql ([#1406](https://github.com/googleapis/genai-toolbox/issues/1406)) ([3a6b517](https://github.com/googleapis/genai-toolbox/commit/3a6b51752f077b225b8c2e2e7308a69a68eec3c0))
-* **prebuilt/cloud-sql:** Add list databases tool for cloud sql ([#1454](https://github.com/googleapis/genai-toolbox/issues/1454)) ([e6a6c61](https://github.com/googleapis/genai-toolbox/commit/e6a6c615d5480e8930ad173d44d243f5bd99eebc))
-* **prebuilt/cloud-sql:** Package cloud sql tools ([#1455](https://github.com/googleapis/genai-toolbox/issues/1455)) ([bf6266b](https://github.com/googleapis/genai-toolbox/commit/bf6266ba1131bd1c5829ac112a8c45c8a5919fea))
-* **prebuilt/cloud-sql-mssql:** Add create instance tool for mssql ([#1440](https://github.com/googleapis/genai-toolbox/issues/1440)) ([b176523](https://github.com/googleapis/genai-toolbox/commit/b17652309d8a02b1f20c6c576b1617b23c8e481f))
-* **prebuilt/cloud-sql-mysql:** Add create instance tool for Cloud SQL MySQL ([#1434](https://github.com/googleapis/genai-toolbox/issues/1434)) ([15b628d](https://github.com/googleapis/genai-toolbox/commit/15b628d2d2feb2ecdd418394b9265a6c77c77f6d))
-* **prebuilt/cloud-sql-mysql:** Add env var support for IP Type ([#1232](https://github.com/googleapis/genai-toolbox/issues/1232)) ([#1347](https://github.com/googleapis/genai-toolbox/issues/1347)) ([0cd3f16](https://github.com/googleapis/genai-toolbox/commit/0cd3f16f877f426b45e35625ba0af03789459591))
-* **prebuilt/cloudsqlpg:** Add cloud sql pg create instance tool ([#1403](https://github.com/googleapis/genai-toolbox/issues/1403)) ([d302499](https://github.com/googleapis/genai-toolbox/commit/d30249961b5a2ddc2c3809b481085d1ca034ead0))
-* **prebuilt/mysql:** Add a new tool to show query plan of a given query in MySQL ([#1474](https://github.com/googleapis/genai-toolbox/issues/1474)) ([1a42e05](https://github.com/googleapis/genai-toolbox/commit/1a42e05675645ac4f1b89edef7a71ac61b637a76))
-* **prebuilt/mysql:** Add  `queryParams` field in MySQL prebuilt config ([#1318](https://github.com/googleapis/genai-toolbox/issues/1318)) ([4b32c2a](https://github.com/googleapis/genai-toolbox/commit/4b32c2a7701ce5ccc56d019055283e73e7046372))
-* **prebuilt/neo4j:** Add prebuiltconfig support for neo4j ([#1352](https://github.com/googleapis/genai-toolbox/issues/1352)) ([f819e26](https://github.com/googleapis/genai-toolbox/commit/f819e2644315a589ec283494f244c1b8407cae59))
-* **prebuilt/observability:** Add cloud sql observability tools ([#1425](https://github.com/googleapis/genai-toolbox/issues/1425)) ([236be89](https://github.com/googleapis/genai-toolbox/commit/236be89961fe423c1ec992d3d1f699f77a6e5b29))
-* **prebuilt/postgres:** Add postgres prebuilt tools ([#1473](https://github.com/googleapis/genai-toolbox/issues/1473)) ([edca9dc](https://github.com/googleapis/genai-toolbox/commit/edca9dc7d772baf1a234485020fa69d76f71bfcc))
-* **prebuilt/sqlite:** Prebuilt tools for the sqlite. ([#1227](https://github.com/googleapis/genai-toolbox/issues/1227)) ([681c2b4](https://github.com/googleapis/genai-toolbox/commit/681c2b4f3a65837d972c138c623c08fb6b1f1785))
-* **source/alloydb-admin:** Add user agent and attach alloydb api in `alloydb-admin` source ([#1448](https://github.com/googleapis/genai-toolbox/issues/1448)) ([9710014](https://github.com/googleapis/genai-toolbox/commit/971001400f25796784f8aeb3ec5cb1a2df2e4c69))
-* **source/bigquery:** Add support for datasets selection ([#1313](https://github.com/googleapis/genai-toolbox/issues/1313)) ([aa39724](https://github.com/googleapis/genai-toolbox/commit/aa3972470fd0f6f5901c5d85dd05f1e2ae973e7b))
-* **source/cloud-monitoring:** Add support for user agent in cloud monitoring source ([#1472](https://github.com/googleapis/genai-toolbox/issues/1472)) ([92680b1](https://github.com/googleapis/genai-toolbox/commit/92680b18d6159300ae66f80ddb4c6bf0547d45a1))
-* **source/cloud-sql-admin:** Add User agent and attach sqldmin in `cloud-sql-admin` source. ([#1441](https://github.com/googleapis/genai-toolbox/issues/1441)) ([56b6574](https://github.com/googleapis/genai-toolbox/commit/56b6574fc2c506c7c7df7f2a25686e3e4aae0e8a))
-* **source/cloudsqladmin:** Add cloud sql admin source ([#1408](https://github.com/googleapis/genai-toolbox/issues/1408)) ([4f46782](https://github.com/googleapis/genai-toolbox/commit/4f4678292762507494515ce61188cd0310805c40))
-* **tool/cloudsql:** Add cloud sql wait for operation tool with exponential backoff ([#1306](https://github.com/googleapis/genai-toolbox/issues/1306)) ([3aef2bb](https://github.com/googleapis/genai-toolbox/commit/3aef2bb7be8274bb4718739faeaa5f97b50dbf19))
-* **tools/alloydb-create-cluster:** Add custom tool kind for AlloyDB create cluster ([#1331](https://github.com/googleapis/genai-toolbox/issues/1331)) ([76bb876](https://github.com/googleapis/genai-toolbox/commit/76bb876d546780908c1a69ef3b1a92781af28a3b))
-* **tools/alloydb-create-instance:** Add new custom tool kind for AlloyDB ([#1379](https://github.com/googleapis/genai-toolbox/issues/1379)) ([091cd9a](https://github.com/googleapis/genai-toolbox/commit/091cd9aa1aabe1cb3de2ce2be5c707a8f77ad647))
-* **tools/alloydb-create-user:** Add new custom tool kind for AlloyDB create user ([#1380](https://github.com/googleapis/genai-toolbox/issues/1380)) ([ab3fd26](https://github.com/googleapis/genai-toolbox/commit/ab3fd261af373dcdaf4555292c63d7095d7a02df))
-* **tools/alloydb-get-cluster:** Add new tool for AlloyDB ([#1420](https://github.com/googleapis/genai-toolbox/issues/1420)) ([c181dab](https://github.com/googleapis/genai-toolbox/commit/c181dabc91bdc1c24c89a3c7bba0049d9af4cf2b))
-* **tools/alloydb-get-instance:** Add new for AlloyDB ([#1435](https://github.com/googleapis/genai-toolbox/issues/1435)) ([f2d9e3b](https://github.com/googleapis/genai-toolbox/commit/f2d9e3b57963082f0db70880d5c02b1cbe3eb75d))
-* **tools/alloydb-get-user:** Add new tool for AlloyDB ([#1436](https://github.com/googleapis/genai-toolbox/issues/1436)) ([677254e](https://github.com/googleapis/genai-toolbox/commit/677254e6d9c532fa9f0fb0b0e4062446640ab75f))
-* **tools/alloydb-list-cluster:** Add custom tool kind for AlloyDB ([#1319](https://github.com/googleapis/genai-toolbox/issues/1319)) ([d4a9eb0](https://github.com/googleapis/genai-toolbox/commit/d4a9eb0ce217c7969aff61868e53c7dc7757d28d))
-* **tools/alloydb-list-instances:** Add custom tool kind for AlloyDB ([#1357](https://github.com/googleapis/genai-toolbox/issues/1357)) ([93c1b30](https://github.com/googleapis/genai-toolbox/commit/93c1b30fced113d6721ade9fdcfb92b5ed6c0ad6))
-* **tools/alloydb-list-users:** Add new custom tool kind for AlloyDB ([#1377](https://github.com/googleapis/genai-toolbox/issues/1377)) ([3a8a65c](https://github.com/googleapis/genai-toolbox/commit/3a8a65ceaa92368563e237087c4a38ed7c0d3fd5))
-* **tools/bigquery-analyze-contribution:** Add analyze contribution tool ([#1223](https://github.com/googleapis/genai-toolbox/issues/1223)) ([81d239b](https://github.com/googleapis/genai-toolbox/commit/81d239b053a6978250878a6809905dcc9424909e))
-* **tools/bigquery-conversational-analytics:** Add allowed datasets support ([#1411](https://github.com/googleapis/genai-toolbox/issues/1411)) ([345bd6a](https://github.com/googleapis/genai-toolbox/commit/345bd6af520bb9ce8a43834951e68fea7bbe6a02))
-* **tools/bigquery-search-catalog:** Add new tool to BigQuery ([#1382](https://github.com/googleapis/genai-toolbox/issues/1382)) ([bffb39d](https://github.com/googleapis/genai-toolbox/commit/bffb39dea3cc946a1e611e3523241443b1e4f047))
-* **tools/bigquery:** Add `useClientOAuth` to BigQuery prebuilt source config ([#1431](https://github.com/googleapis/genai-toolbox/issues/1431)) ([fe2999a](https://github.com/googleapis/genai-toolbox/commit/fe2999a691ac92b2bf35cb7cfd504df2f3ce84b3))
-* **tools/clickhouse-list-databases:** Add `list-databases` tool to clickhouse source ([#1274](https://github.com/googleapis/genai-toolbox/issues/1274)) ([e515d92](https://github.com/googleapis/genai-toolbox/commit/e515d9254f3b8e89f89322d490eb3cedce85d2bb))
-* **tools/firestore-get-rules:** Add `databaseId` to the Firestore source and `firestore-get-rules` tool ([#1505](https://github.com/googleapis/genai-toolbox/issues/1505)) ([7450482](https://github.com/googleapis/genai-toolbox/commit/7450482bb2479eab7d1c8f0d40755a8d11aa3b26))
-* **tools/firestore:** Add `firestore-query` tool ([#1305](https://github.com/googleapis/genai-toolbox/issues/1305)) ([cce602f](https://github.com/googleapis/genai-toolbox/commit/cce602f28097353f6a3017cec1fa5f75283f111d))
-* **tools/looker:** Query tracking for MCP Toolbox in Looker System Activity views ([#1410](https://github.com/googleapis/genai-toolbox/issues/1410)) ([2036c8e](https://github.com/googleapis/genai-toolbox/commit/2036c8efd2fb9edc26df599629d3131c6c367f4b))
-* **tools/mssql-list-tables:** Add new tool for sql server ([#1433](https://github.com/googleapis/genai-toolbox/issues/1433)) ([b036047](https://github.com/googleapis/genai-toolbox/commit/b036047a21f63265c9d9637ac1a671792c9c2e80))
-* **tools/mysql-list-active-queries:** Add a new tool to list ongoing queries in a MySQL instance ([#1471](https://github.com/googleapis/genai-toolbox/issues/1471)) ([ed54cd6](https://github.com/googleapis/genai-toolbox/commit/ed54cd6cfd17a3bdd84025d4eb8264763da36a98))
-* **tools/mysql-list-table-fragmentation:** Add a new tool to list table fragmentation in a MySQL instance ([#1479](https://github.com/googleapis/genai-toolbox/issues/1479)) ([fe651d8](https://github.com/googleapis/genai-toolbox/commit/fe651d822f88832833e869ec049c6c084eae7e51))
-* **tools/mysql-list-tables-missing-index:** Add a new tool to list tables that do not have primary or unique keys in a MySQL instance ([#1493](https://github.com/googleapis/genai-toolbox/issues/1493)) ([9eb821a](https://github.com/googleapis/genai-toolbox/commit/9eb821a6dca408ba993f904aa42b5b4f70674ba7))
-* **tools/mysql-list-tables:** Add new tool for MySQL ([#1287](https://github.com/googleapis/genai-toolbox/issues/1287)) ([6c8460b](https://github.com/googleapis/genai-toolbox/commit/6c8460b0e507315d407c91ba1c821f4820cc1620))
-* **tools/postgres-list-active-queries:** Add new `postgres-list-active-queries` tool ([#1400](https://github.com/googleapis/genai-toolbox/issues/1400)) ([b2b06c7](https://github.com/googleapis/genai-toolbox/commit/b2b06c72c29fd99a0c7118b85e6f7bcf6853d173))
-* **tools/postgres-list-tables:** Add new tool to postgres source ([#1284](https://github.com/googleapis/genai-toolbox/issues/1284)) ([71f360d](https://github.com/googleapis/genai-toolbox/commit/71f360d31522f429a646b705ce7d1d11dac4cf68))
-* **tools/spanner-list-tables:** Add new tool `spanner-list-tables` ([#1404](https://github.com/googleapis/genai-toolbox/issues/1404)) ([7d384dc](https://github.com/googleapis/genai-toolbox/commit/7d384dc28f8c37dddc2f6cefc0bbeb4c201e3167))
-
-
-### Bug Fixes
-
-* **bigquery:** Add `Bearer` parsing to auth token ([#1386](https://github.com/googleapis/genai-toolbox/issues/1386)) ([b5f9780](https://github.com/googleapis/genai-toolbox/commit/b5f9780a59e15eca2591dee32f5da42435e03039))
-* **source/alloydb-admin, source/cloudsql-admin:** Post append new user agent ([#1494](https://github.com/googleapis/genai-toolbox/issues/1494)) ([30f1d3a](https://github.com/googleapis/genai-toolbox/commit/30f1d3a983aa317f1e1a98f9fe753005b56c52bd))
-* **tools/alloydb:** Update parameter names and set default description for AlloyDB control plane tools ([#1468](https://github.com/googleapis/genai-toolbox/issues/1468)) ([6c140d7](https://github.com/googleapis/genai-toolbox/commit/6c140d718a66b45c7ec2d5a267331adb7680f689))
-* **tools/bigquery-conversational-analytics:** Fix authentication scope error in Cloud Run ([#1381](https://github.com/googleapis/genai-toolbox/issues/1381)) ([80b7488](https://github.com/googleapis/genai-toolbox/commit/80b7488ad248ab1d98ee6713e1f6737f67f6754b))
-* **tools/mysql-list-tables:** Update `mysql-list-tables` table_names parameter with default value ([#1439](https://github.com/googleapis/genai-toolbox/issues/1439)) ([da24661](https://github.com/googleapis/genai-toolbox/commit/da246610e105df10a9dc1bce19fa35d408c039f3))
-* **tools/neo4j:** Implement value conversion for Neo4j types to JSON-compatible ([#1428](https://github.com/googleapis/genai-toolbox/issues/1428)) ([4babc4e](https://github.com/googleapis/genai-toolbox/commit/4babc4e11b3b64db8d8c9d6b65e47744f5174f7f))
-
-## [0.14.0](https://github.com/googleapis/genai-toolbox/compare/v0.13.0...v0.14.0) (2025-09-05)
-
-
-### ⚠ BREAKING CHANGES
-
-* **bigquery:** Move `useClientOAuth` config from tool to source ([#1279](https://github.com/googleapis/genai-toolbox/issues/1279)) ([8d20a48](https://github.com/googleapis/genai-toolbox/commit/8d20a48f13bcda853d41bdf80a162de12b076d1b))
-* **tools/bigquerysql:** remove `useClientOAuth` from tools config ([#1312](https://github.com/googleapis/genai-toolbox/issues/1312))
-
-### Features
-
-* **clickhouse:** Add ClickHouse Source and Tools ([#1088](https://github.com/googleapis/genai-toolbox/issues/1088)) ([75a04a5](https://github.com/googleapis/genai-toolbox/commit/75a04a55dd2259bed72fe95119a7a51a906c0b21))
-* **prebuilt/alloydb-postgres:** Support ipType and IAM users ([#1324](https://github.com/googleapis/genai-toolbox/issues/1324)) ([0b2121e](https://github.com/googleapis/genai-toolbox/commit/0b2121ea72eb81348dcd9c740a62ccd32e71fe37))
-* **server/mcp:** Support toolbox auth in mcp ([#1140](https://github.com/googleapis/genai-toolbox/issues/1140)) ([ca353e0](https://github.com/googleapis/genai-toolbox/commit/ca353e0b66fedc00e9110df57db18632aef49018))
-* **source/mysql:** Support `queryParams` in MySQL source ([#1299](https://github.com/googleapis/genai-toolbox/issues/1299)) ([3ae2526](https://github.com/googleapis/genai-toolbox/commit/3ae2526e0fe36b57b05a9b54f1d99f3fc68d9657))
-* **tools/bigquery:** Support end-user credential passthrough on multiple BQ tools ([#1314](https://github.com/googleapis/genai-toolbox/issues/1314)) ([88f4b30](https://github.com/googleapis/genai-toolbox/commit/88f4b3028df3b6a400936cdf8a035bf55021924c))
-* **tools/looker:** Add description for looker-get-models tool ([#1266](https://github.com/googleapis/genai-toolbox/issues/1266)) ([89af3a4](https://github.com/googleapis/genai-toolbox/commit/89af3a4ca332f029615b2a739d1f6cd50519638d))
-* **tools/looker:** Authenticate via end user credentials ([#1257](https://github.com/googleapis/genai-toolbox/issues/1257)) ([8755e3d](https://github.com/googleapis/genai-toolbox/commit/8755e3db3476abb35629b3cca9c78db7366757a4))
-* **tools/looker:** Report field suggestions to agent ([#1267](https://github.com/googleapis/genai-toolbox/issues/1267)) ([2cad82e](https://github.com/googleapis/genai-toolbox/commit/2cad82e5107566dd6c9b75e34e9976af63af0bb5))
-
-
-### Bug Fixes
-
-* Do not print usage on runtime error ([#1315](https://github.com/googleapis/genai-toolbox/issues/1315)) ([afba7a5](https://github.com/googleapis/genai-toolbox/commit/afba7a57cdd4fe7c1b0741dbf8f8c78b14a68089))
-* Update env var to allow empty string ([#1260](https://github.com/googleapis/genai-toolbox/issues/1260)) ([03aa9fa](https://github.com/googleapis/genai-toolbox/commit/03aa9fabacda06f860c9f178485126bddb7d5782))
-* **tools/firestore:** Add document/collection path validation ([#1229](https://github.com/googleapis/genai-toolbox/issues/1229)) ([14c2249](https://github.com/googleapis/genai-toolbox/commit/14c224939a2f9bb349fa00a7d5227877198530c2))
-* **tools/looker-get-dashboards:** Fix Looker client OAuth check ([#1338](https://github.com/googleapis/genai-toolbox/issues/1338)) ([36225aa](https://github.com/googleapis/genai-toolbox/commit/36225aa6db7f8426ad87930866530fde4e9bf0cd))
-* **tools/oceanbase:** Fix encoded text with mysql driver ([#1283](https://github.com/googleapis/genai-toolbox/issues/1283)) ([d16f89f](https://github.com/googleapis/genai-toolbox/commit/d16f89fbb6e49c03998f114ef7dc2b584b5e4967)), closes [#1161](https://github.com/googleapis/genai-toolbox/issues/1161)
-
 ## [0.13.0](https://github.com/googleapis/genai-toolbox/compare/v0.12.0...v0.13.0) (2025-08-27)

 ### ⚠ BREAKING CHANGES
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -27,6 +27,7 @@ This project follows

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

 All submissions, including submissions by project members, require review. We
 use GitHub pull requests for this purpose. Consult
@@ -36,50 +37,28 @@ information on using pull requests.
 ### Code reviews

 * Within 2-5 days, a reviewer will review your PR. They may approve it, or request
-changes.
+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.
+this helps the reviewer know which parts of the PR have changed. 
 * Commits will be
 squashed when merged.
-* Please follow up with changes promptly.
+* 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.

-### Automated Code Reviews
-
-This repository uses **Gemini Code Assist** to provide automated code reviews on Pull Requests. While this does not replace human review, it provides immediate feedback on code quality and potential issues.
-
-You can manually trigger the bot by commenting on your Pull Request:
-
-*   `/gemini`: Manually invokes Gemini Code Assist in comments
-*   `/gemini review`: Posts a code review of the changes in the pull request
-*   `/gemini summary`: Posts a summary of the changes in the pull request.
-*   `/gemini help`: Overview of the available commands
-
-## Guidelines for Pull Requests
-
-1. Please keep your PR small for more thorough review and easier updates. In case of regression, it also allows us to roll back a single feature instead of multiple ones.
-1. For non-trivial changes, consider opening an issue and discussing it with the code owners first.
-1. Provide a good PR description as a record of what change is being made and why it was made. Link to a GitHub issue if it exists.
-1. Make sure your code is thoroughly tested with unit tests and integration tests. Remember to clean up the test instances properly in your code to avoid memory leaks.
-
 ## Adding a New Database Source or Tool

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

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

 ### Adding a New Database Source

@@ -92,7 +71,7 @@ implementation](https://github.com/googleapis/genai-toolbox/blob/main/internal/s
  `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, Type, connection object, additional config).
+  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:
@@ -110,16 +89,11 @@ implementation](https://github.com/googleapis/genai-toolbox/blob/main/internal/s

 ### Adding a New Tool

-> [!NOTE]
-> Please follow the tool naming convention detailed
-> [here](./DEVELOPER.md#tool-naming-conventions).
-
 We recommend looking at an [example tool
 implementation](https://github.com/googleapis/genai-toolbox/tree/main/internal/tools/postgres/postgressql).

-Remember to keep your PRs small. For example, if you are contributing a new Source, only include one or two core Tools within the same PR, the rest of the Tools can come in subsequent PRs. 
-
-* **Create a new directory** under `internal/tools` for your tool type (e.g., `internal/tools/newdb/newdbtool`).
+* **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.
@@ -127,7 +101,7 @@ tools.
  [`ToolConfig`](https://github.com/googleapis/genai-toolbox/blob/fd300dc606d88bf9f7bba689e2cee4e3565537dd/internal/tools/tools.go#L61)
  interface**. This interface requires one method:
  * `ToolConfigType() string`: Returns a unique string identifier for your tool
-    (e.g., `"newdb-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.
@@ -144,16 +118,16 @@ tools.
  * `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 `newdbtool_test.go`.
+* **Implement Unit Tests** in a file named `newdb_test.go`.

 ### Adding Integration Tests

 * **Add a test file** under a new directory `tests/newdb`.
 * **Add pre-defined integration test suites** in the
-  `/tests/newdb/newdb_integration_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):
+  `/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.
@@ -172,21 +146,19 @@ tools.
            parameters][temp-param-doc]. Only run this test if template
            parameters apply to your tool.

-* **Add additional tests** for the tools that are not covered by the predefined tests. Every tool must be tested!
-
 * **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/v0.23.0/tests/tool.go#L41
+    https://github.com/googleapis/genai-toolbox/blob/fd300dc606d88bf9f7bba689e2cee4e3565537dd/tests/tool.go#L31
 [tool-call]:
-    https://github.com/googleapis/genai-toolbox/blob/v0.23.0/tests/tool.go#L229
+    <https://github.com/googleapis/genai-toolbox/blob/fd300dc606d88bf9f7bba689e2cee4e3565537dd/tests/tool.go#L79>
 [mcp-call]:
-    https://github.com/googleapis/genai-toolbox/blob/v0.23.0/tests/tool.go#L789
+    https://github.com/googleapis/genai-toolbox/blob/fd300dc606d88bf9f7bba689e2cee4e3565537dd/tests/tool.go#L554
 [execute-sql]:
-    https://github.com/googleapis/genai-toolbox/blob/v0.23.0/tests/tool.go#L609
+    <https://github.com/googleapis/genai-toolbox/blob/fd300dc606d88bf9f7bba689e2cee4e3565537dd/tests/tool.go#L431>
 [temp-param]:
-    https://github.com/googleapis/genai-toolbox/blob/v0.23.0/tests/tool.go#L454
+    <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

@@ -221,7 +193,7 @@ detailed description of your changes and any requests for long term testing
 resources.

 * **Title:** All pull request title should follow the formatting of
-  [Conventional
+  [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
@@ -243,7 +215,7 @@ resources.
  | style           | Update src code, with only formatting and whitespace updates (e.g. code formatter or linter changes). |

  Pull requests should always add scope whenever possible. The scope is
-  formatted as `<scope-resource>/<scope-type>` (e.g., `sources/postgres`, or
+  formatted as `<scope-type>/<scope-type>` (e.g., `sources/postgres`, or
  `tools/mssql-sql`).
  
  Ideally, **each PR covers only one scope**, if this is
--- a/DEVELOPER.md
+++ b/DEVELOPER.md
@@ -44,51 +44,6 @@ Before you begin, ensure you have the following:
    curl http://127.0.0.1:5000
    ```

-### Tool Naming Conventions
-
-This section details the purpose and conventions for MCP Toolbox's tools naming
-properties, **tool name** and **tool type**.
-
-```
-kind: tools
-name: cancel_hotel <- tool name
-type: postgres-sql  <- tool type
-source: my_pg_source
-```
-
-#### Tool Name
-
-Tool name is the identifier used by a Large Language Model (LLM) to invoke a
-specific tool.
-
-* Custom tools: The user can define any name they want. The below guidelines
-  do not apply.
-* Pre-built tools: The tool name is predefined and cannot be changed. It
-should follow the guidelines.
-
-The following guidelines apply to tool names:
-
-* Should use underscores over hyphens (e.g., `list_collections` instead of
-  `list-collections`).
-* Should not have the product name in the name (e.g., `list_collections` instead
-  of `firestore_list_collections`).
-* Superficial changes are NOT considered as breaking (e.g., changing tool name).
-* Non-superficial changes MAY be considered breaking (e.g. adding new parameters
-  to a function) until they can be validated through extensive testing to ensure
-  they do not negatively impact agent's performances.
-
-#### Tool Type
-
-Tool type serves as a category or type that a user can assign to a tool.
-
-The following guidelines apply to tool types:
-
-* Should use hyphens over underscores (e.g. `firestore-list-collections` or
-  `firestore_list_colelctions`).
-* Should use product name in name (e.g. `firestore-list-collections` over
-  `list-collections`).
-* Changes to tool type are breaking changes and should be avoided.
-
 ## Testing

 ### Infrastructure
@@ -110,7 +65,7 @@ golangci-lint run --fix
 Execute unit tests locally:

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

 ### Integration Tests
@@ -136,29 +91,11 @@ go test -race -v ./cmd/... ./internal/...
    go test -race -v ./tests/alloydbpg
    ```

-1. **Timeout:** The integration test should have a timeout on the server.
-   Look for code like this:
-
-   ```go
-   ctx, cancel := context.WithTimeout(context.Background(), time.Minute)
-   defer cancel()
-
-   cmd, cleanup, err := tests.StartCmd(ctx, toolsFile, args...)
-   if err != nil {
-     t.Fatalf("command initialization returned an error: %s", err)
-   }
-   defer cleanup()
-   ```
-
-   Be sure to set the timeout to a reasonable value for your tests.
-
 #### Running on Pull Requests

 * **Internal Contributors:** Testing workflows should trigger automatically.
 * **External Contributors:** Request Toolbox maintainers to trigger the testing
  workflows on your PR.
-  * Maintainers can comment `/gcbrun` to execute the integration tests.
-  * Maintainers can add the label `tests:run` to execute the unit tests.

 #### Test Resources

@@ -186,9 +123,6 @@ variables for each source.
 * Couchbase - setup in the test project via the Marketplace
 * DGraph - using the public dgraph interface <https://play.dgraph.io> for
  testing
-* Looker
-  * The Cloud Build service account is a user for conversational analytics
-  * The Looker instance runs under google.com:looker-sandbox.
 * Memorystore Redis - setup in the test project using a Memorystore for Redis
  standalone instance
  * Memorystore Redis Cluster, Memorystore Valkey standalone, and Memorystore
@@ -208,30 +142,6 @@ variables for each source.
 * SQLite -  setup in the integration test, where we create a temporary database
  file

-### Link Checking and Fixing with Lychee
-
-We use **[lychee](https://github.com/lycheeverse/lychee-action)** for repository link checks.
-
-* To run the checker **locally**, see the [command-line usage guide](https://github.com/lycheeverse/lychee?tab=readme-ov-file#commandline-usage).
-
-####  Fixing Broken Links
-
-1.  **Update the Link:** Correct the broken URL or update the content where it is used.
-2.  **Ignore the Link:** If you can't fix the link (e.g., due to **external rate-limits** or if it's a **local-only URL**), tell Lychee to **ignore** it.
-
-    * List **regular expressions** or **direct links** in the **[.lycheeignore](https://github.com/googleapis/genai-toolbox/blob/main/.lycheeignore)** file, one entry per line.
-    * **Always add a comment** explaining **why** the link is being skipped to prevent link rot. **Example `.lycheeignore`:**
-       ```text
-       # These are email addresses, not standard web URLs, and usually cause check failures.
-       ^mailto:.*
-       ```
-> [!NOTE]
-> To avoid build failures in GitHub Actions, follow the linking pattern demonstrated here: <br>
-> **Avoid:** (Works in Hugo, breaks Link Checker): `[Read more](docs/setup)` or `[Read more](docs/setup/)` <br>
-> **Reason:** The link checker cannot find a file named "setup" or a directory with that name containing an index. <br>
-> **Preferred:** `[Read more](docs/setup.md)` <br>
-> **Reason:** The GitHub Action finds the physical file. Hugo then uses its internal logic (or render hooks) to resolve this to the correct `/docs/setup/` web URL. <br>
-
 ### Other GitHub Checks

 * License header check (`.github/header-checker-lint.yml`) - Ensures files have
@@ -275,37 +185,11 @@ Follow these steps to preview documentation changes locally using a Hugo server:

 ### Previewing Documentation on Pull Requests

-### Document Versioning Setup
-
-There are 3 GHA workflows we use to achieve document versioning:
-
-1. **Deploy In-development docs:**
-    This workflow is run on every commit merged into the main branch. It deploys
-    the built site to the `/dev/` subdirectory for the in-development
-    documentation.
-
-1. **Deploy Versioned Docs:**
-    When a new GitHub Release is published, it performs two deployments based on
-    the new release tag. One to the new version subdirectory and one to the root
-    directory of the versioned-gh-pages branch.
-
-    **Note:** Before the release PR from release-please is merged, add the
-    newest version into the hugo.toml file.
-
-1. **Deploy Previous Version Docs:**
-    This is a manual workflow, started from the GitHub Actions UI.
-    To rebuild and redeploy documentation for an already released version that
-    were released before this new system was in place. This workflow can be
-    started on the UI by providing the git version tag which you want to create
-    the documentation for. The specific versioned subdirectory and the root docs
-    are updated on the versioned-gh-pages branch.
-
 #### 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
@@ -368,34 +252,9 @@ for instructions on developing Toolbox SDKs.

 ### Team

-Team `@googleapis/senseai-eco` has been set as
+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`. Additionally, database-specific GitHub
-teams (e.g., `@googleapis/toolbox-alloydb`) have been created from MDB groups to
-manage code ownership and review for individual database products.
-
-Team `@googleapis/toolbox-contributors` has write access to this repo. They
-can create branches and approve test runs. But they do not have the ability
-to approve PRs for main. TeamSync is used to create this team from the MDB
-Group `toolbox-contributors`. Googlers who are developing for MCP-Toolbox
-but aren't part of the core team should join this group.
-
-### Issue/PR Triage and SLO
-After an issue is created, maintainers will assign the following labels:
-* `Priority` (defaulted to P0)
-* `Type` (if applicable)
-* `Product` (if applicable)
-
-All incoming issues and PRs will follow the following SLO:
-| Type            | Priority | Objective                                                              |
-|-----------------|----------|------------------------------------------------------------------------|
-| Feature Request | P0       | Must respond within **5 days**                                         |
-| Process         | P0       | Must respond within **5 days**                                         |
-| Bugs            | P0       | Must respond within **5 days**, and resolve/closure within **14 days** |
-| Bugs            | P1       | Must respond within **7 days**, and resolve/closure within **90 days** |
-| Bugs            | P2       | Must respond within **30 days**
-
-_Types that are not listed in the table do not adhere to any SLO._
+this team from MDB Group, `senseai-eco`.

 ### Releasing

@@ -493,8 +352,7 @@ Trigger pull request tests for external contributors by:

 ## Repo Setup & Automation

-* .github/blunderbuss.yml - Auto-assign issues and PRs from GitHub teams. Use a
-  product label to assign to a product-specific team member.
+* .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
--- a/28
+++ b/28
@@ -11,14 +11,9 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-FROM --platform=$BUILDPLATFORM golang:1 AS build

-# Install Zig for CGO cross-compilation
-RUN apt-get update && apt-get install -y xz-utils
-RUN curl -fL "https://ziglang.org/download/0.15.2/zig-x86_64-linux-0.15.2.tar.xz" -o zig.tar.xz && \
-    mkdir -p /zig && \
-    tar -xf zig.tar.xz -C /zig --strip-components=1 && \
-    rm zig.tar.xz
+# Use the latest stable golang 1.x to compile to a binary
+FROM --platform=$BUILDPLATFORM golang:1 AS build

 WORKDIR /go/src/genai-toolbox
 COPY . .
@@ -29,27 +24,14 @@ ARG BUILD_TYPE="container.dev"
 ARG COMMIT_SHA=""

 RUN go get ./...
-
-RUN export ZIG_TARGET="" && \
-    case "${TARGETARCH}" in \
-      ("amd64") ZIG_TARGET="x86_64-linux-gnu" ;; \
-      ("arm64") ZIG_TARGET="aarch64-linux-gnu" ;; \
-      (*) echo "Unsupported architecture: ${TARGETARCH}" && exit 1 ;; \
-    esac && \
-    CGO_ENABLED=1 GOOS=${TARGETOS} GOARCH=${TARGETARCH} \
-    CC="/zig/zig cc -target ${ZIG_TARGET}" \
-    CXX="/zig/zig c++ -target ${ZIG_TARGET}" \
-    go build \
-    -ldflags "-X github.com/googleapis/genai-toolbox/cmd.buildType=${BUILD_TYPE} -X github.com/googleapis/genai-toolbox/cmd.commitSha=${COMMIT_SHA}" \
-    -o genai-toolbox .
+RUN CGO_ENABLED=0 GOOS=${TARGETOS} GOARCH=${TARGETARCH} \
+    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/cc-debian12:nonroot
+FROM gcr.io/distroless/static:nonroot

 WORKDIR /app
 COPY --from=build --chown=nonroot /go/src/genai-toolbox/genai-toolbox /toolbox
 USER nonroot

-LABEL io.modelcontextprotocol.server.name="io.github.googleapis/genai-toolbox"
-
 ENTRYPOINT ["/toolbox"] 
--- a/MCP-TOOLBOX-EXTENSION.md
+++ b/MCP-TOOLBOX-EXTENSION.md
@@ -1,247 +0,0 @@
-This document helps you find and install the right Gemini CLI extension to
-interact with your databases.
-
-## How to Install an Extension
-
-To install any of the extensions listed below, use the `gemini extensions
-install` command followed by the extension's GitHub repository URL.
-
-For complete instructions on finding, installing, and managing extensions,
-please see the [official Gemini CLI extensions
-documentation](https://github.com/google-gemini/gemini-cli/blob/main/docs/extensions/index.md).
-
-**Example Installation Command:**
-
-```bash
-gemini extensions install https://github.com/gemini-cli-extensions/EXTENSION_NAME
-```
-
-Make sure the user knows:
-
-* These commands are not supported from within the CLI
-* These commands will only be reflected in active CLI sessions on restart
-* Extensions require Application Default Credentials in your environment. See
-  [Set up ADC for a local development
-  environment](https://cloud.google.com/docs/authentication/set-up-adc-local-dev-environment)
-  to learn how you can provide either your user credentials or service account
-  credentials to ADC in a local development environment.
-* Most extensions require you to set environment variables to connect to a
-  database. If there is a link provided for the configuration, fetch the web
-  page and return the configuration.
-
-----
-
-## Find Your Database Extension
-
-Find your database or service in the list below to get the correct installation
-command.
-
-**Note on Observability:** Extensions with `-observability` in their name are
-designed to help you understand the health and performance of your database
-instances, often by analyzing metrics and logs.
-
-### Google Cloud Managed Databases
-
-#### BigQuery
-
-* For data analytics and querying:
-
-    ```bash
-    gemini extensions install https://github.com/gemini-cli-extensions/bigquery-data-analytics
-    ```
-
-    Configuration:
-    https://github.com/gemini-cli-extensions/bigquery-data-analytics/tree/main?tab=readme-ov-file#configuration
-
-* For conversational analytics (using natural language):
-
-    ```bash
-    gemini extensions install https://github.com/gemini-cli-extensions/bigquery-conversational-analytics
-    ```
-
-    Configuration: https://github.com/gemini-cli-extensions/bigquery-conversational-analytics/tree/main?tab=readme-ov-file#configuration
-
-#### Cloud SQL for MySQL
-
-* Main Extension:
-
-    ```bash
-    gemini extensions install https://github.com/gemini-cli-extensions/cloud-sql-mysql
-    ```
-
-    Configuration:
-    https://github.com/gemini-cli-extensions/cloud-sql-mysql/tree/main?tab=readme-ov-file#configuration
-
-* Observability:
-
-    ```bash
-    gemini extensions install https://github.com/gemini-cli-extensions/cloud-sql-mysql-observability
-    ```
-
-    If you are looking for self-hosted MySQL, consider the `mysql` extension.
-
-#### Cloud SQL for PostgreSQL
-
-* Main Extension:
-
-    ```bash
-    gemini extensions install https://github.com/gemini-cli-extensions/cloud-sql-postgresql
-    ```
-
-    Configuration:
-    https://github.com/gemini-cli-extensions/cloud-sql-postgresql/tree/main?tab=readme-ov-file#configuration
-
-* Observability:
-
-    ```bash
-    gemini extensions install https://github.com/gemini-cli-extensions/cloud-sql-postgresql-observability
-    ```
-
-    If you are looking for other PostgreSQL options, consider the `postgres`
-    extension for self-hosted instances, or the `alloydb` extension for AlloyDB
-    for PostgreSQL.
-
-#### Cloud SQL for SQL Server
-
-* Main Extension:
-
-    ```bash
-    gemini extensions install https://github.com/gemini-cli-extensions/cloud-sql-sqlserver
-    ```
-
-    Configuration:
-    https://github.com/gemini-cli-extensions/cloud-sql-sqlserver/tree/main?tab=readme-ov-file#configuration
-
-* Observability:
-
-    ```bash
-    gemini extensions install https://github.com/gemini-cli-extensions/cloud-sql-sqlserver-observability
-    ```
-
-    If you are looking for self-hosted SQL Server, consider the `sql-server`
-    extension.
-
-#### AlloyDB for PostgreSQL
-
-* Main Extension:
-
-    ```bash
-    gemini extensions install https://github.com/gemini-cli-extensions/alloydb
-    ```
-
-    Configuration:
-    https://github.com/gemini-cli-extensions/alloydb/tree/main?tab=readme-ov-file#configuration
-
-* Observability:
-
-    ```bash
-    gemini extensions install https://github.com/gemini-cli-extensions/alloydb-observability
-    ```
-
-    If you are looking for other PostgreSQL options, consider the `postgres`
-    extension for self-hosted instances, or the `cloud-sql-postgresql` extension
-    for Cloud SQL for PostgreSQL.
-
-#### Spanner
-
-* For querying Spanner databases:
-
-    ```bash
-    gemini extensions install https://github.com/gemini-cli-extensions/spanner
-    ```
-
-    Configuration:
-    https://github.com/gemini-cli-extensions/spanner/tree/main?tab=readme-ov-file#configuration
-
-#### Firestore
-
-* For querying Firestore in Native Mode:
-
-    ```bash
-    gemini extensions install https://github.com/gemini-cli-extensions/firestore-native
-    ```
-
-    Configuration:
-    https://github.com/gemini-cli-extensions/firestore-native/tree/main?tab=readme-ov-file#configuration
-
-### Other Google Cloud Data Services
-
-#### Dataplex
-
-* For interacting with Dataplex data lakes and assets:
-
-    ```bash
-    gemini extensions install https://github.com/gemini-cli-extensions/dataplex
-    ```
-
-    Configuration:
-    https://github.com/gemini-cli-extensions/dataplex/tree/main?tab=readme-ov-file#configuration
-
-#### Looker
-
-* For querying Looker instances:
-
-    ```bash
-    gemini extensions install https://github.com/gemini-cli-extensions/looker
-    ```
-
-    Configuration:
-    https://github.com/gemini-cli-extensions/looker/tree/main?tab=readme-ov-file#configuration
-
-### Other Database Engines
-
-These extensions are for connecting to database instances not managed by Cloud
-SQL (e.g., self-hosted on-prem, on a VM, or in another cloud).
-
-* MySQL:
-
-    ```bash
-    gemini extensions install https://github.com/gemini-cli-extensions/mysql
-    ```
-
-    Configuration:
-    https://github.com/gemini-cli-extensions/mysql/tree/main?tab=readme-ov-file#configuration
-
-    If you are looking for Google Cloud managed MySQL, consider the
-    `cloud-sql-mysql` extension.
-
-* PostgreSQL:
-
-    ```bash
-    gemini extensions install https://github.com/gemini-cli-extensions/postgres
-    ```
-
-    Configuration:
-    https://github.com/gemini-cli-extensions/postgres/tree/main?tab=readme-ov-file#configuration
-
-    If you are looking for Google Cloud managed PostgreSQL, consider the
-    `cloud-sql-postgresql` or `alloydb` extensions.
-
-* SQL Server:
-
-    ```bash
-    gemini extensions install https://github.com/gemini-cli-extensions/sql-server
-    ```
-
-    Configuration:
-    https://github.com/gemini-cli-extensions/sql-server/tree/main?tab=readme-ov-file#configuration
-
-    If you are looking for Google Cloud managed SQL Server, consider the
-    `cloud-sql-sqlserver` extension.
-
-### Custom Tools
-
-#### MCP Toolbox
-
-* For connecting to MCP Toolbox servers:
-
-    This extension can be used with any Google Cloud database to build custom
-    tools. For more information, see the [MCP Toolbox
-    documentation](https://googleapis.github.io/genai-toolbox/getting-started/introduction/).
-
-    ```bash
-    gemini extensions install https://github.com/gemini-cli-extensions/mcp-toolbox
-    ```
-
-    Configuration:
-    https://github.com/gemini-cli-extensions/mcp-toolbox/tree/main?tab=readme-ov-file#configuration
--- a/README.md
+++ b/README.md
@@ -2,8 +2,6 @@

 # MCP Toolbox for Databases

-<a href="https://trendshift.io/repositories/13019" target="_blank"><img src="https://trendshift.io/api/badge/repositories/13019" alt="googleapis%2Fgenai-toolbox | Trendshift" style="width: 250px; height: 55px;" width="250" height="55"/></a>
-
 [![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)
@@ -35,13 +33,12 @@ documentation](https://googleapis.github.io/genai-toolbox/).
 - [Getting Started](#getting-started)
  - [Installing the server](#installing-the-server)
  - [Running the server](#running-the-server)
+    - [Homebrew Users](#homebrew-users)
  - [Integrating your application](#integrating-your-application)
-  - [Using Toolbox with Gemini CLI Extensions](#using-toolbox-with-gemini-cli-extensions)
 - [Configuration](#configuration)
  - [Sources](#sources)
  - [Tools](#tools)
  - [Toolsets](#toolsets)
-  - [Prompts](#prompts)
 - [Versioning](#versioning)
  - [Pre-1.0.0 Versioning](#pre-100-versioning)
  - [Post-1.0.0 Versioning](#post-100-versioning)
@@ -101,27 +98,10 @@ centralized location to store and update tools, allowing you to share tools
 between agents and applications and update those tools without necessarily
 redeploying your application.

-<p align="center">
-<img src="./docs/en/getting-started/introduction/architecture.png" alt="architecture" width="50%"/>
-</p>
+![architecture](./docs/en/getting-started/introduction/architecture.png)

 ## Getting Started

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

 For the latest version, check the [releases page][releases] and use the
@@ -135,69 +115,13 @@ following instructions for your OS and CPU architecture.
 To install Toolbox as a binary:

 <!-- {x-release-please-start-version} -->
-> <details>
-> <summary>Linux (AMD64)</summary>
->
-> To install Toolbox as a binary on Linux (AMD64):
->
-> ```sh
-> # see releases page for other versions
-> export VERSION=0.26.0
-> curl -L -o toolbox https://storage.googleapis.com/genai-toolbox/v$VERSION/linux/amd64/toolbox
-> chmod +x toolbox
-> ```
->
-> </details>
-> <details>
-> <summary>macOS (Apple Silicon)</summary>
->
-> To install Toolbox as a binary on macOS (Apple Silicon):
->
-> ```sh
-> # see releases page for other versions
-> export VERSION=0.26.0
-> curl -L -o toolbox https://storage.googleapis.com/genai-toolbox/v$VERSION/darwin/arm64/toolbox
-> chmod +x toolbox
-> ```
->
-> </details>
-> <details>
-> <summary>macOS (Intel)</summary>
->
-> To install Toolbox as a binary on macOS (Intel):
->
-> ```sh
-> # see releases page for other versions
-> export VERSION=0.26.0
-> curl -L -o toolbox https://storage.googleapis.com/genai-toolbox/v$VERSION/darwin/amd64/toolbox
-> chmod +x toolbox
-> ```
->
-> </details>
-> <details>
-> <summary>Windows (Command Prompt)</summary>
->
-> To install Toolbox as a binary on Windows (Command Prompt):
->
-> ```cmd
-> :: see releases page for other versions
-> set VERSION=0.26.0
-> curl -o toolbox.exe "https://storage.googleapis.com/genai-toolbox/v%VERSION%/windows/amd64/toolbox.exe"
-> ```
->
-> </details>
-> <details>
-> <summary>Windows (PowerShell)</summary>
->
-> To install Toolbox as a binary on Windows (PowerShell):
->
-> ```powershell
-> # see releases page for other versions
-> $VERSION = "0.26.0"
-> curl.exe -o toolbox.exe "https://storage.googleapis.com/genai-toolbox/v$VERSION/windows/amd64/toolbox.exe"
-> ```
->
-> </details>
+```sh
+# see releases page for other versions
+export VERSION=0.13.0
+curl -O https://storage.googleapis.com/genai-toolbox/v$VERSION/linux/amd64/toolbox
+chmod +x toolbox
+```
+
 </details>

 <details>
@@ -206,7 +130,7 @@ You can also install Toolbox as a container:

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

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

 </details>

-<details>
-<summary>Gemini CLI Extensions</summary>
-
-To install Gemini CLI Extensions for MCP Toolbox, run the following command:
-
-```sh
-gemini extensions install https://github.com/gemini-cli-extensions/mcp-toolbox
-```
-
-</details>
-
 ### Running the server

 [Configure](#configuration) a `tools.yaml` to define your tools, and then
@@ -261,9 +174,8 @@ To run Toolbox from binary:
 ./toolbox --tools-file "tools.yaml"
 ```

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

 </details>

@@ -274,16 +186,15 @@ To run Toolbox from binary:
 To run the server after pulling the [container image](#installing-the-server):

 ```sh
-export VERSION=0.24.0 # Use the version you pulled
+export VERSION=0.11.0 # Use the version you pulled
 docker run -p 5000:5000 \
 -v $(pwd)/tools.yaml:/app/tools.yaml \
 us-central1-docker.pkg.dev/database-toolbox/toolbox/toolbox:$VERSION \
 --tools-file "/app/tools.yaml"
 ```

-> ⓘ Note  
-> The `-v` flag mounts your local `tools.yaml` into the container, and `-p` maps
-> the container's port `5000` to your host's port `5000`.
+ⓘ **NOTE:**  
+The `-v` flag mounts your local `tools.yaml` into the container, and `-p` maps the container's port `5000` to your host's port `5000`.

 </details>

@@ -291,18 +202,14 @@ us-central1-docker.pkg.dev/database-toolbox/toolbox/toolbox:$VERSION \

 <summary>Source</summary>

-To run the server directly from source, navigate to the project root directory
-and run:
+To run the server directly from source, navigate to the project root directory and run:

 ```sh
 go run .
 ```

-> ⓘ Note  
-> This command runs the project from source, and is more suitable for development
-> and testing. It does **not** compile a binary into your `$GOPATH`. If you want
-> to compile a binary instead, refer the [Developer
-> Documentation](./DEVELOPER.md#building-the-binary).
+ⓘ **NOTE:**  
+This command runs the project from source, and is more suitable for development and testing. It does **not** compile a binary into your `$GOPATH`. If you want to compile a binary instead, refer the [Developer Documentation](./DEVELOPER.md#building-the-binary).

 </details>

@@ -310,9 +217,7 @@ go run .

 <summary>Homebrew</summary>

-If you installed Toolbox using [Homebrew](https://brew.sh/), the `toolbox`
-binary is available in your system path. You can start the server with the same
-command:
+If you installed Toolbox using [Homebrew](https://brew.sh/), the `toolbox` binary is available in your system path. You can start the server with the same command:

 ```sh
 toolbox --tools-file "tools.yaml"
@@ -320,26 +225,6 @@ toolbox --tools-file "tools.yaml"

 </details>

-<details>
-<summary>NPM</summary>
-
-To run Toolbox directly without manually downloading the binary (requires Node.js):
-```sh
-npx @toolbox-sdk/server --tools-file tools.yaml
-```
-
-</details>
-
-<details>
-
-<summary>Gemini CLI</summary>
-
-Interact with your custom tools using natural language. Check
-[gemini-cli-extensions/mcp-toolbox](https://github.com/gemini-cli-extensions/mcp-toolbox)
-for more information.
-
-</details>
-
 You can use `toolbox help` for a full list of flags! To stop the server, send a
 terminate signal (`ctrl+c` on most platforms).

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

+
 ### Integrating your application

 Once your server is up and running, you can load the tools into your
@@ -554,36 +440,6 @@ For more detailed instructions on using the Toolbox Core SDK, see the
    ```

  </details>
-  <details>
-    <summary>ADK</summary>
-
-1. Install [Toolbox ADK SDK][toolbox-adk-js]:
-
-    ```bash
-    npm install @toolbox-sdk/adk
-    ```
-
-2. Load tools:
-
-    ```javascript
-    import { ToolboxClient } from '@toolbox-sdk/adk';
-
-    // update the url to point to your server
-    const URL = 'http://127.0.0.1:5000';
-    let client = new ToolboxClient(URL);
-
-    // these tools can be passed to your application!
-    const tools = await client.loadToolset('toolsetName');
-    ```
-
-    For more detailed instructions on using the Toolbox ADK SDK, see the
-    [project's README][toolbox-adk-js-readme].
-
-    [toolbox-adk-js]: https://www.npmjs.com/package/@toolbox-sdk/adk
-    [toolbox-adk-js-readme]:
-       https://github.com/googleapis/mcp-toolbox-sdk-js/blob/main/packages/toolbox-adk/README.md
-
-  </details>
 </details>
 </blockquote>
 <details>
@@ -591,7 +447,7 @@ For more detailed instructions on using the Toolbox Core SDK, see the
  <br>
  <blockquote>

-  <details>
+  <details open>
    <summary>Core</summary>

 1. Install [Toolbox Go SDK][toolbox-go]:
@@ -600,7 +456,7 @@ For more detailed instructions on using the Toolbox Core SDK, see the
    go get github.com/googleapis/mcp-toolbox-sdk-go
    ```

-2. Load tools:
+1. Load tools:

    ```go
    package main
@@ -698,11 +554,13 @@ For more detailed instructions on using the Toolbox Core SDK, see the
    package main
    import (
      "context"
-      "log"
+      "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() {
@@ -710,7 +568,7 @@ For more detailed instructions on using the Toolbox Core SDK, see the
      // Update the url to point to your server
      URL := "http://127.0.0.1:5000"
      ctx := context.Background()
-      g := genkit.Init(ctx)
+      g, err := genkit.Init(ctx)

      client, err := core.NewToolboxClient(URL)

@@ -723,7 +581,6 @@ For more detailed instructions on using the Toolbox Core SDK, see the
      if err != nil {
        log.Fatalf("Failed to convert tool: %v\n", err)
      }
-      log.Printf("Successfully converted tool: %s", genkitTool.Name())
    }
    ```

@@ -832,98 +689,11 @@ For more detailed instructions on using the Toolbox Core SDK, see the
    }
    ```

-  </details>
-  <details open>
-    <summary>ADK Go</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/tbadk"
-      "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 := tbadk.NewToolboxClient(URL)
-      if err != nil {
-        return fmt.Sprintln("Could not start Toolbox Client", err)
-      }
-
-      // Use this tool with ADK Go
-      tool, err := client.LoadTool("toolName", ctx)
-      if err != nil {
-        return fmt.Sprintln("Could not load Toolbox Tool", err)
-      }
-    }
-    ```
-
-    For more detailed instructions on using the Toolbox Go SDK, see the
-    [project's README][toolbox-core-go-readme].
-
-
  </details>
 </details>
 </blockquote>
 </details>

-### Using Toolbox with Gemini CLI Extensions
-
-[Gemini CLI extensions][gemini-cli-extensions] provide tools to interact
-directly with your data sources from command line. Below is a list of Gemini CLI
-extensions that are built on top of **Toolbox**. They allow you to interact with
-your data sources through pre-defined or custom tools with natural language.
-Click into the link to see detailed instructions on their usage.
-
-To use **custom** tools with Gemini CLI:
-
- [MCP Toolbox](https://github.com/gemini-cli-extensions/mcp-toolbox)
-
-To use [prebuilt tools][prebuilt] with Gemini CLI:
-
- [AlloyDB for PostgreSQL](https://github.com/gemini-cli-extensions/alloydb)
- [AlloyDB for PostgreSQL
-  Observability](https://github.com/gemini-cli-extensions/alloydb-observability)
- [BigQuery Data
-  Analytics](https://github.com/gemini-cli-extensions/bigquery-data-analytics)
- [BigQuery Conversational
-  Analytics](https://github.com/gemini-cli-extensions/bigquery-conversational-analytics)
- [Cloud SQL for
-  MySQL](https://github.com/gemini-cli-extensions/cloud-sql-mysql)
- [Cloud SQL for MySQL
-  Observability](https://github.com/gemini-cli-extensions/cloud-sql-mysql-observability)
- [Cloud SQL for
-  PostgreSQL](https://github.com/gemini-cli-extensions/cloud-sql-postgresql)
- [Cloud SQL for PostgreSQL
-  Observability](https://github.com/gemini-cli-extensions/cloud-sql-postgresql-observability)
- [Cloud SQL for SQL
-  Server](https://github.com/gemini-cli-extensions/cloud-sql-sqlserver)
- [Cloud SQL for SQL Server
-  Observability](https://github.com/gemini-cli-extensions/cloud-sql-sqlserver-observability)
- [Looker](https://github.com/gemini-cli-extensions/looker)
- [Dataplex](https://github.com/gemini-cli-extensions/dataplex)
- [MySQL](https://github.com/gemini-cli-extensions/mysql)
- [PostgreSQL](https://github.com/gemini-cli-extensions/postgres)
- [Spanner](https://github.com/gemini-cli-extensions/spanner)
- [Firestore](https://github.com/gemini-cli-extensions/firestore-native)
- [SQL Server](https://github.com/gemini-cli-extensions/sql-server)
-
-[prebuilt]: https://googleapis.github.io/genai-toolbox/reference/prebuilt-tools/
-[gemini-cli-extensions]:
-    https://github.com/google-gemini/gemini-cli/blob/main/docs/extensions/index.md
-
 ## Configuration

 The primary way to configure Toolbox is through the `tools.yaml` file. If you
@@ -940,14 +710,14 @@ Toolbox should have access to. Most tools will have at least one source to
 execute against.

 ```yaml
-kind: sources
-name: my-pg-source
-type: postgres
-host: 127.0.0.1
-port: 5432
-database: toolbox_db
-user: toolbox_user
-password: my-password
+sources:
+  my-pg-source:
+    kind: postgres
+    host: 127.0.0.1
+    port: 5432
+    database: toolbox_db
+    user: toolbox_user
+    password: my-password
 ```

 For more details on configuring different types of sources, see the
@@ -959,16 +729,16 @@ The `tools` section of a `tools.yaml` define the actions an agent can take: what
 type of tool it is, which source(s) it affects, what parameters it uses, etc.

 ```yaml
-kind: tools
-name: search-hotels-by-name
-type: 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 || '%';
+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 || '%';
 ```

 For more details on configuring different types of tools, see the
@@ -1000,25 +770,6 @@ all_tools = client.load_toolset()
 my_second_toolset = client.load_toolset("my_second_toolset")
 ```

-### Prompts
-
-The `prompts` section of a `tools.yaml` defines prompts that can be used for
-interactions with LLMs.
-
-```yaml
-prompts:
-  code_review:
-    description: "Asks the LLM to analyze code quality and suggest improvements."
-    messages:
-      - content: "Please review the following code for quality, correctness, and potential improvements: \n\n{{.code}}"
-    arguments:
-      - name: "code"
-        description: "The code to review"
-```
-
-For more details on configuring prompts, see the
-[Prompts](https://googleapis.github.io/genai-toolbox/resources/prompts).
-
 ## Versioning

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

 ### 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:

@@ -1036,13 +786,12 @@ The version will be incremented  as follows:
  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:

-Once the project reaches a stable `1.0.0` release, the version number
-**`MAJOR.MINOR.PATCH`** will follow the more common convention:
-
- **`MAJOR`**: Incremented for incompatible API changes.
- **`MINOR`**: Incremented for new, backward-compatible functionality.
- **`PATCH`**: Incremented for backward-compatible bug fixes.
+- **`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.
--- a/cmd/internal/imports.go
+++ b/cmd/internal/imports.go
@@ -1,253 +0,0 @@
-// Copyright 2026 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package internal
-
-import (
-	// Import prompt packages for side effect of registration
-	_ "github.com/googleapis/genai-toolbox/internal/prompts/custom"
-
-	// Import tool packages for side effect of registration
-	_ "github.com/googleapis/genai-toolbox/internal/tools/alloydb/alloydbcreatecluster"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/alloydb/alloydbcreateinstance"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/alloydb/alloydbcreateuser"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/alloydb/alloydbgetcluster"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/alloydb/alloydbgetinstance"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/alloydb/alloydbgetuser"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/alloydb/alloydblistclusters"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/alloydb/alloydblistinstances"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/alloydb/alloydblistusers"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/alloydb/alloydbwaitforoperation"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/alloydbainl"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/bigquery/bigqueryanalyzecontribution"
-	_ "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/bigquerysearchcatalog"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/bigquery/bigquerysql"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/bigtable"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/cassandra/cassandracql"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/clickhouse/clickhouseexecutesql"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/clickhouse/clickhouselistdatabases"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/clickhouse/clickhouselisttables"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/clickhouse/clickhousesql"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/cloudgda"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/cloudhealthcare/cloudhealthcarefhirfetchpage"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/cloudhealthcare/cloudhealthcarefhirpatienteverything"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/cloudhealthcare/cloudhealthcarefhirpatientsearch"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/cloudhealthcare/cloudhealthcaregetdataset"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/cloudhealthcare/cloudhealthcaregetdicomstore"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/cloudhealthcare/cloudhealthcaregetdicomstoremetrics"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/cloudhealthcare/cloudhealthcaregetfhirresource"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/cloudhealthcare/cloudhealthcaregetfhirstore"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/cloudhealthcare/cloudhealthcaregetfhirstoremetrics"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/cloudhealthcare/cloudhealthcarelistdicomstores"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/cloudhealthcare/cloudhealthcarelistfhirstores"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/cloudhealthcare/cloudhealthcareretrieverendereddicominstance"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/cloudhealthcare/cloudhealthcaresearchdicominstances"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/cloudhealthcare/cloudhealthcaresearchdicomseries"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/cloudhealthcare/cloudhealthcaresearchdicomstudies"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/cloudloggingadmin/cloudloggingadminlistlognames"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/cloudloggingadmin/cloudloggingadminlistresourcetypes"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/cloudloggingadmin/cloudloggingadminquerylogs"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/cloudmonitoring"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/cloudsql/cloudsqlcloneinstance"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/cloudsql/cloudsqlcreatebackup"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/cloudsql/cloudsqlcreatedatabase"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/cloudsql/cloudsqlcreateusers"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/cloudsql/cloudsqlgetinstances"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/cloudsql/cloudsqllistdatabases"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/cloudsql/cloudsqllistinstances"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/cloudsql/cloudsqlrestorebackup"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/cloudsql/cloudsqlwaitforoperation"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/cloudsqlmssql/cloudsqlmssqlcreateinstance"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/cloudsqlmysql/cloudsqlmysqlcreateinstance"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/cloudsqlpg/cloudsqlpgcreateinstances"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/cloudsqlpg/cloudsqlpgupgradeprecheck"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/couchbase"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/dataform/dataformcompilelocal"
-	_ "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/elasticsearch/elasticsearchesql"
-	_ "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/firestorequery"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/firestore/firestorequerycollection"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/firestore/firestoreupdatedocument"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/firestore/firestorevalidaterules"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/http"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/looker/lookeradddashboardelement"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/looker/lookeradddashboardfilter"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/looker/lookerconversationalanalytics"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/looker/lookercreateprojectfile"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/looker/lookerdeleteprojectfile"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/looker/lookerdevmode"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/looker/lookergenerateembedurl"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/looker/lookergetconnectiondatabases"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/looker/lookergetconnections"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/looker/lookergetconnectionschemas"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/looker/lookergetconnectiontablecolumns"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/looker/lookergetconnectiontables"
-	_ "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/lookergetprojectfile"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/looker/lookergetprojectfiles"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/looker/lookergetprojects"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/looker/lookerhealthanalyze"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/looker/lookerhealthpulse"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/looker/lookerhealthvacuum"
-	_ "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/lookerrundashboard"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/looker/lookerrunlook"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/looker/lookerupdateprojectfile"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/looker/lookervalidateproject"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/mindsdb/mindsdbexecutesql"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/mindsdb/mindsdbsql"
-	_ "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/mssqllisttables"
-	_ "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/mysqlgetqueryplan"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/mysql/mysqllistactivequeries"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/mysql/mysqllisttablefragmentation"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/mysql/mysqllisttables"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/mysql/mysqllisttablesmissinguniqueindexes"
-	_ "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/oracle/oracleexecutesql"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/oracle/oraclesql"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/postgres/postgresdatabaseoverview"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/postgres/postgresexecutesql"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/postgres/postgresgetcolumncardinality"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/postgres/postgreslistactivequeries"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/postgres/postgreslistavailableextensions"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/postgres/postgreslistdatabasestats"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/postgres/postgreslistindexes"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/postgres/postgreslistinstalledextensions"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/postgres/postgreslistlocks"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/postgres/postgreslistpgsettings"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/postgres/postgreslistpublicationtables"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/postgres/postgreslistquerystats"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/postgres/postgreslistroles"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/postgres/postgreslistschemas"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/postgres/postgreslistsequences"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/postgres/postgresliststoredprocedure"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/postgres/postgreslisttables"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/postgres/postgreslisttablespaces"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/postgres/postgreslisttablestats"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/postgres/postgreslisttriggers"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/postgres/postgreslistviews"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/postgres/postgreslongrunningtransactions"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/postgres/postgresreplicationstats"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/postgres/postgressql"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/redis"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/serverlessspark/serverlesssparkcancelbatch"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/serverlessspark/serverlesssparkcreatepysparkbatch"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/serverlessspark/serverlesssparkcreatesparkbatch"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/serverlessspark/serverlesssparkgetbatch"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/serverlessspark/serverlesssparklistbatches"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/singlestore/singlestoreexecutesql"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/singlestore/singlestoresql"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/snowflake/snowflakeexecutesql"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/snowflake/snowflakesql"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/spanner/spannerexecutesql"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/spanner/spannerlistgraphs"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/spanner/spannerlisttables"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/spanner/spannersql"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/sqlite/sqliteexecutesql"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/sqlite/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/wait"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/valkey"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/yugabytedbsql"
-
-	// Import source packages for side effect of registration
-	_ "github.com/googleapis/genai-toolbox/internal/sources/alloydbadmin"
-	_ "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/cassandra"
-	_ "github.com/googleapis/genai-toolbox/internal/sources/clickhouse"
-	_ "github.com/googleapis/genai-toolbox/internal/sources/cloudgda"
-	_ "github.com/googleapis/genai-toolbox/internal/sources/cloudhealthcare"
-	_ "github.com/googleapis/genai-toolbox/internal/sources/cloudloggingadmin"
-	_ "github.com/googleapis/genai-toolbox/internal/sources/cloudmonitoring"
-	_ "github.com/googleapis/genai-toolbox/internal/sources/cloudsqladmin"
-	_ "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/elasticsearch"
-	_ "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/mindsdb"
-	_ "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/oracle"
-	_ "github.com/googleapis/genai-toolbox/internal/sources/postgres"
-	_ "github.com/googleapis/genai-toolbox/internal/sources/redis"
-	_ "github.com/googleapis/genai-toolbox/internal/sources/serverlessspark"
-	_ "github.com/googleapis/genai-toolbox/internal/sources/singlestore"
-	_ "github.com/googleapis/genai-toolbox/internal/sources/snowflake"
-	_ "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"
-	_ "github.com/googleapis/genai-toolbox/internal/sources/yugabytedb"
-)
--- a/cmd/internal/invoke/command.go
+++ b/cmd/internal/invoke/command.go
@@ -1,139 +0,0 @@
-// Copyright 2026 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package invoke
-
-import (
-	"context"
-	"encoding/json"
-	"fmt"
-
-	"github.com/googleapis/genai-toolbox/cmd/internal"
-	"github.com/googleapis/genai-toolbox/internal/server"
-	"github.com/googleapis/genai-toolbox/internal/server/resources"
-	"github.com/googleapis/genai-toolbox/internal/util/parameters"
-	"github.com/spf13/cobra"
-)
-
-func NewCommand(opts *internal.ToolboxOptions) *cobra.Command {
-	cmd := &cobra.Command{
-		Use:   "invoke <tool-name> [params]",
-		Short: "Execute a tool directly",
-		Long: `Execute a tool directly with parameters.
-Params must be a JSON string.
-Example:
-  toolbox invoke my-tool '{"param1": "value1"}'`,
-		Args: cobra.MinimumNArgs(1),
-		RunE: func(c *cobra.Command, args []string) error {
-			return runInvoke(c, args, opts)
-		},
-	}
-	return cmd
-}
-
-func runInvoke(cmd *cobra.Command, args []string, opts *internal.ToolboxOptions) error {
-	ctx, cancel := context.WithCancel(cmd.Context())
-	defer cancel()
-
-	ctx, shutdown, err := opts.Setup(ctx)
-	if err != nil {
-		return err
-	}
-	defer func() {
-		_ = shutdown(ctx)
-	}()
-
-	_, err = opts.LoadConfig(ctx)
-	if err != nil {
-		return err
-	}
-
-	// Initialize Resources
-	sourcesMap, authServicesMap, embeddingModelsMap, toolsMap, toolsetsMap, promptsMap, promptsetsMap, err := server.InitializeConfigs(ctx, opts.Cfg)
-	if err != nil {
-		errMsg := fmt.Errorf("failed to initialize resources: %w", err)
-		opts.Logger.ErrorContext(ctx, errMsg.Error())
-		return errMsg
-	}
-
-	resourceMgr := resources.NewResourceManager(sourcesMap, authServicesMap, embeddingModelsMap, toolsMap, toolsetsMap, promptsMap, promptsetsMap)
-
-	// Execute Tool
-	toolName := args[0]
-	tool, ok := resourceMgr.GetTool(toolName)
-	if !ok {
-		errMsg := fmt.Errorf("tool %q not found", toolName)
-		opts.Logger.ErrorContext(ctx, errMsg.Error())
-		return errMsg
-	}
-
-	var paramsInput string
-	if len(args) > 1 {
-		paramsInput = args[1]
-	}
-
-	params := make(map[string]any)
-	if paramsInput != "" {
-		if err := json.Unmarshal([]byte(paramsInput), &params); err != nil {
-			errMsg := fmt.Errorf("params must be a valid JSON string: %w", err)
-			opts.Logger.ErrorContext(ctx, errMsg.Error())
-			return errMsg
-		}
-	}
-
-	parsedParams, err := parameters.ParseParams(tool.GetParameters(), params, nil)
-	if err != nil {
-		errMsg := fmt.Errorf("invalid parameters: %w", err)
-		opts.Logger.ErrorContext(ctx, errMsg.Error())
-		return errMsg
-	}
-
-	parsedParams, err = tool.EmbedParams(ctx, parsedParams, resourceMgr.GetEmbeddingModelMap())
-	if err != nil {
-		errMsg := fmt.Errorf("error embedding parameters: %w", err)
-		opts.Logger.ErrorContext(ctx, errMsg.Error())
-		return errMsg
-	}
-
-	// Client Auth not supported for ephemeral CLI call
-	requiresAuth, err := tool.RequiresClientAuthorization(resourceMgr)
-	if err != nil {
-		errMsg := fmt.Errorf("failed to check auth requirements: %w", err)
-		opts.Logger.ErrorContext(ctx, errMsg.Error())
-		return errMsg
-	}
-	if requiresAuth {
-		errMsg := fmt.Errorf("client authorization is not supported")
-		opts.Logger.ErrorContext(ctx, errMsg.Error())
-		return errMsg
-	}
-
-	result, err := tool.Invoke(ctx, resourceMgr, parsedParams, "")
-	if err != nil {
-		errMsg := fmt.Errorf("tool execution failed: %w", err)
-		opts.Logger.ErrorContext(ctx, errMsg.Error())
-		return errMsg
-	}
-
-	// Print Result
-	output, err := json.MarshalIndent(result, "", "  ")
-	if err != nil {
-		errMsg := fmt.Errorf("failed to marshal result: %w", err)
-		opts.Logger.ErrorContext(ctx, errMsg.Error())
-		return errMsg
-	}
-	fmt.Fprintln(opts.IOStreams.Out, string(output))
-
-	return nil
-}
--- a/cmd/internal/invoke/command_test.go
+++ b/cmd/internal/invoke/command_test.go
@@ -1,153 +0,0 @@
-// Copyright 2026 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package invoke
-
-import (
-	"bytes"
-	"os"
-	"path/filepath"
-	"strings"
-	"testing"
-
-	"github.com/googleapis/genai-toolbox/cmd/internal"
-	_ "github.com/googleapis/genai-toolbox/internal/sources/bigquery"
-	_ "github.com/googleapis/genai-toolbox/internal/sources/sqlite"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/bigquery/bigquerysql"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/sqlite/sqlitesql"
-	"github.com/spf13/cobra"
-)
-
-func invokeCommand(args []string) (string, error) {
-	parentCmd := &cobra.Command{Use: "toolbox"}
-
-	buf := new(bytes.Buffer)
-	opts := internal.NewToolboxOptions(internal.WithIOStreams(buf, buf))
-	internal.PersistentFlags(parentCmd, opts)
-
-	cmd := NewCommand(opts)
-	parentCmd.AddCommand(cmd)
-	parentCmd.SetArgs(args)
-
-	err := parentCmd.Execute()
-	return buf.String(), err
-}
-
-func TestInvokeTool(t *testing.T) {
-	// Create a temporary tools file
-	tmpDir := t.TempDir()
-
-	toolsFileContent := `
-sources:
-  my-sqlite:
-    kind: sqlite
-    database: test.db
-tools:
-  hello-sqlite:
-    kind: sqlite-sql
-    source: my-sqlite
-    description: "hello tool"
-    statement: "SELECT 'hello' as greeting"
-  echo-tool:
-    kind: sqlite-sql
-    source: my-sqlite
-    description: "echo tool"
-    statement: "SELECT ? as msg"
-    parameters:
-      - name: message
-        type: string
-        description: message to echo
-`
-
-	toolsFilePath := filepath.Join(tmpDir, "tools.yaml")
-	if err := os.WriteFile(toolsFilePath, []byte(toolsFileContent), 0644); err != nil {
-		t.Fatalf("failed to write tools file: %v", err)
-	}
-
-	tcs := []struct {
-		desc    string
-		args    []string
-		want    string
-		wantErr bool
-		errStr  string
-	}{
-		{
-			desc: "success - basic tool call",
-			args: []string{"invoke", "hello-sqlite", "--tools-file", toolsFilePath},
-			want: `"greeting": "hello"`,
-		},
-		{
-			desc: "success - tool call with parameters",
-			args: []string{"invoke", "echo-tool", `{"message": "world"}`, "--tools-file", toolsFilePath},
-			want: `"msg": "world"`,
-		},
-		{
-			desc:    "error - tool not found",
-			args:    []string{"invoke", "non-existent", "--tools-file", toolsFilePath},
-			wantErr: true,
-			errStr:  `tool "non-existent" not found`,
-		},
-		{
-			desc:    "error - invalid JSON params",
-			args:    []string{"invoke", "echo-tool", `invalid-json`, "--tools-file", toolsFilePath},
-			wantErr: true,
-			errStr:  `params must be a valid JSON string`,
-		},
-	}
-
-	for _, tc := range tcs {
-		t.Run(tc.desc, func(t *testing.T) {
-			got, err := invokeCommand(tc.args)
-			if (err != nil) != tc.wantErr {
-				t.Fatalf("got error %v, wantErr %v", err, tc.wantErr)
-			}
-			if tc.wantErr && !strings.Contains(err.Error(), tc.errStr) {
-				t.Fatalf("got error %v, want error containing %q", err, tc.errStr)
-			}
-			if !tc.wantErr && !strings.Contains(got, tc.want) {
-				t.Fatalf("got %q, want it to contain %q", got, tc.want)
-			}
-		})
-	}
-}
-
-func TestInvokeTool_AuthUnsupported(t *testing.T) {
-	tmpDir := t.TempDir()
-	toolsFileContent := `
-sources:
-  my-bq:
-    kind: bigquery
-    project: my-project
-    useClientOAuth: true
-tools:
-  bq-tool:
-    kind: bigquery-sql
-    source: my-bq
-    description: "bq tool"
-    statement: "SELECT 1"
-`
-	toolsFilePath := filepath.Join(tmpDir, "auth_tools.yaml")
-	if err := os.WriteFile(toolsFilePath, []byte(toolsFileContent), 0644); err != nil {
-		t.Fatalf("failed to write tools file: %v", err)
-	}
-
-	args := []string{"invoke", "bq-tool", "--tools-file", toolsFilePath}
-	_, err := invokeCommand(args)
-	if err == nil {
-		t.Fatal("expected error for tool requiring client auth, but got nil")
-	}
-	if !strings.Contains(err.Error(), "client authorization is not supported") {
-		t.Fatalf("unexpected error message: %v", err)
-	}
-}
--- a/cmd/internal/options.go
+++ b/cmd/internal/options.go
@@ -1,251 +0,0 @@
-// Copyright 2026 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package internal
-
-import (
-	"context"
-	"fmt"
-	"io"
-	"os"
-	"slices"
-	"strings"
-
-	"github.com/googleapis/genai-toolbox/internal/log"
-	"github.com/googleapis/genai-toolbox/internal/prebuiltconfigs"
-	"github.com/googleapis/genai-toolbox/internal/server"
-	"github.com/googleapis/genai-toolbox/internal/telemetry"
-	"github.com/googleapis/genai-toolbox/internal/util"
-)
-
-type IOStreams struct {
-	In     io.Reader
-	Out    io.Writer
-	ErrOut io.Writer
-}
-
-// ToolboxOptions holds dependencies shared by all commands.
-type ToolboxOptions struct {
-	IOStreams       IOStreams
-	Logger          log.Logger
-	Cfg             server.ServerConfig
-	ToolsFile       string
-	ToolsFiles      []string
-	ToolsFolder     string
-	PrebuiltConfigs []string
-}
-
-// Option defines a function that modifies the ToolboxOptions struct.
-type Option func(*ToolboxOptions)
-
-// NewToolboxOptions creates a new instance with defaults, then applies any
-// provided options.
-func NewToolboxOptions(opts ...Option) *ToolboxOptions {
-	o := &ToolboxOptions{
-		IOStreams: IOStreams{
-			In:     os.Stdin,
-			Out:    os.Stdout,
-			ErrOut: os.Stderr,
-		},
-	}
-
-	for _, opt := range opts {
-		opt(o)
-	}
-	return o
-}
-
-// Apply allows you to update an EXISTING ToolboxOptions instance.
-// This is useful for "late binding".
-func (o *ToolboxOptions) Apply(opts ...Option) {
-	for _, opt := range opts {
-		opt(o)
-	}
-}
-
-// WithIOStreams updates the IO streams.
-func WithIOStreams(out, err io.Writer) Option {
-	return func(o *ToolboxOptions) {
-		o.IOStreams.Out = out
-		o.IOStreams.ErrOut = err
-	}
-}
-
-// Setup create logger and telemetry instrumentations.
-func (opts *ToolboxOptions) Setup(ctx context.Context) (context.Context, func(context.Context) error, error) {
-	// If stdio, set logger's out stream (usually DEBUG and INFO logs) to
-	// errStream
-	loggerOut := opts.IOStreams.Out
-	if opts.Cfg.Stdio {
-		loggerOut = opts.IOStreams.ErrOut
-	}
-
-	// Handle logger separately from config
-	logger, err := log.NewLogger(opts.Cfg.LoggingFormat.String(), opts.Cfg.LogLevel.String(), loggerOut, opts.IOStreams.ErrOut)
-	if err != nil {
-		return ctx, nil, fmt.Errorf("unable to initialize logger: %w", err)
-	}
-
-	ctx = util.WithLogger(ctx, logger)
-	opts.Logger = logger
-
-	// Set up OpenTelemetry
-	otelShutdown, err := telemetry.SetupOTel(ctx, opts.Cfg.Version, opts.Cfg.TelemetryOTLP, opts.Cfg.TelemetryGCP, opts.Cfg.TelemetryServiceName)
-	if err != nil {
-		errMsg := fmt.Errorf("error setting up OpenTelemetry: %w", err)
-		logger.ErrorContext(ctx, errMsg.Error())
-		return ctx, nil, errMsg
-	}
-
-	shutdownFunc := func(ctx context.Context) error {
-		err := otelShutdown(ctx)
-		if err != nil {
-			errMsg := fmt.Errorf("error shutting down OpenTelemetry: %w", err)
-			logger.ErrorContext(ctx, errMsg.Error())
-			return err
-		}
-		return nil
-	}
-
-	instrumentation, err := telemetry.CreateTelemetryInstrumentation(opts.Cfg.Version)
-	if err != nil {
-		errMsg := fmt.Errorf("unable to create telemetry instrumentation: %w", err)
-		logger.ErrorContext(ctx, errMsg.Error())
-		return ctx, shutdownFunc, errMsg
-	}
-
-	ctx = util.WithInstrumentation(ctx, instrumentation)
-
-	return ctx, shutdownFunc, nil
-}
-
-// LoadConfig checks and merge files that should be loaded into the server
-func (opts *ToolboxOptions) LoadConfig(ctx context.Context) (bool, error) {
-	// Determine if Custom Files should be loaded
-	// Check for explicit custom flags
-	isCustomConfigured := opts.ToolsFile != "" || len(opts.ToolsFiles) > 0 || opts.ToolsFolder != ""
-
-	// Determine if default 'tools.yaml' should be used (No prebuilt AND No custom flags)
-	useDefaultToolsFile := len(opts.PrebuiltConfigs) == 0 && !isCustomConfigured
-
-	if useDefaultToolsFile {
-		opts.ToolsFile = "tools.yaml"
-		isCustomConfigured = true
-	}
-
-	logger, err := util.LoggerFromContext(ctx)
-	if err != nil {
-		return isCustomConfigured, err
-	}
-
-	var allToolsFiles []ToolsFile
-
-	// Load Prebuilt Configuration
-
-	if len(opts.PrebuiltConfigs) > 0 {
-		slices.Sort(opts.PrebuiltConfigs)
-		sourcesList := strings.Join(opts.PrebuiltConfigs, ", ")
-		logMsg := fmt.Sprintf("Using prebuilt tool configurations for: %s", sourcesList)
-		logger.InfoContext(ctx, logMsg)
-
-		for _, configName := range opts.PrebuiltConfigs {
-			buf, err := prebuiltconfigs.Get(configName)
-			if err != nil {
-				logger.ErrorContext(ctx, err.Error())
-				return isCustomConfigured, err
-			}
-
-			// Parse into ToolsFile struct
-			parsed, err := parseToolsFile(ctx, buf)
-			if err != nil {
-				errMsg := fmt.Errorf("unable to parse prebuilt tool configuration for '%s': %w", configName, err)
-				logger.ErrorContext(ctx, errMsg.Error())
-				return isCustomConfigured, errMsg
-			}
-			allToolsFiles = append(allToolsFiles, parsed)
-		}
-	}
-
-	// Load Custom Configurations
-	if isCustomConfigured {
-		// Enforce exclusivity among custom flags (tools-file vs tools-files vs tools-folder)
-		if (opts.ToolsFile != "" && len(opts.ToolsFiles) > 0) ||
-			(opts.ToolsFile != "" && opts.ToolsFolder != "") ||
-			(len(opts.ToolsFiles) > 0 && opts.ToolsFolder != "") {
-			errMsg := fmt.Errorf("--tools-file, --tools-files, and --tools-folder flags cannot be used simultaneously")
-			logger.ErrorContext(ctx, errMsg.Error())
-			return isCustomConfigured, errMsg
-		}
-
-		var customTools ToolsFile
-		var err error
-
-		if len(opts.ToolsFiles) > 0 {
-			// Use tools-files
-			logger.InfoContext(ctx, fmt.Sprintf("Loading and merging %d tool configuration files", len(opts.ToolsFiles)))
-			customTools, err = LoadAndMergeToolsFiles(ctx, opts.ToolsFiles)
-		} else if opts.ToolsFolder != "" {
-			// Use tools-folder
-			logger.InfoContext(ctx, fmt.Sprintf("Loading and merging all YAML files from directory: %s", opts.ToolsFolder))
-			customTools, err = LoadAndMergeToolsFolder(ctx, opts.ToolsFolder)
-		} else {
-			// Use single file (tools-file or default `tools.yaml`)
-			buf, readFileErr := os.ReadFile(opts.ToolsFile)
-			if readFileErr != nil {
-				errMsg := fmt.Errorf("unable to read tool file at %q: %w", opts.ToolsFile, readFileErr)
-				logger.ErrorContext(ctx, errMsg.Error())
-				return isCustomConfigured, errMsg
-			}
-			customTools, err = parseToolsFile(ctx, buf)
-			if err != nil {
-				err = fmt.Errorf("unable to parse tool file at %q: %w", opts.ToolsFile, err)
-			}
-		}
-
-		if err != nil {
-			logger.ErrorContext(ctx, err.Error())
-			return isCustomConfigured, err
-		}
-		allToolsFiles = append(allToolsFiles, customTools)
-	}
-
-	// Modify version string based on loaded configurations
-	if len(opts.PrebuiltConfigs) > 0 {
-		tag := "prebuilt"
-		if isCustomConfigured {
-			tag = "custom"
-		}
-		// prebuiltConfigs is already sorted above
-		for _, configName := range opts.PrebuiltConfigs {
-			opts.Cfg.Version += fmt.Sprintf("+%s.%s", tag, configName)
-		}
-	}
-
-	// Merge Everything
-	// This will error if custom tools collide with prebuilt tools
-	finalToolsFile, err := mergeToolsFiles(allToolsFiles...)
-	if err != nil {
-		logger.ErrorContext(ctx, err.Error())
-		return isCustomConfigured, err
-	}
-
-	opts.Cfg.SourceConfigs = finalToolsFile.Sources
-	opts.Cfg.AuthServiceConfigs = finalToolsFile.AuthServices
-	opts.Cfg.EmbeddingModelConfigs = finalToolsFile.EmbeddingModels
-	opts.Cfg.ToolConfigs = finalToolsFile.Tools
-	opts.Cfg.ToolsetConfigs = finalToolsFile.Toolsets
-	opts.Cfg.PromptConfigs = finalToolsFile.Prompts
-
-	return isCustomConfigured, nil
-}
--- a/cmd/internal/persistent_flags.go
+++ b/cmd/internal/persistent_flags.go
@@ -1,46 +0,0 @@
-// Copyright 2026 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package internal
-
-import (
-	"fmt"
-	"strings"
-
-	"github.com/googleapis/genai-toolbox/internal/prebuiltconfigs"
-	"github.com/spf13/cobra"
-)
-
-// PersistentFlags sets up flags that are available for all commands and
-// subcommands
-// It is also used to set up persistent flags during subcommand unit tests
-func PersistentFlags(parentCmd *cobra.Command, opts *ToolboxOptions) {
-	persistentFlags := parentCmd.PersistentFlags()
-
-	persistentFlags.StringVar(&opts.ToolsFile, "tools-file", "", "File path specifying the tool configuration. Cannot be used with --tools-files, or --tools-folder.")
-	persistentFlags.StringSliceVar(&opts.ToolsFiles, "tools-files", []string{}, "Multiple file paths specifying tool configurations. Files will be merged. Cannot be used with --tools-file, or --tools-folder.")
-	persistentFlags.StringVar(&opts.ToolsFolder, "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 --tools-file, or --tools-files.")
-	persistentFlags.Var(&opts.Cfg.LogLevel, "log-level", "Specify the minimum level logged. Allowed: 'DEBUG', 'INFO', 'WARN', 'ERROR'.")
-	persistentFlags.Var(&opts.Cfg.LoggingFormat, "logging-format", "Specify logging format to use. Allowed: 'standard' or 'JSON'.")
-	persistentFlags.BoolVar(&opts.Cfg.TelemetryGCP, "telemetry-gcp", false, "Enable exporting directly to Google Cloud Monitoring.")
-	persistentFlags.StringVar(&opts.Cfg.TelemetryOTLP, "telemetry-otlp", "", "Enable exporting using OpenTelemetry Protocol (OTLP) to the specified endpoint (e.g. 'http://127.0.0.1:4318')")
-	persistentFlags.StringVar(&opts.Cfg.TelemetryServiceName, "telemetry-service-name", "toolbox", "Sets the value of the service.name resource attribute for telemetry data.")
-	// Fetch prebuilt tools sources to customize the help description
-	prebuiltHelp := fmt.Sprintf(
-		"Use a prebuilt tool configuration by source type. Allowed: '%s'. Can be specified multiple times.",
-		strings.Join(prebuiltconfigs.GetPrebuiltSources(), "', '"),
-	)
-	persistentFlags.StringSliceVar(&opts.PrebuiltConfigs, "prebuilt", []string{}, prebuiltHelp)
-	persistentFlags.StringSliceVar(&opts.Cfg.UserAgentMetadata, "user-agent-metadata", []string{}, "Appends additional metadata to the User-Agent.")
-}
--- a/cmd/internal/skills/command.go
+++ b/cmd/internal/skills/command.go
@@ -1,214 +0,0 @@
-// Copyright 2026 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package skills
-
-import (
-	"context"
-	_ "embed"
-	"fmt"
-	"os"
-	"path/filepath"
-	"sort"
-
-	"github.com/googleapis/genai-toolbox/cmd/internal"
-	"github.com/googleapis/genai-toolbox/internal/server"
-	"github.com/googleapis/genai-toolbox/internal/server/resources"
-	"github.com/googleapis/genai-toolbox/internal/tools"
-
-	"github.com/spf13/cobra"
-)
-
-// skillsCmd is the command for generating skills.
-type skillsCmd struct {
-	*cobra.Command
-	name        string
-	description string
-	toolset     string
-	outputDir   string
-}
-
-// NewCommand creates a new Command.
-func NewCommand(opts *internal.ToolboxOptions) *cobra.Command {
-	cmd := &skillsCmd{}
-	cmd.Command = &cobra.Command{
-		Use:   "skills-generate",
-		Short: "Generate skills from tool configurations",
-		RunE: func(c *cobra.Command, args []string) error {
-			return run(cmd, opts)
-		},
-	}
-
-	cmd.Flags().StringVar(&cmd.name, "name", "", "Name of the generated skill.")
-	cmd.Flags().StringVar(&cmd.description, "description", "", "Description of the generated skill")
-	cmd.Flags().StringVar(&cmd.toolset, "toolset", "", "Name of the toolset to convert into a skill. If not provided, all tools will be included.")
-	cmd.Flags().StringVar(&cmd.outputDir, "output-dir", "skills", "Directory to output generated skills")
-
-	_ = cmd.MarkFlagRequired("name")
-	_ = cmd.MarkFlagRequired("description")
-	return cmd.Command
-}
-
-func run(cmd *skillsCmd, opts *internal.ToolboxOptions) error {
-	ctx, cancel := context.WithCancel(cmd.Context())
-	defer cancel()
-
-	ctx, shutdown, err := opts.Setup(ctx)
-	if err != nil {
-		return err
-	}
-	defer func() {
-		_ = shutdown(ctx)
-	}()
-
-	_, err = opts.LoadConfig(ctx)
-	if err != nil {
-		return err
-	}
-
-	if err := os.MkdirAll(cmd.outputDir, 0755); err != nil {
-		errMsg := fmt.Errorf("error creating output directory: %w", err)
-		opts.Logger.ErrorContext(ctx, errMsg.Error())
-		return errMsg
-	}
-
-	opts.Logger.InfoContext(ctx, fmt.Sprintf("Generating skill '%s'...", cmd.name))
-
-	// Initialize toolbox and collect tools
-	allTools, err := cmd.collectTools(ctx, opts)
-	if err != nil {
-		errMsg := fmt.Errorf("error collecting tools: %w", err)
-		opts.Logger.ErrorContext(ctx, errMsg.Error())
-		return errMsg
-	}
-
-	if len(allTools) == 0 {
-		opts.Logger.InfoContext(ctx, "No tools found to generate.")
-		return nil
-	}
-
-	// Generate the combined skill directory
-	skillPath := filepath.Join(cmd.outputDir, cmd.name)
-	if err := os.MkdirAll(skillPath, 0755); err != nil {
-		errMsg := fmt.Errorf("error creating skill directory: %w", err)
-		opts.Logger.ErrorContext(ctx, errMsg.Error())
-		return errMsg
-	}
-
-	// Generate assets directory
-	assetsPath := filepath.Join(skillPath, "assets")
-	if err := os.MkdirAll(assetsPath, 0755); err != nil {
-		errMsg := fmt.Errorf("error creating assets dir: %w", err)
-		opts.Logger.ErrorContext(ctx, errMsg.Error())
-		return errMsg
-	}
-
-	// Generate scripts directory
-	scriptsPath := filepath.Join(skillPath, "scripts")
-	if err := os.MkdirAll(scriptsPath, 0755); err != nil {
-		errMsg := fmt.Errorf("error creating scripts dir: %w", err)
-		opts.Logger.ErrorContext(ctx, errMsg.Error())
-		return errMsg
-	}
-
-	// Iterate over keys to ensure deterministic order
-	var toolNames []string
-	for name := range allTools {
-		toolNames = append(toolNames, name)
-	}
-	sort.Strings(toolNames)
-
-	for _, toolName := range toolNames {
-		// Generate YAML config in asset directory
-		minimizedContent, err := generateToolConfigYAML(opts.Cfg, toolName)
-		if err != nil {
-			errMsg := fmt.Errorf("error generating filtered config for %s: %w", toolName, err)
-			opts.Logger.ErrorContext(ctx, errMsg.Error())
-			return errMsg
-		}
-
-		specificToolsFileName := fmt.Sprintf("%s.yaml", toolName)
-		if minimizedContent != nil {
-			destPath := filepath.Join(assetsPath, specificToolsFileName)
-			if err := os.WriteFile(destPath, minimizedContent, 0644); err != nil {
-				errMsg := fmt.Errorf("error writing filtered config for %s: %w", toolName, err)
-				opts.Logger.ErrorContext(ctx, errMsg.Error())
-				return errMsg
-			}
-		}
-
-		// Generate wrapper script in scripts directory
-		scriptContent, err := generateScriptContent(toolName, specificToolsFileName)
-		if err != nil {
-			errMsg := fmt.Errorf("error generating script content for %s: %w", toolName, err)
-			opts.Logger.ErrorContext(ctx, errMsg.Error())
-			return errMsg
-		}
-
-		scriptFilename := filepath.Join(scriptsPath, fmt.Sprintf("%s.js", toolName))
-		if err := os.WriteFile(scriptFilename, []byte(scriptContent), 0755); err != nil {
-			errMsg := fmt.Errorf("error writing script %s: %w", scriptFilename, err)
-			opts.Logger.ErrorContext(ctx, errMsg.Error())
-			return errMsg
-		}
-	}
-
-	// Generate SKILL.md
-	skillContent, err := generateSkillMarkdown(cmd.name, cmd.description, allTools)
-	if err != nil {
-		errMsg := fmt.Errorf("error generating SKILL.md content: %w", err)
-		opts.Logger.ErrorContext(ctx, errMsg.Error())
-		return errMsg
-	}
-	skillMdPath := filepath.Join(skillPath, "SKILL.md")
-	if err := os.WriteFile(skillMdPath, []byte(skillContent), 0644); err != nil {
-		errMsg := fmt.Errorf("error writing SKILL.md: %w", err)
-		opts.Logger.ErrorContext(ctx, errMsg.Error())
-		return errMsg
-	}
-
-	opts.Logger.InfoContext(ctx, fmt.Sprintf("Successfully generated skill '%s' with %d tools.", cmd.name, len(allTools)))
-
-	return nil
-}
-
-func (c *skillsCmd) collectTools(ctx context.Context, opts *internal.ToolboxOptions) (map[string]tools.Tool, error) {
-	// Initialize Resources
-	sourcesMap, authServicesMap, embeddingModelsMap, toolsMap, toolsetsMap, promptsMap, promptsetsMap, err := server.InitializeConfigs(ctx, opts.Cfg)
-	if err != nil {
-		return nil, fmt.Errorf("failed to initialize resources: %w", err)
-	}
-
-	resourceMgr := resources.NewResourceManager(sourcesMap, authServicesMap, embeddingModelsMap, toolsMap, toolsetsMap, promptsMap, promptsetsMap)
-
-	result := make(map[string]tools.Tool)
-
-	if c.toolset == "" {
-		return toolsMap, nil
-	}
-
-	ts, ok := resourceMgr.GetToolset(c.toolset)
-	if !ok {
-		return nil, fmt.Errorf("toolset %q not found", c.toolset)
-	}
-
-	for _, t := range ts.Tools {
-		if t != nil {
-			tool := *t
-			result[tool.McpManifest().Name] = tool
-		}
-	}
-
-	return result, nil
-}
--- a/cmd/internal/skills/command_test.go
+++ b/cmd/internal/skills/command_test.go
@@ -1,195 +0,0 @@
-// Copyright 2026 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package skills
-
-import (
-	"bytes"
-	"os"
-	"path/filepath"
-	"strings"
-	"testing"
-
-	"github.com/googleapis/genai-toolbox/cmd/internal"
-	_ "github.com/googleapis/genai-toolbox/internal/sources/sqlite"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/sqlite/sqlitesql"
-	"github.com/spf13/cobra"
-)
-
-func invokeCommand(args []string) (string, error) {
-	parentCmd := &cobra.Command{Use: "toolbox"}
-
-	buf := new(bytes.Buffer)
-	opts := internal.NewToolboxOptions(internal.WithIOStreams(buf, buf))
-	internal.PersistentFlags(parentCmd, opts)
-
-	cmd := NewCommand(opts)
-	parentCmd.AddCommand(cmd)
-	parentCmd.SetArgs(args)
-
-	err := parentCmd.Execute()
-	return buf.String(), err
-}
-
-func TestGenerateSkill(t *testing.T) {
-	// Create a temporary directory for tests
-	tmpDir := t.TempDir()
-	outputDir := filepath.Join(tmpDir, "skills")
-
-	// Create a tools.yaml file with a sqlite tool
-	toolsFileContent := `
-sources:
-  my-sqlite:
-    kind: sqlite
-    database: test.db
-tools:
-  hello-sqlite:
-    kind: sqlite-sql
-    source: my-sqlite
-    description: "hello tool"
-    statement: "SELECT 'hello' as greeting"
-`
-
-	toolsFilePath := filepath.Join(tmpDir, "tools.yaml")
-	if err := os.WriteFile(toolsFilePath, []byte(toolsFileContent), 0644); err != nil {
-		t.Fatalf("failed to write tools file: %v", err)
-	}
-
-	args := []string{
-		"skills-generate",
-		"--tools-file", toolsFilePath,
-		"--output-dir", outputDir,
-		"--name", "hello-sqlite",
-		"--description", "hello tool",
-	}
-
-	got, err := invokeCommand(args)
-	if err != nil {
-		t.Fatalf("command failed: %v\nOutput: %s", err, got)
-	}
-
-	// Verify generated directory structure
-	skillPath := filepath.Join(outputDir, "hello-sqlite")
-	if _, err := os.Stat(skillPath); os.IsNotExist(err) {
-		t.Fatalf("skill directory not created: %s", skillPath)
-	}
-
-	// Check SKILL.md
-	skillMarkdown := filepath.Join(skillPath, "SKILL.md")
-	content, err := os.ReadFile(skillMarkdown)
-	if err != nil {
-		t.Fatalf("failed to read SKILL.md: %v", err)
-	}
-
-	expectedFrontmatter := `---
-name: hello-sqlite
-description: hello tool
---`
-	if !strings.HasPrefix(string(content), expectedFrontmatter) {
-		t.Errorf("SKILL.md does not have expected frontmatter format.\nExpected prefix:\n%s\nGot:\n%s", expectedFrontmatter, string(content))
-	}
-
-	if !strings.Contains(string(content), "## Usage") {
-		t.Errorf("SKILL.md does not contain '## Usage' section")
-	}
-
-	if !strings.Contains(string(content), "## Scripts") {
-		t.Errorf("SKILL.md does not contain '## Scripts' section")
-	}
-
-	if !strings.Contains(string(content), "### hello-sqlite") {
-		t.Errorf("SKILL.md does not contain '### hello-sqlite' tool header")
-	}
-
-	// Check script file
-	scriptFilename := "hello-sqlite.js"
-	scriptPath := filepath.Join(skillPath, "scripts", scriptFilename)
-	if _, err := os.Stat(scriptPath); os.IsNotExist(err) {
-		t.Fatalf("script file not created: %s", scriptPath)
-	}
-
-	scriptContent, err := os.ReadFile(scriptPath)
-	if err != nil {
-		t.Fatalf("failed to read script file: %v", err)
-	}
-	if !strings.Contains(string(scriptContent), "hello-sqlite") {
-		t.Errorf("script file does not contain expected tool name")
-	}
-
-	// Check assets
-	assetPath := filepath.Join(skillPath, "assets", "hello-sqlite.yaml")
-	if _, err := os.Stat(assetPath); os.IsNotExist(err) {
-		t.Fatalf("asset file not created: %s", assetPath)
-	}
-	assetContent, err := os.ReadFile(assetPath)
-	if err != nil {
-		t.Fatalf("failed to read asset file: %v", err)
-	}
-	if !strings.Contains(string(assetContent), "hello-sqlite") {
-		t.Errorf("asset file does not contain expected tool name")
-	}
-}
-
-func TestGenerateSkill_NoConfig(t *testing.T) {
-	tmpDir := t.TempDir()
-	outputDir := filepath.Join(tmpDir, "skills")
-
-	args := []string{
-		"skills-generate",
-		"--output-dir", outputDir,
-		"--name", "test",
-		"--description", "test",
-	}
-
-	_, err := invokeCommand(args)
-	if err == nil {
-		t.Fatal("expected command to fail when no configuration is provided and tools.yaml is missing")
-	}
-
-	// Should not have created the directory if no config was processed
-	if _, err := os.Stat(outputDir); !os.IsNotExist(err) {
-		t.Errorf("output directory should not have been created")
-	}
-}
-
-func TestGenerateSkill_MissingArguments(t *testing.T) {
-	tmpDir := t.TempDir()
-	toolsFilePath := filepath.Join(tmpDir, "tools.yaml")
-	if err := os.WriteFile(toolsFilePath, []byte("tools: {}"), 0644); err != nil {
-		t.Fatalf("failed to write tools file: %v", err)
-	}
-
-	tests := []struct {
-		name string
-		args []string
-	}{
-		{
-			name: "missing name",
-			args: []string{"skills-generate", "--tools-file", toolsFilePath, "--description", "test"},
-		},
-		{
-			name: "missing description",
-			args: []string{"skills-generate", "--tools-file", toolsFilePath, "--name", "test"},
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			got, err := invokeCommand(tt.args)
-			if err == nil {
-				t.Fatalf("expected command to fail due to missing arguments, but it succeeded\nOutput: %s", got)
-			}
-		})
-	}
-}
--- a/cmd/internal/skills/generator.go
+++ b/cmd/internal/skills/generator.go
@@ -1,296 +0,0 @@
-// Copyright 2026 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package skills
-
-import (
-	"bytes"
-	"encoding/json"
-	"fmt"
-	"sort"
-	"strings"
-	"text/template"
-
-	"github.com/goccy/go-yaml"
-	"github.com/googleapis/genai-toolbox/internal/server"
-	"github.com/googleapis/genai-toolbox/internal/sources"
-	"github.com/googleapis/genai-toolbox/internal/tools"
-	"github.com/googleapis/genai-toolbox/internal/util/parameters"
-)
-
-const skillTemplate = `---
-name: {{.SkillName}}
-description: {{.SkillDescription}}
---
-
-## Usage
-
-All scripts can be executed using Node.js. Replace ` + "`" + `<param_name>` + "`" + ` and ` + "`" + `<param_value>` + "`" + ` with actual values.
-
-**Bash:**
-` + "`" + `node scripts/<script_name>.js '{"<param_name>": "<param_value>"}'` + "`" + `
-
-**PowerShell:**
-` + "`" + `node scripts/<script_name>.js '{\"<param_name>\": \"<param_value>\"}'` + "`" + `
-
-## Scripts
-
-{{range .Tools}}
-### {{.Name}}
-
-{{.Description}}
-
-{{.ParametersSchema}}
-
---
-{{end}}
-`
-
-type toolTemplateData struct {
-	Name             string
-	Description      string
-	ParametersSchema string
-}
-
-type skillTemplateData struct {
-	SkillName        string
-	SkillDescription string
-	Tools            []toolTemplateData
-}
-
-// generateSkillMarkdown generates the content of the SKILL.md file.
-// It includes usage instructions and a reference section for each tool in the skill,
-// detailing its description and parameters.
-func generateSkillMarkdown(skillName, skillDescription string, toolsMap map[string]tools.Tool) (string, error) {
-	var toolsData []toolTemplateData
-
-	// Order tools based on name
-	var toolNames []string
-	for name := range toolsMap {
-		toolNames = append(toolNames, name)
-	}
-	sort.Strings(toolNames)
-
-	for _, name := range toolNames {
-		tool := toolsMap[name]
-		manifest := tool.Manifest()
-
-		parametersSchema, err := formatParameters(manifest.Parameters)
-		if err != nil {
-			return "", err
-		}
-
-		toolsData = append(toolsData, toolTemplateData{
-			Name:             name,
-			Description:      manifest.Description,
-			ParametersSchema: parametersSchema,
-		})
-	}
-
-	data := skillTemplateData{
-		SkillName:        skillName,
-		SkillDescription: skillDescription,
-		Tools:            toolsData,
-	}
-
-	tmpl, err := template.New("markdown").Parse(skillTemplate)
-	if err != nil {
-		return "", fmt.Errorf("error parsing markdown template: %w", err)
-	}
-
-	var buf strings.Builder
-	if err := tmpl.Execute(&buf, data); err != nil {
-		return "", fmt.Errorf("error executing markdown template: %w", err)
-	}
-
-	return buf.String(), nil
-}
-
-const nodeScriptTemplate = `#!/usr/bin/env node
-
-const { spawn, execSync } = require('child_process');
-const path = require('path');
-const fs = require('fs');
-
-const toolName = "{{.Name}}";
-const toolsFileName = "{{.ToolsFileName}}";
-
-function getToolboxPath() {
-    try {
-        const checkCommand = process.platform === 'win32' ? 'where toolbox' : 'which toolbox';
-        const globalPath = execSync(checkCommand, { stdio: 'pipe', encoding: 'utf-8' }).trim();
-        if (globalPath) {
-            return globalPath.split('\n')[0].trim();
-        }
-    } catch (e) {
-        // Ignore error;
-    }
-    const localPath = path.resolve(__dirname, '../../../toolbox');
-    if (fs.existsSync(localPath)) {
-        return localPath;
-    }
-    throw new Error("Toolbox binary not found");
-}
-
-let toolboxBinary;
-try {
-    toolboxBinary = getToolboxPath();
-} catch (err) {
-    console.error("Error:", err.message);
-    process.exit(1);
-}
-
-let configArgs = [];
-if (toolsFileName) {
-  configArgs.push("--tools-file", path.join(__dirname, "..", "assets", toolsFileName));
-}
-
-const args = process.argv.slice(2);
-const toolboxArgs = [...configArgs, "invoke", toolName, ...args];
-
-const child = spawn(toolboxBinary, toolboxArgs, { stdio: 'inherit' });
-
-child.on('close', (code) => {
-  process.exit(code);
-});
-
-child.on('error', (err) => {
-  console.error("Error executing toolbox:", err);
-  process.exit(1);
-});
-`
-
-type scriptData struct {
-	Name          string
-	ToolsFileName string
-}
-
-// generateScriptContent creates the content for a Node.js wrapper script.
-// This script invokes the toolbox CLI with the appropriate configuration
-// (using a generated tools file) and arguments to execute the specific tool.
-func generateScriptContent(name string, toolsFileName string) (string, error) {
-	data := scriptData{
-		Name:          name,
-		ToolsFileName: toolsFileName,
-	}
-
-	tmpl, err := template.New("script").Parse(nodeScriptTemplate)
-	if err != nil {
-		return "", fmt.Errorf("error parsing script template: %w", err)
-	}
-
-	var buf strings.Builder
-	if err := tmpl.Execute(&buf, data); err != nil {
-		return "", fmt.Errorf("error executing script template: %w", err)
-	}
-
-	return buf.String(), nil
-}
-
-// formatParameters converts a list of parameter manifests into a formatted JSON schema string.
-// This schema is used in the skill documentation to describe the input parameters for a tool.
-func formatParameters(params []parameters.ParameterManifest) (string, error) {
-	if len(params) == 0 {
-		return "", nil
-	}
-
-	properties := make(map[string]interface{})
-	var required []string
-
-	for _, p := range params {
-		paramMap := map[string]interface{}{
-			"type":        p.Type,
-			"description": p.Description,
-		}
-		if p.Default != nil {
-			paramMap["default"] = p.Default
-		}
-		properties[p.Name] = paramMap
-		if p.Required {
-			required = append(required, p.Name)
-		}
-	}
-
-	schema := map[string]interface{}{
-		"type":       "object",
-		"properties": properties,
-	}
-	if len(required) > 0 {
-		schema["required"] = required
-	}
-
-	schemaJSON, err := json.MarshalIndent(schema, "", "  ")
-	if err != nil {
-		return "", fmt.Errorf("error generating parameters schema: %w", err)
-	}
-
-	return fmt.Sprintf("#### Parameters\n\n```json\n%s\n```", string(schemaJSON)), nil
-}
-
-// generateToolConfigYAML generates the YAML configuration for a single tool and its dependency (source).
-// It extracts the relevant tool and source configurations from the server config and formats them
-// into a YAML document suitable for inclusion in the skill's assets.
-func generateToolConfigYAML(cfg server.ServerConfig, toolName string) ([]byte, error) {
-	toolCfg, ok := cfg.ToolConfigs[toolName]
-	if !ok {
-		return nil, fmt.Errorf("error finding tool config: %s", toolName)
-	}
-
-	var buf bytes.Buffer
-	encoder := yaml.NewEncoder(&buf)
-
-	// Process Tool Config
-	toolWrapper := struct {
-		Kind   string           `yaml:"kind"`
-		Config tools.ToolConfig `yaml:",inline"`
-	}{
-		Kind:   "tools",
-		Config: toolCfg,
-	}
-
-	if err := encoder.Encode(toolWrapper); err != nil {
-		return nil, fmt.Errorf("error encoding tool config: %w", err)
-	}
-
-	// Process Source Config
-	var toolMap map[string]interface{}
-	b, err := yaml.Marshal(toolCfg)
-	if err != nil {
-		return nil, fmt.Errorf("error marshaling tool config: %w", err)
-	}
-	if err := yaml.Unmarshal(b, &toolMap); err != nil {
-		return nil, fmt.Errorf("error unmarshaling tool config map: %w", err)
-	}
-
-	if sourceName, ok := toolMap["source"].(string); ok && sourceName != "" {
-		sourceCfg, ok := cfg.SourceConfigs[sourceName]
-		if !ok {
-			return nil, fmt.Errorf("error finding source config: %s", sourceName)
-		}
-
-		sourceWrapper := struct {
-			Kind   string               `yaml:"kind"`
-			Config sources.SourceConfig `yaml:",inline"`
-		}{
-			Kind:   "sources",
-			Config: sourceCfg,
-		}
-
-		if err := encoder.Encode(sourceWrapper); err != nil {
-			return nil, fmt.Errorf("error encoding source config: %w", err)
-		}
-	}
-
-	return buf.Bytes(), nil
-}
--- a/cmd/internal/skills/generator_test.go
+++ b/cmd/internal/skills/generator_test.go
@@ -1,347 +0,0 @@
-// Copyright 2026 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package skills
-
-import (
-	"context"
-	"strings"
-	"testing"
-
-	"github.com/googleapis/genai-toolbox/internal/server"
-	"github.com/googleapis/genai-toolbox/internal/sources"
-	"github.com/googleapis/genai-toolbox/internal/tools"
-	"github.com/googleapis/genai-toolbox/internal/util/parameters"
-	"go.opentelemetry.io/otel/trace"
-)
-
-type MockToolConfig struct {
-	Name       string                `yaml:"name"`
-	Type       string                `yaml:"type"`
-	Source     string                `yaml:"source"`
-	Other      string                `yaml:"other"`
-	Parameters parameters.Parameters `yaml:"parameters"`
-}
-
-func (m MockToolConfig) ToolConfigType() string {
-	return m.Type
-}
-
-func (m MockToolConfig) Initialize(map[string]sources.Source) (tools.Tool, error) {
-	return nil, nil
-}
-
-type MockSourceConfig struct {
-	Name             string `yaml:"name"`
-	Type             string `yaml:"type"`
-	ConnectionString string `yaml:"connection_string"`
-}
-
-func (m MockSourceConfig) SourceConfigType() string {
-	return m.Type
-}
-
-func (m MockSourceConfig) Initialize(context.Context, trace.Tracer) (sources.Source, error) {
-	return nil, nil
-}
-
-func TestFormatParameters(t *testing.T) {
-	tests := []struct {
-		name         string
-		params       []parameters.ParameterManifest
-		wantContains []string
-		wantErr      bool
-	}{
-		{
-			name:         "empty parameters",
-			params:       []parameters.ParameterManifest{},
-			wantContains: []string{""},
-		},
-		{
-			name: "single required string parameter",
-			params: []parameters.ParameterManifest{
-				{
-					Name:        "param1",
-					Description: "A test parameter",
-					Type:        "string",
-					Required:    true,
-				},
-			},
-			wantContains: []string{
-				"## Parameters",
-				"```json",
-				`"type": "object"`,
-				`"properties": {`,
-				`"param1": {`,
-				`"type": "string"`,
-				`"description": "A test parameter"`,
-				`"required": [`,
-				`"param1"`,
-			},
-		},
-		{
-			name: "mixed parameters with defaults",
-			params: []parameters.ParameterManifest{
-				{
-					Name:        "param1",
-					Description: "Param 1",
-					Type:        "string",
-					Required:    true,
-				},
-				{
-					Name:        "param2",
-					Description: "Param 2",
-					Type:        "integer",
-					Default:     42,
-					Required:    false,
-				},
-			},
-			wantContains: []string{
-				`"param1": {`,
-				`"param2": {`,
-				`"default": 42`,
-				`"required": [`,
-				`"param1"`,
-			},
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			got, err := formatParameters(tt.params)
-			if (err != nil) != tt.wantErr {
-				t.Errorf("formatParameters() error = %v, wantErr %v", err, tt.wantErr)
-				return
-			}
-			if tt.wantErr {
-				return
-			}
-
-			if len(tt.params) == 0 {
-				if got != "" {
-					t.Errorf("formatParameters() = %v, want empty string", got)
-				}
-				return
-			}
-
-			for _, want := range tt.wantContains {
-				if !strings.Contains(got, want) {
-					t.Errorf("formatParameters() result missing expected string: %s\nGot:\n%s", want, got)
-				}
-			}
-		})
-	}
-}
-
-func TestGenerateSkillMarkdown(t *testing.T) {
-	toolsMap := map[string]tools.Tool{
-		"tool1": server.MockTool{
-			Description: "First tool",
-			Params: []parameters.Parameter{
-				parameters.NewStringParameter("p1", "d1"),
-			},
-		},
-	}
-
-	got, err := generateSkillMarkdown("MySkill", "My Description", toolsMap)
-	if err != nil {
-		t.Fatalf("generateSkillMarkdown() error = %v", err)
-	}
-
-	expectedSubstrings := []string{
-		"name: MySkill",
-		"description: My Description",
-		"## Usage",
-		"All scripts can be executed using Node.js",
-		"**Bash:**",
-		"`node scripts/<script_name>.js '{\"<param_name>\": \"<param_value>\"}'`",
-		"**PowerShell:**",
-		"`node scripts/<script_name>.js '{\"<param_name>\": \"<param_value>\"}'`",
-		"## Scripts",
-		"### tool1",
-		"First tool",
-		"## Parameters",
-	}
-
-	for _, s := range expectedSubstrings {
-		if !strings.Contains(got, s) {
-			t.Errorf("generateSkillMarkdown() missing substring %q", s)
-		}
-	}
-}
-
-func TestGenerateScriptContent(t *testing.T) {
-	tests := []struct {
-		name          string
-		toolName      string
-		toolsFileName string
-		wantContains  []string
-	}{
-		{
-			name:          "basic script",
-			toolName:      "test-tool",
-			toolsFileName: "",
-			wantContains: []string{
-				`const toolName = "test-tool";`,
-				`const toolsFileName = "";`,
-				`const toolboxArgs = [...configArgs, "invoke", toolName, ...args];`,
-			},
-		},
-		{
-			name:          "script with tools file",
-			toolName:      "complex-tool",
-			toolsFileName: "tools.yaml",
-			wantContains: []string{
-				`const toolName = "complex-tool";`,
-				`const toolsFileName = "tools.yaml";`,
-				`configArgs.push("--tools-file", path.join(__dirname, "..", "assets", toolsFileName));`,
-			},
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			got, err := generateScriptContent(tt.toolName, tt.toolsFileName)
-			if err != nil {
-				t.Fatalf("generateScriptContent() error = %v", err)
-			}
-
-			for _, s := range tt.wantContains {
-				if !strings.Contains(got, s) {
-					t.Errorf("generateScriptContent() missing substring %q\nGot:\n%s", s, got)
-				}
-			}
-		})
-	}
-}
-
-func TestGenerateToolConfigYAML(t *testing.T) {
-	cfg := server.ServerConfig{
-		ToolConfigs: server.ToolConfigs{
-			"tool1": MockToolConfig{
-				Name:   "tool1",
-				Type:   "custom-tool",
-				Source: "src1",
-				Other:  "foo",
-			},
-			"toolNoSource": MockToolConfig{
-				Name: "toolNoSource",
-				Type: "http",
-			},
-			"toolWithParams": MockToolConfig{
-				Name: "toolWithParams",
-				Type: "custom-tool",
-				Parameters: []parameters.Parameter{
-					parameters.NewStringParameter("param1", "desc1"),
-				},
-			},
-			"toolWithMissingSource": MockToolConfig{
-				Name:   "toolWithMissingSource",
-				Type:   "custom-tool",
-				Source: "missing-src",
-			},
-		},
-		SourceConfigs: server.SourceConfigs{
-			"src1": MockSourceConfig{
-				Name:             "src1",
-				Type:             "postgres",
-				ConnectionString: "conn1",
-			},
-		},
-	}
-
-	tests := []struct {
-		name         string
-		toolName     string
-		wantContains []string
-		wantErr      bool
-		wantNil      bool
-	}{
-		{
-			name:     "tool with source",
-			toolName: "tool1",
-			wantContains: []string{
-				"kind: tools",
-				"name: tool1",
-				"type: custom-tool",
-				"source: src1",
-				"other: foo",
-				"---",
-				"kind: sources",
-				"name: src1",
-				"type: postgres",
-				"connection_string: conn1",
-			},
-		},
-		{
-			name:     "tool without source",
-			toolName: "toolNoSource",
-			wantContains: []string{
-				"kind: tools",
-				"name: toolNoSource",
-				"type: http",
-			},
-		},
-		{
-			name:     "tool with parameters",
-			toolName: "toolWithParams",
-			wantContains: []string{
-				"kind: tools",
-				"name: toolWithParams",
-				"type: custom-tool",
-				"parameters:",
-				"- name: param1",
-				"type: string",
-				"description: desc1",
-			},
-		},
-		{
-			name:     "non-existent tool",
-			toolName: "missing-tool",
-			wantErr:  true,
-		},
-		{
-			name:     "tool with missing source config",
-			toolName: "toolWithMissingSource",
-			wantErr:  true,
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			gotBytes, err := generateToolConfigYAML(cfg, tt.toolName)
-			if (err != nil) != tt.wantErr {
-				t.Errorf("generateToolConfigYAML() error = %v, wantErr %v", err, tt.wantErr)
-				return
-			}
-			if tt.wantErr {
-				return
-			}
-
-			if tt.wantNil {
-				if gotBytes != nil {
-					t.Errorf("generateToolConfigYAML() expected nil, got %s", string(gotBytes))
-				}
-				return
-			}
-
-			got := string(gotBytes)
-			for _, want := range tt.wantContains {
-				if !strings.Contains(got, want) {
-					t.Errorf("generateToolConfigYAML() result missing expected string: %q\nGot:\n%s", want, got)
-				}
-			}
-		})
-	}
-}
--- a/cmd/internal/tools_file.go
+++ b/cmd/internal/tools_file.go
@@ -1,349 +0,0 @@
-// Copyright 2026 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package internal
-
-import (
-	"bytes"
-	"context"
-	"fmt"
-	"io"
-	"os"
-	"path/filepath"
-	"regexp"
-	"slices"
-	"strings"
-
-	"github.com/goccy/go-yaml"
-	"github.com/googleapis/genai-toolbox/internal/server"
-)
-
-type ToolsFile struct {
-	Sources         server.SourceConfigs         `yaml:"sources"`
-	AuthServices    server.AuthServiceConfigs    `yaml:"authServices"`
-	EmbeddingModels server.EmbeddingModelConfigs `yaml:"embeddingModels"`
-	Tools           server.ToolConfigs           `yaml:"tools"`
-	Toolsets        server.ToolsetConfigs        `yaml:"toolsets"`
-	Prompts         server.PromptConfigs         `yaml:"prompts"`
-}
-
-// parseEnv replaces environment variables ${ENV_NAME} with their values.
-// also support ${ENV_NAME:default_value}.
-func parseEnv(input string) (string, error) {
-	re := regexp.MustCompile(`\$\{(\w+)(:([^}]*))?\}`)
-
-	var err error
-	output := re.ReplaceAllStringFunc(input, func(match string) string {
-		parts := re.FindStringSubmatch(match)
-
-		// extract the variable name
-		variableName := parts[1]
-		if value, found := os.LookupEnv(variableName); found {
-			return value
-		}
-		if len(parts) >= 4 && 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
-	output, err := parseEnv(string(raw))
-	if err != nil {
-		return toolsFile, fmt.Errorf("error parsing environment variables: %s", err)
-	}
-	raw = []byte(output)
-
-	raw, err = convertToolsFile(raw)
-	if err != nil {
-		return toolsFile, fmt.Errorf("error converting tools file: %s", err)
-	}
-
-	// Parse contents
-	toolsFile.Sources, toolsFile.AuthServices, toolsFile.EmbeddingModels, toolsFile.Tools, toolsFile.Toolsets, toolsFile.Prompts, err = server.UnmarshalResourceConfig(ctx, raw)
-	if err != nil {
-		return toolsFile, err
-	}
-	return toolsFile, nil
-}
-
-func convertToolsFile(raw []byte) ([]byte, error) {
-	var input yaml.MapSlice
-	decoder := yaml.NewDecoder(bytes.NewReader(raw), yaml.UseOrderedMap())
-
-	// convert to tools file v2
-	var buf bytes.Buffer
-	encoder := yaml.NewEncoder(&buf)
-
-	v1keys := []string{"sources", "authSources", "authServices", "embeddingModels", "tools", "toolsets", "prompts"}
-	for {
-		if err := decoder.Decode(&input); err != nil {
-			if err == io.EOF {
-				break
-			}
-			return nil, err
-		}
-		for _, item := range input {
-			key, ok := item.Key.(string)
-			if !ok {
-				return nil, fmt.Errorf("unexpected non-string key in input: %v", item.Key)
-			}
-			// check if the key is config file v1's key
-			if slices.Contains(v1keys, key) {
-				// check if value conversion to yaml.MapSlice successfully
-				// fields such as "tools" in toolsets might pass the first check but
-				// fail to convert to MapSlice
-				if slice, ok := item.Value.(yaml.MapSlice); ok {
-					// Deprecated: convert authSources to authServices
-					if key == "authSources" {
-						key = "authServices"
-					}
-					transformed, err := transformDocs(key, slice)
-					if err != nil {
-						return nil, err
-					}
-					// encode per-doc
-					for _, doc := range transformed {
-						if err := encoder.Encode(doc); err != nil {
-							return nil, err
-						}
-					}
-				} else {
-					// invalid input will be ignored
-					// we don't want to throw error here since the config could
-					// be valid but with a different order such as:
-					// ---
-					// tools:
-					// - tool_a
-					// kind: toolsets
-					// ---
-					continue
-				}
-			} else {
-				// this doc is already v2, encode to buf
-				if err := encoder.Encode(input); err != nil {
-					return nil, err
-				}
-				break
-			}
-		}
-	}
-	return buf.Bytes(), nil
-}
-
-// transformDocs transforms the configuration file from v1 format to v2
-// yaml.MapSlice will preserve the order in a map
-func transformDocs(kind string, input yaml.MapSlice) ([]yaml.MapSlice, error) {
-	var transformed []yaml.MapSlice
-	for _, entry := range input {
-		entryName, ok := entry.Key.(string)
-		if !ok {
-			return nil, fmt.Errorf("unexpected non-string key for entry in '%s': %v", kind, entry.Key)
-		}
-		entryBody := ProcessValue(entry.Value, kind == "toolsets")
-
-		currentTransformed := yaml.MapSlice{
-			{Key: "kind", Value: kind},
-			{Key: "name", Value: entryName},
-		}
-
-		// Merge the transformed body into our result
-		if bodySlice, ok := entryBody.(yaml.MapSlice); ok {
-			currentTransformed = append(currentTransformed, bodySlice...)
-		} else {
-			return nil, fmt.Errorf("unable to convert entryBody to MapSlice")
-		}
-		transformed = append(transformed, currentTransformed)
-	}
-	return transformed, nil
-}
-
-// ProcessValue recursively looks for MapSlices to rename 'kind' -> 'type'
-func ProcessValue(v any, isToolset bool) any {
-	switch val := v.(type) {
-	case yaml.MapSlice:
-		// creating a new MapSlice is safer for recursive transformation
-		newVal := make(yaml.MapSlice, len(val))
-		for i, item := range val {
-			// Perform renaming
-			if item.Key == "kind" {
-				item.Key = "type"
-			}
-			// Recursive call for nested values (e.g., nested objects or lists)
-			item.Value = ProcessValue(item.Value, false)
-			newVal[i] = item
-		}
-		return newVal
-	case []any:
-		// Process lists: If it's a toolset top-level list, wrap it.
-		if isToolset {
-			return yaml.MapSlice{{Key: "tools", Value: val}}
-		}
-		// Otherwise, recurse into list items (to catch nested objects)
-		newVal := make([]any, len(val))
-		for i := range val {
-			newVal[i] = ProcessValue(val[i], false)
-		}
-		return newVal
-	default:
-		return val
-	}
-}
-
-// 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),
-		EmbeddingModels: make(server.EmbeddingModelConfigs),
-		Tools:           make(server.ToolConfigs),
-		Toolsets:        make(server.ToolsetConfigs),
-		Prompts:         make(server.PromptConfigs),
-	}
-
-	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 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 embeddingModels
-		for name, em := range file.EmbeddingModels {
-			if _, exists := merged.EmbeddingModels[name]; exists {
-				conflicts = append(conflicts, fmt.Sprintf("embedding model '%s' (file #%d)", name, fileIndex+1))
-			} else {
-				merged.EmbeddingModels[name] = em
-			}
-		}
-
-		// 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
-			}
-		}
-
-		// Check for conflicts and merge prompts
-		for name, prompt := range file.Prompts {
-			if _, exists := merged.Prompts[name]; exists {
-				conflicts = append(conflicts, fmt.Sprintf("prompt '%s' (file #%d)", name, fileIndex+1))
-			} else {
-				merged.Prompts[name] = prompt
-			}
-		}
-	}
-
-	// 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, toolset and prompt 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)
-}
--- a/cmd/internal/tools_file_test.go
+++ b/cmd/internal/tools_file_test.go
--- a/cmd/options.go
+++ b/cmd/options.go
@@ -0,0 +1,30 @@
+// Copyright 2024 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package cmd
+
+import (
+	"io"
+)
+
+// Option is a function that configures a Command.
+type Option func(*Command)
+
+// WithStreams overrides the default writer.
+func WithStreams(out, err io.Writer) Option {
+	return func(c *Command) {
+		c.outStream = out
+		c.errStream = err
+	}
+}
--- a/cmd/internal/options_test.go
+++ b/cmd/internal/options_test.go
@@ -12,38 +12,57 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.

-package internal
+package cmd

 import (
 	"errors"
 	"io"
 	"testing"
+
+	"github.com/spf13/cobra"
 )

-func TestToolboxOptions(t *testing.T) {
+func TestCommandOptions(t *testing.T) {
 	w := io.Discard
 	tcs := []struct {
 		desc    string
-		isValid func(*ToolboxOptions) error
+		isValid func(*Command) error
 		option  Option
 	}{
 		{
 			desc: "with logger",
-			isValid: func(o *ToolboxOptions) error {
-				if o.IOStreams.Out != w || o.IOStreams.ErrOut != w {
+			isValid: func(c *Command) error {
+				if c.outStream != w || c.errStream != w {
 					return errors.New("loggers do not match")
 				}
 				return nil
 			},
-			option: WithIOStreams(w, w),
+			option: WithStreams(w, w),
 		},
 	}
 	for _, tc := range tcs {
 		t.Run(tc.desc, func(t *testing.T) {
-			got := NewToolboxOptions(tc.option)
+			got, err := invokeProxyWithOption(tc.option)
+			if err != nil {
+				t.Fatal(err)
+			}
 			if err := tc.isValid(got); err != nil {
 				t.Errorf("option did not initialize command correctly: %v", err)
 			}
 		})
 	}
 }
+
+func invokeProxyWithOption(o Option) (*Command, error) {
+	c := NewCommand(o)
+	// Keep the test output quiet
+	c.SilenceUsage = true
+	c.SilenceErrors = true
+	// Disable execute behavior
+	c.RunE = func(*cobra.Command, []string) error {
+		return nil
+	}
+
+	err := c.Execute()
+	return c, err
+}
--- a/cmd/root.go
+++ b/cmd/root.go
@@ -15,6 +15,7 @@
 package cmd

 import (
+	"bytes"
 	"context"
 	_ "embed"
 	"fmt"
@@ -23,6 +24,7 @@ import (
 	"os"
 	"os/signal"
 	"path/filepath"
+	"regexp"
 	"runtime"
 	"slices"
 	"strings"
@@ -30,18 +32,120 @@ import (
 	"time"

 	"github.com/fsnotify/fsnotify"
-	// Importing the cmd/internal package also import packages for side effect of registration
-	"github.com/googleapis/genai-toolbox/cmd/internal"
-	"github.com/googleapis/genai-toolbox/cmd/internal/invoke"
-	"github.com/googleapis/genai-toolbox/cmd/internal/skills"
+	yaml "github.com/goccy/go-yaml"
 	"github.com/googleapis/genai-toolbox/internal/auth"
-	"github.com/googleapis/genai-toolbox/internal/embeddingmodels"
-	"github.com/googleapis/genai-toolbox/internal/prompts"
+	"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/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/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 (
@@ -70,95 +174,366 @@ func semanticVersion() string {
 	return v
 }

-// GenerateCommand returns a new Command object with the specified IO streams
-// This is used for integration test package
-func GenerateCommand(out, err io.Writer) *cobra.Command {
-	opts := internal.NewToolboxOptions(internal.WithIOStreams(out, err))
-	return NewCommand(opts)
-}
-
 // Execute adds all child commands to the root command and sets flags appropriately.
 // This is called by main.main(). It only needs to happen once to the rootCmd.
 func Execute() {
-	// Initialize options
-	opts := internal.NewToolboxOptions()
-
-	if err := NewCommand(opts).Execute(); err != nil {
+	if err := NewCommand().Execute(); err != nil {
 		exit := 1
 		os.Exit(exit)
 	}
 }

+// Command represents an invocation of the CLI.
+type Command struct {
+	*cobra.Command
+
+	cfg            server.ServerConfig
+	logger         log.Logger
+	tools_file     string
+	tools_files    []string
+	tools_folder   string
+	prebuiltConfig string
+	inStream       io.Reader
+	outStream      io.Writer
+	errStream      io.Writer
+}
+
 // NewCommand returns a Command object representing an invocation of the CLI.
-func NewCommand(opts *internal.ToolboxOptions) *cobra.Command {
-	cmd := &cobra.Command{
+func NewCommand(opts ...Option) *Command {
+	in := os.Stdin
+	out := os.Stdout
+	err := os.Stderr
+
+	baseCmd := &cobra.Command{
 		Use:           "toolbox",
 		Version:       versionString,
 		SilenceErrors: true,
 	}
+	cmd := &Command{
+		Command:   baseCmd,
+		inStream:  in,
+		outStream: out,
+		errStream: err,
+	}
+
+	for _, o := range opts {
+		o(cmd)
+	}

 	// Do not print Usage on runtime error
 	cmd.SilenceUsage = true

 	// Set server version
-	opts.Cfg.Version = versionString
+	cmd.cfg.Version = versionString

 	// set baseCmd in, out and err the same as cmd.
-	cmd.SetIn(opts.IOStreams.In)
-	cmd.SetOut(opts.IOStreams.Out)
-	cmd.SetErr(opts.IOStreams.ErrOut)
-
-	// setup flags that are common across all commands
-	internal.PersistentFlags(cmd, opts)
+	baseCmd.SetIn(cmd.inStream)
+	baseCmd.SetOut(cmd.outStream)
+	baseCmd.SetErr(cmd.errStream)

 	flags := cmd.Flags()
+	flags.StringVarP(&cmd.cfg.Address, "address", "a", "127.0.0.1", "Address of the interface the server will listen on.")
+	flags.IntVarP(&cmd.cfg.Port, "port", "p", 5000, "Port the server will listen on.")

-	flags.StringVarP(&opts.Cfg.Address, "address", "a", "127.0.0.1", "Address of the interface the server will listen on.")
-	flags.IntVarP(&opts.Cfg.Port, "port", "p", 5000, "Port the server will listen on.")
-
-	flags.StringVar(&opts.ToolsFile, "tools_file", "", "File path specifying the tool configuration. Cannot be used with --tools-files, or --tools-folder.")
+	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.BoolVar(&opts.Cfg.Stdio, "stdio", false, "Listens via MCP STDIO instead of acting as a remote HTTP server.")
-	flags.BoolVar(&opts.Cfg.DisableReload, "disable-reload", false, "Disables dynamic reloading of tools file.")
-	flags.BoolVar(&opts.Cfg.UI, "ui", false, "Launches the Toolbox UI web server.")
-	// TODO: Insecure by default. Might consider updating this for v1.0.0
-	flags.StringSliceVar(&opts.Cfg.AllowedOrigins, "allowed-origins", []string{"*"}, "Specifies a list of origins permitted to access this server. Defaults to '*'.")
-	flags.StringSliceVar(&opts.Cfg.AllowedHosts, "allowed-hosts", []string{"*"}, "Specifies a list of hosts permitted to access this server. Defaults to '*'.")
+	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.")
+
+	// 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, opts) }
-
-	// Register subcommands for tool invocation
-	cmd.AddCommand(invoke.NewCommand(opts))
-	// Register subcommands for skill generation
-	cmd.AddCommand(skills.NewCommand(opts))
+	cmd.RunE = func(*cobra.Command, []string) error { return run(cmd) }

 	return cmd
 }

-func handleDynamicReload(ctx context.Context, toolsFile internal.ToolsFile, s *server.Server) error {
+type ToolsFile struct {
+	Sources      server.SourceConfigs      `yaml:"sources"`
+	AuthSources  server.AuthServiceConfigs `yaml:"authSources"` // Deprecated: Kept for compatibility.
+	AuthServices server.AuthServiceConfigs `yaml:"authServices"`
+	Tools        server.ToolConfigs        `yaml:"tools"`
+	Toolsets     server.ToolsetConfigs     `yaml:"toolsets"`
+}
+
+// parseEnv replaces environment variables ${ENV_NAME} with their values.
+// also support ${ENV_NAME:default_value}.
+func parseEnv(input string) (string, error) {
+	re := regexp.MustCompile(`\$\{(\w+)(:(\w*))?\}`)
+
+	var err error
+	output := re.ReplaceAllStringFunc(input, func(match string) string {
+		parts := re.FindStringSubmatch(match)
+
+		// extract the variable name
+		variableName := parts[1]
+		if value, found := os.LookupEnv(variableName); found {
+			return value
+		}
+		if parts[2] != "" {
+			return parts[3]
+		}
+		err = fmt.Errorf("environment variable not found: %q", variableName)
+		return ""
+	})
+	return output, err
+}
+
+func convertToolsFile(ctx context.Context, raw []byte) ([]byte, error) {
 	logger, err := util.LoggerFromContext(ctx)
 	if err != nil {
 		panic(err)
 	}

-	sourcesMap, authServicesMap, embeddingModelsMap, toolsMap, toolsetsMap, promptsMap, promptsetsMap, err := validateReloadEdits(ctx, toolsFile)
+	keysToCheck := []string{"sources", "authServices", "authSources", "tools", "toolsets"}
+	var input map[string]any
+	if err := yaml.Unmarshal(raw, &input); err != nil {
+		return nil, fmt.Errorf("error unmarshaling tools file: %s", err)
+	}
+
+	// convert to tools file v2
+	var toolsFileV1 bool
+	var buf bytes.Buffer
+	for _, kind := range keysToCheck {
+		resource, ok := input[kind]
+		if !ok {
+			// if this is skipped for all keys, the tools file is in v2
+			continue
+		}
+		toolsFileV1 = true
+		// convert `authSources` to `authServices`
+		if kind == "authSources" {
+			logger.WarnContext(ctx, "`authSources` is deprecated, use `authServices` instead")
+			kind = "authServices"
+		}
+		r, ok := resource.(map[string]any)
+		if !ok {
+			return nil, fmt.Errorf("'%s' is not a map", kind)
+		}
+
+		for name, d := range r {
+			buf.WriteString(fmt.Sprintf("kind: %s\n", kind))
+			buf.WriteString(fmt.Sprintf("name: %s\n", name))
+
+			if kind == "toolsets" {
+				b, err := yaml.Marshal(d)
+				if err != nil {
+					return nil, fmt.Errorf("error marshaling: %s", err)
+				}
+				buf.WriteString(fmt.Sprintf("tools:\n%s", b))
+			} else {
+				fields, ok := d.(map[string]any)
+				if !ok {
+					return nil, fmt.Errorf("fields for %s is not a map", name)
+				}
+				// Copy all existing fields, renaming 'kind' to 'type'.
+				buf.WriteString(fmt.Sprintf("type: %s\n", fields["kind"]))
+				for key, value := range fields {
+					if key == "kind" {
+						continue
+					}
+					o := map[string]any{key: value}
+					b, err := yaml.Marshal(o)
+					if err != nil {
+						return nil, fmt.Errorf("error marshaling: %s", err)
+					}
+					buf.Write(b)
+				}
+			}
+			buf.WriteString("---\n")
+		}
+	}
+	if !toolsFileV1 {
+		return raw, nil
+	}
+	return buf.Bytes(), nil
+}
+
+// parseToolsFile parses the provided yaml into appropriate configs.
+func parseToolsFile(ctx context.Context, raw []byte) (ToolsFile, error) {
+	var toolsFile ToolsFile
+	// Replace environment variables if found
+	output, err := parseEnv(string(raw))
+	if err != nil {
+		return toolsFile, fmt.Errorf("error parsing environment variables: %s", err)
+	}
+	raw = []byte(output)
+
+	// Parse contents
+	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, embeddingModelsMap, toolsMap, toolsetsMap, promptsMap, promptsetsMap)
+	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 internal.ToolsFile,
-) (map[string]sources.Source, map[string]auth.AuthService, map[string]embeddingmodels.EmbeddingModel, map[string]tools.Tool, map[string]tools.Toolset, map[string]prompts.Prompt, map[string]prompts.Promptset, error,
+	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 {
@@ -176,23 +551,21 @@ func validateReloadEdits(
 	defer span.End()

 	reloadedConfig := server.ServerConfig{
-		Version:               versionString,
-		SourceConfigs:         toolsFile.Sources,
-		AuthServiceConfigs:    toolsFile.AuthServices,
-		EmbeddingModelConfigs: toolsFile.EmbeddingModels,
-		ToolConfigs:           toolsFile.Tools,
-		ToolsetConfigs:        toolsFile.Toolsets,
-		PromptConfigs:         toolsFile.Prompts,
+		Version:            versionString,
+		SourceConfigs:      toolsFile.Sources,
+		AuthServiceConfigs: toolsFile.AuthServices,
+		ToolConfigs:        toolsFile.Tools,
+		ToolsetConfigs:     toolsFile.Toolsets,
 	}

-	sourcesMap, authServicesMap, embeddingModelsMap, toolsMap, toolsetsMap, promptsMap, promptsetsMap, err := server.InitializeConfigs(ctx, reloadedConfig)
+	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, nil, nil, nil, err
+		return nil, nil, nil, nil, err
 	}

-	return sourcesMap, authServicesMap, embeddingModelsMap, toolsMap, toolsetsMap, promptsMap, promptsetsMap, nil
+	return sourcesMap, authServicesMap, toolsMap, toolsetsMap, nil
 }

 // watchChanges checks for changes in the provided yaml tools file(s) or folder.
@@ -283,18 +656,18 @@ func watchChanges(ctx context.Context, watchDirs map[string]bool, watchedFiles m

 		case <-debounce.C:
 			debounce.Stop()
-			var reloadedToolsFile internal.ToolsFile
+			var reloadedToolsFile ToolsFile

 			if watchingFolder {
 				logger.DebugContext(ctx, "Reloading tools folder.")
-				reloadedToolsFile, err = internal.LoadAndMergeToolsFolder(ctx, folderToWatch)
+				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 = internal.LoadAndMergeToolsFiles(ctx, slices.Collect(maps.Keys(watchedFiles)))
+				reloadedToolsFile, err = loadAndMergeToolsFiles(ctx, slices.Collect(maps.Keys(watchedFiles)))
 				if err != nil {
 					logger.WarnContext(ctx, "error loading tools files %s", err)
 					continue
@@ -311,6 +684,20 @@ func watchChanges(ctx context.Context, watchDirs map[string]bool, watchedFiles m
 	}
 }

+// updateLogLevel checks if Toolbox have to update the existing log level set by users.
+// stdio doesn't support "debug" and "info" logs.
+func updateLogLevel(stdio bool, logLevel string) bool {
+	if stdio {
+		switch strings.ToUpper(logLevel) {
+		case log.Debug, log.Info:
+			return true
+		default:
+			return false
+		}
+	}
+	return false
+}
+
 func resolveWatcherInputs(toolsFile string, toolsFiles []string, toolsFolder string) (map[string]bool, map[string]bool) {
 	var relevantFiles []string

@@ -338,7 +725,11 @@ func resolveWatcherInputs(toolsFile string, toolsFiles []string, toolsFolder str
 	return watchDirs, watchedFiles
 }

-func run(cmd *cobra.Command, opts *internal.ToolboxOptions) error {
+func run(cmd *Command) error {
+	if updateLogLevel(cmd.cfg.Stdio, cmd.cfg.LogLevel.String()) {
+		cmd.cfg.LogLevel = server.StringLevel(log.Warn)
+	}
+
 	ctx, cancel := context.WithCancel(cmd.Context())
 	defer cancel()

@@ -355,40 +746,158 @@ func run(cmd *cobra.Command, opts *internal.ToolboxOptions) error {
 		}
 		switch s {
 		case syscall.SIGINT:
-			opts.Logger.DebugContext(sCtx, "Received SIGINT signal to shutdown.")
+			cmd.logger.DebugContext(sCtx, "Received SIGINT signal to shutdown.")
 		case syscall.SIGTERM:
-			opts.Logger.DebugContext(sCtx, "Sending SIGTERM signal to shutdown.")
+			cmd.logger.DebugContext(sCtx, "Sending SIGTERM signal to shutdown.")
 		}
 		cancel()
 	}(ctx)

-	ctx, shutdown, err := opts.Setup(ctx)
+	// Handle logger separately from config
+	switch strings.ToLower(cmd.cfg.LoggingFormat.String()) {
+	case "json":
+		logger, err := log.NewStructuredLogger(cmd.outStream, cmd.errStream, cmd.cfg.LogLevel.String())
+		if err != nil {
+			return fmt.Errorf("unable to initialize logger: %w", err)
+		}
+		cmd.logger = logger
+	case "standard":
+		logger, err := log.NewStdLogger(cmd.outStream, cmd.errStream, cmd.cfg.LogLevel.String())
+		if err != nil {
+			return fmt.Errorf("unable to initialize logger: %w", err)
+		}
+		cmd.logger = logger
+	default:
+		return fmt.Errorf("logging format invalid")
+	}
+
+	ctx = util.WithLogger(ctx, cmd.logger)
+
+	// Set up OpenTelemetry
+	otelShutdown, err := telemetry.SetupOTel(ctx, cmd.cfg.Version, cmd.cfg.TelemetryOTLP, cmd.cfg.TelemetryGCP, cmd.cfg.TelemetryServiceName)
 	if err != nil {
-		return err
+		errMsg := fmt.Errorf("error setting up OpenTelemetry: %w", err)
+		cmd.logger.ErrorContext(ctx, errMsg.Error())
+		return errMsg
 	}
 	defer func() {
-		_ = shutdown(ctx)
+		err := otelShutdown(ctx)
+		if err != nil {
+			errMsg := fmt.Errorf("error shutting down OpenTelemetry: %w", err)
+			cmd.logger.ErrorContext(ctx, errMsg.Error())
+		}
 	}()

-	isCustomConfigured, err := opts.LoadConfig(ctx)
-	if err != nil {
-		return err
+	var toolsFile ToolsFile
+
+	if cmd.prebuiltConfig != "" {
+		// 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)
+		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 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
+		}
 	}

+	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 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, opts.Cfg)
+	s, err := server.NewServer(ctx, cmd.cfg)
 	if err != nil {
 		errMsg := fmt.Errorf("toolbox failed to initialize: %w", err)
-		opts.Logger.ErrorContext(ctx, errMsg.Error())
+		cmd.logger.ErrorContext(ctx, errMsg.Error())
 		return errMsg
 	}

 	// run server in background
 	srvErr := make(chan error)
-	if opts.Cfg.Stdio {
+	if cmd.cfg.Stdio {
 		go func() {
 			defer close(srvErr)
-			err = s.ServeStdio(ctx, opts.IOStreams.In, opts.IOStreams.Out)
+			err = s.ServeStdio(ctx, cmd.inStream, cmd.outStream)
 			if err != nil {
 				srvErr <- err
 			}
@@ -397,12 +906,12 @@ func run(cmd *cobra.Command, opts *internal.ToolboxOptions) error {
 		err = s.Listen(ctx)
 		if err != nil {
 			errMsg := fmt.Errorf("toolbox failed to start listener: %w", err)
-			opts.Logger.ErrorContext(ctx, errMsg.Error())
+			cmd.logger.ErrorContext(ctx, errMsg.Error())
 			return errMsg
 		}
-		opts.Logger.InfoContext(ctx, "Server ready to serve!")
-		if opts.Cfg.UI {
-			opts.Logger.InfoContext(ctx, fmt.Sprintf("Toolbox UI is up and running at: http://%s:%d/ui", opts.Cfg.Address, opts.Cfg.Port))
+		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() {
@@ -414,8 +923,9 @@ func run(cmd *cobra.Command, opts *internal.ToolboxOptions) error {
 		}()
 	}

-	if isCustomConfigured && !opts.Cfg.DisableReload {
-		watchDirs, watchedFiles := resolveWatcherInputs(opts.ToolsFile, opts.ToolsFiles, opts.ToolsFolder)
+	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)
 	}
@@ -425,13 +935,13 @@ func run(cmd *cobra.Command, opts *internal.ToolboxOptions) error {
 	case err := <-srvErr:
 		if err != nil {
 			errMsg := fmt.Errorf("toolbox crashed with the following error: %w", err)
-			opts.Logger.ErrorContext(ctx, errMsg.Error())
+			cmd.logger.ErrorContext(ctx, errMsg.Error())
 			return errMsg
 		}
 	case <-ctx.Done():
 		shutdownContext, cancel := context.WithTimeout(context.Background(), 10*time.Second)
 		defer cancel()
-		opts.Logger.WarnContext(shutdownContext, "Shutting down gracefully...")
+		cmd.logger.WarnContext(shutdownContext, "Shutting down gracefully...")
 		err := s.Shutdown(shutdownContext)
 		if err == context.DeadlineExceeded {
 			return fmt.Errorf("graceful shutdown timed out... forcing exit")
--- a/cmd/root_test.go
+++ b/cmd/root_test.go
--- a/cmd/version.txt
+++ b/cmd/version.txt
@@ -1 +1 @@
-0.26.0
+0.13.0
--- a/docs/ALLOYDBADMIN_README.md
+++ b/docs/ALLOYDBADMIN_README.md
@@ -1,81 +0,0 @@
-# AlloyDB for PostgreSQL Admin MCP Server
-
-The AlloyDB Model Context Protocol (MCP) Server gives AI-powered development tools the ability to work with your Google Cloud AlloyDB for PostgreSQL resources. It supports full lifecycle control, from creating clusters and instances to exploring schemas and running queries.
-
-## Features
-
-An editor configured to use the AlloyDB MCP server can use its AI capabilities to help you:
-
-* **Provision & Manage Infrastructure**: Create and manage AlloyDB clusters, instances, and users
-
-To connect to the database to explore and query data, search the MCP store for the AlloyDB for PostgreSQL MCP Server.
-
-## Prerequisites
-
-*   [Node.js](https://nodejs.org/) installed.
-*   A Google Cloud project with the **AlloyDB API** enabled.
-*   Ensure [Application Default Credentials](https://cloud.google.com/docs/authentication/gcloud) are available in your environment.
-*   IAM Permissions:
-    *   AlloyDB Admin (`roles/alloydb.admin`) (for managing infrastructure)
-    *   Service Usage Consumer (`roles/serviceusage.serviceUsageConsumer`)
-
-## Install & Configuration
-
-In the Antigravity MCP Store, click the "Install" button.
-
-> [!NOTE]
-> On first use, the installation process automatically downloads and uses
-> [MCP Toolbox](https://www.npmjs.com/package/@toolbox-sdk/server)
-> `>=0.26.0`. To update MCP Toolbox, use:
-> ```npm i -g @toolbox-sdk/server@latest```
-> To always run the latest version, update the MCP server configuration to use:
-> ```npx -y @toolbox-sdk/server@latest --prebuilt alloydb-postgres-admin```.
-
-You'll now be able to see all enabled tools in the "Tools" tab.
-
-> [!NOTE]
-> If you encounter issues with Windows Defender blocking the execution, you may need to configure an allowlist. See [Configure exclusions for Microsoft Defender Antivirus](https://learn.microsoft.com/en-us/microsoft-365/security/defender-endpoint/configure-exclusions-microsoft-defender-antivirus?view=o365-worldwide) for more details.
-
-## Usage
-
-Once configured, the MCP server will automatically provide AlloyDB capabilities to your AI assistant. You can:
-
-*   "Create a new AlloyDB cluster named 'e-commerce-prod' in the 'my-gcp-project' project."
-*   "Add a read-only instance to my 'e-commerce-prod' cluster."
-*   "Create a new user named 'analyst' with read access to all tables."
-
-## Server Capabilities
-
-The AlloyDB MCP server provides the following tools:
-
-| Tool Name            | Description                                                        |
-|:---------------------|:-------------------------------------------------------------------|
-| `create_cluster`     | Create an AlloyDB cluster.                                         |
-| `create_instance`    | Create an AlloyDB instance (PRIMARY, READ-POOL, or SECONDARY).     |
-| `create_user`        | Create ALLOYDB-BUILT-IN or IAM-based users for an AlloyDB cluster. |
-| `get_cluster`        | Get details about an AlloyDB cluster.                              |
-| `get_instance`       | Get details about an AlloyDB instance.                             |
-| `get_user`           | Get details about a user in an AlloyDB cluster.                    |
-| `list_clusters`      | List clusters in a given project and location.                     |
-| `list_instances`     | List instances in a given project and location.                    |
-| `list_users`         | List users in a given project and location.                        |
-| `wait_for_operation` | Poll the operations API until the operation is done.               |
-
-## Custom MCP Server Configuration
-
-Add the following configuration to your MCP client (e.g., `settings.json` for Gemini CLI, `mcp_config.json` for Antigravity):
-
-```json
-{
-  "mcpServers": {
-    "alloydb-admin": {
-      "command": "npx",
-      "args": ["-y", "@toolbox-sdk/server", "--prebuilt", "alloydb-postgres-admin", "--stdio"]
-    }
-  }
-}
-```
-
-## Documentation
-
-For more information, visit the [AlloyDB for PostgreSQL documentation](https://cloud.google.com/alloydb/docs).
--- a/docs/ALLOYDBPG_README.md
+++ b/docs/ALLOYDBPG_README.md
@@ -1,101 +0,0 @@
-# AlloyDB for PostgreSQL MCP Server
-
-The AlloyDB Model Context Protocol (MCP) Server gives AI-powered development tools the ability to work with your Google Cloud AlloyDB for PostgreSQL resources. It supports full lifecycle control, from exploring schemas and running queries to monitoring your database.
-
-## Features
-
-An editor configured to use the AlloyDB MCP server can use its AI capabilities to help you:
-
- **Explore Schemas and Data** - List tables, get table details, and view data
- **Execute SQL** - Run SQL queries directly from your editor
- **Monitor Performance** - View active queries, query plans, and other performance metrics (via observability tools)
- **Manage Extensions** - List available and installed PostgreSQL extensions
-
-For AlloyDB infrastructure management, search the MCP store for the AlloyDB for PostgreSQL Admin MCP Server.
-
-## Prerequisites
-
-*   [Node.js](https://nodejs.org/) installed.
-*   A Google Cloud project with the **AlloyDB API** enabled.
-*   Ensure [Application Default Credentials](https://cloud.google.com/docs/authentication/gcloud) are available in your environment.
-*   IAM Permissions:
-    *   AlloyDB Client (`roles/alloydb.client`) (for connecting and querying)
-    *   Service Usage Consumer (`roles/serviceusage.serviceUsageConsumer`)
-
-> **Note:** If your AlloyDB instance uses private IPs, you must run the MCP server in the same Virtual Private Cloud (VPC) network.
-
-## Install & Configuration
-
-1. In the Antigravity MCP Store, click the "Install" button.
-    > [!NOTE]
-    > On first use, the installation process automatically downloads and uses
-    > [MCP Toolbox](https://www.npmjs.com/package/@toolbox-sdk/server)
-    > `>=0.26.0`. To update MCP Toolbox, use:
-    > ```npm i -g @toolbox-sdk/server@latest```
-    > To always run the latest version, update the MCP server configuration to use:
-    > ```npx -y @toolbox-sdk/server@latest --prebuilt alloydb-postgres```.
-
-2. Add the required inputs for your [cluster](https://docs.cloud.google.com/alloydb/docs/cluster-list) in the configuration pop-up, then click "Save". You can update this configuration at any time in the "Configure" tab.
-
-> [!NOTE]
-> If you encounter issues with Windows Defender blocking the execution, you may need to configure an allowlist. See [Configure exclusions for Microsoft Defender Antivirus](https://learn.microsoft.com/en-us/microsoft-365/security/defender-endpoint/configure-exclusions-microsoft-defender-antivirus?view=o365-worldwide) for more details.
-
-You'll now be able to see all enabled tools in the "Tools" tab.
-
-## Usage
-
-Once configured, the MCP server will automatically provide AlloyDB capabilities to your AI assistant. You can:
-
-*   "Show me all tables in the 'orders' database."
-*   "What are the columns in the 'products' table?"
-*   "How many orders were placed in the last 30 days?"
-
-## Server Capabilities
-
-The AlloyDB MCP server provides the following tools:
-
-| Tool Name                        | Description                                                |
-|:---------------------------------|:-----------------------------------------------------------|
-| `list_tables`                    | Lists detailed schema information for user-created tables. |
-| `execute_sql`                    | Executes a SQL query.                                      |
-| `list_active_queries`            | List currently running queries.                            |
-| `list_available_extensions`      | List available extensions for installation.                |
-| `list_installed_extensions`      | List installed extensions.                                 |
-| `get_query_plan`                 | Get query plan for a SQL statement.                        |
-| `list_autovacuum_configurations` | List autovacuum configurations and their values.           |
-| `list_memory_configurations`     | List memory configurations and their values.               |
-| `list_top_bloated_tables`        | List top bloated tables.                                   |
-| `list_replication_slots`         | List replication slots.                                    |
-| `list_invalid_indexes`           | List invalid indexes.                                      |
-
-## Custom MCP Server Configuration
-
-The AlloyDB MCP server is configured using environment variables.
-
-```bash
-export ALLOYDB_POSTGRES_PROJECT="<your-gcp-project-id>"
-export ALLOYDB_POSTGRES_REGION="<your-alloydb-region>"
-export ALLOYDB_POSTGRES_CLUSTER="<your-alloydb-cluster-id>"
-export ALLOYDB_POSTGRES_INSTANCE="<your-alloydb-instance-id>"
-export ALLOYDB_POSTGRES_DATABASE="<your-database-name>"
-export ALLOYDB_POSTGRES_USER="<your-database-user>"  # Optional
-export ALLOYDB_POSTGRES_PASSWORD="<your-database-password>"  # Optional
-export ALLOYDB_POSTGRES_IP_TYPE="PUBLIC"  # Optional: `PUBLIC`, `PRIVATE`, `PSC`. Defaults to `PUBLIC`.
-```
-
-Add the following configuration to your MCP client (e.g., `settings.json` for Gemini CLI, `mcp_config.json` for Antigravity):
-
-```json
-{
-  "mcpServers": {
-    "alloydb-postgres": {
-      "command": "npx",
-      "args": ["-y", "@toolbox-sdk/server", "--prebuilt", "alloydb-postgres", "--stdio"]
-    }
-  }
-}
-```
-
-## Documentation
-
-For more information, visit the [AlloyDB for PostgreSQL documentation](https://cloud.google.com/alloydb/docs).
--- a/docs/BIGQUERY_README.md
+++ b/docs/BIGQUERY_README.md
@@ -1,96 +0,0 @@
-# BigQuery MCP Server
-
-The BigQuery Model Context Protocol (MCP) Server enables AI-powered development tools to seamlessly connect, interact, and generate data insights with your BigQuery datasets and data using natural language commands.
-
-## Features
-
-An editor configured to use the BigQuery MCP server can use its AI capabilities to help you:
-
- **Natural Language to Data Analytics:** Easily find required BigQuery tables and ask analytical questions in plain English.
- **Seamless Workflow:** Stay within your CLI, eliminating the need to constantly switch to the GCP console for generating analytical insights.
- **Run Advanced Analytics:** Generate forecasts and perform contribution analysis using built-in advanced tools.
-
-## Prerequisites
-
-*   [Node.js](https://nodejs.org/) installed.
-*   A Google Cloud project with the **BigQuery API** enabled.
-*   Ensure [Application Default Credentials](https://cloud.google.com/docs/authentication/gcloud) are available in your environment.
-*   IAM Permissions:
-    *   BigQuery User (`roles/bigquery.user`)
-
-## Install & Configuration
-
-1. In the Antigravity MCP Store, click the "Install" button.
-    > [!NOTE]
-    > On first use, the installation process automatically downloads and uses
-    > [MCP Toolbox](https://www.npmjs.com/package/@toolbox-sdk/server)
-    > `>=0.26.0`. To update MCP Toolbox, use:
-    > ```npm i -g @toolbox-sdk/server@latest```
-    > To always run the latest version, update the MCP server configuration to use:
-    > ```npx -y @toolbox-sdk/server@latest --prebuilt bigquery```.
-
-2. Add the required inputs in the configuration pop-up, then click "Save". You can update this configuration at any time in the "Configure" tab.
-
-> [!NOTE]
-> If you encounter issues with Windows Defender blocking the execution, you may need to configure an allowlist. See [Configure exclusions for Microsoft Defender Antivirus](https://learn.microsoft.com/en-us/microsoft-365/security/defender-endpoint/configure-exclusions-microsoft-defender-antivirus?view=o365-worldwide) for more details.
-
-You'll now be able to see all enabled tools in the "Tools" tab.
-
-
-### Usage 
-
-Once configured, the MCP server will automatically provide BigQuery capabilities to your AI assistant. You can:
-
-
-*   **Find Data:**
-
-    *   "Find tables related to PyPi downloads"
-    *   "Find tables related to Google analytics data in the dataset bigquery-public-data"
-
-*   **Generate Analytics and Insights:**
-
-    *   "Using bigquery-public-data.pypi.file_downloads show me the top 10 downloaded pypi packages this month."
-    *   "Using bigquery-public-data.pypi.file_downloads can you forecast downloads for the last four months of 2025 for package urllib3?"
-
-## Server Capabilities
-
-The BigQuery MCP server provides the following tools:
-
-| Tool Name              | Description                                                     |
-|:-----------------------|:----------------------------------------------------------------|
-| `execute_sql`          | Executes a SQL query.                                           |
-| `forecast`             | Forecast time series data.                                      |
-| `get_dataset_info`     | Get dataset metadata.                                           |
-| `get_table_info`       | Get table metadata.                                             |
-| `list_dataset_ids`     | Lists dataset IDs in the database.                              |
-| `list_table_ids`       | Lists table IDs in the database.                                |
-| `analyze_contribution` | Perform contribution analysis, also called key driver analysis. |
-| `search_catalog`       | Search for tables based on the provided query.                  |
-
-## Custom MCP Server Configuration
-
-The BigQuery MCP server is configured using environment variables.
-
-```bash
-export BIGQUERY_PROJECT="<your-gcp-project-id>"
-export BIGQUERY_LOCATION="<your-dataset-location>"  # Optional
-export BIGQUERY_USE_CLIENT_OAUTH="true"  # Optional
-export BIGQUERY_SCOPES="<comma-separated-scopes>"  # Optional
-```
-
-Add the following configuration to your MCP client (e.g., `settings.json` for Gemini CLI, `mcp_config.json` for Antigravity):
-
-```json
-{
-  "mcpServers": {
-    "bigquery": {
-      "command": "npx",
-      "args": ["-y", "@toolbox-sdk/server", "--prebuilt", "bigquery", "--stdio"]
-    }
-  }
-}
-```
-
-## Documentation
-
-For more information, visit the [BigQuery documentation](https://cloud.google.com/bigquery/docs).
--- a/docs/CLOUDSQLMSSQLADMIN_README.md
+++ b/docs/CLOUDSQLMSSQLADMIN_README.md
@@ -1,78 +0,0 @@
-# Cloud SQL for SQL Server Admin MCP Server
-
-The Cloud SQL for SQL Server Model Context Protocol (MCP) Server gives AI-powered development tools the ability to work with your Google Cloud SQL for SQL Server databases. It supports connecting to instances, exploring schemas, and running queries.
-
-## Features
-
-An editor configured to use the Cloud SQL for SQL Server MCP server can use its AI capabilities to help you:
-
- **Provision & Manage Infrastructure** - Create and manage Cloud SQL instances and users
-
-To connect to the database to explore and query data, search the MCP store for the Cloud SQL for SQL Server MCP Server.
-
-## Prerequisites
-
-*   [Node.js](https://nodejs.org/) installed.
-*   A Google Cloud project with the **Cloud SQL Admin API** enabled.
-*   Ensure [Application Default Credentials](https://cloud.google.com/docs/authentication/gcloud) are available in your environment.
-*   IAM Permissions:
-  * Cloud SQL Viewer (`roles/cloudsql.viewer`)
-  * Cloud SQL Admin (`roles/cloudsql.admin`)
-
-## Install & Configuration
-
-In the Antigravity MCP Store, click the "Install" button.
-
-> [!NOTE]
-> On first use, the installation process automatically downloads and uses
-> [MCP Toolbox](https://www.npmjs.com/package/@toolbox-sdk/server)
-> `>=0.26.0`. To update MCP Toolbox, use:
-> ```npm i -g @toolbox-sdk/server@latest```
-> To always run the latest version, update the MCP server configuration to use:
-> ```npx -y @toolbox-sdk/server@latest --prebuilt cloud-sql-mssql-admin```.
-
-You'll now be able to see all enabled tools in the "Tools" tab.
-
-> [!NOTE]
-> If you encounter issues with Windows Defender blocking the execution, you may need to configure an allowlist. See [Configure exclusions for Microsoft Defender Antivirus](https://learn.microsoft.com/en-us/microsoft-365/security/defender-endpoint/configure-exclusions-microsoft-defender-antivirus?view=o365-worldwide) for more details.
-
-## Usage
-
-Once configured, the MCP server will automatically provide Cloud SQL for SQL Server capabilities to your AI assistant. You can:
-
-  * "Create a new Cloud SQL for SQL Server instance named 'e-commerce-prod' in the 'my-gcp-project' project."
-  * "Create a new user named 'analyst' with read access to all tables."
-
-## Server Capabilities
-
-The Cloud SQL for SQL Server MCP server provides the following tools:
-
-| Tool Name            | Description                                            |
-|:---------------------|:-------------------------------------------------------|
-| `create_instance`    | Create an instance (PRIMARY, READ-POOL, or SECONDARY). |
-| `create_user`        | Create BUILT-IN or IAM-based users for an instance.    |
-| `get_instance`       | Get details about an instance.                         |
-| `get_user`           | Get details about a user in an instance.               |
-| `list_instances`     | List instances in a given project and location.        |
-| `list_users`         | List users in a given project and location.            |
-| `wait_for_operation` | Poll the operations API until the operation is done.   |
-
-
-## Custom MCP Server Configuration
-
-Add the following configuration to your MCP client (e.g., `settings.json` for Gemini CLI, `mcp_config.json` for Antigravity):
-
-```json
-{
-  "mcpServers": {
-    "cloud-sql-sqlserver-admin": {
-      "command": "npx",
-      "args": ["-y", "@toolbox-sdk/server", "--prebuilt", "cloud-sql-mssql-admin", "--stdio"]
-    }
-  }
-}
-```
-
-## Documentation
-
-For more information, visit the [Cloud SQL for SQL Server documentation](https://cloud.google.com/sql/docs/sqlserver).
--- a/docs/CLOUDSQLMSSQL_README.md
+++ b/docs/CLOUDSQLMSSQL_README.md
@@ -1,96 +0,0 @@
-# Cloud SQL for SQL Server MCP Server
-
-The Cloud SQL for SQL Server Model Context Protocol (MCP) Server gives AI-powered development tools the ability to work with your Google Cloud SQL for SQL Server databases. It supports connecting to instances, exploring schemas, and running queries.
-
-## Features
-
-An editor configured to use the Cloud SQL for SQL Server MCP server can use its AI capabilities to help you:
-
- **Query Data** - Execute SQL queries
- **Explore Schema** - List tables and view schema details
-
-For Cloud SQL infrastructure management, search the MCP store for the Cloud SQL for SQL Server Admin MCP Server.
-
-## Prerequisites
-
-*   [Node.js](https://nodejs.org/) installed.
-*   A Google Cloud project with the **Cloud SQL Admin API** enabled.
-*   Ensure [Application Default Credentials](https://cloud.google.com/docs/authentication/gcloud) are available in your environment.
-*   IAM Permissions:
-    *   Cloud SQL Client (`roles/cloudsql.client`)
-
-> **Note:** If your instance uses private IPs, you must run the MCP server in the same Virtual Private Cloud (VPC) network.
-
-## Install & Configuration
-
-1. In the Antigravity MCP Store, click the "Install" button.
-    > [!NOTE]
-    > On first use, the installation process automatically downloads and uses
-    > [MCP Toolbox](https://www.npmjs.com/package/@toolbox-sdk/server)
-    > `>=0.26.0`. To update MCP Toolbox, use:
-    > ```npm i -g @toolbox-sdk/server@latest```
-    > To always run the latest version, update the MCP server configuration to use:
-    > ```npx -y @toolbox-sdk/server@latest --prebuilt cloud-sql-mssql```.
-
-2. Add the required inputs for your [instance](https://cloud.google.com/sql/docs/sqlserver/instance-info) in the configuration pop-up, then click "Save". You can update this configuration at any time in the "Configure" tab.
-
-You'll now be able to see all enabled tools in the "Tools" tab.
-
-> [!NOTE]
-> If you encounter issues with Windows Defender blocking the execution, you may need to configure an allowlist. See [Configure exclusions for Microsoft Defender Antivirus](https://learn.microsoft.com/en-us/microsoft-365/security/defender-endpoint/configure-exclusions-microsoft-defender-antivirus?view=o365-worldwide) for more details.
-
-## Usage
-
-Once configured, the MCP server will automatically provide Cloud SQL for SQL Server capabilities to your AI assistant. You can:
-
-*   "Select top 10 rows from the customers table."
-*   "List all tables in the database."
-
-## Server Capabilities
-
-The Cloud SQL for SQL Server MCP server provides the following tools:
-
-| Tool Name     | Description                                                |
-|:--------------|:-----------------------------------------------------------|
-| `execute_sql` | Use this tool to execute SQL.                              |
-| `list_tables` | Lists detailed schema information for user-created tables. |
-
-## Custom MCP Server Configuration
-
-The MCP server is configured using environment variables.
-
-```bash
-export CLOUD_SQL_MSSQL_PROJECT="<your-gcp-project-id>"
-export CLOUD_SQL_MSSQL_REGION="<your-cloud-sql-region>"
-export CLOUD_SQL_MSSQL_INSTANCE="<your-cloud-sql-instance-id>"
-export CLOUD_SQL_MSSQL_DATABASE="<your-database-name>"
-export CLOUD_SQL_MSSQL_USER="<your-database-user>"  # Optional
-export CLOUD_SQL_MSSQL_PASSWORD="<your-database-password>"  # Optional
-export CLOUD_SQL_MSSQL_IP_TYPE="PUBLIC"  # Optional: `PUBLIC`, `PRIVATE`, `PSC`. Defaults to `PUBLIC`.
-```
-
-
-Add the following configuration to your MCP client (e.g., `settings.json` for Gemini CLI, `mcp_config.json` for Antigravity):
-
-```json
-{
-  "mcpServers": {
-    "cloud-sql-mssql": {
-      "command": "npx",
-      "args": ["-y", "@toolbox-sdk/server", "--prebuilt", "cloud-sql-mssql", "--stdio"],
-      "env": {
-        "CLOUD_SQL_MSSQL_PROJECT": "your-project-id",
-        "CLOUD_SQL_MSSQL_REGION": "your-region",
-        "CLOUD_SQL_MSSQL_INSTANCE": "your-instance-id",
-        "CLOUD_SQL_MSSQL_DATABASE": "your-database-name",
-        "CLOUD_SQL_MSSQL_USER": "your-username",
-        "CLOUD_SQL_MSSQL_PASSWORD": "your-password"
-      }
-    }
-  }
-}
-```
-
-## Documentation
-
-For more information, visit the [Cloud SQL for SQL Server documentation](https://cloud.google.com/sql/docs/sqlserver).
--- a/docs/CLOUDSQLMYSQLADMIN_README.md
+++ b/docs/CLOUDSQLMYSQLADMIN_README.md
@@ -1,77 +0,0 @@
-# Cloud SQL for MySQL Admin MCP Server
-
-The Cloud SQL for MySQL Model Context Protocol (MCP) Server gives AI-powered development tools the ability to work with your Google Cloud SQL for MySQL databases. It supports connecting to instances, exploring schemas, and running queries.
-
-## Features
-
-An editor configured to use the Cloud SQL for MySQL MCP server can use its AI capabilities to help you:
-
- **Provision & Manage Infrastructure** - Create and manage Cloud SQL instances and users
-
-To connect to the database to explore and query data, search the MCP store for the Cloud SQL for MySQL MCP Server.
-
-## Prerequisites
-
-*   [Node.js](https://nodejs.org/) installed.
-*   A Google Cloud project with the **Cloud SQL Admin API** enabled.
-*   Ensure [Application Default Credentials](https://cloud.google.com/docs/authentication/gcloud) are available in your environment.
-*   IAM Permissions:
-  * Cloud SQL Viewer (`roles/cloudsql.viewer`)
-  * Cloud SQL Admin (`roles/cloudsql.admin`)
-
-## Install & Configuration
-
-In the Antigravity MCP Store, click the "Install" button.
-
-> [!NOTE]
-> On first use, the installation process automatically downloads and uses
-> [MCP Toolbox](https://www.npmjs.com/package/@toolbox-sdk/server)
-> `>=0.26.0`. To update MCP Toolbox, use:
-> ```npm i -g @toolbox-sdk/server@latest```
-> To always run the latest version, update the MCP server configuration to use:
-> ```npx -y @toolbox-sdk/server@latest --prebuilt cloud-sql-mysql-admin```.
-
-You'll now be able to see all enabled tools in the "Tools" tab.
-
-> [!NOTE]
-> If you encounter issues with Windows Defender blocking the execution, you may need to configure an allowlist. See [Configure exclusions for Microsoft Defender Antivirus](https://learn.microsoft.com/en-us/microsoft-365/security/defender-endpoint/configure-exclusions-microsoft-defender-antivirus?view=o365-worldwide) for more details.
-
-## Usage
-
-Once configured, the MCP server will automatically provide Cloud SQL for MySQL capabilities to your AI assistant. You can:
-
-   * "Create a new Cloud SQL for MySQL instance named 'e-commerce-prod' in the 'my-gcp-project' project."
-   * "Create a new user named 'analyst' with read access to all tables."
-
-## Server Capabilities
-
-The Cloud SQL for MySQL MCP server provides the following tools:
-
-| Tool Name            | Description                                            |
-|:---------------------|:-------------------------------------------------------|
-| `create_instance`    | Create an instance (PRIMARY, READ-POOL, or SECONDARY). |
-| `create_user`        | Create BUILT-IN or IAM-based users for an instance.    |
-| `get_instance`       | Get details about an instance.                         |
-| `get_user`           | Get details about a user in an instance.               |
-| `list_instances`     | List instances in a given project and location.        |
-| `list_users`         | List users in a given project and location.            |
-| `wait_for_operation` | Poll the operations API until the operation is done.   |
-
-## Custom MCP Server Configuration
-
-Add the following configuration to your MCP client (e.g., `settings.json` for Gemini CLI, `mcp_config.json` for Antigravity):
-
-```json
-{
-  "mcpServers": {
-    "cloud-sql-mysql-admin": {
-      "command": "npx",
-      "args": ["-y", "@toolbox-sdk/server", "--prebuilt", "cloud-sql-mysql-admin", "--stdio"]
-    }
-  }
-}
-```
-
-## Documentation
-
-For more information, visit the [Cloud SQL for MySQL documentation](https://cloud.google.com/sql/docs/mysql).
--- a/docs/CLOUDSQLMYSQL_README.md
+++ b/docs/CLOUDSQLMYSQL_README.md
@@ -1,102 +0,0 @@
-# Cloud SQL for MySQL MCP Server
-
-The Cloud SQL for MySQL Model Context Protocol (MCP) Server gives AI-powered development tools the ability to work with your Google Cloud SQL for MySQL databases. It supports connecting to instances, exploring schemas, and running queries.
-
-## Features
-
-An editor configured to use the Cloud SQL for MySQL MCP server can use its AI capabilities to help you:
-
- **Query Data** - Execute SQL queries and analyze query plans
- **Explore Schema** - List tables and view schema details
- **Database Maintenance** - Check for fragmentation and missing indexes
- **Monitor Performance** - View active queries
-
-For Cloud SQL infrastructure management, search the MCP store for the Cloud SQL for MySQL Admin MCP Server.
-
-## Prerequisites
-
-*   [Node.js](https://nodejs.org/) installed.
-*   A Google Cloud project with the **Cloud SQL Admin API** enabled.
-*   Ensure [Application Default Credentials](https://cloud.google.com/docs/authentication/gcloud) are available in your environment.
-*   IAM Permissions:
-    *   Cloud SQL Client (`roles/cloudsql.client`)
-
-> **Note:** If your instance uses private IPs, you must run the MCP server in the same Virtual Private Cloud (VPC) network.
-
-## Install & Configuration
-
-1. In the Antigravity MCP Store, click the "Install" button.
-    > [!NOTE]
-    > On first use, the installation process automatically downloads and uses
-    > [MCP Toolbox](https://www.npmjs.com/package/@toolbox-sdk/server)
-    > `>=0.26.0`. To update MCP Toolbox, use:
-    > ```npm i -g @toolbox-sdk/server@latest```
-    > To always run the latest version, update the MCP server configuration to use:
-    > ```npx -y @toolbox-sdk/server@latest --prebuilt cloud-sql-mysql```.
-
-2. Add the required inputs for your [instance](https://cloud.google.com/sql/docs/mysql/instance-info) in the configuration pop-up, then click "Save". You can update this configuration at any time in the "Configure" tab.
-
-You'll now be able to see all enabled tools in the "Tools" tab.
-
-> [!NOTE]
-> If you encounter issues with Windows Defender blocking the execution, you may need to configure an allowlist. See [Configure exclusions for Microsoft Defender Antivirus](https://learn.microsoft.com/en-us/microsoft-365/security/defender-endpoint/configure-exclusions-microsoft-defender-antivirus?view=o365-worldwide) for more details.
-
-## Usage
-
-Once configured, the MCP server will automatically provide Cloud SQL for MySQL capabilities to your AI assistant. You can:
-
-*   "Show me the schema for the 'orders' table."
-*   "List the top 10 active queries."
-*   "Check for tables missing unique indexes."
-
-## Server Capabilities
-
-The Cloud SQL for MySQL MCP server provides the following tools:
-
-| Tool Name                            | Description                                                             |
-|:-------------------------------------|:------------------------------------------------------------------------|
-| `execute_sql`                        | Use this tool to execute SQL.                                           |
-| `list_active_queries`                | Lists top N ongoing queries from processlist and innodb_trx.            |
-| `get_query_plan`                     | Provide information about how MySQL executes a SQL statement (EXPLAIN). |
-| `list_tables`                        | Lists detailed schema information for user-created tables.              |
-| `list_tables_missing_unique_indexes` | Find tables that do not have primary or unique key constraint.          |
-| `list_table_fragmentation`           | List table fragmentation in MySQL.                                      |
-
-## Custom MCP Server Configuration
-
-The MCP server is configured using environment variables.
-
-```bash
-export CLOUD_SQL_MYSQL_PROJECT="<your-gcp-project-id>"
-export CLOUD_SQL_MYSQL_REGION="<your-cloud-sql-region>"
-export CLOUD_SQL_MYSQL_INSTANCE="<your-cloud-sql-instance-id>"
-export CLOUD_SQL_MYSQL_DATABASE="<your-database-name>"
-export CLOUD_SQL_MYSQL_USER="<your-database-user>"  # Optional
-export CLOUD_SQL_MYSQL_PASSWORD="<your-database-password>"  # Optional
-export CLOUD_SQL_MYSQL_IP_TYPE="PUBLIC"  # Optional: `PUBLIC`, `PRIVATE`, `PSC`. Defaults to `PUBLIC`.
-```
-
-Add the following configuration to your MCP client (e.g., `settings.json` for Gemini CLI, `mcp_config.json` for Antigravity):
-
-```json
-{
-  "mcpServers": {
-    "cloud-sql-mysql": {
-      "command": "npx",
-      "args": ["-y", "@toolbox-sdk/server", "--prebuilt", "cloud-sql-mysql", "--stdio"],
-      "env": {
-        "CLOUD_SQL_MYSQL_PROJECT": "your-project-id",
-        "CLOUD_SQL_MYSQL_REGION": "your-region",
-        "CLOUD_SQL_MYSQL_INSTANCE": "your-instance-id",
-        "CLOUD_SQL_MYSQL_DATABASE": "your-database-name",
-        "CLOUD_SQL_MYSQL_USER": "your-username",
-        "CLOUD_SQL_MYSQL_PASSWORD": "your-password"
-      }
-    }
-  }
-}
-```
-
-## Documentation
-
-For more information, visit the [Cloud SQL for MySQL documentation](https://cloud.google.com/sql/docs/mysql).
--- a/docs/CLOUDSQLPGADMIN_README.md
+++ b/docs/CLOUDSQLPGADMIN_README.md
@@ -1,77 +0,0 @@
-# Cloud SQL for PostgreSQL Admin MCP Server
-
-The Cloud SQL for PostgreSQL Model Context Protocol (MCP) Server gives AI-powered development tools the ability to work with your Google Cloud SQL for PostgreSQL databases. It supports connecting to instances, exploring schemas, running queries, and analyzing performance.
-
-## Features
-
-An editor configured to use the Cloud SQL for PostgreSQL MCP server can use its AI capabilities to help you:
-
- **Provision & Manage Infrastructure** - Create and manage Cloud SQL instances and users
-
-To connect to the database to explore and query data, search the MCP store for the Cloud SQL for PostgreSQL MCP Server.
-
-## Prerequisites
-
-*   [Node.js](https://nodejs.org/) installed.
-*   A Google Cloud project with the **Cloud SQL Admin API** enabled.
-*   Ensure [Application Default Credentials](https://cloud.google.com/docs/authentication/gcloud) are available in your environment.
-*   IAM Permissions:
-    * Cloud SQL Viewer (`roles/cloudsql.viewer`)
-    * Cloud SQL Admin (`roles/cloudsql.admin`)
-
-## Install & Configuration
-
-In the Antigravity MCP Store, click the "Install" button.
-
-> [!NOTE]
-> On first use, the installation process automatically downloads and uses
-> [MCP Toolbox](https://www.npmjs.com/package/@toolbox-sdk/server)
-> `>=0.26.0`. To update MCP Toolbox, use:
-> ```npm i -g @toolbox-sdk/server@latest```
-> To always run the latest version, update the MCP server configuration to use:
-> ```npx -y @toolbox-sdk/server@latest --prebuilt cloud-sql-postgres-admin```.
-
-You'll now be able to see all enabled tools in the "Tools" tab.
-
-> [!NOTE]
-> If you encounter issues with Windows Defender blocking the execution, you may need to configure an allowlist. See [Configure exclusions for Microsoft Defender Antivirus](https://learn.microsoft.com/en-us/microsoft-365/security/defender-endpoint/configure-exclusions-microsoft-defender-antivirus?view=o365-worldwide) for more details.
-
-## Usage
-
-Once configured, the MCP server will automatically provide Cloud SQL for PostgreSQL capabilities to your AI assistant. You can:
-
-* "Create a new Cloud SQL for Postgres instance named 'e-commerce-prod' in the 'my-gcp-project' project."
-* "Create a new user named 'analyst' with read access to all tables."
-
-## Server Capabilities
-
-The Cloud SQL for PostgreSQL MCP server provides the following tools:
-
-| Tool Name            | Description                                            |
-|:---------------------|:-------------------------------------------------------|
-| `create_instance`    | Create an instance (PRIMARY, READ-POOL, or SECONDARY). |
-| `create_user`        | Create BUILT-IN or IAM-based users for an instance.    |
-| `get_instance`       | Get details about an instance.                         |
-| `get_user`           | Get details about a user in an instance.               |
-| `list_instances`     | List instances in a given project and location.        |
-| `list_users`         | List users in a given project and location.            |
-| `wait_for_operation` | Poll the operations API until the operation is done.   |
-
-## Custom MCP Server Configuration
-
-Add the following configuration to your MCP client (e.g., `settings.json` for Gemini CLI, `mcp_config.json` for Antigravity):
-
-```json
-{
-  "mcpServers": {
-    "cloud-sql-postgres-admin": {
-      "command": "npx",
-      "args": ["-y", "@toolbox-sdk/server", "--prebuilt", "cloud-sql-postgres-admin", "--stdio"]
-    }
-  }
-}
-```
-
-## Documentation
-
-For more information, visit the [Cloud SQL for PostgreSQL documentation](https://cloud.google.com/sql/docs/postgres).
--- a/docs/CLOUDSQLPG_README.md
+++ b/docs/CLOUDSQLPG_README.md
@@ -1,114 +0,0 @@
-# Cloud SQL for PostgreSQL MCP Server
-
-The Cloud SQL for PostgreSQL Model Context Protocol (MCP) Server gives AI-powered development tools the ability to work with your Google Cloud SQL for PostgreSQL databases. It supports connecting to instances, exploring schemas, running queries, and analyzing performance.
-
-## Features
-
-An editor configured to use the Cloud SQL for PostgreSQL MCP server can use its AI capabilities to help you:
-
- **Query Data** - Execute SQL queries and analyze query plans
- **Explore Schema** - List tables, views, indexes, and triggers
- **Monitor Performance** - View active queries, bloat, and memory configurations
- **Manage Extensions** - List available and installed extensions
-
-For Cloud SQL infrastructure management, search the MCP store for the Cloud SQL for PostgreSQL Admin MCP Server.
-
-## Prerequisites
-
-*   [Node.js](https://nodejs.org/) installed.
-*   A Google Cloud project with the **Cloud SQL Admin API** enabled.
-*   Ensure [Application Default Credentials](https://cloud.google.com/docs/authentication/gcloud) are available in your environment.
-*   IAM Permissions:
-    *   Cloud SQL Client (`roles/cloudsql.client`)
-
-> **Note:** If your instance uses private IPs, you must run the MCP server in the same Virtual Private Cloud (VPC) network.
-
-## Install & Configuration
-
-1. In the Antigravity MCP Store, click the "Install" button.
-    > [!NOTE]
-    > On first use, the installation process automatically downloads and uses
-    > [MCP Toolbox](https://www.npmjs.com/package/@toolbox-sdk/server)
-    > `>=0.26.0`. To update MCP Toolbox, use:
-    > ```npm i -g @toolbox-sdk/server@latest```
-    > To always run the latest version, update the MCP server configuration to use:
-    > ```npx -y @toolbox-sdk/server@latest --prebuilt cloud-sql-postgres```.
-
-2. Add the required inputs for your [instance](https://cloud.google.com/sql/docs/postgres/instance-info) in the configuration pop-up, then click "Save". You can update this configuration at any time in the "Configure" tab.
-
-You'll now be able to see all enabled tools in the "Tools" tab.
-
-> [!NOTE]
-> If you encounter issues with Windows Defender blocking the execution, you may need to configure an allowlist. See [Configure exclusions for Microsoft Defender Antivirus](https://learn.microsoft.com/en-us/microsoft-365/security/defender-endpoint/configure-exclusions-microsoft-defender-antivirus?view=o365-worldwide) for more details.
-
-## Usage
-
-Once configured, the MCP server will automatically provide Cloud SQL for PostgreSQL capabilities to your AI assistant. You can:
-
-*   "Show me the top 5 bloated tables."
-*   "List all installed extensions."
-*   "Explain the query plan for SELECT * FROM users."
-
-## Server Capabilities
-
-The Cloud SQL for PostgreSQL MCP server provides the following tools:
-
-| Tool Name                        | Description                                                    |
-|:---------------------------------|:---------------------------------------------------------------|
-| `execute_sql`                    | Use this tool to execute sql.                                  |
-| `list_tables`                    | Lists detailed schema information for user-created tables.     |
-| `list_active_queries`            | List the top N currently running queries.                      |
-| `list_available_extensions`      | Discover all PostgreSQL extensions available for installation. |
-| `list_installed_extensions`      | List all installed PostgreSQL extensions.                      |
-| `list_autovacuum_configurations` | List PostgreSQL autovacuum-related configurations.             |
-| `list_memory_configurations`     | List PostgreSQL memory-related configurations.                 |
-| `list_top_bloated_tables`        | List the top tables by dead-tuple (approximate bloat signal).  |
-| `list_replication_slots`         | List key details for all PostgreSQL replication slots.         |
-| `list_invalid_indexes`           | Lists all invalid PostgreSQL indexes.                          |
-| `get_query_plan`                 | Generate a PostgreSQL EXPLAIN plan in JSON format.             |
-| `list_views`                     | Lists views in the database.                                   |
-| `list_schemas`                   | Lists all schemas in the database.                             |
-| `database_overview`              | Fetches the current state of the PostgreSQL server.            |
-| `list_triggers`                  | Lists all non-internal triggers in a database.                 |
-| `list_indexes`                   | Lists available user indexes in the database.                  |
-| `list_sequences`                 | Lists sequences in the database.                               |
-
-
-## Custom MCP Server Configuration
-
-The MCP server is configured using environment variables.
-
-```bash
-export CLOUD_SQL_POSTGRES_PROJECT="<your-gcp-project-id>"
-export CLOUD_SQL_POSTGRES_REGION="<your-cloud-sql-region>"
-export CLOUD_SQL_POSTGRES_INSTANCE="<your-cloud-sql-instance-id>"
-export CLOUD_SQL_POSTGRES_DATABASE="<your-database-name>"
-export CLOUD_SQL_POSTGRES_USER="<your-database-user>"  # Optional
-export CLOUD_SQL_POSTGRES_PASSWORD="<your-database-password>"  # Optional
-export CLOUD_SQL_POSTGRES_IP_TYPE="PUBLIC"  # Optional: `PUBLIC`, `PRIVATE`, `PSC`. Defaults to `PUBLIC`.
-```
-
-Add the following configuration to your MCP client (e.g., `settings.json` for Gemini CLI, `mcp_config.json` for Antigravity):
-
-```json
-{
-  "mcpServers": {
-    "cloud-sql-postgres": {
-      "command": "npx",
-      "args": ["-y", "@toolbox-sdk/server", "--prebuilt", "cloud-sql-postgres", "--stdio"],
-      "env": {
-        "CLOUD_SQL_POSTGRES_PROJECT": "your-project-id",
-        "CLOUD_SQL_POSTGRES_REGION": "your-region",
-        "CLOUD_SQL_POSTGRES_INSTANCE": "your-instance-id",
-        "CLOUD_SQL_POSTGRES_DATABASE": "your-database-name",
-        "CLOUD_SQL_POSTGRES_USER": "your-username",
-        "CLOUD_SQL_POSTGRES_PASSWORD": "your-password"
-      }
-    }
-  }
-}
-```
-
-## Documentation
-
-For more information, visit the [Cloud SQL for PostgreSQL documentation](https://cloud.google.com/sql/docs/postgres).
--- a/docs/DATAPLEX_README.md
+++ b/docs/DATAPLEX_README.md
@@ -1,81 +0,0 @@
-# Dataplex MCP Server
-
-The Dataplex Model Context Protocol (MCP) Server gives AI-powered development tools the ability to work with your Google Cloud Dataplex Catalog. It supports searching and looking up entries and aspect types.
-
-## Features
-
-An editor configured to use the Dataplex MCP server can use its AI capabilities to help you:
-
- **Search Catalog** - Search for entries in Dataplex Catalog
- **Explore Metadata** - Lookup specific entries and search aspect types
-
-## Prerequisites
-
-*   [Node.js](https://nodejs.org/) installed.
-*   A Google Cloud project with the **Dataplex API** enabled.
-*   Ensure [Application Default Credentials](https://cloud.google.com/docs/authentication/gcloud) are available in your environment.
-*   IAM Permissions:
-    *   Dataplex Viewer (`roles/dataplex.viewer`) or equivalent permissions to read catalog entries.
-
-## Install & Configuration
-
-1. In the Antigravity MCP Store, click the "Install" button.
-    > [!NOTE]
-    > On first use, the installation process automatically downloads and uses
-    > [MCP Toolbox](https://www.npmjs.com/package/@toolbox-sdk/server)
-    > `>=0.26.0`. To update MCP Toolbox, use:
-    > ```npm i -g @toolbox-sdk/server@latest```
-    > To always run the latest version, update the MCP server configuration to use:
-    > ```npx -y @toolbox-sdk/server@latest --prebuilt dataplex```.
-
-2. Add the required inputs in the configuration pop-up, then click "Save". You can update this configuration at any time in the "Configure" tab.
-
-You'll now be able to see all enabled tools in the "Tools" tab.
-
-> [!NOTE]
-> If you encounter issues with Windows Defender blocking the execution, you may need to configure an allowlist. See [Configure exclusions for Microsoft Defender Antivirus](https://learn.microsoft.com/en-us/microsoft-365/security/defender-endpoint/configure-exclusions-microsoft-defender-antivirus?view=o365-worldwide) for more details.
-
-## Usage
-
-Once configured, the MCP server will automatically provide Dataplex capabilities to your AI assistant. You can:
-
-*   "Search for entries related to 'sales' in Dataplex."
-*   "Look up details for the entry 'projects/my-project/locations/us-central1/entryGroups/my-group/entries/my-entry'."
-
-## Server Capabilities
-
-The Dataplex MCP server provides the following tools:
-
-| Tool Name             | Description                                      |
-|:----------------------|:-------------------------------------------------|
-| `search_entries`      | Search for entries in Dataplex Catalog.          |
-| `lookup_entry`        | Retrieve a specific entry from Dataplex Catalog. |
-| `search_aspect_types` | Find aspect types relevant to the query.         |
-
-## Custom MCP Server Configuration
-
-The MCP server is configured using environment variables.
-
-```bash
-export DATAPLEX_PROJECT="<your-gcp-project-id>"
-```
-
-Add the following configuration to your MCP client (e.g., `settings.json` for Gemini CLI, `mcp_config.json` for Antigravity):
-
-```json
-{
-  "mcpServers": {
-    "dataplex": {
-      "command": "npx",
-      "args": ["-y", "@toolbox-sdk/server", "--prebuilt", "dataplex", "--stdio"],
-      "env": {
-        "DATAPLEX_PROJECT": "your-project-id"
-      }
-    }
-  }
-}
-```
-
-## Documentation
-
-For more information, visit the [Dataplex documentation](https://cloud.google.com/dataplex/docs).
--- a/docs/LOOKER_README.md
+++ b/docs/LOOKER_README.md
@@ -1,99 +0,0 @@
-# Looker MCP Server
-
-The Looker Model Context Protocol (MCP) Server gives AI-powered development tools the ability to work with your Looker instance. It supports exploring models, running queries, managing dashboards, and more.
-
-## Features
-
-An editor configured to use the Looker MCP server can use its AI capabilities to help you:
-
- **Explore Models** - Get models, explores, dimensions, measures, filters, and parameters
- **Run Queries** - Execute Looker queries, generate SQL, and create query URLs
- **Manage Dashboards** - Create, run, and modify dashboards
- **Manage Looks** - Search for and run saved looks
- **Health Checks** - Analyze instance health and performance
-
-## Prerequisites
-
-*   [Node.js](https://nodejs.org/) installed.
-*   Access to a Looker instance.
-*   API Credentials (`Client ID` and `Client Secret`) or OAuth configuration.
-
-## Install & Configuration
-
-1. In the Antigravity MCP Store, click the "Install" button.
-    > [!NOTE]
-    > On first use, the installation process automatically downloads and uses
-    > [MCP Toolbox](https://www.npmjs.com/package/@toolbox-sdk/server)
-    > `>=0.26.0`. To update MCP Toolbox, use:
-    > ```npm i -g @toolbox-sdk/server@latest```
-    > To always run the latest version, update the MCP server configuration to use:
-    > ```npx -y @toolbox-sdk/server@latest --prebuilt looker```.
-
-2. Add the required inputs for your [instance](https://docs.cloud.google.com/looker/docs/set-up-and-administer-looker) in the configuration pop-up, then click "Save". You can update this configuration at any time in the "Configure" tab.
-
-You'll now be able to see all enabled tools in the "Tools" tab.
-
-> [!NOTE]
-> If you encounter issues with Windows Defender blocking the execution, you may need to configure an allowlist. See [Configure exclusions for Microsoft Defender Antivirus](https://learn.microsoft.com/en-us/microsoft-365/security/defender-endpoint/configure-exclusions-microsoft-defender-antivirus?view=o365-worldwide) for more details.
-
-## Usage
-
-Once configured, the MCP server will automatically provide Looker capabilities to your AI assistant. You can:
-
-*   "Find explores in the 'ecommerce' model."
-*   "Run a query to show total sales by month."
-*   "Create a new dashboard named 'Sales Overview'."
-
-## Server Capabilities
-
-The Looker MCP server provides a wide range of tools. Here are some of the key capabilities:
-
-| Tool Name               | Description                                               |
-|:------------------------|:----------------------------------------------------------|
-| `get_models`            | Retrieves the list of LookML models.                      |
-| `get_explores`          | Retrieves the list of explores defined in a LookML model. |
-| `query`                 | Run a query against the LookML model.                     |
-| `query_sql`             | Generate the SQL that Looker would run.                   |
-| `run_look`              | Runs a saved look.                                        |
-| `run_dashboard`         | Runs all tiles in a dashboard.                            |
-| `make_dashboard`        | Creates a new dashboard.                                  |
-| `add_dashboard_element` | Adds a tile to a dashboard.                               |
-| `health_pulse`          | Checks the status of the Looker instance.                 |
-| `dev_mode`              | Toggles development mode.                                 |
-| `get_projects`          | Lists LookML projects.                                    |
-
-## Custom MCP Server Configuration
-
-The MCP server is configured using environment variables.
-
-```bash
-export LOOKER_BASE_URL="<your-looker-instance-url>"  # e.g. `https://looker.example.com`. You may need to add the port, i.e. `:19999`.
-export LOOKER_CLIENT_ID="<your-looker-client-id>"
-export LOOKER_CLIENT_SECRET="<your-looker-client-secret>"
-export LOOKER_VERIFY_SSL="true" # Optional, defaults to true
-export LOOKER_SHOW_HIDDEN_MODELS="true" # Optional, defaults to true
-export LOOKER_SHOW_HIDDEN_EXPLORES="true" # Optional, defaults to true
-export LOOKER_SHOW_HIDDEN_FIELDS="true" # Optional, defaults to true
-```
-
-Add the following configuration to your MCP client (e.g., `settings.json` for Gemini CLI, `mcp_config.json` for Antigravity):
-
-```json
-{
-  "mcpServers": {
-    "looker": {
-      "command": "npx",
-      "args": ["-y", "@toolbox-sdk/server", "--prebuilt", "looker", "--stdio"],
-      "env": {
-        "LOOKER_BASE_URL": "https://your.looker.instance.com",
-        "LOOKER_CLIENT_ID": "your-client-id",
-        "LOOKER_CLIENT_SECRET": "your-client-secret"
-      }
-    }
-  }
-}
-```
-
-## Documentation
-
-For more information, visit the [Looker documentation](https://cloud.google.com/looker).
--- a/docs/SPANNER_README.md
+++ b/docs/SPANNER_README.md
@@ -1,90 +0,0 @@
-# Cloud Spanner MCP Server
-
-The Cloud Spanner Model Context Protocol (MCP) Server gives AI-powered development tools the ability to work with your Google Cloud Spanner databases. It supports executing SQL queries and exploring schemas.
-
-## Features
-
-An editor configured to use the Cloud Spanner MCP server can use its AI capabilities to help you:
-
- **Query Data** - Execute DML and DQL SQL queries
- **Explore Schema** - List tables and view schema details
-
-## Prerequisites
-
-*   [Node.js](https://nodejs.org/) installed.
-*   A Google Cloud project with the **Cloud Spanner API** enabled.
-*   Ensure [Application Default Credentials](https://cloud.google.com/docs/authentication/gcloud) are available in your environment.
-*   IAM Permissions:
-    *   Cloud Spanner Database User (`roles/spanner.databaseUser`) (for data access)
-    *   Cloud Spanner Viewer (`roles/spanner.viewer`) (for schema access)
-
-## Install & Configuration
-
-1. In the Antigravity MCP Store, click the "Install" button.
-    > [!NOTE]
-    > On first use, the installation process automatically downloads and uses
-    > [MCP Toolbox](https://www.npmjs.com/package/@toolbox-sdk/server)
-    > `>=0.26.0`. To update MCP Toolbox, use:
-    > ```npm i -g @toolbox-sdk/server@latest```
-    > To always run the latest version, update the MCP server configuration to use:
-    > ```npx -y @toolbox-sdk/server@latest --prebuilt spanner```.
-
-2. Add the required inputs for your [instance](https://docs.cloud.google.com/spanner/docs/instances) in the configuration pop-up, then click "Save". You can update this configuration at any time in the "Configure" tab.
-
-You'll now be able to see all enabled tools in the "Tools" tab.
-
-> [!NOTE]
-> If you encounter issues with Windows Defender blocking the execution, you may need to configure an allowlist. See [Configure exclusions for Microsoft Defender Antivirus](https://learn.microsoft.com/en-us/microsoft-365/security/defender-endpoint/configure-exclusions-microsoft-defender-antivirus?view=o365-worldwide) for more details.
-
-## Usage
-
-Once configured, the MCP server will automatically provide Cloud Spanner capabilities to your AI assistant. You can:
-
-*   "Execute a DML query to update customer names."
-*   "List all tables in the `my-database`."
-*   "Execute a DQL query to select data from `orders` table."
-
-## Server Capabilities
-
-The Cloud Spanner MCP server provides the following tools:
-
-| Tool Name         | Description                                                      |
-|:------------------|:-----------------------------------------------------------------|
-| `execute_sql`     | Use this tool to execute DML SQL.                                |
-| `execute_sql_dql` | Use this tool to execute DQL SQL.                                |
-| `list_tables`     | Lists detailed schema information for user-created tables.       |
-| `list_graphs`     | Lists detailed graph schema information for user-created graphs. |
-
-## Custom MCP Server Configuration
-
-The MCP server is configured using environment variables.
-
-```bash
-export SPANNER_PROJECT="<your-gcp-project-id>"
-export SPANNER_INSTANCE="<your-spanner-instance-id>"
-export SPANNER_DATABASE="<your-spanner-database-id>"
-export SPANNER_DIALECT="googlesql" # Optional: "googlesql" or "postgresql". Defaults to "googlesql".
-```
-
-Add the following configuration to your MCP client (e.g., `settings.json` for Gemini CLI, `mcp_config.json` for Antigravity):
-
-```json
-{
-  "mcpServers": {
-    "spanner": {
-      "command": "npx",
-      "args": ["-y", "@toolbox-sdk/server", "--prebuilt", "spanner", "--stdio"],
-      "env": {
-        "SPANNER_PROJECT": "your-project-id",
-        "SPANNER_INSTANCE": "your-instance-id",
-        "SPANNER_DATABASE": "your-database-name",
-        "SPANNER_DIALECT": "googlesql"
-      }
-    }
-  }
-}
-```
-
-## Documentation
-
-For more information, visit the [Cloud Spanner documentation](https://cloud.google.com/spanner/docs).
--- a/docs/TOOLBOX_README.md
+++ b/docs/TOOLBOX_README.md
@@ -1,52 +0,0 @@
-# MCP Toolbox for Databases Server
-
-The MCP Toolbox for Databases Server gives AI-powered development tools the ability to work with your custom tools. It is designed to simplify and secure the development of tools for interacting with databases.
-
-
-## Prerequisites
-
-*   [Node.js](https://nodejs.org/) installed.
-*   A Google Cloud project with relevant APIs enabled.
-*   Ensure [Application Default Credentials](https://cloud.google.com/docs/authentication/gcloud) are available in your environment.
-
-## Install & Configuration
-
-1.  In the Antigravity MCP Store, click the **Install** button. A configuration window will appear.
-    > [!NOTE]
-    > On first use, the installation process automatically downloads and uses
-    > [MCP Toolbox](https://www.npmjs.com/package/@toolbox-sdk/server)
-    > `>=0.26.0`. To update MCP Toolbox, use:
-    > ```npm i -g @toolbox-sdk/server@latest```
-    > To always run the latest version, update the MCP server configuration to use:
-    > ```npx -y @toolbox-sdk/server@latest```. 
-
-3.  Create your [`tools.yaml` configuration file](https://googleapis.github.io/genai-toolbox/getting-started/configure/).
-
-4.  In the configuration window, enter the full absolute path to your `tools.yaml` file and click **Save**.
-
-> [!NOTE]
-> If you encounter issues with Windows Defender blocking the execution, you may need to configure an allowlist. See [Configure exclusions for Microsoft Defender Antivirus](https://learn.microsoft.com/en-us/microsoft-365/security/defender-endpoint/configure-exclusions-microsoft-defender-antivirus?view=o365-worldwide) for more details.
-
-## Usage
-
-Interact with your custom tools using natural language.
-
-## Custom MCP Server Configuration
-
-```json
-{
-  "mcpServers": {
-    "mcp-toolbox": {
-      "command": "npx",
-      "args": ["-y", "@toolbox-sdk/server", "--tools-file", "your-tool-file.yaml"],
-      "env": {
-        "ENV_VAR_NAME": "ENV_VAR_VALUE",
-      }
-    }
-  }
-}
-```
-
-## Documentation
-
-For more information, visit the [MCP Toolbox for Databases documentation](https://googleapis.github.io/genai-toolbox/getting-started/introduction/).
--- a/docs/en/about/faq.md
+++ b/docs/en/about/faq.md
@@ -44,11 +44,15 @@ most popular issues, so make sure to +1 ones you are the most interested in.

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

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

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

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

--- a/docs/en/blogs/_index.md
+++ b/docs/en/blogs/_index.md
@@ -1,18 +0,0 @@
---
-title: "Featured Articles"
-weight: 3
-description: Toolbox Medium Blogs
-manualLink: "https://medium.com/@mcp_toolbox"
-manualLinkTarget: _blank
---
-
-<html>
-  <head>
-    <title>Redirecting to Featured Articles</title>
-    <link rel="canonical" href="https://medium.com/@mcp_toolbox"/>
-    <meta http-equiv="refresh" content="0;url=https://medium.com/@mcp_toolbox"/>
-  </head>
-  <body>
-    <p>If you are not automatically redirected, please <a href="https://medium.com/@mcp_toolbox">follow this link to our articles</a>.</p>
-  </body>
-</html>
--- a/docs/en/concepts/telemetry/index.md
+++ b/docs/en/concepts/telemetry/index.md
@@ -183,11 +183,11 @@ Protocol (OTLP). If you would like to use a collector, please refer to this

 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. "127.0.0.1:4318"). To pass an insecure endpoint here, set environment variable `OTEL_EXPORTER_OTLP_INSECURE=true`. |
-| `--telemetry-service-name` | string   | Sets the value of the `service.name` resource attribute. Default is `toolbox`.                                                                                                                            |
+| **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-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
 for OpenTelemetry via the [General SDK Configuration][sdk-configuration] through
@@ -207,5 +207,5 @@ To enable Google Cloud Exporter:
 To enable OTLP Exporter, provide Collector endpoint:

 ```bash
-./toolbox --telemetry-otlp="127.0.0.1:4553"
+./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
@@ -234,7 +234,7 @@
      },
      "outputs": [],
      "source": [
-        "version = \"0.26.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",
@@ -300,89 +300,78 @@
        "# You can also upload a tools file and use that to run toolbox.\n",
        "tools_file_name = \"tools.yml\"\n",
        "file_content = f\"\"\"\n",
-        "kind: sources\n",
-        "name: my-pg-source\n",
-        "type: postgres\n",
-        "host: 127.0.0.1\n",
-        "port: 5432\n",
-        "database: toolbox_db\n",
-        "user: toolbox_user\n",
-        "password: my-password\n",
-        "---\n",
-        "kind: tools\n",
-        "name: search-hotels-by-name\n",
-        "type: postgres-sql\n",
-        "source: my-pg-source\n",
-        "description: Search for hotels based on name.\n",
-        "parameters:\n",
-        "  - name: name\n",
-        "    type: string\n",
-        "    description: The name of the hotel.\n",
-        "statement: SELECT * FROM hotels WHERE name ILIKE '%' || \\$1 || '%';\n",
-        "---\n",
-        "kind: tools\n",
-        "name: search-hotels-by-location\n",
-        "type: postgres-sql\n",
-        "source: my-pg-source\n",
-        "description: Search for hotels based on location.\n",
-        "parameters:\n",
-        "  - name: location\n",
-        "    type: string\n",
-        "    description: The location of the hotel.\n",
-        "statement: SELECT * FROM hotels WHERE location ILIKE '%' || \\$1 || '%';\n",
-        "---\n",
-        "kind: tools\n",
-        "name: book-hotel\n",
-        "type: postgres-sql\n",
-        "source: my-pg-source\n",
-        "description: >-\n",
-        "   Book a hotel by its ID. If the hotel is successfully booked, returns a NULL, raises an error if not.\n",
-        "parameters:\n",
-        "  - name: hotel_id\n",
-        "    type: string\n",
-        "    description: The ID of the hotel to book.\n",
-        "statement: UPDATE hotels SET booked = B'1' WHERE id = \\$1;\n",
-        "---\n",
-        "kind: tools\n",
-        "name: update-hotel\n",
-        "type: postgres-sql\n",
-        "source: my-pg-source\n",
-        "description: >-\n",
-        "  Update a hotel's check-in and check-out dates by its ID. Returns a message\n",
-        "  indicating  whether the hotel was successfully updated or not.\n",
-        "parameters:\n",
-        "  - name: hotel_id\n",
-        "    type: string\n",
-        "    description: The ID of the hotel to update.\n",
-        "  - name: checkin_date\n",
-        "    type: string\n",
-        "    description: The new check-in date of the hotel.\n",
-        "  - name: checkout_date\n",
-        "    type: string\n",
-        "    description: The new check-out date of the hotel.\n",
-        "statement: >-\n",
-        "  UPDATE hotels SET checkin_date = CAST(\\$2 as date), checkout_date = CAST(\\$3\n",
-        "  as date) WHERE id = \\$1;\n",
-        "---\n",
-        "kind: tools\n",
-        "name: cancel-hotel\n",
-        "type: postgres-sql\n",
-        "source: my-pg-source\n",
-        "description: Cancel a hotel by its ID.\n",
-        "parameters:\n",
-        "  - name: hotel_id\n",
-        "    type: string\n",
-        "    description: The ID of the hotel to cancel.\n",
-        "statement: UPDATE hotels SET booked = B'0' WHERE id = \\$1;\n",
-        "---\n",
-        "kind: toolsets\n",
-        "name: my-toolset\n",
+        "sources:\n",
+        "  my-pg-source:\n",
+        "    kind: postgres\n",
+        "    host: 127.0.0.1\n",
+        "    port: 5432\n",
+        "    database: toolbox_db\n",
+        "    user: toolbox_user\n",
+        "    password: my-password\n",
        "tools:\n",
-        "  - search-hotels-by-name\n",
-        "  - search-hotels-by-location\n",
-        "  - book-hotel\n",
-        "  - update-hotel\n",
-        "  - cancel-hotel\n",
+        "  search-hotels-by-name:\n",
+        "    kind: postgres-sql\n",
+        "    source: my-pg-source\n",
+        "    description: Search for hotels based on name.\n",
+        "    parameters:\n",
+        "      - name: name\n",
+        "        type: string\n",
+        "        description: The name of the hotel.\n",
+        "    statement: SELECT * FROM hotels WHERE name ILIKE '%' || \\$1 || '%';\n",
+        "  search-hotels-by-location:\n",
+        "    kind: postgres-sql\n",
+        "    source: my-pg-source\n",
+        "    description: Search for hotels based on location.\n",
+        "    parameters:\n",
+        "      - name: location\n",
+        "        type: string\n",
+        "        description: The location of the hotel.\n",
+        "    statement: SELECT * FROM hotels WHERE location ILIKE '%' || \\$1 || '%';\n",
+        "  book-hotel:\n",
+        "    kind: postgres-sql\n",
+        "    source: my-pg-source\n",
+        "    description: >-\n",
+        "       Book a hotel by its ID. If the hotel is successfully booked, returns a NULL, raises an error if not.\n",
+        "    parameters:\n",
+        "      - name: hotel_id\n",
+        "        type: string\n",
+        "        description: The ID of the hotel to book.\n",
+        "    statement: UPDATE hotels SET booked = B'1' WHERE id = \\$1;\n",
+        "  update-hotel:\n",
+        "    kind: postgres-sql\n",
+        "    source: my-pg-source\n",
+        "    description: >-\n",
+        "      Update a hotel's check-in and check-out dates by its ID. Returns a message\n",
+        "      indicating  whether the hotel was successfully updated or not.\n",
+        "    parameters:\n",
+        "      - name: hotel_id\n",
+        "        type: string\n",
+        "        description: The ID of the hotel to update.\n",
+        "      - name: checkin_date\n",
+        "        type: string\n",
+        "        description: The new check-in date of the hotel.\n",
+        "      - name: checkout_date\n",
+        "        type: string\n",
+        "        description: The new check-out date of the hotel.\n",
+        "    statement: >-\n",
+        "      UPDATE hotels SET checkin_date = CAST(\\$2 as date), checkout_date = CAST(\\$3\n",
+        "      as date) WHERE id = \\$1;\n",
+        "  cancel-hotel:\n",
+        "    kind: postgres-sql\n",
+        "    source: my-pg-source\n",
+        "    description: Cancel a hotel by its ID.\n",
+        "    parameters:\n",
+        "      - name: hotel_id\n",
+        "        type: string\n",
+        "        description: The ID of the hotel to cancel.\n",
+        "    statement: UPDATE hotels SET booked = B'0' WHERE id = \\$1;\n",
+        "toolsets:\n",
+        "  my-toolset:\n",
+        "    - search-hotels-by-name\n",
+        "    - search-hotels-by-location\n",
+        "    - book-hotel\n",
+        "    - update-hotel\n",
+        "    - cancel-hotel\n",
        "\"\"\""
      ]
    },
@@ -520,7 +509,8 @@
      },
      "outputs": [],
      "source": [
-        "! pip install google-adk[toolbox] --quiet"
+        "! pip install toolbox-core --quiet\n",
+        "! pip install google-adk --quiet"
      ]
    },
    {
@@ -535,18 +525,14 @@
        "from google.adk.runners import Runner\n",
        "from google.adk.sessions import InMemorySessionService\n",
        "from google.adk.artifacts.in_memory_artifact_service import InMemoryArtifactService\n",
-        "from google.adk.tools.toolbox_toolset import ToolboxToolset\n",
        "from google.genai import types\n",
+        "from toolbox_core import ToolboxSyncClient\n",
        "\n",
        "import os\n",
        "# TODO(developer): replace this with your Google API key\n",
        "os.environ['GOOGLE_API_KEY'] = \"<GOOGLE_API_KEY>\"\n",
        "\n",
-        "# Configure toolset\n",
-        "toolset = ToolboxToolset(\n",
-        "    server_url=\"http://127.0.0.1:5000\",\n",
-        "    toolset_name=\"my-toolset\"\n",
-        ")\n",
+        "toolbox_client = ToolboxSyncClient(\"http://127.0.0.1:5000\")\n",
        "\n",
        "prompt = \"\"\"\n",
        "  You're a helpful hotel assistant. You handle hotel searching, booking and\n",
@@ -563,7 +549,7 @@
        "    name='hotel_agent',\n",
        "    description='A helpful AI assistant.',\n",
        "    instruction=prompt,\n",
-        "    tools=[toolset],\n",
+        "    tools=toolbox_client.load_toolset(\"my-toolset\"),\n",
        ")\n",
        "\n",
        "session_service = InMemorySessionService()\n",
--- a/docs/en/getting-started/configure.md
+++ b/docs/en/getting-started/configure.md
@@ -22,7 +22,6 @@ etc., you could use environment variables instead with the format `${ENV_NAME}`.
  user: ${USER_NAME}
  password: ${PASSWORD}
 ```
-
 A default value can be specified like `${ENV_NAME:default}`.

 ```yaml
@@ -36,14 +35,14 @@ Toolbox should have access to. Most tools will have at least one source to
 execute against.

 ```yaml
-kind: sources
-name: my-pg-source
-type: postgres
-host: 127.0.0.1
-port: 5432
-database: toolbox_db
-user: ${USER_NAME}
-password: ${PASSWORD}
+sources:
+  my-pg-source:
+    kind: postgres
+    host: 127.0.0.1
+    port: 5432
+    database: toolbox_db
+    user: ${USER_NAME}
+    password: ${PASSWORD}
 ```

 For more details on configuring different types of sources, see the
@@ -56,16 +55,16 @@ take: what type of tool it is, which source(s) it affects, what parameters it
 uses, etc.

 ```yaml
-kind: tools
-name: search-hotels-by-name
-type: 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 || '%';
+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 || '%';
 ```

 For more details on configuring different types of tools, see the
@@ -78,17 +77,13 @@ that you want to be able to load together. This can be useful for defining
 different sets for different agents or different applications.

 ```yaml
-kind: toolsets
-name: my_first_toolset
-tools:
-  - my_first_tool
-  - my_second_tool
---
-kind: toolsets
-name: my_second_toolset
-tools:
-  - my_second_tool
-  - my_third_tool
+toolsets:
+  my_first_toolset:
+    - my_first_tool
+    - my_second_tool
+  my_second_toolset:
+    - my_second_tool
+    - my_third_tool
 ```

 You can load toolsets by name:
@@ -100,22 +95,3 @@ all_tools = client.load_toolset()
 # This will only load the tools listed in 'my_second_toolset'
 my_second_toolset = client.load_toolset("my_second_toolset")
 ```
-
-### Prompts
-
-The `prompts` section of your `tools.yaml` defines the templates containing
-structured messages and instructions for interacting with language models.
-
-```yaml
-kind: prompts
-name: code_review
-description: "Asks the LLM to analyze code quality and suggest improvements."
-messages:
-  - content: "Please review the following code for quality, correctness, and potential improvements: \n\n{{.code}}"
-arguments:
-  - name: "code"
-    description: "The code to review"
-```
-
-For more details on configuring different types of prompts, see the
-[Prompts](../resources/prompts/).
--- a/docs/en/getting-started/introduction/_index.md
+++ b/docs/en/getting-started/introduction/_index.md
@@ -16,12 +16,6 @@ Databases” as its initial development predated MCP, but was renamed to align
 with recently added MCP compatibility.
 {{< /notice >}}

-{{< notice note >}}
-This document has been updated to support the configuration file v2 format. To
-view documentation with configuration file v1 format, please navigate to the
-top-right menu and select versions v0.26.0 or older.
-{{< /notice >}}
-
 ## Why Toolbox?

 Toolbox helps you build Gen AI tools that let your agents access data in your
@@ -77,22 +71,6 @@ redeploying your application.

 ## Getting Started

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

 For the latest version, check the [releases page][releases] and use the
@@ -103,68 +81,23 @@ following instructions for your OS and CPU architecture.
 <!-- {x-release-please-start-version} -->
 {{< tabpane text=true >}}
 {{% tab header="Binary" lang="en" %}}
-{{< tabpane text=true >}}
-{{% tab header="Linux (AMD64)" lang="en" %}}
-To install Toolbox as a binary on Linux (AMD64):
+
+To install Toolbox as a binary:

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

-{{% /tab %}}
-{{% tab header="macOS (Apple Silicon)" lang="en" %}}
-To install Toolbox as a binary on macOS (Apple Silicon):
-
-```sh
-# see releases page for other versions
-export VERSION=0.26.0
-curl -L -o toolbox https://storage.googleapis.com/genai-toolbox/v$VERSION/darwin/arm64/toolbox
-chmod +x toolbox
-```
-
-{{% /tab %}}
-{{% tab header="macOS (Intel)" lang="en" %}}
-To install Toolbox as a binary on macOS (Intel):
-
-```sh
-# see releases page for other versions
-export VERSION=0.26.0
-curl -L -o toolbox https://storage.googleapis.com/genai-toolbox/v$VERSION/darwin/amd64/toolbox
-chmod +x toolbox
-```
-
-{{% /tab %}}
-{{% tab header="Windows (Command Prompt)" lang="en" %}}
-To install Toolbox as a binary on Windows (Command Prompt):
-
-```cmd
-:: see releases page for other versions
-set VERSION=0.26.0
-curl -o toolbox.exe "https://storage.googleapis.com/genai-toolbox/v%VERSION%/windows/amd64/toolbox.exe"
-```
-
-{{% /tab %}}
-{{% tab header="Windows (PowerShell)" lang="en" %}}
-To install Toolbox as a binary on Windows (PowerShell):
-
-```powershell
-# see releases page for other versions
-$VERSION = "0.26.0"
-curl.exe -o toolbox.exe "https://storage.googleapis.com/genai-toolbox/v$VERSION/windows/amd64/toolbox.exe"
-```
-
-{{% /tab %}}
-{{< /tabpane >}}
 {{% /tab %}}
 {{% tab header="Container image" lang="en" %}}
 You can also install Toolbox as a container:

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

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

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

 {{% /tab %}}
@@ -206,9 +138,8 @@ Toolbox enables dynamic reloading by default. To disable, use the

 #### 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).
+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
@@ -216,8 +147,7 @@ visit [Toolbox UI](../../how-to/toolbox-ui/index.md).

 #### 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:
+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"
@@ -255,8 +185,7 @@ async with ToolboxClient("http://127.0.0.1:5000") as client:
 {{< /highlight >}}

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

 {{% /tab %}}
 {{% tab header="LangChain" lang="en" %}}
@@ -277,8 +206,7 @@ async with ToolboxClient("http://127.0.0.1:5000") as client:
 {{< /highlight >}}

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

 {{% /tab %}}
 {{% tab header="Llamaindex" lang="en" %}}
@@ -300,8 +228,7 @@ async with ToolboxClient("http://127.0.0.1:5000") as client:
 {{< /highlight >}}

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

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

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

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

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

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

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

@@ -424,32 +339,11 @@ const tools = toolboxTools.map(getTool);

 {{< /highlight >}}

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

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

 #### Go

@@ -540,8 +434,6 @@ func main() {
 	}
 }
 {{< /highlight >}}
-For end-to-end samples on using the Toolbox Go SDK with LangChain Go, see the [project's
-samples](https://github.com/googleapis/mcp-toolbox-sdk-go/tree/main/core/samples)

 {{% /tab %}}
 {{% tab header="Genkit Go" lang="en" %}}
@@ -586,8 +478,6 @@ func main() {
 	}
 }
 {{< /highlight >}}
-For end-to-end samples on using the Toolbox Go SDK with Genkit Go, see the [project's
-samples](https://github.com/googleapis/mcp-toolbox-sdk-go/tree/main/tbgenkit/samples)

 {{% /tab %}}
 {{% tab header="Go GenAI" lang="en" %}}
@@ -642,8 +532,6 @@ func main() {
 	}
 }
 {{< /highlight >}}
-For end-to-end samples on using the Toolbox Go SDK with Go GenAI, see the [project's
-samples](https://github.com/googleapis/mcp-toolbox-sdk-go/tree/main/core/samples)

 {{% /tab %}}

@@ -697,47 +585,13 @@ func main() {
 	}
 }
 {{< /highlight >}}
-For end-to-end samples on using the Toolbox Go SDK with OpenAI Go, see the [project's
-samples](https://github.com/googleapis/mcp-toolbox-sdk-go/tree/main/core/samples)
-
-{{% /tab %}}
-
-{{% tab header="ADK Go" lang="en" %}}
-
-{{< highlight go >}}
-package main
-
-import (
-  	"context"
-  	"fmt"
-  	"github.com/googleapis/mcp-toolbox-sdk-go/tbadk"
-)
-
-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 := tbadk.NewToolboxClient(URL)
-  	if err != nil {
-		return fmt.Sprintln("Could not start Toolbox Client", err)
-  	}
-
-  	// Use this tool with ADK Go
-  	tool, err := client.LoadTool("toolName", ctx)
-  	if err != nil {
-		return fmt.Sprintln("Could not load Toolbox Tool", err)
-  	}
-}
-
-{{< /highlight >}}
-
-For end-to-end samples on using the Toolbox Go SDK with ADK Go, see the [project's
-samples](https://github.com/googleapis/mcp-toolbox-sdk-go/tree/main/tbadk/samples)

 {{% /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).
+[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
@@ -13,27 +13,17 @@ description: >

 This guide assumes you have already done the following:

-1. Installed [Python 3.10+][install-python] (including [pip][install-pip] and
-   your preferred virtual environment tool for managing dependencies e.g.
-   [venv][install-venv]).
+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].

-[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
-
 {{< 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
@@ -41,10 +31,9 @@ This guide assumes you have already done the following:
 In this section, we will write and run an agent that will load the Tools
 from Toolbox.

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

 1. In a new terminal, install the SDK package.
@@ -52,7 +41,7 @@ runtime](https://research.google.com/colaboratory/local-runtimes.html).
    {{< tabpane persist=header >}}
 {{< tab header="ADK" lang="bash" >}}

-pip install google-adk[toolbox]
+pip install toolbox-core
 {{< /tab >}}
 {{< tab header="Langchain" lang="bash" >}}

@@ -73,7 +62,7 @@ pip install toolbox-core
    {{< tabpane persist=header >}}
 {{< tab header="ADK" lang="bash" >}}

-# No other dependencies required for ADK
+pip install google-adk
 {{< /tab >}}
 {{< tab header="Langchain" lang="bash" >}}

@@ -101,62 +90,44 @@ pip install google-genai
 {{< /tab >}}
 {{< /tabpane >}}

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

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

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

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

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

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

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

 {{< notice info >}}
-For more information, visit the [Python SDK
-repo](https://github.com/googleapis/mcp-toolbox-sdk-python).
+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
@@ -17,15 +17,12 @@ This guide assumes you have already done the following:
 [install-postgres]: https://www.postgresql.org/download/

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

 ## 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
@@ -52,31 +49,614 @@ from Toolbox.
    {{< tabpane persist=header >}}
 {{< tab header="LangChain Go" lang="go" >}}

-{{< include "quickstart/go/langchain/quickstart.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" >}}

-{{< include "quickstart/go/genkit/quickstart.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" >}}

-{{< include "quickstart/go/genAI/quickstart.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" >}}

-{{< include "quickstart/go/openAI/quickstart.go" >}}
+package main

-{{< /tab >}}
+import (
+	"context"
+	"encoding/json"
+	"log"
+	"fmt

-{{< tab header="ADK Go" lang="go" >}}
+	"github.com/googleapis/mcp-toolbox-sdk-go/core"
+	openai "github.com/openai/openai-go"
+)

-{{< include "quickstart/go/adkgo/quickstart.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 >}}
@@ -87,7 +667,7 @@ from Toolbox.
    go mod tidy
    ```

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

    ```sh
    go run hotelagent.go
--- a/docs/en/getting-started/local_quickstart_js.md
+++ b/docs/en/getting-started/local_quickstart_js.md
@@ -17,15 +17,12 @@ This guide assumes you have already done the following:
 [install-postgres]: https://www.postgresql.org/download/

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

 ## 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
@@ -39,25 +36,11 @@ from Toolbox.
    npm init -y
    ```

-1. In a new terminal, install the
-   SDK package.
-   {{< tabpane persist=header >}}
-{{< tab header="LangChain" lang="bash" >}}
-npm install @toolbox-sdk/core
-{{< /tab >}}
-{{< tab header="GenkitJS" lang="bash" >}}
-npm install @toolbox-sdk/core
-{{< /tab >}}
-{{< tab header="LlamaIndex" lang="bash" >}}
-npm install @toolbox-sdk/core
-{{< /tab >}}
-{{< tab header="GoogleGenAI" lang="bash" >}}
-npm install @toolbox-sdk/core
-{{< /tab >}}
-{{< tab header="ADK" lang="bash" >}}
-npm install @toolbox-sdk/adk
-{{< /tab >}}
-{{< /tabpane >}}
+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

@@ -72,15 +55,11 @@ npm install genkit @genkit-ai/googleai
 npm install llamaindex @llamaindex/google @llamaindex/workflow
 {{< /tab >}}
 {{< tab header="GoogleGenAI" lang="bash" >}}
-npm install @google/genai
-{{< /tab >}}
-{{< tab header="ADK" lang="bash" >}}
-npm install @google/adk
+npm install @google/genai 
 {{< /tab >}}
 {{< /tabpane >}}

-1. Create a new file named `hotelAgent.js` and copy the following code to create
-   an agent:
+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" >}}
@@ -107,12 +86,6 @@ npm install @google/adk

 {{< /tab >}}

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

 1. Run your agent, and observe the results:
@@ -122,6 +95,5 @@ npm install @google/adk
    ```

 {{< notice info >}}
-For more information, visit the [JS SDK
-repo](https://github.com/googleapis/mcp-toolbox-sdk-js).
+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
@@ -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.26.0/$OS/toolbox
+    curl -O https://storage.googleapis.com/genai-toolbox/v0.13.0/$OS/toolbox
    ```
    <!-- {x-release-please-end} -->

@@ -125,89 +125,78 @@ In this section, we will download Toolbox, configure our tools in a
    {{< /notice >}}

    ```yaml
-    kind: sources
-    name: my-pg-source
-    type: postgres
-    host: 127.0.0.1
-    port: 5432
-    database: toolbox_db
-    user: toolbox_user
-    password: my-password
-    ---
-    kind: tools
-    name: search-hotels-by-name
-    type: 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 || '%';
-    ---
-    kind: tools
-    name: search-hotels-by-location
-    type: 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 || '%';
-    ---
-    kind: tools
-    name: book-hotel
-    type: 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;
-    ---
-    kind: tools
-    name: update-hotel
-    type: 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;
-    ---
-    kind: tools
-    name: cancel-hotel
-    type: 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;
-    ---
-    kind: toolsets
-    name: my-toolset
+    sources:
+      my-pg-source:
+        kind: postgres
+        host: 127.0.0.1
+        port: 5432
+        database: toolbox_db
+        user: toolbox_user
+        password: my-password
    tools:
-      - search-hotels-by-name
-      - search-hotels-by-location
-      - book-hotel
-      - update-hotel
-      - cancel-hotel
+      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
--- a/docs/en/getting-started/prompts_quickstart_gemini_cli.md
+++ b/docs/en/getting-started/prompts_quickstart_gemini_cli.md
@@ -1,251 +0,0 @@
---
-title: "Prompts using Gemini CLI"
-type: docs
-weight: 5
-description: >
-  How to get started using Toolbox prompts locally with PostgreSQL and [Gemini CLI](https://pypi.org/project/gemini-cli/).
---
-
-## Before you begin
-
-This guide assumes you have already done the following:
-
-1. Installed [PostgreSQL 16+ and the `psql` client][install-postgres].
- 
-[install-postgres]: https://www.postgresql.org/download/
-
-## Step 1: Set up your database
-
-In this section, we will create a database, insert some data that needs to be
-accessed by our agent, and create a database user for Toolbox to connect with.
-
-1. Connect to postgres using the `psql` command:
-
-    ```bash
-    psql -h 127.0.0.1 -U postgres
-    ```
-
-    Here, `postgres` denotes the default postgres superuser.
-
-    {{< notice info >}}
-
-#### **Having trouble connecting?**
-
-* **Password Prompt:** If you are prompted for a password for the `postgres`
-  user and do not know it (or a blank password doesn't work), your PostgreSQL
-  installation might require a password or a different authentication method.
-* **`FATAL: role "postgres" does not exist`:** This error means the default
-  `postgres` superuser role isn't available under that name on your system.
-* **`Connection refused`:** Ensure your PostgreSQL server is actually running.
-  You can typically check with `sudo systemctl status postgresql` and start it
-  with `sudo systemctl start postgresql` on Linux systems.
-
-<br/>
-
-#### **Common Solution**
-
-For password issues or if the `postgres` role seems inaccessible directly, try
-switching to the `postgres` operating system user first. This user often has
-permission to connect without a password for local connections (this is called
-peer authentication).
-
-```bash
-sudo -i -u postgres
-psql -h 127.0.0.1
-```
-
-Once you are in the `psql` shell using this method, you can proceed with the
-database creation steps below. Afterwards, type `\q` to exit `psql`, and then
-`exit` to return to your normal user shell.
-
-If desired, once connected to `psql` as the `postgres` OS user, you can set a
-password for the `postgres` *database* user using: `ALTER USER postgres WITH
-PASSWORD 'your_chosen_password';`. This would allow direct connection with `-U
-postgres` and a password next time.
-    {{< /notice >}}
-
-1. Create a new database and a new user:
-
-    {{< notice tip >}}
-  For a real application, it's best to follow the principle of least permission
-  and only grant the privileges your application needs.
-    {{< /notice >}}
-
-    ```sql
-      CREATE USER toolbox_user WITH PASSWORD 'my-password';
-
-      CREATE DATABASE toolbox_db;
-      GRANT ALL PRIVILEGES ON DATABASE toolbox_db TO toolbox_user;
-
-      ALTER DATABASE toolbox_db OWNER TO toolbox_user;
-    ```
-
-1. End the database session:
-
-    ```bash
-    \q
-    ```
-
-    (If you used `sudo -i -u postgres` and then `psql`, remember you might also
-    need to type `exit` after `\q` to leave the `postgres` user's shell
-    session.)
-
-1. Connect to your database with your new user:
-
-    ```bash
-    psql -h 127.0.0.1 -U toolbox_user -d toolbox_db
-    ```
-
-1. Create the required tables using the following commands:
-
-    ```sql
-    CREATE TABLE users (
-      id SERIAL PRIMARY KEY,
-      username VARCHAR(50) NOT NULL,
-      email VARCHAR(100) UNIQUE NOT NULL,
-      created_at TIMESTAMPTZ DEFAULT NOW()
-    );
-
-    CREATE TABLE restaurants (
-      id SERIAL PRIMARY KEY,
-      name VARCHAR(100) NOT NULL,
-      location VARCHAR(100)
-    );
-
-    CREATE TABLE reviews (
-      id SERIAL PRIMARY KEY,
-      user_id INT REFERENCES users(id),
-      restaurant_id INT REFERENCES restaurants(id),
-      rating INT CHECK (rating >= 1 AND rating <= 5),
-      review_text TEXT,
-      is_published BOOLEAN DEFAULT false,
-      moderation_status VARCHAR(50) DEFAULT 'pending_manual_review',      
-      created_at TIMESTAMPTZ DEFAULT NOW()
-    );
-    ```
-
-1. Insert dummy data into the tables.
-
-    ```sql
-    INSERT INTO users (id, username, email) VALUES
-    (123, 'jane_d', 'jane.d@example.com'),
-    (124, 'john_s', 'john.s@example.com'),
-    (125, 'sam_b', 'sam.b@example.com');
-
-    INSERT INTO restaurants (id, name, location) VALUES
-    (455, 'Pizza Palace', '123 Main St'),
-    (456, 'The Corner Bistro', '456 Oak Ave'),
-    (457, 'Sushi Spot', '789 Pine Ln');
-
-    INSERT INTO reviews (user_id, restaurant_id, rating, review_text, is_published, moderation_status) VALUES
-    (124, 455, 5, 'Best pizza in town! The crust was perfect.', true, 'approved'),
-    (125, 457, 4, 'Great sushi, very fresh. A bit pricey but worth it.', true, 'approved'),
-    (123, 457, 5, 'Absolutely loved the dragon roll. Will be back!', true, 'approved'),
-    (123, 456, 4, 'The atmosphere was lovely and the food was great. My photo upload might have been weird though.', false, 'pending_manual_review'),
-    (125, 456, 1, 'This review contains inappropriate language.', false, 'rejected');
-    ```
-
-1. End the database session:
-
-    ```bash
-    \q
-    ```
-
-## Step 2: Configure Toolbox
-
-Create a file named `tools.yaml`. This file defines the database connection, the
-SQL tools available, and the prompts the agents will use.
-
-```yaml
-kind: sources
-name: my-foodiefind-db
-type: postgres
-host: 127.0.0.1
-port: 5432
-database: toolbox_db
-user: toolbox_user
-password: my-password
---
-kind: tools
-name: find_user_by_email
-type: postgres-sql
-source: my-foodiefind-db
-description: Find a user's ID by their email address.
-parameters:
-  - name: email
-    type: string
-    description: The email address of the user to find.
-statement: SELECT id FROM users WHERE email = $1;
---
-kind: tools
-name: find_restaurant_by_name
-type: postgres-sql
-source: my-foodiefind-db
-description: Find a restaurant's ID by its exact name.
-parameters:
-  - name: name
-    type: string
-    description: The name of the restaurant to find.
-statement: SELECT id FROM restaurants WHERE name = $1;
---
-kind: tools
-name: find_review_by_user_and_restaurant
-type: postgres-sql
-source: my-foodiefind-db
-description: Find the full record for a specific review using the user's ID and the restaurant's ID.
-parameters:
-  - name: user_id
-    type: integer
-    description: The numerical ID of the user.
-  - name: restaurant_id
-    type: integer
-    description: The numerical ID of the restaurant.
-statement: SELECT * FROM reviews WHERE user_id = $1 AND restaurant_id = $2;
---
-kind: prompts
-name: investigate_missing_review
-description: "Investigates a user's missing review by finding the user, restaurant, and the review itself, then analyzing its status."
-arguments:
-  - name: "user_email"
-    description: "The email of the user who wrote the review."
-  - name: "restaurant_name"
-    description: "The name of the restaurant being reviewed."
-messages:
-  - content: >-
-      **Goal:** Find the review written by the user with email '{{.user_email}}' for the restaurant named '{{.restaurant_name}}' and understand its status.
-      **Workflow:**
-      1. Use the `find_user_by_email` tool with the email '{{.user_email}}' to get the `user_id`.
-      2. Use the `find_restaurant_by_name` tool with the name '{{.restaurant_name}}' to get the `restaurant_id`.
-      3. Use the `find_review_by_user_and_restaurant` tool with the `user_id` and `restaurant_id` you just found.
-      4. Analyze the results from the final tool call. Examine the `is_published` and `moderation_status` fields and explain the review's status to the user in a clear, human-readable sentence.
-```
-
-## Step 3: Connect to Gemini CLI
-
-Configure the Gemini CLI to talk to your local Toolbox MCP server.
-
-1. Open or create your Gemini settings file: `~/.gemini/settings.json`.
-2. Add the following configuration to the file:
-
-    ```json
-    {
-      "mcpServers": {
-        "MCPToolbox": {
-          "httpUrl": "http://localhost:5000/mcp"
-        }
-      },
-      "mcp": {
-        "allowed": ["MCPToolbox"]
-      }
-    }
-    ```
-3. Start Gemini CLI using 
-    ```sh
-    gemini
-    ```
-    In case Gemini CLI is already running, use `/mcp refresh` to refresh the MCP server.
-
-4. Use gemini slash commands to run your prompt: 
-    ```sh
-    /investigate_missing_review --user_email="jane.d@example.com" --restaurant_name="The Corner Bistro"
-    ```
--- a/docs/en/getting-started/quickstart/go/adkgo/go.mod
+++ b/docs/en/getting-started/quickstart/go/adkgo/go.mod
@@ -1,42 +0,0 @@
-module adkgo-quickstart
-
-go 1.24.4
-
-require (
-	github.com/googleapis/mcp-toolbox-sdk-go v0.4.0
-	google.golang.org/adk v0.1.0
-	google.golang.org/genai v1.36.0
-)
-
-require (
-	cloud.google.com/go v0.123.0 // indirect
-	cloud.google.com/go/auth v0.17.0 // indirect
-	cloud.google.com/go/auth/oauth2adapt v0.2.8 // indirect
-	cloud.google.com/go/compute/metadata v0.9.0 // indirect
-	github.com/felixge/httpsnoop v1.0.4 // indirect
-	github.com/go-logr/logr v1.4.3 // indirect
-	github.com/go-logr/stdr v1.2.2 // indirect
-	github.com/google/go-cmp v0.7.0 // indirect
-	github.com/google/s2a-go v0.1.9 // indirect
-	github.com/google/uuid v1.6.0 // indirect
-	github.com/googleapis/enterprise-certificate-proxy v0.3.6 // indirect
-	github.com/googleapis/gax-go/v2 v2.15.0 // indirect
-	github.com/gorilla/websocket v1.5.3 // indirect
-	go.opentelemetry.io/auto/sdk v1.2.1 // indirect
-	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.63.0 // indirect
-	go.opentelemetry.io/otel v1.38.0 // indirect
-	go.opentelemetry.io/otel/metric v1.38.0 // indirect
-	go.opentelemetry.io/otel/sdk v1.38.0 // indirect
-	go.opentelemetry.io/otel/trace v1.38.0 // indirect
-	golang.org/x/crypto v0.45.0 // indirect
-	golang.org/x/net v0.47.0 // indirect
-	golang.org/x/oauth2 v0.32.0 // indirect
-	golang.org/x/sys v0.38.0 // indirect
-	golang.org/x/text v0.31.0 // indirect
-	google.golang.org/api v0.255.0 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20251029180050-ab9386a59fda // indirect
-	google.golang.org/grpc v1.76.0 // indirect
-	google.golang.org/protobuf v1.36.10 // indirect
-	rsc.io/omap v1.2.0 // indirect
-	rsc.io/ordered v1.1.1 // indirect
-)
--- a/docs/en/getting-started/quickstart/go/adkgo/go.sum
+++ b/docs/en/getting-started/quickstart/go/adkgo/go.sum
@@ -1,128 +0,0 @@
-cel.dev/expr v0.24.0 h1:56OvJKSH3hDGL0ml5uSxZmz3/3Pq4tJ+fb1unVLAFcY=
-cel.dev/expr v0.24.0/go.mod h1:hLPLo1W4QUmuYdA72RBX06QTs6MXw941piREPl3Yfiw=
-cloud.google.com/go v0.123.0 h1:2NAUJwPR47q+E35uaJeYoNhuNEM9kM8SjgRgdeOJUSE=
-cloud.google.com/go v0.123.0/go.mod h1:xBoMV08QcqUGuPW65Qfm1o9Y4zKZBpGS+7bImXLTAZU=
-cloud.google.com/go/auth v0.17.0 h1:74yCm7hCj2rUyyAocqnFzsAYXgJhrG26XCFimrc/Kz4=
-cloud.google.com/go/auth v0.17.0/go.mod h1:6wv/t5/6rOPAX4fJiRjKkJCvswLwdet7G8+UGXt7nCQ=
-cloud.google.com/go/auth/oauth2adapt v0.2.8 h1:keo8NaayQZ6wimpNSmW5OPc283g65QNIiLpZnkHRbnc=
-cloud.google.com/go/auth/oauth2adapt v0.2.8/go.mod h1:XQ9y31RkqZCcwJWNSx2Xvric3RrU88hAYYbjDWYDL+c=
-cloud.google.com/go/compute/metadata v0.9.0 h1:pDUj4QMoPejqq20dK0Pg2N4yG9zIkYGdBtwLoEkH9Zs=
-cloud.google.com/go/compute/metadata v0.9.0/go.mod h1:E0bWwX5wTnLPedCKqk3pJmVgCBSM6qQI1yTBdEb3C10=
-cloud.google.com/go/iam v1.5.3 h1:+vMINPiDF2ognBJ97ABAYYwRgsaqxPbQDlMnbHMjolc=
-cloud.google.com/go/iam v1.5.3/go.mod h1:MR3v9oLkZCTlaqljW6Eb2d3HGDGK5/bDv93jhfISFvU=
-cloud.google.com/go/monitoring v1.24.3 h1:dde+gMNc0UhPZD1Azu6at2e79bfdztVDS5lvhOdsgaE=
-cloud.google.com/go/monitoring v1.24.3/go.mod h1:nYP6W0tm3N9H/bOw8am7t62YTzZY+zUeQ+Bi6+2eonI=
-cloud.google.com/go/secretmanager v1.16.0 h1:19QT7ZsLJ8FSP1k+4esQvuCD7npMJml6hYzilxVyT+k=
-cloud.google.com/go/secretmanager v1.16.0/go.mod h1://C/e4I8D26SDTz1f3TQcddhcmiC3rMEl0S1Cakvs3Q=
-cloud.google.com/go/storage v1.57.1 h1:gzao6odNJ7dR3XXYvAgPK+Iw4fVPPznEPPyNjbaVkq8=
-cloud.google.com/go/storage v1.57.1/go.mod h1:329cwlpzALLgJuu8beyJ/uvQznDHpa2U5lGjWednkzg=
-github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.30.0 h1:sBEjpZlNHzK1voKq9695PJSX2o5NEXl7/OL3coiIY0c=
-github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.30.0/go.mod h1:P4WPRUkOhJC13W//jWpyfJNDAIpvRbAUIYLX/4jtlE0=
-github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.53.0 h1:owcC2UnmsZycprQ5RfRgjydWhuoxg71LUfyiQdijZuM=
-github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.53.0/go.mod h1:ZPpqegjbE99EPKsu3iUWV22A04wzGPcAY/ziSIQEEgs=
-github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.53.0 h1:Ron4zCA/yk6U7WOBXhTJcDpsUBG9npumK6xw2auFltQ=
-github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.53.0/go.mod h1:cSgYe11MCNYunTnRXrKiR/tHc0eoKjICUuWpNZoVCOo=
-github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs=
-github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
-github.com/cncf/xds/go v0.0.0-20251014123835-2ee22ca58382 h1:5IeUoAZvqwF6LcCnV99NbhrGKN6ihZgahJv5jKjmZ3k=
-github.com/cncf/xds/go v0.0.0-20251014123835-2ee22ca58382/go.mod h1:HlzOvOjVBOfTGSRXRyY0OiCS/3J1akRGQQpRO/7zyF4=
-github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
-github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/envoyproxy/go-control-plane v0.13.4 h1:zEqyPVyku6IvWCFwux4x9RxkLOMUL+1vC9xUFv5l2/M=
-github.com/envoyproxy/go-control-plane/envoy v1.35.0 h1:ixjkELDE+ru6idPxcHLj8LBVc2bFP7iBytj353BoHUo=
-github.com/envoyproxy/go-control-plane/envoy v1.35.0/go.mod h1:09qwbGVuSWWAyN5t/b3iyVfz5+z8QWGrzkoqm/8SbEs=
-github.com/envoyproxy/protoc-gen-validate v1.2.1 h1:DEo3O99U8j4hBFwbJfrz9VtgcDfUKS7KJ7spH3d86P8=
-github.com/envoyproxy/protoc-gen-validate v1.2.1/go.mod h1:d/C80l/jxXLdfEIhX1W2TmLfsJ31lvEjwamM4DxlWXU=
-github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg=
-github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
-github.com/go-jose/go-jose/v4 v4.1.3 h1:CVLmWDhDVRa6Mi/IgCgaopNosCaHz7zrMeF9MlZRkrs=
-github.com/go-jose/go-jose/v4 v4.1.3/go.mod h1:x4oUasVrzR7071A4TnHLGSPpNOm2a21K9Kf04k1rs08=
-github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
-github.com/go-logr/logr v1.4.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI=
-github.com/go-logr/logr v1.4.3/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
-github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=
-github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE=
-github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek=
-github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps=
-github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
-github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
-github.com/google/jsonschema-go v0.3.0 h1:6AH2TxVNtk3IlvkkhjrtbUc4S8AvO0Xii0DxIygDg+Q=
-github.com/google/jsonschema-go v0.3.0/go.mod h1:r5quNTdLOYEz95Ru18zA0ydNbBuYoo9tgaYcxEYhJVE=
-github.com/google/s2a-go v0.1.9 h1:LGD7gtMgezd8a/Xak7mEWL0PjoTQFvpRudN895yqKW0=
-github.com/google/s2a-go v0.1.9/go.mod h1:YA0Ei2ZQL3acow2O62kdp9UlnvMmU7kA6Eutn0dXayM=
-github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
-github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/googleapis/enterprise-certificate-proxy v0.3.6 h1:GW/XbdyBFQ8Qe+YAmFU9uHLo7OnF5tL52HFAgMmyrf4=
-github.com/googleapis/enterprise-certificate-proxy v0.3.6/go.mod h1:MkHOF77EYAE7qfSuSS9PU6g4Nt4e11cnsDUowfwewLA=
-github.com/googleapis/gax-go/v2 v2.15.0 h1:SyjDc1mGgZU5LncH8gimWo9lW1DtIfPibOG81vgd/bo=
-github.com/googleapis/gax-go/v2 v2.15.0/go.mod h1:zVVkkxAQHa1RQpg9z2AUCMnKhi0Qld9rcmyfL1OZhoc=
-github.com/googleapis/mcp-toolbox-sdk-go v0.4.0 h1:SYJRZzmOyXs9anKp+dfq4rprO92KKnxNyJCCsLkW7nw=
-github.com/googleapis/mcp-toolbox-sdk-go v0.4.0/go.mod h1:ivRLILO1B72J2HWCjSStemdhTWccjfW9FnEj4SAM81w=
-github.com/gorilla/websocket v1.5.3 h1:saDtZ6Pbx/0u+bgYQ3q96pZgCzfhKXGPqt7kZ72aNNg=
-github.com/gorilla/websocket v1.5.3/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
-github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 h1:GFCKgmp0tecUJ0sJuv4pzYCqS9+RGSn52M3FUwPs+uo=
-github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10/go.mod h1:t/avpk3KcrXxUnYOhZhMXJlSEyie6gQbtLq5NM3loB8=
-github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U=
-github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/spiffe/go-spiffe/v2 v2.6.0 h1:l+DolpxNWYgruGQVV0xsfeya3CsC7m8iBzDnMpsbLuo=
-github.com/spiffe/go-spiffe/v2 v2.6.0/go.mod h1:gm2SeUoMZEtpnzPNs2Csc0D/gX33k1xIx7lEzqblHEs=
-github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
-github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
-go.opentelemetry.io/auto/sdk v1.2.1 h1:jXsnJ4Lmnqd11kwkBV2LgLoFMZKizbCi5fNZ/ipaZ64=
-go.opentelemetry.io/auto/sdk v1.2.1/go.mod h1:KRTj+aOaElaLi+wW1kO/DZRXwkF4C5xPbEe3ZiIhN7Y=
-go.opentelemetry.io/contrib/detectors/gcp v1.38.0 h1:ZoYbqX7OaA/TAikspPl3ozPI6iY6LiIY9I8cUfm+pJs=
-go.opentelemetry.io/contrib/detectors/gcp v1.38.0/go.mod h1:SU+iU7nu5ud4oCb3LQOhIZ3nRLj6FNVrKgtflbaf2ts=
-go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.63.0 h1:YH4g8lQroajqUwWbq/tr2QX1JFmEXaDLgG+ew9bLMWo=
-go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.63.0/go.mod h1:fvPi2qXDqFs8M4B4fmJhE92TyQs9Ydjlg3RvfUp+NbQ=
-go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.63.0 h1:RbKq8BG0FI8OiXhBfcRtqqHcZcka+gU3cskNuf05R18=
-go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.63.0/go.mod h1:h06DGIukJOevXaj/xrNjhi/2098RZzcLTbc0jDAUbsg=
-go.opentelemetry.io/otel v1.38.0 h1:RkfdswUDRimDg0m2Az18RKOsnI8UDzppJAtj01/Ymk8=
-go.opentelemetry.io/otel v1.38.0/go.mod h1:zcmtmQ1+YmQM9wrNsTGV/q/uyusom3P8RxwExxkZhjM=
-go.opentelemetry.io/otel/metric v1.38.0 h1:Kl6lzIYGAh5M159u9NgiRkmoMKjvbsKtYRwgfrA6WpA=
-go.opentelemetry.io/otel/metric v1.38.0/go.mod h1:kB5n/QoRM8YwmUahxvI3bO34eVtQf2i4utNVLr9gEmI=
-go.opentelemetry.io/otel/sdk v1.38.0 h1:l48sr5YbNf2hpCUj/FoGhW9yDkl+Ma+LrVl8qaM5b+E=
-go.opentelemetry.io/otel/sdk v1.38.0/go.mod h1:ghmNdGlVemJI3+ZB5iDEuk4bWA3GkTpW+DOoZMYBVVg=
-go.opentelemetry.io/otel/sdk/metric v1.38.0 h1:aSH66iL0aZqo//xXzQLYozmWrXxyFkBJ6qT5wthqPoM=
-go.opentelemetry.io/otel/sdk/metric v1.38.0/go.mod h1:dg9PBnW9XdQ1Hd6ZnRz689CbtrUp0wMMs9iPcgT9EZA=
-go.opentelemetry.io/otel/trace v1.38.0 h1:Fxk5bKrDZJUH+AMyyIXGcFAPah0oRcT+LuNtJrmcNLE=
-go.opentelemetry.io/otel/trace v1.38.0/go.mod h1:j1P9ivuFsTceSWe1oY+EeW3sc+Pp42sO++GHkg4wwhs=
-go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
-go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
-golang.org/x/crypto v0.45.0 h1:jMBrvKuj23MTlT0bQEOBcAE0mjg8mK9RXFhRH6nyF3Q=
-golang.org/x/crypto v0.45.0/go.mod h1:XTGrrkGJve7CYK7J8PEww4aY7gM3qMCElcJQ8n8JdX4=
-golang.org/x/net v0.47.0 h1:Mx+4dIFzqraBXUugkia1OOvlD6LemFo1ALMHjrXDOhY=
-golang.org/x/net v0.47.0/go.mod h1:/jNxtkgq5yWUGYkaZGqo27cfGZ1c5Nen03aYrrKpVRU=
-golang.org/x/oauth2 v0.32.0 h1:jsCblLleRMDrxMN29H3z/k1KliIvpLgCkE6R8FXXNgY=
-golang.org/x/oauth2 v0.32.0/go.mod h1:lzm5WQJQwKZ3nwavOZ3IS5Aulzxi68dUSgRHujetwEA=
-golang.org/x/sync v0.18.0 h1:kr88TuHDroi+UVf+0hZnirlk8o8T+4MrK6mr60WkH/I=
-golang.org/x/sync v0.18.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI=
-golang.org/x/sys v0.38.0 h1:3yZWxaJjBmCWXqhN1qh02AkOnCQ1poK6oF+a7xWL6Gc=
-golang.org/x/sys v0.38.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
-golang.org/x/text v0.31.0 h1:aC8ghyu4JhP8VojJ2lEHBnochRno1sgL6nEi9WGFGMM=
-golang.org/x/text v0.31.0/go.mod h1:tKRAlv61yKIjGGHX/4tP1LTbc13YSec1pxVEWXzfoeM=
-golang.org/x/time v0.14.0 h1:MRx4UaLrDotUKUdCIqzPC48t1Y9hANFKIRpNx+Te8PI=
-golang.org/x/time v0.14.0/go.mod h1:eL/Oa2bBBK0TkX57Fyni+NgnyQQN4LitPmob2Hjnqw4=
-gonum.org/v1/gonum v0.16.0 h1:5+ul4Swaf3ESvrOnidPp4GZbzf0mxVQpDCYUQE7OJfk=
-gonum.org/v1/gonum v0.16.0/go.mod h1:fef3am4MQ93R2HHpKnLk4/Tbh/s0+wqD5nfa6Pnwy4E=
-google.golang.org/adk v0.1.0 h1:+w/fHuqRVolotOATlujRA+2DKUuDrFH2poRdEX2QjB8=
-google.golang.org/adk v0.1.0/go.mod h1:NvtSLoNx7UzZIiUAI1KoJQLMmt9sG3oCgiCx1TLqKFw=
-google.golang.org/api v0.255.0 h1:OaF+IbRwOottVCYV2wZan7KUq7UeNUQn1BcPc4K7lE4=
-google.golang.org/api v0.255.0/go.mod h1:d1/EtvCLdtiWEV4rAEHDHGh2bCnqsWhw+M8y2ECN4a8=
-google.golang.org/genai v1.36.0 h1:sJCIjqTAmwrtAIaemtTiKkg2TO1RxnYEusTmEQ3nGxM=
-google.golang.org/genai v1.36.0/go.mod h1:A3kkl0nyBjyFlNjgxIwKq70julKbIxpSxqKO5gw/gmk=
-google.golang.org/genproto v0.0.0-20251014184007-4626949a642f h1:vLd1CJuJOUgV6qijD7KT5Y2ZtC97ll4dxjTUappMnbo=
-google.golang.org/genproto v0.0.0-20251014184007-4626949a642f/go.mod h1:PI3KrSadr00yqfv6UDvgZGFsmLqeRIwt8x4p5Oo7CdM=
-google.golang.org/genproto/googleapis/api v0.0.0-20251014184007-4626949a642f h1:OiFuztEyBivVKDvguQJYWq1yDcfAHIID/FVrPR4oiI0=
-google.golang.org/genproto/googleapis/api v0.0.0-20251014184007-4626949a642f/go.mod h1:kprOiu9Tr0JYyD6DORrc4Hfyk3RFXqkQ3ctHEum3ZbM=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20251029180050-ab9386a59fda h1:i/Q+bfisr7gq6feoJnS/DlpdwEL4ihp41fvRiM3Ork0=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20251029180050-ab9386a59fda/go.mod h1:7i2o+ce6H/6BluujYR+kqX3GKH+dChPTQU19wjRPiGk=
-google.golang.org/grpc v1.76.0 h1:UnVkv1+uMLYXoIz6o7chp59WfQUYA2ex/BXQ9rHZu7A=
-google.golang.org/grpc v1.76.0/go.mod h1:Ju12QI8M6iQJtbcsV+awF5a4hfJMLi4X0JLo94ULZ6c=
-google.golang.org/protobuf v1.36.10 h1:AYd7cD/uASjIL6Q9LiTjz8JLcrh/88q5UObnmY3aOOE=
-google.golang.org/protobuf v1.36.10/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco=
-gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
-gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-rsc.io/omap v1.2.0 h1:c1M8jchnHbzmJALzGLclfH3xDWXrPxSUHXzH5C+8Kdw=
-rsc.io/omap v1.2.0/go.mod h1:C8pkI0AWexHopQtZX+qiUeJGzvc8HkdgnsWK4/mAa00=
-rsc.io/ordered v1.1.1 h1:1kZM6RkTmceJgsFH/8DLQvkCVEYomVDJfBRLT595Uak=
-rsc.io/ordered v1.1.1/go.mod h1:evAi8739bWVBRG9aaufsjVc202+6okf8u2QeVL84BCM=
--- a/docs/en/getting-started/quickstart/go/adkgo/quickstart.go
+++ b/docs/en/getting-started/quickstart/go/adkgo/quickstart.go
@@ -1,132 +0,0 @@
-package main
-
-import (
-	"context"
-	"fmt"
-	"log"
-	"os"
-	"strings"
-
-	"github.com/googleapis/mcp-toolbox-sdk-go/tbadk"
-	"google.golang.org/adk/agent"
-	"google.golang.org/adk/agent/llmagent"
-	"google.golang.org/adk/model/gemini"
-	"google.golang.org/adk/runner"
-	"google.golang.org/adk/session"
-	"google.golang.org/adk/tool"
-	"google.golang.org/genai"
-)
-
-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 queriesAdk = []string{
-	"Find hotels in Basel. ",
-	"Find hotels 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("GEMINI_API_KEY")
-	toolboxURL := "http://localhost:5000"
-	ctx := context.Background()
-
-	// Initialize the MCP Toolbox client.
-	toolboxClient, err := tbadk.NewToolboxClient(toolboxURL)
-	if err != nil {
-		log.Fatalf("Failed to create MCP Toolbox client: %v", err)
-	}
-
-	// Load the tools using the MCP Toolbox SDK.
-	toolsetName := "my-toolset"
-	mcpTools, err := toolboxClient.LoadToolset(toolsetName, ctx)
-	if err != nil {
-		log.Fatalf("Failed to load MCP toolset '%s': %v\nMake sure your Toolbox server is running.", toolsetName, err)
-	}
-
-	// Set up the Gemini Model
-	model, err := gemini.NewModel(ctx, "gemini-2.5-flash", &genai.ClientConfig{
-		APIKey: genaiKey,
-	})
-	if err != nil {
-		log.Fatalf("Failed to create model: %v", err)
-	}
-
-	// Type Cast the ToolboxTools
-	tools := make([]tool.Tool, len(mcpTools))
-	for i := range mcpTools {
-		tools[i] = &mcpTools[i]
-	}
-
-	// Create an llm agent
-	llmagent, err := llmagent.New(llmagent.Config{
-		Name:        "hotel_assistant",
-		Model:       model,
-		Description: "Agent to answer questions about hotels.",
-		Instruction: systemPrompt,
-		Tools:       tools,
-	})
-	if err != nil {
-		log.Fatalf("Failed to create agent: %v", err)
-	}
-
-	appName := "hotel_assistant"
-	userID := "user-123"
-
-	// Create a session service
-	sessionService := session.InMemoryService()
-	resp, err := sessionService.Create(ctx, &session.CreateRequest{
-		AppName: appName,
-		UserID:  userID,
-	})
-	if err != nil {
-		log.Fatalf("Failed to create the session service: %v", err)
-	}
-	session := resp.Session
-
-	// Configure the runner
-	r, err := runner.New(runner.Config{
-		AppName:        appName,
-		Agent:          llmagent,
-		SessionService: sessionService,
-	})
-	if err != nil {
-		log.Fatalf("Failed to create runner: %v", err)
-	}
-
-	// Loop through queries to the llm agent
-	for i, query := range queriesAdk {
-		fmt.Printf("\n=== Query %d: %s ===\n", i+1, query)
-		userMsg := genai.NewContentFromText(query, genai.RoleUser)
-
-		streamingMode := agent.StreamingModeSSE
-		for event, err := range r.Run(ctx, userID, session.ID(), userMsg, agent.RunConfig{
-			StreamingMode: streamingMode,
-		}) {
-			if err != nil {
-				fmt.Printf("\nAGENT_ERROR: %v\n", err)
-			} else {
-				if event.LLMResponse.Content != nil {
-					for _, p := range event.LLMResponse.Content.Parts {
-						// if its running in streaming mode, don't print the non partial llmResponses
-						if streamingMode != agent.StreamingModeSSE || event.LLMResponse.Partial {
-							fmt.Print(p.Text)
-						}
-					}
-				}
-			}
-		}
-
-		fmt.Println("\n" + strings.Repeat("-", 80) + "\n")
-	}
-}
--- a/docs/en/getting-started/quickstart/go/genAI/go.mod
+++ b/docs/en/getting-started/quickstart/go/genAI/go.mod
@@ -1,37 +0,0 @@
-module genai-quickstart
-
-go 1.24.6
-
-require (
-	github.com/googleapis/mcp-toolbox-sdk-go v0.4.0
-	google.golang.org/genai v1.36.0
-)
-
-require (
-	cloud.google.com/go v0.123.0 // indirect
-	cloud.google.com/go/auth v0.17.0 // indirect
-	cloud.google.com/go/auth/oauth2adapt v0.2.8 // indirect
-	cloud.google.com/go/compute/metadata v0.9.0 // indirect
-	github.com/felixge/httpsnoop v1.0.4 // indirect
-	github.com/go-logr/logr v1.4.3 // indirect
-	github.com/go-logr/stdr v1.2.2 // indirect
-	github.com/google/go-cmp v0.7.0 // indirect
-	github.com/google/s2a-go v0.1.9 // indirect
-	github.com/googleapis/enterprise-certificate-proxy v0.3.6 // indirect
-	github.com/googleapis/gax-go/v2 v2.15.0 // indirect
-	github.com/gorilla/websocket v1.5.3 // indirect
-	go.opentelemetry.io/auto/sdk v1.2.1 // indirect
-	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.63.0 // indirect
-	go.opentelemetry.io/otel v1.38.0 // indirect
-	go.opentelemetry.io/otel/metric v1.38.0 // indirect
-	go.opentelemetry.io/otel/trace v1.38.0 // indirect
-	golang.org/x/crypto v0.45.0 // indirect
-	golang.org/x/net v0.47.0 // indirect
-	golang.org/x/oauth2 v0.32.0 // indirect
-	golang.org/x/sys v0.38.0 // indirect
-	golang.org/x/text v0.31.0 // indirect
-	google.golang.org/api v0.255.0 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20251029180050-ab9386a59fda // indirect
-	google.golang.org/grpc v1.76.0 // indirect
-	google.golang.org/protobuf v1.36.10 // indirect
-)
--- a/docs/en/getting-started/quickstart/go/genAI/go.sum
+++ b/docs/en/getting-started/quickstart/go/genAI/go.sum
@@ -1,118 +0,0 @@
-cel.dev/expr v0.24.0 h1:56OvJKSH3hDGL0ml5uSxZmz3/3Pq4tJ+fb1unVLAFcY=
-cel.dev/expr v0.24.0/go.mod h1:hLPLo1W4QUmuYdA72RBX06QTs6MXw941piREPl3Yfiw=
-cloud.google.com/go v0.123.0 h1:2NAUJwPR47q+E35uaJeYoNhuNEM9kM8SjgRgdeOJUSE=
-cloud.google.com/go v0.123.0/go.mod h1:xBoMV08QcqUGuPW65Qfm1o9Y4zKZBpGS+7bImXLTAZU=
-cloud.google.com/go/auth v0.17.0 h1:74yCm7hCj2rUyyAocqnFzsAYXgJhrG26XCFimrc/Kz4=
-cloud.google.com/go/auth v0.17.0/go.mod h1:6wv/t5/6rOPAX4fJiRjKkJCvswLwdet7G8+UGXt7nCQ=
-cloud.google.com/go/auth/oauth2adapt v0.2.8 h1:keo8NaayQZ6wimpNSmW5OPc283g65QNIiLpZnkHRbnc=
-cloud.google.com/go/auth/oauth2adapt v0.2.8/go.mod h1:XQ9y31RkqZCcwJWNSx2Xvric3RrU88hAYYbjDWYDL+c=
-cloud.google.com/go/compute/metadata v0.9.0 h1:pDUj4QMoPejqq20dK0Pg2N4yG9zIkYGdBtwLoEkH9Zs=
-cloud.google.com/go/compute/metadata v0.9.0/go.mod h1:E0bWwX5wTnLPedCKqk3pJmVgCBSM6qQI1yTBdEb3C10=
-cloud.google.com/go/iam v1.5.3 h1:+vMINPiDF2ognBJ97ABAYYwRgsaqxPbQDlMnbHMjolc=
-cloud.google.com/go/iam v1.5.3/go.mod h1:MR3v9oLkZCTlaqljW6Eb2d3HGDGK5/bDv93jhfISFvU=
-cloud.google.com/go/monitoring v1.24.3 h1:dde+gMNc0UhPZD1Azu6at2e79bfdztVDS5lvhOdsgaE=
-cloud.google.com/go/monitoring v1.24.3/go.mod h1:nYP6W0tm3N9H/bOw8am7t62YTzZY+zUeQ+Bi6+2eonI=
-cloud.google.com/go/secretmanager v1.16.0 h1:19QT7ZsLJ8FSP1k+4esQvuCD7npMJml6hYzilxVyT+k=
-cloud.google.com/go/secretmanager v1.16.0/go.mod h1://C/e4I8D26SDTz1f3TQcddhcmiC3rMEl0S1Cakvs3Q=
-cloud.google.com/go/storage v1.57.1 h1:gzao6odNJ7dR3XXYvAgPK+Iw4fVPPznEPPyNjbaVkq8=
-cloud.google.com/go/storage v1.57.1/go.mod h1:329cwlpzALLgJuu8beyJ/uvQznDHpa2U5lGjWednkzg=
-github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.30.0 h1:sBEjpZlNHzK1voKq9695PJSX2o5NEXl7/OL3coiIY0c=
-github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.30.0/go.mod h1:P4WPRUkOhJC13W//jWpyfJNDAIpvRbAUIYLX/4jtlE0=
-github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.53.0 h1:owcC2UnmsZycprQ5RfRgjydWhuoxg71LUfyiQdijZuM=
-github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.53.0/go.mod h1:ZPpqegjbE99EPKsu3iUWV22A04wzGPcAY/ziSIQEEgs=
-github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.53.0 h1:Ron4zCA/yk6U7WOBXhTJcDpsUBG9npumK6xw2auFltQ=
-github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.53.0/go.mod h1:cSgYe11MCNYunTnRXrKiR/tHc0eoKjICUuWpNZoVCOo=
-github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs=
-github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
-github.com/cncf/xds/go v0.0.0-20251014123835-2ee22ca58382 h1:5IeUoAZvqwF6LcCnV99NbhrGKN6ihZgahJv5jKjmZ3k=
-github.com/cncf/xds/go v0.0.0-20251014123835-2ee22ca58382/go.mod h1:HlzOvOjVBOfTGSRXRyY0OiCS/3J1akRGQQpRO/7zyF4=
-github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
-github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/envoyproxy/go-control-plane v0.13.4 h1:zEqyPVyku6IvWCFwux4x9RxkLOMUL+1vC9xUFv5l2/M=
-github.com/envoyproxy/go-control-plane/envoy v1.35.0 h1:ixjkELDE+ru6idPxcHLj8LBVc2bFP7iBytj353BoHUo=
-github.com/envoyproxy/go-control-plane/envoy v1.35.0/go.mod h1:09qwbGVuSWWAyN5t/b3iyVfz5+z8QWGrzkoqm/8SbEs=
-github.com/envoyproxy/protoc-gen-validate v1.2.1 h1:DEo3O99U8j4hBFwbJfrz9VtgcDfUKS7KJ7spH3d86P8=
-github.com/envoyproxy/protoc-gen-validate v1.2.1/go.mod h1:d/C80l/jxXLdfEIhX1W2TmLfsJ31lvEjwamM4DxlWXU=
-github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg=
-github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
-github.com/go-jose/go-jose/v4 v4.1.3 h1:CVLmWDhDVRa6Mi/IgCgaopNosCaHz7zrMeF9MlZRkrs=
-github.com/go-jose/go-jose/v4 v4.1.3/go.mod h1:x4oUasVrzR7071A4TnHLGSPpNOm2a21K9Kf04k1rs08=
-github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
-github.com/go-logr/logr v1.4.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI=
-github.com/go-logr/logr v1.4.3/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
-github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=
-github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE=
-github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek=
-github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps=
-github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
-github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
-github.com/google/s2a-go v0.1.9 h1:LGD7gtMgezd8a/Xak7mEWL0PjoTQFvpRudN895yqKW0=
-github.com/google/s2a-go v0.1.9/go.mod h1:YA0Ei2ZQL3acow2O62kdp9UlnvMmU7kA6Eutn0dXayM=
-github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
-github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/googleapis/enterprise-certificate-proxy v0.3.6 h1:GW/XbdyBFQ8Qe+YAmFU9uHLo7OnF5tL52HFAgMmyrf4=
-github.com/googleapis/enterprise-certificate-proxy v0.3.6/go.mod h1:MkHOF77EYAE7qfSuSS9PU6g4Nt4e11cnsDUowfwewLA=
-github.com/googleapis/gax-go/v2 v2.15.0 h1:SyjDc1mGgZU5LncH8gimWo9lW1DtIfPibOG81vgd/bo=
-github.com/googleapis/gax-go/v2 v2.15.0/go.mod h1:zVVkkxAQHa1RQpg9z2AUCMnKhi0Qld9rcmyfL1OZhoc=
-github.com/googleapis/mcp-toolbox-sdk-go v0.4.0 h1:SYJRZzmOyXs9anKp+dfq4rprO92KKnxNyJCCsLkW7nw=
-github.com/googleapis/mcp-toolbox-sdk-go v0.4.0/go.mod h1:ivRLILO1B72J2HWCjSStemdhTWccjfW9FnEj4SAM81w=
-github.com/gorilla/websocket v1.5.3 h1:saDtZ6Pbx/0u+bgYQ3q96pZgCzfhKXGPqt7kZ72aNNg=
-github.com/gorilla/websocket v1.5.3/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
-github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 h1:GFCKgmp0tecUJ0sJuv4pzYCqS9+RGSn52M3FUwPs+uo=
-github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10/go.mod h1:t/avpk3KcrXxUnYOhZhMXJlSEyie6gQbtLq5NM3loB8=
-github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U=
-github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/spiffe/go-spiffe/v2 v2.6.0 h1:l+DolpxNWYgruGQVV0xsfeya3CsC7m8iBzDnMpsbLuo=
-github.com/spiffe/go-spiffe/v2 v2.6.0/go.mod h1:gm2SeUoMZEtpnzPNs2Csc0D/gX33k1xIx7lEzqblHEs=
-github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
-github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
-go.opentelemetry.io/auto/sdk v1.2.1 h1:jXsnJ4Lmnqd11kwkBV2LgLoFMZKizbCi5fNZ/ipaZ64=
-go.opentelemetry.io/auto/sdk v1.2.1/go.mod h1:KRTj+aOaElaLi+wW1kO/DZRXwkF4C5xPbEe3ZiIhN7Y=
-go.opentelemetry.io/contrib/detectors/gcp v1.38.0 h1:ZoYbqX7OaA/TAikspPl3ozPI6iY6LiIY9I8cUfm+pJs=
-go.opentelemetry.io/contrib/detectors/gcp v1.38.0/go.mod h1:SU+iU7nu5ud4oCb3LQOhIZ3nRLj6FNVrKgtflbaf2ts=
-go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.63.0 h1:YH4g8lQroajqUwWbq/tr2QX1JFmEXaDLgG+ew9bLMWo=
-go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.63.0/go.mod h1:fvPi2qXDqFs8M4B4fmJhE92TyQs9Ydjlg3RvfUp+NbQ=
-go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.63.0 h1:RbKq8BG0FI8OiXhBfcRtqqHcZcka+gU3cskNuf05R18=
-go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.63.0/go.mod h1:h06DGIukJOevXaj/xrNjhi/2098RZzcLTbc0jDAUbsg=
-go.opentelemetry.io/otel v1.38.0 h1:RkfdswUDRimDg0m2Az18RKOsnI8UDzppJAtj01/Ymk8=
-go.opentelemetry.io/otel v1.38.0/go.mod h1:zcmtmQ1+YmQM9wrNsTGV/q/uyusom3P8RxwExxkZhjM=
-go.opentelemetry.io/otel/metric v1.38.0 h1:Kl6lzIYGAh5M159u9NgiRkmoMKjvbsKtYRwgfrA6WpA=
-go.opentelemetry.io/otel/metric v1.38.0/go.mod h1:kB5n/QoRM8YwmUahxvI3bO34eVtQf2i4utNVLr9gEmI=
-go.opentelemetry.io/otel/sdk v1.38.0 h1:l48sr5YbNf2hpCUj/FoGhW9yDkl+Ma+LrVl8qaM5b+E=
-go.opentelemetry.io/otel/sdk v1.38.0/go.mod h1:ghmNdGlVemJI3+ZB5iDEuk4bWA3GkTpW+DOoZMYBVVg=
-go.opentelemetry.io/otel/sdk/metric v1.38.0 h1:aSH66iL0aZqo//xXzQLYozmWrXxyFkBJ6qT5wthqPoM=
-go.opentelemetry.io/otel/sdk/metric v1.38.0/go.mod h1:dg9PBnW9XdQ1Hd6ZnRz689CbtrUp0wMMs9iPcgT9EZA=
-go.opentelemetry.io/otel/trace v1.38.0 h1:Fxk5bKrDZJUH+AMyyIXGcFAPah0oRcT+LuNtJrmcNLE=
-go.opentelemetry.io/otel/trace v1.38.0/go.mod h1:j1P9ivuFsTceSWe1oY+EeW3sc+Pp42sO++GHkg4wwhs=
-golang.org/x/crypto v0.45.0 h1:jMBrvKuj23MTlT0bQEOBcAE0mjg8mK9RXFhRH6nyF3Q=
-golang.org/x/crypto v0.45.0/go.mod h1:XTGrrkGJve7CYK7J8PEww4aY7gM3qMCElcJQ8n8JdX4=
-golang.org/x/net v0.47.0 h1:Mx+4dIFzqraBXUugkia1OOvlD6LemFo1ALMHjrXDOhY=
-golang.org/x/net v0.47.0/go.mod h1:/jNxtkgq5yWUGYkaZGqo27cfGZ1c5Nen03aYrrKpVRU=
-golang.org/x/oauth2 v0.32.0 h1:jsCblLleRMDrxMN29H3z/k1KliIvpLgCkE6R8FXXNgY=
-golang.org/x/oauth2 v0.32.0/go.mod h1:lzm5WQJQwKZ3nwavOZ3IS5Aulzxi68dUSgRHujetwEA=
-golang.org/x/sync v0.18.0 h1:kr88TuHDroi+UVf+0hZnirlk8o8T+4MrK6mr60WkH/I=
-golang.org/x/sync v0.18.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI=
-golang.org/x/sys v0.38.0 h1:3yZWxaJjBmCWXqhN1qh02AkOnCQ1poK6oF+a7xWL6Gc=
-golang.org/x/sys v0.38.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
-golang.org/x/text v0.31.0 h1:aC8ghyu4JhP8VojJ2lEHBnochRno1sgL6nEi9WGFGMM=
-golang.org/x/text v0.31.0/go.mod h1:tKRAlv61yKIjGGHX/4tP1LTbc13YSec1pxVEWXzfoeM=
-golang.org/x/time v0.14.0 h1:MRx4UaLrDotUKUdCIqzPC48t1Y9hANFKIRpNx+Te8PI=
-golang.org/x/time v0.14.0/go.mod h1:eL/Oa2bBBK0TkX57Fyni+NgnyQQN4LitPmob2Hjnqw4=
-gonum.org/v1/gonum v0.16.0 h1:5+ul4Swaf3ESvrOnidPp4GZbzf0mxVQpDCYUQE7OJfk=
-gonum.org/v1/gonum v0.16.0/go.mod h1:fef3am4MQ93R2HHpKnLk4/Tbh/s0+wqD5nfa6Pnwy4E=
-google.golang.org/api v0.255.0 h1:OaF+IbRwOottVCYV2wZan7KUq7UeNUQn1BcPc4K7lE4=
-google.golang.org/api v0.255.0/go.mod h1:d1/EtvCLdtiWEV4rAEHDHGh2bCnqsWhw+M8y2ECN4a8=
-google.golang.org/genai v1.36.0 h1:sJCIjqTAmwrtAIaemtTiKkg2TO1RxnYEusTmEQ3nGxM=
-google.golang.org/genai v1.36.0/go.mod h1:A3kkl0nyBjyFlNjgxIwKq70julKbIxpSxqKO5gw/gmk=
-google.golang.org/genproto v0.0.0-20251014184007-4626949a642f h1:vLd1CJuJOUgV6qijD7KT5Y2ZtC97ll4dxjTUappMnbo=
-google.golang.org/genproto v0.0.0-20251014184007-4626949a642f/go.mod h1:PI3KrSadr00yqfv6UDvgZGFsmLqeRIwt8x4p5Oo7CdM=
-google.golang.org/genproto/googleapis/api v0.0.0-20251014184007-4626949a642f h1:OiFuztEyBivVKDvguQJYWq1yDcfAHIID/FVrPR4oiI0=
-google.golang.org/genproto/googleapis/api v0.0.0-20251014184007-4626949a642f/go.mod h1:kprOiu9Tr0JYyD6DORrc4Hfyk3RFXqkQ3ctHEum3ZbM=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20251029180050-ab9386a59fda h1:i/Q+bfisr7gq6feoJnS/DlpdwEL4ihp41fvRiM3Ork0=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20251029180050-ab9386a59fda/go.mod h1:7i2o+ce6H/6BluujYR+kqX3GKH+dChPTQU19wjRPiGk=
-google.golang.org/grpc v1.76.0 h1:UnVkv1+uMLYXoIz6o7chp59WfQUYA2ex/BXQ9rHZu7A=
-google.golang.org/grpc v1.76.0/go.mod h1:Ju12QI8M6iQJtbcsV+awF5a4hfJMLi4X0JLo94ULZ6c=
-google.golang.org/protobuf v1.36.10 h1:AYd7cD/uASjIL6Q9LiTjz8JLcrh/88q5UObnmY3aOOE=
-google.golang.org/protobuf v1.36.10/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco=
-gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
-gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
--- a/docs/en/getting-started/quickstart/go/genAI/quickstart.go
+++ b/docs/en/getting-started/quickstart/go/genAI/quickstart.go
@@ -1,174 +0,0 @@
-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)
-		}
-	}
-}
--- a/docs/en/getting-started/quickstart/go/genkit/go.mod
+++ b/docs/en/getting-started/quickstart/go/genkit/go.mod
@@ -1,53 +0,0 @@
-module genkit-quickstart
-
-go 1.24.6
-
-require (
-	github.com/firebase/genkit/go v1.2.0
-	github.com/googleapis/mcp-toolbox-sdk-go v0.4.0
-)
-
-require (
-	cloud.google.com/go v0.123.0 // indirect
-	cloud.google.com/go/auth v0.17.0 // indirect
-	cloud.google.com/go/auth/oauth2adapt v0.2.8 // indirect
-	cloud.google.com/go/compute/metadata v0.9.0 // indirect
-	github.com/bahlo/generic-list-go v0.2.0 // indirect
-	github.com/buger/jsonparser v1.1.1 // indirect
-	github.com/felixge/httpsnoop v1.0.4 // indirect
-	github.com/go-logr/logr v1.4.3 // indirect
-	github.com/go-logr/stdr v1.2.2 // indirect
-	github.com/goccy/go-yaml v1.17.1 // indirect
-	github.com/google/dotprompt/go v0.0.0-20251014011017-8d056e027254 // indirect
-	github.com/google/go-cmp v0.7.0 // indirect
-	github.com/google/s2a-go v0.1.9 // indirect
-	github.com/google/uuid v1.6.0 // indirect
-	github.com/googleapis/enterprise-certificate-proxy v0.3.6 // indirect
-	github.com/googleapis/gax-go/v2 v2.15.0 // indirect
-	github.com/gorilla/websocket v1.5.3 // indirect
-	github.com/invopop/jsonschema v0.13.0 // indirect
-	github.com/mailru/easyjson v0.9.0 // indirect
-	github.com/mbleigh/raymond v0.0.0-20250414171441-6b3a58ab9e0a // indirect
-	github.com/wk8/go-ordered-map/v2 v2.1.8 // indirect
-	github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
-	github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
-	github.com/xeipuuv/gojsonschema v1.2.0 // indirect
-	github.com/yosida95/uritemplate/v3 v3.0.2 // indirect
-	go.opentelemetry.io/auto/sdk v1.2.1 // indirect
-	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.63.0 // indirect
-	go.opentelemetry.io/otel v1.38.0 // indirect
-	go.opentelemetry.io/otel/metric v1.38.0 // indirect
-	go.opentelemetry.io/otel/sdk v1.38.0 // indirect
-	go.opentelemetry.io/otel/trace v1.38.0 // indirect
-	golang.org/x/crypto v0.45.0 // indirect
-	golang.org/x/net v0.47.0 // indirect
-	golang.org/x/oauth2 v0.32.0 // indirect
-	golang.org/x/sys v0.38.0 // indirect
-	golang.org/x/text v0.31.0 // indirect
-	google.golang.org/api v0.255.0 // indirect
-	google.golang.org/genai v1.34.0 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20251029180050-ab9386a59fda // indirect
-	google.golang.org/grpc v1.76.0 // indirect
-	google.golang.org/protobuf v1.36.10 // indirect
-	gopkg.in/yaml.v3 v3.0.1 // indirect
-)
--- a/docs/en/getting-started/quickstart/go/genkit/go.sum
+++ b/docs/en/getting-started/quickstart/go/genkit/go.sum
@@ -1,160 +0,0 @@
-cel.dev/expr v0.24.0 h1:56OvJKSH3hDGL0ml5uSxZmz3/3Pq4tJ+fb1unVLAFcY=
-cel.dev/expr v0.24.0/go.mod h1:hLPLo1W4QUmuYdA72RBX06QTs6MXw941piREPl3Yfiw=
-cloud.google.com/go v0.123.0 h1:2NAUJwPR47q+E35uaJeYoNhuNEM9kM8SjgRgdeOJUSE=
-cloud.google.com/go v0.123.0/go.mod h1:xBoMV08QcqUGuPW65Qfm1o9Y4zKZBpGS+7bImXLTAZU=
-cloud.google.com/go/auth v0.17.0 h1:74yCm7hCj2rUyyAocqnFzsAYXgJhrG26XCFimrc/Kz4=
-cloud.google.com/go/auth v0.17.0/go.mod h1:6wv/t5/6rOPAX4fJiRjKkJCvswLwdet7G8+UGXt7nCQ=
-cloud.google.com/go/auth/oauth2adapt v0.2.8 h1:keo8NaayQZ6wimpNSmW5OPc283g65QNIiLpZnkHRbnc=
-cloud.google.com/go/auth/oauth2adapt v0.2.8/go.mod h1:XQ9y31RkqZCcwJWNSx2Xvric3RrU88hAYYbjDWYDL+c=
-cloud.google.com/go/compute/metadata v0.9.0 h1:pDUj4QMoPejqq20dK0Pg2N4yG9zIkYGdBtwLoEkH9Zs=
-cloud.google.com/go/compute/metadata v0.9.0/go.mod h1:E0bWwX5wTnLPedCKqk3pJmVgCBSM6qQI1yTBdEb3C10=
-cloud.google.com/go/iam v1.5.3 h1:+vMINPiDF2ognBJ97ABAYYwRgsaqxPbQDlMnbHMjolc=
-cloud.google.com/go/iam v1.5.3/go.mod h1:MR3v9oLkZCTlaqljW6Eb2d3HGDGK5/bDv93jhfISFvU=
-cloud.google.com/go/monitoring v1.24.3 h1:dde+gMNc0UhPZD1Azu6at2e79bfdztVDS5lvhOdsgaE=
-cloud.google.com/go/monitoring v1.24.3/go.mod h1:nYP6W0tm3N9H/bOw8am7t62YTzZY+zUeQ+Bi6+2eonI=
-cloud.google.com/go/secretmanager v1.16.0 h1:19QT7ZsLJ8FSP1k+4esQvuCD7npMJml6hYzilxVyT+k=
-cloud.google.com/go/secretmanager v1.16.0/go.mod h1://C/e4I8D26SDTz1f3TQcddhcmiC3rMEl0S1Cakvs3Q=
-cloud.google.com/go/storage v1.57.1 h1:gzao6odNJ7dR3XXYvAgPK+Iw4fVPPznEPPyNjbaVkq8=
-cloud.google.com/go/storage v1.57.1/go.mod h1:329cwlpzALLgJuu8beyJ/uvQznDHpa2U5lGjWednkzg=
-github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.30.0 h1:sBEjpZlNHzK1voKq9695PJSX2o5NEXl7/OL3coiIY0c=
-github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.30.0/go.mod h1:P4WPRUkOhJC13W//jWpyfJNDAIpvRbAUIYLX/4jtlE0=
-github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.53.0 h1:owcC2UnmsZycprQ5RfRgjydWhuoxg71LUfyiQdijZuM=
-github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.53.0/go.mod h1:ZPpqegjbE99EPKsu3iUWV22A04wzGPcAY/ziSIQEEgs=
-github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.53.0 h1:Ron4zCA/yk6U7WOBXhTJcDpsUBG9npumK6xw2auFltQ=
-github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.53.0/go.mod h1:cSgYe11MCNYunTnRXrKiR/tHc0eoKjICUuWpNZoVCOo=
-github.com/bahlo/generic-list-go v0.2.0 h1:5sz/EEAK+ls5wF+NeqDpk5+iNdMDXrh3z3nPnH1Wvgk=
-github.com/bahlo/generic-list-go v0.2.0/go.mod h1:2KvAjgMlE5NNynlg/5iLrrCCZ2+5xWbdbCW3pNTGyYg=
-github.com/buger/jsonparser v1.1.1 h1:2PnMjfWD7wBILjqQbt530v576A/cAbQvEW9gGIpYMUs=
-github.com/buger/jsonparser v1.1.1/go.mod h1:6RYKKt7H4d4+iWqouImQ9R2FZql3VbhNgx27UK13J/0=
-github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs=
-github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
-github.com/cncf/xds/go v0.0.0-20251014123835-2ee22ca58382 h1:5IeUoAZvqwF6LcCnV99NbhrGKN6ihZgahJv5jKjmZ3k=
-github.com/cncf/xds/go v0.0.0-20251014123835-2ee22ca58382/go.mod h1:HlzOvOjVBOfTGSRXRyY0OiCS/3J1akRGQQpRO/7zyF4=
-github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
-github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/envoyproxy/go-control-plane v0.13.4 h1:zEqyPVyku6IvWCFwux4x9RxkLOMUL+1vC9xUFv5l2/M=
-github.com/envoyproxy/go-control-plane/envoy v1.35.0 h1:ixjkELDE+ru6idPxcHLj8LBVc2bFP7iBytj353BoHUo=
-github.com/envoyproxy/go-control-plane/envoy v1.35.0/go.mod h1:09qwbGVuSWWAyN5t/b3iyVfz5+z8QWGrzkoqm/8SbEs=
-github.com/envoyproxy/protoc-gen-validate v1.2.1 h1:DEo3O99U8j4hBFwbJfrz9VtgcDfUKS7KJ7spH3d86P8=
-github.com/envoyproxy/protoc-gen-validate v1.2.1/go.mod h1:d/C80l/jxXLdfEIhX1W2TmLfsJ31lvEjwamM4DxlWXU=
-github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg=
-github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
-github.com/firebase/genkit/go v1.2.0 h1:C31p32vdMZhhSSQQvXouH/kkcleTH4jlgFmpqlJtBS4=
-github.com/firebase/genkit/go v1.2.0/go.mod h1:ru1cIuxG1s3HeUjhnadVveDJ1yhinj+j+uUh0f0pyxE=
-github.com/go-jose/go-jose/v4 v4.1.3 h1:CVLmWDhDVRa6Mi/IgCgaopNosCaHz7zrMeF9MlZRkrs=
-github.com/go-jose/go-jose/v4 v4.1.3/go.mod h1:x4oUasVrzR7071A4TnHLGSPpNOm2a21K9Kf04k1rs08=
-github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
-github.com/go-logr/logr v1.4.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI=
-github.com/go-logr/logr v1.4.3/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
-github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=
-github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE=
-github.com/goccy/go-yaml v1.17.1 h1:LI34wktB2xEE3ONG/2Ar54+/HJVBriAGJ55PHls4YuY=
-github.com/goccy/go-yaml v1.17.1/go.mod h1:XBurs7gK8ATbW4ZPGKgcbrY1Br56PdM69F7LkFRi1kA=
-github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek=
-github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps=
-github.com/google/dotprompt/go v0.0.0-20251014011017-8d056e027254 h1:okN800+zMJOGHLJCgry+OGzhhtH6YrjQh1rluHmOacE=
-github.com/google/dotprompt/go v0.0.0-20251014011017-8d056e027254/go.mod h1:k8cjJAQWc//ac/bMnzItyOFbfT01tgRTZGgxELCuxEQ=
-github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
-github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
-github.com/google/s2a-go v0.1.9 h1:LGD7gtMgezd8a/Xak7mEWL0PjoTQFvpRudN895yqKW0=
-github.com/google/s2a-go v0.1.9/go.mod h1:YA0Ei2ZQL3acow2O62kdp9UlnvMmU7kA6Eutn0dXayM=
-github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
-github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/googleapis/enterprise-certificate-proxy v0.3.6 h1:GW/XbdyBFQ8Qe+YAmFU9uHLo7OnF5tL52HFAgMmyrf4=
-github.com/googleapis/enterprise-certificate-proxy v0.3.6/go.mod h1:MkHOF77EYAE7qfSuSS9PU6g4Nt4e11cnsDUowfwewLA=
-github.com/googleapis/gax-go/v2 v2.15.0 h1:SyjDc1mGgZU5LncH8gimWo9lW1DtIfPibOG81vgd/bo=
-github.com/googleapis/gax-go/v2 v2.15.0/go.mod h1:zVVkkxAQHa1RQpg9z2AUCMnKhi0Qld9rcmyfL1OZhoc=
-github.com/googleapis/mcp-toolbox-sdk-go v0.4.0 h1:SYJRZzmOyXs9anKp+dfq4rprO92KKnxNyJCCsLkW7nw=
-github.com/googleapis/mcp-toolbox-sdk-go v0.4.0/go.mod h1:ivRLILO1B72J2HWCjSStemdhTWccjfW9FnEj4SAM81w=
-github.com/gorilla/websocket v1.5.3 h1:saDtZ6Pbx/0u+bgYQ3q96pZgCzfhKXGPqt7kZ72aNNg=
-github.com/gorilla/websocket v1.5.3/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
-github.com/invopop/jsonschema v0.13.0 h1:KvpoAJWEjR3uD9Kbm2HWJmqsEaHt8lBUpd0qHcIi21E=
-github.com/invopop/jsonschema v0.13.0/go.mod h1:ffZ5Km5SWWRAIN6wbDXItl95euhFz2uON45H2qjYt+0=
-github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
-github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
-github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
-github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
-github.com/mailru/easyjson v0.9.0 h1:PrnmzHw7262yW8sTBwxi1PdJA3Iw/EKBa8psRf7d9a4=
-github.com/mailru/easyjson v0.9.0/go.mod h1:1+xMtQp2MRNVL/V1bOzuP3aP8VNwRW55fQUto+XFtTU=
-github.com/mbleigh/raymond v0.0.0-20250414171441-6b3a58ab9e0a h1:v2cBA3xWKv2cIOVhnzX/gNgkNXqiHfUgJtA3r61Hf7A=
-github.com/mbleigh/raymond v0.0.0-20250414171441-6b3a58ab9e0a/go.mod h1:Y6ghKH+ZijXn5d9E7qGGZBmjitx7iitZdQiIW97EpTU=
-github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 h1:GFCKgmp0tecUJ0sJuv4pzYCqS9+RGSn52M3FUwPs+uo=
-github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10/go.mod h1:t/avpk3KcrXxUnYOhZhMXJlSEyie6gQbtLq5NM3loB8=
-github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U=
-github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0tI/otEQ=
-github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7so1lCWt35ZSgc=
-github.com/spiffe/go-spiffe/v2 v2.6.0 h1:l+DolpxNWYgruGQVV0xsfeya3CsC7m8iBzDnMpsbLuo=
-github.com/spiffe/go-spiffe/v2 v2.6.0/go.mod h1:gm2SeUoMZEtpnzPNs2Csc0D/gX33k1xIx7lEzqblHEs=
-github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
-github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
-github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
-github.com/wk8/go-ordered-map/v2 v2.1.8 h1:5h/BUHu93oj4gIdvHHHGsScSTMijfx5PeYkE/fJgbpc=
-github.com/wk8/go-ordered-map/v2 v2.1.8/go.mod h1:5nJHM5DyteebpVlHnWMV0rPz6Zp7+xBAnxjb1X5vnTw=
-github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU=
-github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb h1:zGWFAtiMcyryUHoUjUJX0/lt1H2+i2Ka2n+D3DImSNo=
-github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU=
-github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 h1:EzJWgHovont7NscjpAxXsDA8S8BMYve8Y5+7cuRE7R0=
-github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod h1:GwrjFmJcFw6At/Gs6z4yjiIwzuJ1/+UwLxMQDVQXShQ=
-github.com/xeipuuv/gojsonschema v1.2.0 h1:LhYJRs+L4fBtjZUfuSZIKGeVu0QRy8e5Xi7D17UxZ74=
-github.com/xeipuuv/gojsonschema v1.2.0/go.mod h1:anYRn/JVcOK2ZgGU+IjEV4nwlhoK5sQluxsYJ78Id3Y=
-github.com/yosida95/uritemplate/v3 v3.0.2 h1:Ed3Oyj9yrmi9087+NczuL5BwkIc4wvTb5zIM+UJPGz4=
-github.com/yosida95/uritemplate/v3 v3.0.2/go.mod h1:ILOh0sOhIJR3+L/8afwt/kE++YT040gmv5BQTMR2HP4=
-go.opentelemetry.io/auto/sdk v1.2.1 h1:jXsnJ4Lmnqd11kwkBV2LgLoFMZKizbCi5fNZ/ipaZ64=
-go.opentelemetry.io/auto/sdk v1.2.1/go.mod h1:KRTj+aOaElaLi+wW1kO/DZRXwkF4C5xPbEe3ZiIhN7Y=
-go.opentelemetry.io/contrib/detectors/gcp v1.38.0 h1:ZoYbqX7OaA/TAikspPl3ozPI6iY6LiIY9I8cUfm+pJs=
-go.opentelemetry.io/contrib/detectors/gcp v1.38.0/go.mod h1:SU+iU7nu5ud4oCb3LQOhIZ3nRLj6FNVrKgtflbaf2ts=
-go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.63.0 h1:YH4g8lQroajqUwWbq/tr2QX1JFmEXaDLgG+ew9bLMWo=
-go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.63.0/go.mod h1:fvPi2qXDqFs8M4B4fmJhE92TyQs9Ydjlg3RvfUp+NbQ=
-go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.63.0 h1:RbKq8BG0FI8OiXhBfcRtqqHcZcka+gU3cskNuf05R18=
-go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.63.0/go.mod h1:h06DGIukJOevXaj/xrNjhi/2098RZzcLTbc0jDAUbsg=
-go.opentelemetry.io/otel v1.38.0 h1:RkfdswUDRimDg0m2Az18RKOsnI8UDzppJAtj01/Ymk8=
-go.opentelemetry.io/otel v1.38.0/go.mod h1:zcmtmQ1+YmQM9wrNsTGV/q/uyusom3P8RxwExxkZhjM=
-go.opentelemetry.io/otel/metric v1.38.0 h1:Kl6lzIYGAh5M159u9NgiRkmoMKjvbsKtYRwgfrA6WpA=
-go.opentelemetry.io/otel/metric v1.38.0/go.mod h1:kB5n/QoRM8YwmUahxvI3bO34eVtQf2i4utNVLr9gEmI=
-go.opentelemetry.io/otel/sdk v1.38.0 h1:l48sr5YbNf2hpCUj/FoGhW9yDkl+Ma+LrVl8qaM5b+E=
-go.opentelemetry.io/otel/sdk v1.38.0/go.mod h1:ghmNdGlVemJI3+ZB5iDEuk4bWA3GkTpW+DOoZMYBVVg=
-go.opentelemetry.io/otel/sdk/metric v1.38.0 h1:aSH66iL0aZqo//xXzQLYozmWrXxyFkBJ6qT5wthqPoM=
-go.opentelemetry.io/otel/sdk/metric v1.38.0/go.mod h1:dg9PBnW9XdQ1Hd6ZnRz689CbtrUp0wMMs9iPcgT9EZA=
-go.opentelemetry.io/otel/trace v1.38.0 h1:Fxk5bKrDZJUH+AMyyIXGcFAPah0oRcT+LuNtJrmcNLE=
-go.opentelemetry.io/otel/trace v1.38.0/go.mod h1:j1P9ivuFsTceSWe1oY+EeW3sc+Pp42sO++GHkg4wwhs=
-go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
-go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
-golang.org/x/crypto v0.45.0 h1:jMBrvKuj23MTlT0bQEOBcAE0mjg8mK9RXFhRH6nyF3Q=
-golang.org/x/crypto v0.45.0/go.mod h1:XTGrrkGJve7CYK7J8PEww4aY7gM3qMCElcJQ8n8JdX4=
-golang.org/x/net v0.47.0 h1:Mx+4dIFzqraBXUugkia1OOvlD6LemFo1ALMHjrXDOhY=
-golang.org/x/net v0.47.0/go.mod h1:/jNxtkgq5yWUGYkaZGqo27cfGZ1c5Nen03aYrrKpVRU=
-golang.org/x/oauth2 v0.32.0 h1:jsCblLleRMDrxMN29H3z/k1KliIvpLgCkE6R8FXXNgY=
-golang.org/x/oauth2 v0.32.0/go.mod h1:lzm5WQJQwKZ3nwavOZ3IS5Aulzxi68dUSgRHujetwEA=
-golang.org/x/sync v0.18.0 h1:kr88TuHDroi+UVf+0hZnirlk8o8T+4MrK6mr60WkH/I=
-golang.org/x/sync v0.18.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI=
-golang.org/x/sys v0.38.0 h1:3yZWxaJjBmCWXqhN1qh02AkOnCQ1poK6oF+a7xWL6Gc=
-golang.org/x/sys v0.38.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
-golang.org/x/text v0.31.0 h1:aC8ghyu4JhP8VojJ2lEHBnochRno1sgL6nEi9WGFGMM=
-golang.org/x/text v0.31.0/go.mod h1:tKRAlv61yKIjGGHX/4tP1LTbc13YSec1pxVEWXzfoeM=
-golang.org/x/time v0.14.0 h1:MRx4UaLrDotUKUdCIqzPC48t1Y9hANFKIRpNx+Te8PI=
-golang.org/x/time v0.14.0/go.mod h1:eL/Oa2bBBK0TkX57Fyni+NgnyQQN4LitPmob2Hjnqw4=
-gonum.org/v1/gonum v0.16.0 h1:5+ul4Swaf3ESvrOnidPp4GZbzf0mxVQpDCYUQE7OJfk=
-gonum.org/v1/gonum v0.16.0/go.mod h1:fef3am4MQ93R2HHpKnLk4/Tbh/s0+wqD5nfa6Pnwy4E=
-google.golang.org/api v0.255.0 h1:OaF+IbRwOottVCYV2wZan7KUq7UeNUQn1BcPc4K7lE4=
-google.golang.org/api v0.255.0/go.mod h1:d1/EtvCLdtiWEV4rAEHDHGh2bCnqsWhw+M8y2ECN4a8=
-google.golang.org/genai v1.34.0 h1:lPRJRO+HqRX1SwFo1Xb/22nZ5MBEPUbXDl61OoDxlbY=
-google.golang.org/genai v1.34.0/go.mod h1:7pAilaICJlQBonjKKJNhftDFv3SREhZcTe9F6nRcjbg=
-google.golang.org/genproto v0.0.0-20251014184007-4626949a642f h1:vLd1CJuJOUgV6qijD7KT5Y2ZtC97ll4dxjTUappMnbo=
-google.golang.org/genproto v0.0.0-20251014184007-4626949a642f/go.mod h1:PI3KrSadr00yqfv6UDvgZGFsmLqeRIwt8x4p5Oo7CdM=
-google.golang.org/genproto/googleapis/api v0.0.0-20251014184007-4626949a642f h1:OiFuztEyBivVKDvguQJYWq1yDcfAHIID/FVrPR4oiI0=
-google.golang.org/genproto/googleapis/api v0.0.0-20251014184007-4626949a642f/go.mod h1:kprOiu9Tr0JYyD6DORrc4Hfyk3RFXqkQ3ctHEum3ZbM=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20251029180050-ab9386a59fda h1:i/Q+bfisr7gq6feoJnS/DlpdwEL4ihp41fvRiM3Ork0=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20251029180050-ab9386a59fda/go.mod h1:7i2o+ce6H/6BluujYR+kqX3GKH+dChPTQU19wjRPiGk=
-google.golang.org/grpc v1.76.0 h1:UnVkv1+uMLYXoIz6o7chp59WfQUYA2ex/BXQ9rHZu7A=
-google.golang.org/grpc v1.76.0/go.mod h1:Ju12QI8M6iQJtbcsV+awF5a4hfJMLi4X0JLo94ULZ6c=
-google.golang.org/protobuf v1.36.10 h1:AYd7cD/uASjIL6Q9LiTjz8JLcrh/88q5UObnmY3aOOE=
-google.golang.org/protobuf v1.36.10/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
-gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
-gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
-gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
--- a/docs/en/getting-started/quickstart/go/genkit/quickstart.go
+++ b/docs/en/getting-started/quickstart/go/genkit/quickstart.go
@@ -1,129 +0,0 @@
-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 := genkit.Init(ctx,
-		genkit.WithPlugins(&googlegenai.GoogleAI{}),
-		genkit.WithDefaultModel("googleai/gemini-2.0-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())
-		}
-
-	}
-
-}
--- a/docs/en/getting-started/quickstart/go/langchain/go.mod
+++ b/docs/en/getting-started/quickstart/go/langchain/go.mod
@@ -1,49 +0,0 @@
-module langchan-quickstart
-
-go 1.24.6
-
-require (
-	github.com/googleapis/mcp-toolbox-sdk-go v0.4.0
-	github.com/tmc/langchaingo v0.1.14
-)
-
-require (
-	cloud.google.com/go v0.123.0 // indirect
-	cloud.google.com/go/ai v0.7.0 // indirect
-	cloud.google.com/go/aiplatform v1.105.0 // indirect
-	cloud.google.com/go/auth v0.17.0 // indirect
-	cloud.google.com/go/auth/oauth2adapt v0.2.8 // indirect
-	cloud.google.com/go/compute/metadata v0.9.0 // indirect
-	cloud.google.com/go/iam v1.5.3 // indirect
-	cloud.google.com/go/longrunning v0.6.7 // indirect
-	cloud.google.com/go/vertexai v0.12.0 // indirect
-	github.com/dlclark/regexp2 v1.10.0 // indirect
-	github.com/felixge/httpsnoop v1.0.4 // indirect
-	github.com/go-logr/logr v1.4.3 // indirect
-	github.com/go-logr/stdr v1.2.2 // indirect
-	github.com/google/generative-ai-go v0.15.1 // indirect
-	github.com/google/s2a-go v0.1.9 // indirect
-	github.com/google/uuid v1.6.0 // indirect
-	github.com/googleapis/enterprise-certificate-proxy v0.3.6 // indirect
-	github.com/googleapis/gax-go/v2 v2.15.0 // indirect
-	github.com/pkoukk/tiktoken-go v0.1.6 // indirect
-	go.opentelemetry.io/auto/sdk v1.2.1 // indirect
-	go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.63.0 // indirect
-	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.63.0 // indirect
-	go.opentelemetry.io/otel v1.38.0 // indirect
-	go.opentelemetry.io/otel/metric v1.38.0 // indirect
-	go.opentelemetry.io/otel/trace v1.38.0 // indirect
-	golang.org/x/crypto v0.45.0 // indirect
-	golang.org/x/net v0.47.0 // indirect
-	golang.org/x/oauth2 v0.32.0 // indirect
-	golang.org/x/sync v0.18.0 // indirect
-	golang.org/x/sys v0.38.0 // indirect
-	golang.org/x/text v0.31.0 // indirect
-	golang.org/x/time v0.14.0 // indirect
-	google.golang.org/api v0.255.0 // indirect
-	google.golang.org/genproto v0.0.0-20251014184007-4626949a642f // indirect
-	google.golang.org/genproto/googleapis/api v0.0.0-20251014184007-4626949a642f // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20251029180050-ab9386a59fda // indirect
-	google.golang.org/grpc v1.76.0 // indirect
-	google.golang.org/protobuf v1.36.10 // indirect
-)
--- a/docs/en/getting-started/quickstart/go/langchain/go.sum
+++ b/docs/en/getting-started/quickstart/go/langchain/go.sum
@@ -1,136 +0,0 @@
-cel.dev/expr v0.24.0 h1:56OvJKSH3hDGL0ml5uSxZmz3/3Pq4tJ+fb1unVLAFcY=
-cel.dev/expr v0.24.0/go.mod h1:hLPLo1W4QUmuYdA72RBX06QTs6MXw941piREPl3Yfiw=
-cloud.google.com/go v0.123.0 h1:2NAUJwPR47q+E35uaJeYoNhuNEM9kM8SjgRgdeOJUSE=
-cloud.google.com/go v0.123.0/go.mod h1:xBoMV08QcqUGuPW65Qfm1o9Y4zKZBpGS+7bImXLTAZU=
-cloud.google.com/go/ai v0.7.0 h1:P6+b5p4gXlza5E+u7uvcgYlzZ7103ACg70YdZeC6oGE=
-cloud.google.com/go/ai v0.7.0/go.mod h1:7ozuEcraovh4ABsPbrec3o4LmFl9HigNI3D5haxYeQo=
-cloud.google.com/go/aiplatform v1.105.0 h1:Tbc2iEp7vbzgk6Vs4QexfNo8/nl+E+Na+FEreRZdhcM=
-cloud.google.com/go/aiplatform v1.105.0/go.mod h1:4rwKOMdubQOND81AlO3EckcskvEFCYSzXKfn42GMm8k=
-cloud.google.com/go/auth v0.17.0 h1:74yCm7hCj2rUyyAocqnFzsAYXgJhrG26XCFimrc/Kz4=
-cloud.google.com/go/auth v0.17.0/go.mod h1:6wv/t5/6rOPAX4fJiRjKkJCvswLwdet7G8+UGXt7nCQ=
-cloud.google.com/go/auth/oauth2adapt v0.2.8 h1:keo8NaayQZ6wimpNSmW5OPc283g65QNIiLpZnkHRbnc=
-cloud.google.com/go/auth/oauth2adapt v0.2.8/go.mod h1:XQ9y31RkqZCcwJWNSx2Xvric3RrU88hAYYbjDWYDL+c=
-cloud.google.com/go/compute/metadata v0.9.0 h1:pDUj4QMoPejqq20dK0Pg2N4yG9zIkYGdBtwLoEkH9Zs=
-cloud.google.com/go/compute/metadata v0.9.0/go.mod h1:E0bWwX5wTnLPedCKqk3pJmVgCBSM6qQI1yTBdEb3C10=
-cloud.google.com/go/iam v1.5.3 h1:+vMINPiDF2ognBJ97ABAYYwRgsaqxPbQDlMnbHMjolc=
-cloud.google.com/go/iam v1.5.3/go.mod h1:MR3v9oLkZCTlaqljW6Eb2d3HGDGK5/bDv93jhfISFvU=
-cloud.google.com/go/longrunning v0.6.7 h1:IGtfDWHhQCgCjwQjV9iiLnUta9LBCo8R9QmAFsS/PrE=
-cloud.google.com/go/longrunning v0.6.7/go.mod h1:EAFV3IZAKmM56TyiE6VAP3VoTzhZzySwI/YI1s/nRsY=
-cloud.google.com/go/monitoring v1.24.3 h1:dde+gMNc0UhPZD1Azu6at2e79bfdztVDS5lvhOdsgaE=
-cloud.google.com/go/monitoring v1.24.3/go.mod h1:nYP6W0tm3N9H/bOw8am7t62YTzZY+zUeQ+Bi6+2eonI=
-cloud.google.com/go/secretmanager v1.16.0 h1:19QT7ZsLJ8FSP1k+4esQvuCD7npMJml6hYzilxVyT+k=
-cloud.google.com/go/secretmanager v1.16.0/go.mod h1://C/e4I8D26SDTz1f3TQcddhcmiC3rMEl0S1Cakvs3Q=
-cloud.google.com/go/storage v1.57.1 h1:gzao6odNJ7dR3XXYvAgPK+Iw4fVPPznEPPyNjbaVkq8=
-cloud.google.com/go/storage v1.57.1/go.mod h1:329cwlpzALLgJuu8beyJ/uvQznDHpa2U5lGjWednkzg=
-cloud.google.com/go/vertexai v0.12.0 h1:zTadEo/CtsoyRXNx3uGCncoWAP1H2HakGqwznt+iMo8=
-cloud.google.com/go/vertexai v0.12.0/go.mod h1:8u+d0TsvBfAAd2x5R6GMgbYhsLgo3J7lmP4bR8g2ig8=
-github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.30.0 h1:sBEjpZlNHzK1voKq9695PJSX2o5NEXl7/OL3coiIY0c=
-github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.30.0/go.mod h1:P4WPRUkOhJC13W//jWpyfJNDAIpvRbAUIYLX/4jtlE0=
-github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.53.0 h1:owcC2UnmsZycprQ5RfRgjydWhuoxg71LUfyiQdijZuM=
-github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.53.0/go.mod h1:ZPpqegjbE99EPKsu3iUWV22A04wzGPcAY/ziSIQEEgs=
-github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.53.0 h1:Ron4zCA/yk6U7WOBXhTJcDpsUBG9npumK6xw2auFltQ=
-github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.53.0/go.mod h1:cSgYe11MCNYunTnRXrKiR/tHc0eoKjICUuWpNZoVCOo=
-github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs=
-github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
-github.com/cncf/xds/go v0.0.0-20251014123835-2ee22ca58382 h1:5IeUoAZvqwF6LcCnV99NbhrGKN6ihZgahJv5jKjmZ3k=
-github.com/cncf/xds/go v0.0.0-20251014123835-2ee22ca58382/go.mod h1:HlzOvOjVBOfTGSRXRyY0OiCS/3J1akRGQQpRO/7zyF4=
-github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
-github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/dlclark/regexp2 v1.10.0 h1:+/GIL799phkJqYW+3YbOd8LCcbHzT0Pbo8zl70MHsq0=
-github.com/dlclark/regexp2 v1.10.0/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8=
-github.com/envoyproxy/go-control-plane v0.13.4 h1:zEqyPVyku6IvWCFwux4x9RxkLOMUL+1vC9xUFv5l2/M=
-github.com/envoyproxy/go-control-plane/envoy v1.35.0 h1:ixjkELDE+ru6idPxcHLj8LBVc2bFP7iBytj353BoHUo=
-github.com/envoyproxy/go-control-plane/envoy v1.35.0/go.mod h1:09qwbGVuSWWAyN5t/b3iyVfz5+z8QWGrzkoqm/8SbEs=
-github.com/envoyproxy/protoc-gen-validate v1.2.1 h1:DEo3O99U8j4hBFwbJfrz9VtgcDfUKS7KJ7spH3d86P8=
-github.com/envoyproxy/protoc-gen-validate v1.2.1/go.mod h1:d/C80l/jxXLdfEIhX1W2TmLfsJ31lvEjwamM4DxlWXU=
-github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg=
-github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
-github.com/go-jose/go-jose/v4 v4.1.3 h1:CVLmWDhDVRa6Mi/IgCgaopNosCaHz7zrMeF9MlZRkrs=
-github.com/go-jose/go-jose/v4 v4.1.3/go.mod h1:x4oUasVrzR7071A4TnHLGSPpNOm2a21K9Kf04k1rs08=
-github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
-github.com/go-logr/logr v1.4.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI=
-github.com/go-logr/logr v1.4.3/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
-github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=
-github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE=
-github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek=
-github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps=
-github.com/google/generative-ai-go v0.15.1 h1:n8aQUpvhPOlGVuM2DRkJ2jvx04zpp42B778AROJa+pQ=
-github.com/google/generative-ai-go v0.15.1/go.mod h1:AAucpWZjXsDKhQYWvCYuP6d0yB1kX998pJlOW1rAesw=
-github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
-github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
-github.com/google/s2a-go v0.1.9 h1:LGD7gtMgezd8a/Xak7mEWL0PjoTQFvpRudN895yqKW0=
-github.com/google/s2a-go v0.1.9/go.mod h1:YA0Ei2ZQL3acow2O62kdp9UlnvMmU7kA6Eutn0dXayM=
-github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
-github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/googleapis/enterprise-certificate-proxy v0.3.6 h1:GW/XbdyBFQ8Qe+YAmFU9uHLo7OnF5tL52HFAgMmyrf4=
-github.com/googleapis/enterprise-certificate-proxy v0.3.6/go.mod h1:MkHOF77EYAE7qfSuSS9PU6g4Nt4e11cnsDUowfwewLA=
-github.com/googleapis/gax-go/v2 v2.15.0 h1:SyjDc1mGgZU5LncH8gimWo9lW1DtIfPibOG81vgd/bo=
-github.com/googleapis/gax-go/v2 v2.15.0/go.mod h1:zVVkkxAQHa1RQpg9z2AUCMnKhi0Qld9rcmyfL1OZhoc=
-github.com/googleapis/mcp-toolbox-sdk-go v0.4.0 h1:SYJRZzmOyXs9anKp+dfq4rprO92KKnxNyJCCsLkW7nw=
-github.com/googleapis/mcp-toolbox-sdk-go v0.4.0/go.mod h1:ivRLILO1B72J2HWCjSStemdhTWccjfW9FnEj4SAM81w=
-github.com/pkoukk/tiktoken-go v0.1.6 h1:JF0TlJzhTbrI30wCvFuiw6FzP2+/bR+FIxUdgEAcUsw=
-github.com/pkoukk/tiktoken-go v0.1.6/go.mod h1:9NiV+i9mJKGj1rYOT+njbv+ZwA/zJxYdewGl6qVatpg=
-github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 h1:GFCKgmp0tecUJ0sJuv4pzYCqS9+RGSn52M3FUwPs+uo=
-github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10/go.mod h1:t/avpk3KcrXxUnYOhZhMXJlSEyie6gQbtLq5NM3loB8=
-github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U=
-github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/spiffe/go-spiffe/v2 v2.6.0 h1:l+DolpxNWYgruGQVV0xsfeya3CsC7m8iBzDnMpsbLuo=
-github.com/spiffe/go-spiffe/v2 v2.6.0/go.mod h1:gm2SeUoMZEtpnzPNs2Csc0D/gX33k1xIx7lEzqblHEs=
-github.com/stretchr/objx v0.5.2 h1:xuMeJ0Sdp5ZMRXx/aWO6RZxdr3beISkG5/G/aIRr3pY=
-github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA=
-github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
-github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
-github.com/tmc/langchaingo v0.1.14 h1:o1qWBPigAIuFvrG6cjTFo0cZPFEZ47ZqpOYMjM15yZc=
-github.com/tmc/langchaingo v0.1.14/go.mod h1:aKKYXYoqhIDEv7WKdpnnCLRaqXic69cX9MnDUk72378=
-go.opentelemetry.io/auto/sdk v1.2.1 h1:jXsnJ4Lmnqd11kwkBV2LgLoFMZKizbCi5fNZ/ipaZ64=
-go.opentelemetry.io/auto/sdk v1.2.1/go.mod h1:KRTj+aOaElaLi+wW1kO/DZRXwkF4C5xPbEe3ZiIhN7Y=
-go.opentelemetry.io/contrib/detectors/gcp v1.38.0 h1:ZoYbqX7OaA/TAikspPl3ozPI6iY6LiIY9I8cUfm+pJs=
-go.opentelemetry.io/contrib/detectors/gcp v1.38.0/go.mod h1:SU+iU7nu5ud4oCb3LQOhIZ3nRLj6FNVrKgtflbaf2ts=
-go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.63.0 h1:YH4g8lQroajqUwWbq/tr2QX1JFmEXaDLgG+ew9bLMWo=
-go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.63.0/go.mod h1:fvPi2qXDqFs8M4B4fmJhE92TyQs9Ydjlg3RvfUp+NbQ=
-go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.63.0 h1:RbKq8BG0FI8OiXhBfcRtqqHcZcka+gU3cskNuf05R18=
-go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.63.0/go.mod h1:h06DGIukJOevXaj/xrNjhi/2098RZzcLTbc0jDAUbsg=
-go.opentelemetry.io/otel v1.38.0 h1:RkfdswUDRimDg0m2Az18RKOsnI8UDzppJAtj01/Ymk8=
-go.opentelemetry.io/otel v1.38.0/go.mod h1:zcmtmQ1+YmQM9wrNsTGV/q/uyusom3P8RxwExxkZhjM=
-go.opentelemetry.io/otel/metric v1.38.0 h1:Kl6lzIYGAh5M159u9NgiRkmoMKjvbsKtYRwgfrA6WpA=
-go.opentelemetry.io/otel/metric v1.38.0/go.mod h1:kB5n/QoRM8YwmUahxvI3bO34eVtQf2i4utNVLr9gEmI=
-go.opentelemetry.io/otel/sdk v1.38.0 h1:l48sr5YbNf2hpCUj/FoGhW9yDkl+Ma+LrVl8qaM5b+E=
-go.opentelemetry.io/otel/sdk v1.38.0/go.mod h1:ghmNdGlVemJI3+ZB5iDEuk4bWA3GkTpW+DOoZMYBVVg=
-go.opentelemetry.io/otel/sdk/metric v1.38.0 h1:aSH66iL0aZqo//xXzQLYozmWrXxyFkBJ6qT5wthqPoM=
-go.opentelemetry.io/otel/sdk/metric v1.38.0/go.mod h1:dg9PBnW9XdQ1Hd6ZnRz689CbtrUp0wMMs9iPcgT9EZA=
-go.opentelemetry.io/otel/trace v1.38.0 h1:Fxk5bKrDZJUH+AMyyIXGcFAPah0oRcT+LuNtJrmcNLE=
-go.opentelemetry.io/otel/trace v1.38.0/go.mod h1:j1P9ivuFsTceSWe1oY+EeW3sc+Pp42sO++GHkg4wwhs=
-golang.org/x/crypto v0.45.0 h1:jMBrvKuj23MTlT0bQEOBcAE0mjg8mK9RXFhRH6nyF3Q=
-golang.org/x/crypto v0.45.0/go.mod h1:XTGrrkGJve7CYK7J8PEww4aY7gM3qMCElcJQ8n8JdX4=
-golang.org/x/net v0.47.0 h1:Mx+4dIFzqraBXUugkia1OOvlD6LemFo1ALMHjrXDOhY=
-golang.org/x/net v0.47.0/go.mod h1:/jNxtkgq5yWUGYkaZGqo27cfGZ1c5Nen03aYrrKpVRU=
-golang.org/x/oauth2 v0.32.0 h1:jsCblLleRMDrxMN29H3z/k1KliIvpLgCkE6R8FXXNgY=
-golang.org/x/oauth2 v0.32.0/go.mod h1:lzm5WQJQwKZ3nwavOZ3IS5Aulzxi68dUSgRHujetwEA=
-golang.org/x/sync v0.18.0 h1:kr88TuHDroi+UVf+0hZnirlk8o8T+4MrK6mr60WkH/I=
-golang.org/x/sync v0.18.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI=
-golang.org/x/sys v0.38.0 h1:3yZWxaJjBmCWXqhN1qh02AkOnCQ1poK6oF+a7xWL6Gc=
-golang.org/x/sys v0.38.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
-golang.org/x/text v0.31.0 h1:aC8ghyu4JhP8VojJ2lEHBnochRno1sgL6nEi9WGFGMM=
-golang.org/x/text v0.31.0/go.mod h1:tKRAlv61yKIjGGHX/4tP1LTbc13YSec1pxVEWXzfoeM=
-golang.org/x/time v0.14.0 h1:MRx4UaLrDotUKUdCIqzPC48t1Y9hANFKIRpNx+Te8PI=
-golang.org/x/time v0.14.0/go.mod h1:eL/Oa2bBBK0TkX57Fyni+NgnyQQN4LitPmob2Hjnqw4=
-gonum.org/v1/gonum v0.16.0 h1:5+ul4Swaf3ESvrOnidPp4GZbzf0mxVQpDCYUQE7OJfk=
-gonum.org/v1/gonum v0.16.0/go.mod h1:fef3am4MQ93R2HHpKnLk4/Tbh/s0+wqD5nfa6Pnwy4E=
-google.golang.org/api v0.255.0 h1:OaF+IbRwOottVCYV2wZan7KUq7UeNUQn1BcPc4K7lE4=
-google.golang.org/api v0.255.0/go.mod h1:d1/EtvCLdtiWEV4rAEHDHGh2bCnqsWhw+M8y2ECN4a8=
-google.golang.org/genproto v0.0.0-20251014184007-4626949a642f h1:vLd1CJuJOUgV6qijD7KT5Y2ZtC97ll4dxjTUappMnbo=
-google.golang.org/genproto v0.0.0-20251014184007-4626949a642f/go.mod h1:PI3KrSadr00yqfv6UDvgZGFsmLqeRIwt8x4p5Oo7CdM=
-google.golang.org/genproto/googleapis/api v0.0.0-20251014184007-4626949a642f h1:OiFuztEyBivVKDvguQJYWq1yDcfAHIID/FVrPR4oiI0=
-google.golang.org/genproto/googleapis/api v0.0.0-20251014184007-4626949a642f/go.mod h1:kprOiu9Tr0JYyD6DORrc4Hfyk3RFXqkQ3ctHEum3ZbM=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20251029180050-ab9386a59fda h1:i/Q+bfisr7gq6feoJnS/DlpdwEL4ihp41fvRiM3Ork0=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20251029180050-ab9386a59fda/go.mod h1:7i2o+ce6H/6BluujYR+kqX3GKH+dChPTQU19wjRPiGk=
-google.golang.org/grpc v1.76.0 h1:UnVkv1+uMLYXoIz6o7chp59WfQUYA2ex/BXQ9rHZu7A=
-google.golang.org/grpc v1.76.0/go.mod h1:Ju12QI8M6iQJtbcsV+awF5a4hfJMLi4X0JLo94ULZ6c=
-google.golang.org/protobuf v1.36.10 h1:AYd7cD/uASjIL6Q9LiTjz8JLcrh/88q5UObnmY3aOOE=
-google.golang.org/protobuf v1.36.10/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco=
-gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
-gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
-gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
-gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo=
-sigs.k8s.io/yaml v1.3.0/go.mod h1:GeOyir5tyXNByN85N/dRIT9es5UQNerPYEKK56eTBm8=
--- a/docs/en/getting-started/quickstart/go/langchain/quickstart.go
+++ b/docs/en/getting-started/quickstart/go/langchain/quickstart.go
@@ -1,149 +0,0 @@
-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-2.0-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)
-
-	}
-
-}
--- a/docs/en/getting-started/quickstart/go/openAI/go.mod
+++ b/docs/en/getting-started/quickstart/go/openAI/go.mod
@@ -1,38 +0,0 @@
-module openai-quickstart
-
-go 1.24.6
-
-require (
-	github.com/googleapis/mcp-toolbox-sdk-go v0.4.0
-	github.com/openai/openai-go/v3 v3.8.1
-)
-
-require (
-	cloud.google.com/go/auth v0.17.0 // indirect
-	cloud.google.com/go/auth/oauth2adapt v0.2.8 // indirect
-	cloud.google.com/go/compute/metadata v0.9.0 // indirect
-	github.com/felixge/httpsnoop v1.0.4 // indirect
-	github.com/go-logr/logr v1.4.3 // indirect
-	github.com/go-logr/stdr v1.2.2 // indirect
-	github.com/google/s2a-go v0.1.9 // indirect
-	github.com/googleapis/enterprise-certificate-proxy v0.3.6 // indirect
-	github.com/googleapis/gax-go/v2 v2.15.0 // indirect
-	github.com/tidwall/gjson v1.18.0 // indirect
-	github.com/tidwall/match v1.1.1 // indirect
-	github.com/tidwall/pretty v1.2.1 // indirect
-	github.com/tidwall/sjson v1.2.5 // indirect
-	go.opentelemetry.io/auto/sdk v1.2.1 // indirect
-	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.63.0 // indirect
-	go.opentelemetry.io/otel v1.38.0 // indirect
-	go.opentelemetry.io/otel/metric v1.38.0 // indirect
-	go.opentelemetry.io/otel/trace v1.38.0 // indirect
-	golang.org/x/crypto v0.45.0 // indirect
-	golang.org/x/net v0.47.0 // indirect
-	golang.org/x/oauth2 v0.32.0 // indirect
-	golang.org/x/sys v0.38.0 // indirect
-	golang.org/x/text v0.31.0 // indirect
-	google.golang.org/api v0.255.0 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20251029180050-ab9386a59fda // indirect
-	google.golang.org/grpc v1.76.0 // indirect
-	google.golang.org/protobuf v1.36.10 // indirect
-)
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Yuan Teoh	fea5fed265	chore: add preprocessing layer to convert tools file	2025-09-05 17:40:07 -07:00
Yuan Teoh	a060660580	chore!: update `kind` field to `type`	2025-09-04 19:16:53 -07:00
				`@@ -1 +0,0 @@`
				`<script src='{{ .Site.BaseURL }}js/w3.js' type="application/x-javascript"></script>`
@@ -1 +1 @@
 .26.0
 .13.0