fresh installation check

.ci/integration.cloudbuild.yaml

@@ -171,23 +171,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"]
@@ -312,25 +295,6 @@ steps:
           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"]
@@ -923,7 +887,7 @@ steps:
         tar -C /usr/local -xzf go.tar.gz
         export PATH="/usr/local/go/bin:$$PATH"
 
-        go test -v ./tests/oracle/... \
+        go test -v ./internal/sources/oracle/... \
           -coverprofile=oracle_coverage.out \
           -coverpkg=./internal/sources/oracle/...,./internal/tools/oracle/...
         
@@ -931,8 +895,8 @@ steps:
         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
+        if awk -v cov="$coverage_numeric" 'BEGIN {exit !(cov < 20)}'; then
-            echo "Coverage failure: $total_coverage is below 60%."
+            echo "Coverage failure: $total_coverage is below 20%."
             exit 1
         fi
 

.ci/quickstart_test/run_js_tests.sh

@@ -77,11 +77,24 @@ run_orch_test() {
     setup_orch_table
 
     cd "$orch_dir"
+
+    echo "--- Debugging npm config for $orch_name ---"
+    npm config list
+
+    echo "--- Active Registry for $orch_name ---"
+    npm config get registry
+
+    echo "--- Inspecting .npmrc files ---"
+    [ -f ".npmrc" ] && echo "Local .npmrc content:" && cat .npmrc
+    [ -f "$HOME/.npmrc" ] && echo "Global .npmrc content:" && cat "$HOME/.npmrc"
+
+    export GPKG_DEBUG=1
+
     echo "Installing dependencies for $orch_name..."
     if [ -f "package-lock.json" ]; then
-      npm ci
+      npm ci --loglevel verbose
     else
-      npm install
+      npm install --loglevel verbose
     fi
 
     cd ..

.github/workflows/deploy_dev_docs.yaml

@@ -51,12 +51,12 @@ jobs:
           extended: true
 
       - name: Setup Node
-        uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6
+        uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6
         with:
           node-version: "22"
 
       - name: Cache dependencies
-        uses: actions/cache@8b402f58fbc84540c8b491a91e594a4576fec3d7 # v5
+        uses: actions/cache@9255dc7a253b0ccc959486e2bca901246202afeb # v5
         with:
           path: ~/.npm
           key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}

.github/workflows/deploy_previous_version_docs.yaml

@@ -57,7 +57,7 @@ jobs:
         with:
           hugo-version: "0.145.0"
           extended: true
-      - uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6
+      - uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6
         with:
           node-version: "22"
 

.github/workflows/deploy_versioned_docs.yaml

@@ -44,7 +44,7 @@ jobs:
           extended: true
 
       - name: Setup Node
-        uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6
+        uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6
         with:
           node-version: "22"
 

.github/workflows/docs_preview_deploy.yaml

@@ -62,12 +62,12 @@ jobs:
           extended: true
 
       - name: Setup Node
-        uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6
+        uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6
         with:
           node-version: "22"
 
       - name: Cache dependencies
-        uses: actions/cache@8b402f58fbc84540c8b491a91e594a4576fec3d7 # v5
+        uses: actions/cache@9255dc7a253b0ccc959486e2bca901246202afeb # v5
         with:
           path: ~/.npm
           key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}

.github/workflows/link_checker_workflow.yaml

@@ -25,7 +25,7 @@ jobs:
         uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6
 
       - name: Restore lychee cache
-        uses: actions/cache@8b402f58fbc84540c8b491a91e594a4576fec3d7 # v5
+        uses: actions/cache@9255dc7a253b0ccc959486e2bca901246202afeb # v5
         with:
           path: .lycheecache
           key: cache-lychee-${{ github.sha }}
@@ -39,7 +39,6 @@ jobs:
             --no-progress
             --cache
             --max-cache-age 1d
-            --exclude '^neo4j\+.*' --exclude '^bolt://.*'
             README.md
             docs/
           output: /tmp/foo.txt

.github/workflows/lint.yaml

@@ -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@4dc6199c7b1a012772edbd06daecab0f50c9053c # v6.1.0
         with:
           go-version: "1.25"
       - name: Checkout code
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
         with:
           ref: ${{ github.event.pull_request.head.sha }}
           repository: ${{ github.event.pull_request.head.repo.full_name }}

.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@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
       - uses: micnncim/action-label-syncer@3abd5ab72fda571e69fffd97bd4e0033dd5f495c # v1.3.0
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/tests.yaml

@@ -57,12 +57,12 @@ jobs:
             }
 
       - name: Setup Go
-        uses: actions/setup-go@7a3fe6cf4cb3a834922a1244abfce67bcef6a0c5 # v6.2.0
+        uses: actions/setup-go@4dc6199c7b1a012772edbd06daecab0f50c9053c # v6.1.0
         with:
           go-version: "1.24"
 
       - name: Checkout code
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
         with:
           ref: ${{ github.event.pull_request.head.sha }}
           repository: ${{ github.event.pull_request.head.repo.full_name }}

.hugo/hugo.toml

@@ -51,10 +51,6 @@ ignoreFiles = ["quickstart/shared", "quickstart/python", "quickstart/js", "quick
 # 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/"

.lycheeignore

@@ -39,7 +39,7 @@ 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/package/@toolbox-sdk/core
 https://www.npmjs.com/package/@toolbox-sdk/adk
-https://www.oceanbase.com/
+
 
 # Ignore social media and blog profiles to reduce external request overhead
 https://medium.com/@mcp_toolbox

CHANGELOG.md

@@ -1,30 +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)
 
 

CONTRIBUTING.md

@@ -92,11 +92,11 @@ 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:
-  * `SourceConfigType() string`: Returns a unique string identifier for your
+  * `SourceConfigKind() string`: Returns a unique string identifier for your
     data source (e.g., `"newdb"`).
   * `Initialize(ctx context.Context, tracer trace.Tracer) (Source, error)`:
     Creates a new instance of your data source and establishes a connection to
@@ -104,7 +104,7 @@ implementation](https://github.com/googleapis/genai-toolbox/blob/main/internal/s
 * **Implement the
   [`Source`](https://github.com/googleapis/genai-toolbox/blob/fd300dc606d88bf9f7bba689e2cee4e3565537dd/internal/sources/sources.go#L63)
   interface**. This interface requires one method:
-  * `SourceType() string`: Returns the same string identifier as `SourceConfigType()`.
+  * `SourceKind() string`: Returns the same string identifier as `SourceConfigKind()`.
 * **Implement `init()`** to register the new Source.
 * **Implement Unit Tests** in a file named `newdb_test.go`.
 
@@ -126,7 +126,7 @@ tools.
 * **Implement the
   [`ToolConfig`](https://github.com/googleapis/genai-toolbox/blob/fd300dc606d88bf9f7bba689e2cee4e3565537dd/internal/tools/tools.go#L61)
   interface**. This interface requires one method:
-  * `ToolConfigType() string`: Returns a unique string identifier for your tool
+  * `ToolConfigKind() string`: Returns a unique string identifier for your tool
     (e.g., `"newdb-tool"`).
   * `Initialize(sources map[string]Source) (Tool, error)`: Creates a new
     instance of your tool and validates that it can connect to the specified
@@ -243,7 +243,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-kind>` (e.g., `sources/postgres`, or
   `tools/mssql-sql`).
   
   Ideally, **each PR covers only one scope**, if this is

DEVELOPER.md

@@ -47,13 +47,12 @@ Before you begin, ensure you have the following:
 ### Tool Naming Conventions
 
 This section details the purpose and conventions for MCP Toolbox's tools naming
-properties, **tool name** and **tool type**.
+properties, **tool name** and **tool kind**.
 
 ```
-kind: tools
+cancel_hotel: <- tool name
-name: cancel_hotel <- tool name
+    kind: postgres-sql  <- tool kind
-type: postgres-sql  <- tool type
+    source: my_pg_source
-source: my_pg_source
 ```
 
 #### Tool Name
@@ -77,17 +76,17 @@ The following guidelines apply to tool names:
   to a function) until they can be validated through extensive testing to ensure
   they do not negatively impact agent's performances.
 
-#### Tool Type
+#### Tool Kind
 
-Tool type serves as a category or type that a user can assign to a tool.
+Tool kind serves as a category or type that a user can assign to a tool.
 
-The following guidelines apply to tool types:
+The following guidelines apply to tool kinds:
 
-* Should use hyphens over underscores (e.g. `firestore-list-collections` or
+* Should user 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.
+* Changes to tool kind are breaking changes and should be avoided.
 
 ## Testing
 

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)
@@ -107,7 +105,7 @@ redeploying your application.
 
 ## Getting Started
 
-### Quickstart: Running Toolbox using NPX
+### (Non-production) Running Toolbox
 
 You can run Toolbox directly with a [configuration file](#configuration):
 
@@ -142,7 +140,7 @@ To install Toolbox as a binary:
 >
 > ```sh
 > # see releases page for other versions
-> export VERSION=0.26.0
+> export VERSION=0.25.0
 > curl -L -o toolbox https://storage.googleapis.com/genai-toolbox/v$VERSION/linux/amd64/toolbox
 > chmod +x toolbox
 > ```
@@ -155,7 +153,7 @@ To install Toolbox as a binary:
 >
 > ```sh
 > # see releases page for other versions
-> export VERSION=0.26.0
+> export VERSION=0.25.0
 > curl -L -o toolbox https://storage.googleapis.com/genai-toolbox/v$VERSION/darwin/arm64/toolbox
 > chmod +x toolbox
 > ```
@@ -168,7 +166,7 @@ To install Toolbox as a binary:
 >
 > ```sh
 > # see releases page for other versions
-> export VERSION=0.26.0
+> export VERSION=0.25.0
 > curl -L -o toolbox https://storage.googleapis.com/genai-toolbox/v$VERSION/darwin/amd64/toolbox
 > chmod +x toolbox
 > ```
@@ -181,7 +179,7 @@ To install Toolbox as a binary:
 >
 > ```cmd
 > :: see releases page for other versions
-> set VERSION=0.26.0
+> set VERSION=0.25.0
 > curl -o toolbox.exe "https://storage.googleapis.com/genai-toolbox/v%VERSION%/windows/amd64/toolbox.exe"
 > ```
 >
@@ -193,7 +191,7 @@ To install Toolbox as a binary:
 >
 > ```powershell
 > # see releases page for other versions
-> $VERSION = "0.26.0"
+> $VERSION = "0.25.0"
 > curl.exe -o toolbox.exe "https://storage.googleapis.com/genai-toolbox/v$VERSION/windows/amd64/toolbox.exe"
 > ```
 >
@@ -206,7 +204,7 @@ You can also install Toolbox as a container:
 
 ```sh
 # see releases page for other versions
-export VERSION=0.26.0
+export VERSION=0.25.0
 docker pull us-central1-docker.pkg.dev/database-toolbox/toolbox/toolbox:$VERSION
 ```
 
@@ -230,7 +228,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.25.0
 ```
 <!-- {x-release-please-end} -->
 
@@ -940,14 +938,14 @@ Toolbox should have access to. Most tools will have at least one source to
 execute against.
 
 ```yaml
-kind: sources
+sources:
-name: my-pg-source
+  my-pg-source:
-type: postgres
+    kind: postgres
-host: 127.0.0.1
+    host: 127.0.0.1
-port: 5432
+    port: 5432
-database: toolbox_db
+    database: toolbox_db
-user: toolbox_user
+    user: toolbox_user
-password: my-password
+    password: my-password
 ```
 
 For more details on configuring different types of sources, see the
@@ -956,19 +954,19 @@ For more details on configuring different types of sources, see the
 ### Tools
 
 The `tools` section of a `tools.yaml` define the actions an agent can take: what
-type of tool it is, which source(s) it affects, what parameters it uses, etc.
+kind of tool it is, which source(s) it affects, what parameters it uses, etc.
 
 ```yaml
-kind: tools
+tools:
-name: search-hotels-by-name
+  search-hotels-by-name:
-type: postgres-sql
+    kind: postgres-sql
-source: my-pg-source
+    source: my-pg-source
-description: Search for hotels based on name.
+    description: Search for hotels based on name.
-parameters:
+    parameters:
-  - name: name
+      - name: name
-    type: string
+        type: string
-    description: The name of the hotel.
+        description: The name of the hotel.
-statement: SELECT * FROM hotels WHERE name ILIKE '%' || $1 || '%';
+    statement: SELECT * FROM hotels WHERE name ILIKE '%' || $1 || '%';
 ```
 
 For more details on configuring different types of tools, see the

cmd/invoke_tool_test.go

@@ -1,131 +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 cmd
-
-import (
-	"context"
-	"os"
-	"path/filepath"
-	"strings"
-	"testing"
-)
-
-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 := invokeCommandWithContext(context.Background(), 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 := invokeCommandWithContext(context.Background(), 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)
-	}
-}

cmd/root.go

@@ -15,7 +15,6 @@
 package cmd
 
 import (
-	"bytes"
 	"context"
 	_ "embed"
 	"fmt"
@@ -34,7 +33,6 @@ import (
 	"github.com/fsnotify/fsnotify"
 	yaml "github.com/goccy/go-yaml"
 	"github.com/googleapis/genai-toolbox/internal/auth"
-	"github.com/googleapis/genai-toolbox/internal/cli/invoke"
 	"github.com/googleapis/genai-toolbox/internal/embeddingmodels"
 	"github.com/googleapis/genai-toolbox/internal/log"
 	"github.com/googleapis/genai-toolbox/internal/prebuiltconfigs"
@@ -92,9 +90,6 @@ import (
 	_ "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"
@@ -248,7 +243,6 @@ import (
 	_ "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"
@@ -321,15 +315,15 @@ func Execute() {
 type Command struct {
 	*cobra.Command
 
-	cfg             server.ServerConfig
+	cfg            server.ServerConfig
-	logger          log.Logger
+	logger         log.Logger
-	tools_file      string
+	tools_file     string
-	tools_files     []string
+	tools_files    []string
-	tools_folder    string
+	tools_folder   string
-	prebuiltConfigs []string
+	prebuiltConfig string
-	inStream        io.Reader
+	inStream       io.Reader
-	outStream       io.Writer
+	outStream      io.Writer
-	errStream       io.Writer
+	errStream      io.Writer
 }
 
 // NewCommand returns a Command object representing an invocation of the CLI.
@@ -366,47 +360,43 @@ func NewCommand(opts ...Option) *Command {
 	baseCmd.SetErr(cmd.errStream)
 
 	flags := cmd.Flags()
-	persistentFlags := cmd.PersistentFlags()
-
 	flags.StringVarP(&cmd.cfg.Address, "address", "a", "127.0.0.1", "Address of the interface the server will listen on.")
 	flags.IntVarP(&cmd.cfg.Port, "port", "p", 5000, "Port the server will listen on.")
 
 	flags.StringVar(&cmd.tools_file, "tools_file", "", "File path specifying the tool configuration. Cannot be used with --tools-files, or --tools-folder.")
 	// deprecate tools_file
 	_ = flags.MarkDeprecated("tools_file", "please use --tools-file instead")
-	persistentFlags.StringVar(&cmd.tools_file, "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 --tools-files, or --tools-folder.")
-	persistentFlags.StringSliceVar(&cmd.tools_files, "tools-files", []string{}, "Multiple file paths specifying tool configurations. Files will be merged. Cannot be used with --tools-file, 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 --tools-file, or --tools-folder.")
-	persistentFlags.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 --tools-file, or --tools-files.")
+	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 --tools-file, or --tools-files.")
-	persistentFlags.Var(&cmd.cfg.LogLevel, "log-level", "Specify the minimum level logged. Allowed: 'DEBUG', 'INFO', 'WARN', 'ERROR'.")
+	flags.Var(&cmd.cfg.LogLevel, "log-level", "Specify the minimum level logged. Allowed: 'DEBUG', 'INFO', 'WARN', 'ERROR'.")
-	persistentFlags.Var(&cmd.cfg.LoggingFormat, "logging-format", "Specify logging format to use. Allowed: 'standard' or 'JSON'.")
+	flags.Var(&cmd.cfg.LoggingFormat, "logging-format", "Specify logging format to use. Allowed: 'standard' or 'JSON'.")
-	persistentFlags.BoolVar(&cmd.cfg.TelemetryGCP, "telemetry-gcp", false, "Enable exporting directly to Google Cloud Monitoring.")
+	flags.BoolVar(&cmd.cfg.TelemetryGCP, "telemetry-gcp", false, "Enable exporting directly to Google Cloud Monitoring.")
-	persistentFlags.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.TelemetryOTLP, "telemetry-otlp", "", "Enable exporting using OpenTelemetry Protocol (OTLP) to the specified endpoint (e.g. 'http://127.0.0.1:4318')")
-	persistentFlags.StringVar(&cmd.cfg.TelemetryServiceName, "telemetry-service-name", "toolbox", "Sets the value of the service.name resource attribute for telemetry data.")
+	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. Allowed: '%s'. Can be specified multiple times.",
+		"Use a prebuilt tool configuration by source type. Allowed: '%s'.",
 		strings.Join(prebuiltconfigs.GetPrebuiltSources(), "', '"),
 	)
-	persistentFlags.StringSliceVar(&cmd.prebuiltConfigs, "prebuilt", []string{}, prebuiltHelp)
+	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.")
 	// TODO: Insecure by default. Might consider updating this for v1.0.0
 	flags.StringSliceVar(&cmd.cfg.AllowedOrigins, "allowed-origins", []string{"*"}, "Specifies a list of origins permitted to access this server. Defaults to '*'.")
 	flags.StringSliceVar(&cmd.cfg.AllowedHosts, "allowed-hosts", []string{"*"}, "Specifies a list of hosts permitted to access this server. Defaults to '*'.")
-	persistentFlags.StringSliceVar(&cmd.cfg.UserAgentMetadata, "user-agent-metadata", []string{}, "Appends additional metadata to the User-Agent.")
+	flags.StringSliceVar(&cmd.cfg.UserAgentMetadata, "user-agent-metadata", []string{}, "Appends additional metadata to the User-Agent.")
 
 	// wrap RunE command so that we have access to original Command object
 	cmd.RunE = func(*cobra.Command, []string) error { return run(cmd) }
 
-	// Register subcommands for tool invocation
-	baseCmd.AddCommand(invoke.NewCommand(cmd))
-
 	return cmd
 }
 
 type ToolsFile struct {
 	Sources         server.SourceConfigs         `yaml:"sources"`
+	AuthSources     server.AuthServiceConfigs    `yaml:"authSources"` // Deprecated: Kept for compatibility.
 	AuthServices    server.AuthServiceConfigs    `yaml:"authServices"`
 	EmbeddingModels server.EmbeddingModelConfigs `yaml:"embeddingModels"`
 	Tools           server.ToolConfigs           `yaml:"tools"`
@@ -437,129 +427,6 @@ func parseEnv(input string) (string, error) {
 	return output, err
 }
 
-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
-	}
-}
-
 // parseToolsFile parses the provided yaml into appropriate configs.
 func parseToolsFile(ctx context.Context, raw []byte) (ToolsFile, error) {
 	var toolsFile ToolsFile
@@ -570,13 +437,8 @@ func parseToolsFile(ctx context.Context, raw []byte) (ToolsFile, error) {
 	}
 	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)
+	err = yaml.UnmarshalContext(ctx, raw, &toolsFile, yaml.Strict())
 	if err != nil {
 		return toolsFile, err
 	}
@@ -608,6 +470,18 @@ func mergeToolsFiles(files ...ToolsFile) (ToolsFile, error) {
 			}
 		}
 
+		// 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 {
+				if merged.AuthSources == nil {
+					merged.AuthSources = make(server.AuthServiceConfigs)
+				}
+				merged.AuthSources[name] = authSource
+			}
+		}
+
 		// Check for conflicts and merge authServices
 		for name, authService := range file.AuthServices {
 			if _, exists := merged.AuthServices[name]; exists {
@@ -925,183 +799,6 @@ func resolveWatcherInputs(toolsFile string, toolsFiles []string, toolsFolder str
 	return watchDirs, watchedFiles
 }
 
-func (cmd *Command) Config() server.ServerConfig {
-	return cmd.cfg
-}
-
-func (cmd *Command) Out() io.Writer {
-	return cmd.outStream
-}
-
-func (cmd *Command) Logger() log.Logger {
-	return cmd.logger
-}
-
-func (cmd *Command) LoadConfig(ctx context.Context) error {
-	logger, err := util.LoggerFromContext(ctx)
-	if err != nil {
-		return err
-	}
-
-	var allToolsFiles []ToolsFile
-
-	// Load Prebuilt Configuration
-
-	if len(cmd.prebuiltConfigs) > 0 {
-		slices.Sort(cmd.prebuiltConfigs)
-		sourcesList := strings.Join(cmd.prebuiltConfigs, ", ")
-		logMsg := fmt.Sprintf("Using prebuilt tool configurations for: %s", sourcesList)
-		logger.InfoContext(ctx, logMsg)
-
-		for _, configName := range cmd.prebuiltConfigs {
-			buf, err := prebuiltconfigs.Get(configName)
-			if err != nil {
-				logger.ErrorContext(ctx, err.Error())
-				return 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 errMsg
-			}
-			allToolsFiles = append(allToolsFiles, parsed)
-		}
-	}
-
-	// Determine if Custom Files should be loaded
-	// Check for explicit custom flags
-	isCustomConfigured := cmd.tools_file != "" || len(cmd.tools_files) > 0 || cmd.tools_folder != ""
-
-	// Determine if default 'tools.yaml' should be used (No prebuilt AND No custom flags)
-	useDefaultToolsFile := len(cmd.prebuiltConfigs) == 0 && !isCustomConfigured
-
-	if useDefaultToolsFile {
-		cmd.tools_file = "tools.yaml"
-		isCustomConfigured = true
-	}
-
-	// Load Custom Configurations
-	if isCustomConfigured {
-		// Enforce exclusivity among custom flags (tools-file vs tools-files vs tools-folder)
-		if (cmd.tools_file != "" && len(cmd.tools_files) > 0) ||
-			(cmd.tools_file != "" && cmd.tools_folder != "") ||
-			(len(cmd.tools_files) > 0 && cmd.tools_folder != "") {
-			errMsg := fmt.Errorf("--tools-file, --tools-files, and --tools-folder flags cannot be used simultaneously")
-			logger.ErrorContext(ctx, errMsg.Error())
-			return errMsg
-		}
-
-		var customTools ToolsFile
-		var err error
-
-		if len(cmd.tools_files) > 0 {
-			// Use tools-files
-			logger.InfoContext(ctx, fmt.Sprintf("Loading and merging %d tool configuration files", len(cmd.tools_files)))
-			customTools, err = loadAndMergeToolsFiles(ctx, cmd.tools_files)
-		} else if cmd.tools_folder != "" {
-			// Use tools-folder
-			logger.InfoContext(ctx, fmt.Sprintf("Loading and merging all YAML files from directory: %s", cmd.tools_folder))
-			customTools, err = loadAndMergeToolsFolder(ctx, cmd.tools_folder)
-		} else {
-			// Use single file (tools-file or default `tools.yaml`)
-			buf, readFileErr := os.ReadFile(cmd.tools_file)
-			if readFileErr != nil {
-				errMsg := fmt.Errorf("unable to read tool file at %q: %w", cmd.tools_file, readFileErr)
-				logger.ErrorContext(ctx, errMsg.Error())
-				return errMsg
-			}
-			customTools, err = parseToolsFile(ctx, buf)
-			if err != nil {
-				err = fmt.Errorf("unable to parse tool file at %q: %w", cmd.tools_file, err)
-			}
-		}
-
-		if err != nil {
-			logger.ErrorContext(ctx, err.Error())
-			return err
-		}
-		allToolsFiles = append(allToolsFiles, customTools)
-	}
-
-	// Modify version string based on loaded configurations
-	if len(cmd.prebuiltConfigs) > 0 {
-		tag := "prebuilt"
-		if isCustomConfigured {
-			tag = "custom"
-		}
-		// cmd.prebuiltConfigs is already sorted above
-		for _, configName := range cmd.prebuiltConfigs {
-			cmd.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 err
-	}
-
-	cmd.cfg.SourceConfigs = finalToolsFile.Sources
-	cmd.cfg.AuthServiceConfigs = finalToolsFile.AuthServices
-	cmd.cfg.EmbeddingModelConfigs = finalToolsFile.EmbeddingModels
-	cmd.cfg.ToolConfigs = finalToolsFile.Tools
-	cmd.cfg.ToolsetConfigs = finalToolsFile.Toolsets
-	cmd.cfg.PromptConfigs = finalToolsFile.Prompts
-
-	return nil
-}
-
-func (cmd *Command) 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 := cmd.outStream
-	if cmd.cfg.Stdio {
-		loggerOut = cmd.errStream
-	}
-
-	// Handle logger separately from config
-	logger, err := log.NewLogger(cmd.cfg.LoggingFormat.String(), cmd.cfg.LogLevel.String(), loggerOut, cmd.errStream)
-	if err != nil {
-		return ctx, nil, fmt.Errorf("unable to initialize logger: %w", err)
-	}
-	cmd.logger = logger
-
-	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 {
-		errMsg := fmt.Errorf("error setting up OpenTelemetry: %w", err)
-		cmd.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)
-			cmd.logger.ErrorContext(ctx, errMsg.Error())
-			return err
-		}
-		return nil
-	}
-
-	instrumentation, err := telemetry.CreateTelemetryInstrumentation(cmd.cfg.Version)
-	if err != nil {
-		errMsg := fmt.Errorf("unable to create telemetry instrumentation: %w", err)
-		cmd.logger.ErrorContext(ctx, errMsg.Error())
-		return ctx, shutdownFunc, errMsg
-	}
-
-	ctx = util.WithInstrumentation(ctx, instrumentation)
-
-	return ctx, shutdownFunc, nil
-}
-
 func run(cmd *Command) error {
 	ctx, cancel := context.WithCancel(cmd.Context())
 	defer cancel()
@@ -1126,18 +823,163 @@ func run(cmd *Command) error {
 		cancel()
 	}(ctx)
 
-	ctx, shutdown, err := cmd.Setup(ctx)
+	// If stdio, set logger's out stream (usually DEBUG and INFO logs) to errStream
+	loggerOut := cmd.outStream
+	if cmd.cfg.Stdio {
+		loggerOut = cmd.errStream
+	}
+
+	// Handle logger separately from config
+	switch strings.ToLower(cmd.cfg.LoggingFormat.String()) {
+	case "json":
+		logger, err := log.NewStructuredLogger(loggerOut, 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(loggerOut, 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())
+		}
 	}()
 
-	if err := cmd.LoadConfig(ctx); err != nil {
+	var allToolsFiles []ToolsFile
+
+	// Load Prebuilt Configuration
+	if cmd.prebuiltConfig != "" {
+		buf, err := prebuiltconfigs.Get(cmd.prebuiltConfig)
+		if err != nil {
+			cmd.logger.ErrorContext(ctx, err.Error())
+			return err
+		}
+		logMsg := fmt.Sprint("Using prebuilt tool configuration for ", cmd.prebuiltConfig)
+		cmd.logger.InfoContext(ctx, logMsg)
+		// Append prebuilt.source to Version string for the User Agent
+		cmd.cfg.Version += "+prebuilt." + cmd.prebuiltConfig
+
+		parsed, 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
+		}
+		allToolsFiles = append(allToolsFiles, parsed)
+	}
+
+	// Determine if Custom Files should be loaded
+	// Check for explicit custom flags
+	isCustomConfigured := cmd.tools_file != "" || len(cmd.tools_files) > 0 || cmd.tools_folder != ""
+
+	// Determine if default 'tools.yaml' should be used (No prebuilt AND No custom flags)
+	useDefaultToolsFile := cmd.prebuiltConfig == "" && !isCustomConfigured
+
+	if useDefaultToolsFile {
+		cmd.tools_file = "tools.yaml"
+		isCustomConfigured = true
+	}
+
+	// Load Custom Configurations
+	if isCustomConfigured {
+		// Enforce exclusivity among custom flags (tools-file vs tools-files vs tools-folder)
+		if (cmd.tools_file != "" && len(cmd.tools_files) > 0) ||
+			(cmd.tools_file != "" && cmd.tools_folder != "") ||
+			(len(cmd.tools_files) > 0 && 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
+		}
+
+		var customTools ToolsFile
+		var err error
+
+		if len(cmd.tools_files) > 0 {
+			// Use tools-files
+			cmd.logger.InfoContext(ctx, fmt.Sprintf("Loading and merging %d tool configuration files", len(cmd.tools_files)))
+			customTools, err = loadAndMergeToolsFiles(ctx, cmd.tools_files)
+		} else if cmd.tools_folder != "" {
+			// Use tools-folder
+			cmd.logger.InfoContext(ctx, fmt.Sprintf("Loading and merging all YAML files from directory: %s", cmd.tools_folder))
+			customTools, err = loadAndMergeToolsFolder(ctx, cmd.tools_folder)
+		} else {
+			// Use single file (tools-file or default `tools.yaml`)
+			buf, readFileErr := os.ReadFile(cmd.tools_file)
+			if readFileErr != nil {
+				errMsg := fmt.Errorf("unable to read tool file at %q: %w", cmd.tools_file, readFileErr)
+				cmd.logger.ErrorContext(ctx, errMsg.Error())
+				return errMsg
+			}
+			customTools, err = parseToolsFile(ctx, buf)
+			if err != nil {
+				err = fmt.Errorf("unable to parse tool file at %q: %w", cmd.tools_file, err)
+			}
+		}
+
+		if err != nil {
+			cmd.logger.ErrorContext(ctx, err.Error())
+			return err
+		}
+		allToolsFiles = append(allToolsFiles, customTools)
+	}
+
+	// Merge Everything
+	// This will error if custom tools collide with prebuilt tools
+	finalToolsFile, err := mergeToolsFiles(allToolsFiles...)
+	if err != nil {
+		cmd.logger.ErrorContext(ctx, err.Error())
 		return err
 	}
 
+	cmd.cfg.SourceConfigs = finalToolsFile.Sources
+	cmd.cfg.AuthServiceConfigs = finalToolsFile.AuthServices
+	cmd.cfg.EmbeddingModelConfigs = finalToolsFile.EmbeddingModels
+	cmd.cfg.ToolConfigs = finalToolsFile.Tools
+	cmd.cfg.ToolsetConfigs = finalToolsFile.Toolsets
+	cmd.cfg.PromptConfigs = finalToolsFile.Prompts
+
+	authSourceConfigs := finalToolsFile.AuthSources
+	if authSourceConfigs != nil {
+		cmd.logger.WarnContext(ctx, "`authSources` is deprecated, use `authServices` instead")
+
+		for k, v := range authSourceConfigs {
+			if _, exists := cmd.cfg.AuthServiceConfigs[k]; exists {
+				errMsg := fmt.Errorf("resource conflict detected: authSource '%s' has the same name as an existing authService. Please rename your authSource", k)
+				cmd.logger.ErrorContext(ctx, errMsg.Error())
+				return errMsg
+			}
+			cmd.cfg.AuthServiceConfigs[k] = v
+		}
+	}
+
+	instrumentation, err := telemetry.CreateTelemetryInstrumentation(versionString)
+	if err != nil {
+		errMsg := fmt.Errorf("unable to create telemetry instrumentation: %w", err)
+		cmd.logger.ErrorContext(ctx, errMsg.Error())
+		return errMsg
+	}
+
+	ctx = util.WithInstrumentation(ctx, instrumentation)
+
 	// start server
 	s, err := server.NewServer(ctx, cmd.cfg)
 	if err != nil {
@@ -1177,9 +1019,6 @@ func run(cmd *Command) error {
 		}()
 	}
 
-	// Determine if Custom Files are configured (re-check as loadAndMergeConfig might have updated defaults)
-	isCustomConfigured := cmd.tools_file != "" || len(cmd.tools_files) > 0 || cmd.tools_folder != ""
-
 	if isCustomConfigured && !cmd.cfg.DisableReload {
 		watchDirs, watchedFiles := resolveWatcherInputs(cmd.tools_file, cmd.tools_files, cmd.tools_folder)
 		// start watching the file(s) or folder for changes to trigger dynamic reloading

cmd/version.txt

@@ -1 +1 @@
-0.26.0
+0.25.0

docs/ALLOYDBADMIN_README.md

@@ -23,14 +23,6 @@ To connect to the database to explore and query data, search the MCP store for t
 
 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]

docs/ALLOYDBPG_README.md

@@ -27,13 +27,6 @@ For AlloyDB infrastructure management, search the MCP store for the AlloyDB for
 ## 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.
 

docs/BIGQUERY_README.md

@@ -21,13 +21,6 @@ An editor configured to use the BigQuery MCP server can use its AI capabilities
 ## 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.
 

docs/CLOUDSQLMSSQLADMIN_README.md

@@ -23,14 +23,6 @@ To connect to the database to explore and query data, search the MCP store for t
 
 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]

docs/CLOUDSQLMSSQL_README.md

@@ -24,13 +24,6 @@ For Cloud SQL infrastructure management, search the MCP store for the Cloud SQL
 ## 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.
 

docs/CLOUDSQLMYSQLADMIN_README.md

@@ -23,14 +23,6 @@ To connect to the database to explore and query data, search the MCP store for t
 
 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]

docs/CLOUDSQLMYSQL_README.md

@@ -26,13 +26,6 @@ For Cloud SQL infrastructure management, search the MCP store for the Cloud SQL
 ## 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.
 

docs/CLOUDSQLPGADMIN_README.md

@@ -23,14 +23,6 @@ To connect to the database to explore and query data, search the MCP store for t
 
 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]

docs/CLOUDSQLPG_README.md

@@ -26,13 +26,6 @@ For Cloud SQL infrastructure management, search the MCP store for the Cloud SQL
 ## 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.
 

docs/DATAPLEX_README.md

@@ -20,13 +20,6 @@ An editor configured to use the Dataplex MCP server can use its AI capabilities
 ## 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.
 

docs/LOOKER_README.md

@@ -21,13 +21,6 @@ An editor configured to use the Looker MCP server can use its AI capabilities to
 ## 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.
 

docs/SPANNER_README.md

@@ -21,13 +21,6 @@ An editor configured to use the Cloud Spanner MCP server can use its AI capabili
 ## 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.
 

docs/TOOLBOX_README.md

@@ -12,17 +12,10 @@ The MCP Toolbox for Databases Server gives AI-powered development tools the abil
 ## 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/).
+2.  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**.
+3.  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.

docs/en/about/faq.md

@@ -45,7 +45,7 @@ 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 
+**HTTP tools** (`kind: http`). These allow you to connect your agents to REST APIs 
 and other web services, enabling workflows that extend beyond database interactions.
 
 For configuration details, see the [HTTP Tools documentation](../resources/tools/http/http.md).

docs/en/concepts/telemetry/index.md

@@ -64,7 +64,7 @@ The structured logging outputs log as JSON:
   "timestamp":"2024-11-04T16:45:11.987299-08:00",
   "severity":"ERROR",
   "logging.googleapis.com/sourceLocation":{...},
-  "message":"unable to parse tool file at \"tools.yaml\": \"cloud-sql-postgres1\" is not a valid type of data source"
+  "message":"unable to parse tool file at \"tools.yaml\": \"cloud-sql-postgres1\" is not a valid kind of data source"
 }
 ```
 

docs/en/getting-started/colab_quickstart.ipynb

@@ -234,7 +234,7 @@
       },
       "outputs": [],
       "source": [
-        "version = \"0.26.0\" # x-release-please-version\n",
+        "version = \"0.25.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",
+        "sources:\n",
-        "name: my-pg-source\n",
+        "  my-pg-source:\n",
-        "type: postgres\n",
+        "    kind: postgres\n",
-        "host: 127.0.0.1\n",
+        "    host: 127.0.0.1\n",
-        "port: 5432\n",
+        "    port: 5432\n",
-        "database: toolbox_db\n",
+        "    database: toolbox_db\n",
-        "user: toolbox_user\n",
+        "    user: toolbox_user\n",
-        "password: my-password\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",
         "tools:\n",
-        "  - search-hotels-by-name\n",
+        "  search-hotels-by-name:\n",
-        "  - search-hotels-by-location\n",
+        "    kind: postgres-sql\n",
-        "  - book-hotel\n",
+        "    source: my-pg-source\n",
-        "  - update-hotel\n",
+        "    description: Search for hotels based on name.\n",
-        "  - cancel-hotel\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",
+        "toolbox_client = ToolboxSyncClient(\"http://127.0.0.1:5000\")\n",
-        "toolset = ToolboxToolset(\n",
-        "    server_url=\"http://127.0.0.1:5000\",\n",
-        "    toolset_name=\"my-toolset\"\n",
-        ")\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",

docs/en/getting-started/configure.md

@@ -36,14 +36,14 @@ Toolbox should have access to. Most tools will have at least one source to
 execute against.
 
 ```yaml
-kind: sources
+sources:
-name: my-pg-source
+  my-pg-source:
-type: postgres
+    kind: postgres
-host: 127.0.0.1
+    host: 127.0.0.1
-port: 5432
+    port: 5432
-database: toolbox_db
+    database: toolbox_db
-user: ${USER_NAME}
+    user: ${USER_NAME}
-password: ${PASSWORD}
+    password: ${PASSWORD}
 ```
 
 For more details on configuring different types of sources, see the
@@ -52,20 +52,20 @@ For more details on configuring different types of sources, see the
 ### Tools
 
 The `tools` section of your `tools.yaml` defines the actions your agent can
-take: what type of tool it is, which source(s) it affects, what parameters it
+take: what kind of tool it is, which source(s) it affects, what parameters it
 uses, etc.
 
 ```yaml
-kind: tools
+tools:
-name: search-hotels-by-name
+  search-hotels-by-name:
-type: postgres-sql
+    kind: postgres-sql
-source: my-pg-source
+    source: my-pg-source
-description: Search for hotels based on name.
+    description: Search for hotels based on name.
-parameters:
+    parameters:
-  - name: name
+      - name: name
-    type: string
+        type: string
-    description: The name of the hotel.
+        description: The name of the hotel.
-statement: SELECT * FROM hotels WHERE name ILIKE '%' || $1 || '%';
+    statement: SELECT * FROM hotels WHERE name ILIKE '%' || $1 || '%';
 ```
 
 For more details on configuring different types of tools, see the
@@ -78,17 +78,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
+toolsets:
-name: my_first_toolset
+  my_first_toolset:
-tools:
+    - my_first_tool
-  - my_first_tool
+    - my_second_tool
-  - my_second_tool
+  my_second_toolset:
----
+    - my_second_tool
-kind: toolsets
+    - my_third_tool
-name: my_second_toolset
-tools:
-  - my_second_tool
-  - my_third_tool
 ```
 
 You can load toolsets by name:
@@ -107,14 +103,14 @@ The `prompts` section of your `tools.yaml` defines the templates containing
 structured messages and instructions for interacting with language models.
 
 ```yaml
-kind: prompts
+prompts:
-name: code_review
+  code_review:
-description: "Asks the LLM to analyze code quality and suggest improvements."
+    description: "Asks the LLM to analyze code quality and suggest improvements."
-messages:
+    messages:
-  - content: "Please review the following code for quality, correctness, and potential improvements: \n\n{{.code}}"
+      - content: "Please review the following code for quality, correctness, and potential improvements: \n\n{{.code}}"
-arguments:
+    arguments:
-  - name: "code"
+      - name: "code"
-    description: "The code to review"
+        description: "The code to review"
 ```
 
 For more details on configuring different types of prompts, see the

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,7 +71,7 @@ redeploying your application.
 
 ## Getting Started
 
-### Quickstart: Running Toolbox using NPX 
+### (Non-production) Running Toolbox
 
 You can run Toolbox directly with a [configuration file](../configure.md):
 
@@ -109,7 +103,7 @@ To install Toolbox as a binary on Linux (AMD64):
 
 ```sh
 # see releases page for other versions
-export VERSION=0.26.0
+export VERSION=0.25.0
 curl -L -o toolbox https://storage.googleapis.com/genai-toolbox/v$VERSION/linux/amd64/toolbox
 chmod +x toolbox
 ```
@@ -120,7 +114,7 @@ To install Toolbox as a binary on macOS (Apple Silicon):
 
 ```sh
 # see releases page for other versions
-export VERSION=0.26.0
+export VERSION=0.25.0
 curl -L -o toolbox https://storage.googleapis.com/genai-toolbox/v$VERSION/darwin/arm64/toolbox
 chmod +x toolbox
 ```
@@ -131,7 +125,7 @@ To install Toolbox as a binary on macOS (Intel):
 
 ```sh
 # see releases page for other versions
-export VERSION=0.26.0
+export VERSION=0.25.0
 curl -L -o toolbox https://storage.googleapis.com/genai-toolbox/v$VERSION/darwin/amd64/toolbox
 chmod +x toolbox
 ```
@@ -142,7 +136,7 @@ To install Toolbox as a binary on Windows (Command Prompt):
 
 ```cmd
 :: see releases page for other versions
-set VERSION=0.26.0
+set VERSION=0.25.0
 curl -o toolbox.exe "https://storage.googleapis.com/genai-toolbox/v%VERSION%/windows/amd64/toolbox.exe"
 ```
 
@@ -152,7 +146,7 @@ To install Toolbox as a binary on Windows (PowerShell):
 
 ```powershell
 # see releases page for other versions
-$VERSION = "0.26.0"
+$VERSION = "0.25.0"
 curl.exe -o toolbox.exe "https://storage.googleapis.com/genai-toolbox/v$VERSION/windows/amd64/toolbox.exe"
 ```
 
@@ -164,7 +158,7 @@ You can also install Toolbox as a container:
 
 ```sh
 # see releases page for other versions
-export VERSION=0.26.0
+export VERSION=0.25.0
 docker pull us-central1-docker.pkg.dev/database-toolbox/toolbox/toolbox:$VERSION
 ```
 
@@ -183,7 +177,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.25.0
 ```
 
 {{% /tab %}}

docs/en/getting-started/local_quickstart.md

@@ -52,7 +52,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 +73,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" >}}
 

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.25.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
+    sources:
-    name: my-pg-source
+      my-pg-source:
-    type: postgres
+        kind: postgres
-    host: 127.0.0.1
+        host: 127.0.0.1
-    port: 5432
+        port: 5432
-    database: toolbox_db
+        database: toolbox_db
-    user: toolbox_user
+        user: toolbox_user
-    password: my-password
+        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
     tools:
-      - search-hotels-by-name
+      search-hotels-by-name:
-      - search-hotels-by-location
+        kind: postgres-sql
-      - book-hotel
+        source: my-pg-source
-      - update-hotel
+        description: Search for hotels based on name.
-      - cancel-hotel
+        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

docs/en/getting-started/prompts_quickstart_gemini_cli.md

@@ -157,67 +157,61 @@ 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
+sources:
-name: my-foodiefind-db
+  my-foodiefind-db:
-type: postgres
+    kind: postgres
-host: 127.0.0.1
+    host: 127.0.0.1
-port: 5432
+    port: 5432
-database: toolbox_db
+    database: toolbox_db
-user: toolbox_user
+    user: toolbox_user
-password: my-password
+    password: my-password
----
+tools:
-kind: tools
+  find_user_by_email:
-name: find_user_by_email
+    kind: postgres-sql
-type: postgres-sql
+    source: my-foodiefind-db
-source: my-foodiefind-db
+    description: Find a user's ID by their email address.
-description: Find a user's ID by their email address.
+    parameters:
-parameters:
+      - name: email
-  - name: email
+        type: string
-    type: string
+        description: The email address of the user to find.
-    description: The email address of the user to find.
+    statement: SELECT id FROM users WHERE email = $1;
-statement: SELECT id FROM users WHERE email = $1;
+  find_restaurant_by_name:
----
+    kind: postgres-sql
-kind: tools
+    source: my-foodiefind-db
-name: find_restaurant_by_name
+    description: Find a restaurant's ID by its exact name.
-type: postgres-sql
+    parameters:
-source: my-foodiefind-db
+      - name: name
-description: Find a restaurant's ID by its exact name.
+        type: string
-parameters:
+        description: The name of the restaurant to find.
-  - name: name
+    statement: SELECT id FROM restaurants WHERE name = $1;
-    type: string
+  find_review_by_user_and_restaurant:
-    description: The name of the restaurant to find.
+    kind: postgres-sql
-statement: SELECT id FROM restaurants WHERE name = $1;
+    source: my-foodiefind-db
----
+    description: Find the full record for a specific review using the user's ID and the restaurant's ID.
-kind: tools
+    parameters:
-name: find_review_by_user_and_restaurant
+      - name: user_id
-type: postgres-sql
+        type: integer
-source: my-foodiefind-db
+        description: The numerical ID of the user.
-description: Find the full record for a specific review using the user's ID and the restaurant's ID.
+      - name: restaurant_id
-parameters:
+        type: integer
-  - name: user_id
+        description: The numerical ID of the restaurant.
-    type: integer
+    statement: SELECT * FROM reviews WHERE user_id = $1 AND restaurant_id = $2;
-    description: The numerical ID of the user.
+prompts:
-  - name: restaurant_id
+  investigate_missing_review:
-    type: integer
+    description: "Investigates a user's missing review by finding the user, restaurant, and the review itself, then analyzing its status."
-    description: The numerical ID of the restaurant.
+    arguments:
-statement: SELECT * FROM reviews WHERE user_id = $1 AND restaurant_id = $2;
+      - name: "user_email"
----
+        description: "The email of the user who wrote the review."
-kind: prompts
+      - name: "restaurant_name"
-name: investigate_missing_review
+        description: "The name of the restaurant being reviewed."
-description: "Investigates a user's missing review by finding the user, restaurant, and the review itself, then analyzing its status."
+    messages:
-arguments:
+      - content: >-
-  - name: "user_email"
+          **Goal:** Find the review written by the user with email '{{.user_email}}' for the restaurant named '{{.restaurant_name}}' and understand its status.
-    description: "The email of the user who wrote the review."
+          **Workflow:**
-  - name: "restaurant_name"
+          1. Use the `find_user_by_email` tool with the email '{{.user_email}}' to get the `user_id`.
-    description: "The name of the restaurant being reviewed."
+          2. Use the `find_restaurant_by_name` tool with the name '{{.restaurant_name}}' to get the `restaurant_id`.
-messages:
+          3. Use the `find_review_by_user_and_restaurant` tool with the `user_id` and `restaurant_id` you just found.
-  - content: >-
+          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.
-      **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

docs/en/getting-started/quickstart/js/adk/package.json

@@ -11,7 +11,7 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@google/adk": "^0.1.3",
+    "@google/adk": "^0.2.4",
     "@toolbox-sdk/adk": "^0.1.5"
   }
 }

docs/en/getting-started/quickstart/js/genkit/package-lock.json

@@ -24,13 +24,12 @@
       }
     },
     "node_modules/@dabh/diagnostics": {
-      "version": "2.0.8",
+      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/@dabh/diagnostics/-/diagnostics-2.0.8.tgz",
+      "resolved": "https://registry.npmjs.org/@dabh/diagnostics/-/diagnostics-2.0.3.tgz",
-      "integrity": "sha512-R4MSXTVnuMzGD7bzHdW2ZhhdPC/igELENcq5IjEverBvq5hn1SXCWcsi6eSsdWP0/Ur+SItRRjAktmdoX/8R/Q==",
+      "integrity": "sha512-hrlQOIi7hAfzsMqlGSFyVucrx38O+j6wiGOf//H2ecvIEqYN4ADBSS2iLMh5UFyDunCNniUIPk/q3riFv45xRA==",
-      "license": "MIT",
       "optional": true,
       "dependencies": {
-        "@so-ric/colorspace": "^1.1.6",
+        "colorspace": "1.1.x",
         "enabled": "2.0.x",
         "kuler": "^2.0.0"
       }
@@ -579,10 +578,9 @@
       }
     },
     "node_modules/@google-cloud/firestore": {
-      "version": "7.11.6",
+      "version": "7.11.3",
-      "resolved": "https://registry.npmjs.org/@google-cloud/firestore/-/firestore-7.11.6.tgz",
+      "resolved": "https://registry.npmjs.org/@google-cloud/firestore/-/firestore-7.11.3.tgz",
-      "integrity": "sha512-EW/O8ktzwLfyWBOsNuhRoMi8lrC3clHM5LVFhGvO1HCsLozCOOXRAlHrYBoE6HL42Sc8yYMuCb2XqcnJ4OOEpw==",
+      "integrity": "sha512-qsM3/WHpawF07SRVvEJJVRwhYzM7o9qtuksyuqnrMig6fxIrwWnsezECWsG/D5TyYru51Fv5c/RTqNDQ2yU+4w==",
-      "license": "Apache-2.0",
       "optional": true,
       "peer": true,
       "dependencies": {
@@ -2889,17 +2887,6 @@
       "resolved": "https://registry.npmjs.org/@protobufjs/utf8/-/utf8-1.1.0.tgz",
       "integrity": "sha512-Vvn3zZrhQZkkBE8LSuW3em98c0FwgO4nxzv6OdSxPKJIEKY2bGbHn+mhGIPerzI4twdxaP8/0+06HBpwf345Lw=="
     },
-    "node_modules/@so-ric/colorspace": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/@so-ric/colorspace/-/colorspace-1.1.6.tgz",
-      "integrity": "sha512-/KiKkpHNOBgkFJwu9sh48LkHSMYGyuTcSFK/qMBdnOAlrRJzRSXAOFB5qwzaVQuDl8wAvHVMkaASQDReTahxuw==",
-      "license": "MIT",
-      "optional": true,
-      "dependencies": {
-        "color": "^5.0.2",
-        "text-hex": "1.0.x"
-      }
-    },
     "node_modules/@toolbox-sdk/core": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/@toolbox-sdk/core/-/core-0.1.2.tgz",
@@ -3528,53 +3515,38 @@
       }
     },
     "node_modules/color": {
-      "version": "5.0.3",
+      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/color/-/color-5.0.3.tgz",
+      "resolved": "https://registry.npmjs.org/color/-/color-3.2.1.tgz",
-      "integrity": "sha512-ezmVcLR3xAVp8kYOm4GS45ZLLgIE6SPAFoduLr6hTDajwb3KZ2F46gulK3XpcwRFb5KKGCSezCBAY4Dw4HsyXA==",
+      "integrity": "sha512-aBl7dZI9ENN6fUGC7mWpMTPNHmWUSNan9tuWN6ahh5ZLNk9baLJOnSMlrQkHcrfFgz2/RigjUVAjdx36VcemKA==",
-      "license": "MIT",
       "optional": true,
       "dependencies": {
-        "color-convert": "^3.1.3",
+        "color-convert": "^1.9.3",
-        "color-string": "^2.1.3"
+        "color-string": "^1.6.0"
-      },
-      "engines": {
-        "node": ">=18"
       }
     },
     "node_modules/color-convert": {
-      "version": "3.1.3",
+      "version": "1.9.3",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-3.1.3.tgz",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-      "integrity": "sha512-fasDH2ont2GqF5HpyO4w0+BcewlhHEZOFn9c1ckZdHpJ56Qb7MHhH/IcJZbBGgvdtwdwNbLvxiBEdg336iA9Sg==",
+      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-      "license": "MIT",
       "optional": true,
       "dependencies": {
-        "color-name": "^2.0.0"
+        "color-name": "1.1.3"
-      },
-      "engines": {
-        "node": ">=14.6"
       }
     },
     "node_modules/color-name": {
-      "version": "2.1.0",
+      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-2.1.0.tgz",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha512-1bPaDNFm0axzE4MEAzKPuqKWeRaT43U/hyxKPBdqTfmPF+d6n7FSoTFxLVULUJOmiLp01KjhIPPH+HrXZJN4Rg==",
+      "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==",
-      "license": "MIT",
+      "optional": true
-      "optional": true,
-      "engines": {
-        "node": ">=12.20"
-      }
     },
     "node_modules/color-string": {
-      "version": "2.1.4",
+      "version": "1.9.1",
-      "resolved": "https://registry.npmjs.org/color-string/-/color-string-2.1.4.tgz",
+      "resolved": "https://registry.npmjs.org/color-string/-/color-string-1.9.1.tgz",
-      "integrity": "sha512-Bb6Cq8oq0IjDOe8wJmi4JeNn763Xs9cfrBcaylK1tPypWzyoy2G3l90v9k64kjphl/ZJjPIShFztenRomi8WTg==",
+      "integrity": "sha512-shrVawQFojnZv6xM40anx4CkoDP+fZsw/ZerEMsW/pyzsRbElpsL/DBVW7q3ExxwusdNXI3lXpuhEZkzs8p5Eg==",
-      "license": "MIT",
       "optional": true,
       "dependencies": {
-        "color-name": "^2.0.0"
+        "color-name": "^1.0.0",
-      },
+        "simple-swizzle": "^0.2.2"
-      "engines": {
-        "node": ">=18"
       }
     },
     "node_modules/colorette": {
@@ -3582,6 +3554,16 @@
       "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.20.tgz",
       "integrity": "sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w=="
     },
+    "node_modules/colorspace": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/colorspace/-/colorspace-1.1.4.tgz",
+      "integrity": "sha512-BgvKJiuVu1igBUF2kEjRCZXol6wiiGbY5ipL/oVPwm0BL9sIpMIzM8IK7vwuxIIzOXMV3Ey5w+vxhm0rR/TN8w==",
+      "optional": true,
+      "dependencies": {
+        "color": "^3.1.3",
+        "text-hex": "1.0.x"
+      }
+    },
     "node_modules/combined-stream": {
       "version": "1.0.8",
       "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
@@ -4986,6 +4968,12 @@
         "node": ">= 0.10"
       }
     },
+    "node_modules/is-arrayish": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.2.tgz",
+      "integrity": "sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==",
+      "optional": true
+    },
     "node_modules/is-core-module": {
       "version": "2.16.1",
       "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.16.1.tgz",
@@ -5126,14 +5114,13 @@
       }
     },
     "node_modules/jsonwebtoken/node_modules/jws": {
-      "version": "3.2.3",
+      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/jws/-/jws-3.2.3.tgz",
+      "resolved": "https://registry.npmjs.org/jws/-/jws-3.2.2.tgz",
-      "integrity": "sha512-byiJ0FLRdLdSVSReO/U4E7RoEyOCKnEnEPMjq3HxWtvzLsV08/i5RQKsFVNkCldrCaPr2vDNAOMsfs8T/Hze7g==",
+      "integrity": "sha512-YHlZCB6lMTllWDtSPHz/ZXTsi8S00usEV6v1tjq8tOUZzw7DpSDWVXjXDre6ed1w/pd495ODpHZYSdkRTsa0HA==",
-      "license": "MIT",
       "optional": true,
       "peer": true,
       "dependencies": {
-        "jwa": "^1.4.2",
+        "jwa": "^1.4.1",
         "safe-buffer": "^5.0.1"
       }
     },
@@ -5166,12 +5153,11 @@
       }
     },
     "node_modules/jws": {
-      "version": "4.0.1",
+      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/jws/-/jws-4.0.1.tgz",
+      "resolved": "https://registry.npmjs.org/jws/-/jws-4.0.0.tgz",
-      "integrity": "sha512-EKI/M/yqPncGUUh44xz0PxSidXFr/+r0pA70+gIYhjv+et7yxM+s29Y+VGDkovRofQem0fs7Uvf4+YmAdyRduA==",
+      "integrity": "sha512-KDncfTmOZoOMTFG4mBlG0qUIOlc03fmzH+ru6RgYVZhPkyiy/92Owlt/8UEN+a4TXR1FQetfIpJE8ApdvdVxTg==",
-      "license": "MIT",
       "dependencies": {
-        "jwa": "^2.0.1",
+        "jwa": "^2.0.0",
         "safe-buffer": "^5.0.1"
       }
     },
@@ -5438,10 +5424,9 @@
       }
     },
     "node_modules/node-forge": {
-      "version": "1.3.3",
+      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-1.3.3.tgz",
+      "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-1.3.1.tgz",
-      "integrity": "sha512-rLvcdSyRCyouf6jcOIPe/BgwG/d7hKjzMKOas33/pHEr6gbq18IK9zV7DiPvzsz0oBJPme6qr6H6kGZuI9/DZg==",
+      "integrity": "sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA==",
-      "license": "(BSD-3-Clause OR GPL-2.0)",
       "optional": true,
       "peer": true,
       "engines": {
@@ -6053,6 +6038,15 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/simple-swizzle": {
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.2.tgz",
+      "integrity": "sha512-JA//kQgZtbuY83m+xT+tXJkmJncGMTFT+C+g2h2R9uxkYIrE2yy9sgmcLhCnw57/WSD+Eh3J97FPEDFnbXnDUg==",
+      "optional": true,
+      "dependencies": {
+        "is-arrayish": "^0.3.1"
+      }
+    },
     "node_modules/source-map": {
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
@@ -6239,7 +6233,6 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/text-hex/-/text-hex-1.0.0.tgz",
       "integrity": "sha512-uuVGNWzgJ4yhRaNSiubPY7OjISw4sw4E5Uv0wbjp+OzcbmVU/rsT8ujgcXJhn9ypzsgr5vlzpPqP+MBBKcGvbg==",
-      "license": "MIT",
       "optional": true
     },
     "node_modules/thriftrw": {
@@ -6423,14 +6416,13 @@
       }
     },
     "node_modules/winston": {
-      "version": "3.19.0",
+      "version": "3.17.0",
-      "resolved": "https://registry.npmjs.org/winston/-/winston-3.19.0.tgz",
+      "resolved": "https://registry.npmjs.org/winston/-/winston-3.17.0.tgz",
-      "integrity": "sha512-LZNJgPzfKR+/J3cHkxcpHKpKKvGfDZVPS4hfJCc4cCG0CgYzvlD6yE/S3CIL/Yt91ak327YCpiF/0MyeZHEHKA==",
+      "integrity": "sha512-DLiFIXYC5fMPxaRg832S6F5mJYvePtmO5G9v9IgUFPhXm9/GkXarH/TUrBAVzhTCzAj9anE/+GjrgXp/54nOgw==",
-      "license": "MIT",
       "optional": true,
       "dependencies": {
         "@colors/colors": "^1.6.0",
-        "@dabh/diagnostics": "^2.0.8",
+        "@dabh/diagnostics": "^2.0.2",
         "async": "^3.2.3",
         "is-stream": "^2.0.0",
         "logform": "^2.7.0",

docs/en/getting-started/quickstart/js/llamaindex/package.json

@@ -11,7 +11,7 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@llamaindex/google": "^0.3.20",
+    "@llamaindex/google": "^0.4.0",
     "@llamaindex/workflow": "^1.1.22",
     "@toolbox-sdk/core": "^0.1.2",
     "llamaindex": "^0.12.0"

docs/en/getting-started/quickstart/python/adk/quickstart.py

@@ -1,17 +1,15 @@
 from google.adk import Agent
 from google.adk.apps import App
-from google.adk.tools.toolbox_toolset import ToolboxToolset
+from toolbox_core import ToolboxSyncClient
 
 # TODO(developer): update the TOOLBOX_URL to your toolbox endpoint
-toolset = ToolboxToolset(
+client = ToolboxSyncClient("http://127.0.0.1:5000")
-    server_url="http://127.0.0.1:5000",
-)
 
 root_agent = Agent(
     name='root_agent',
     model='gemini-2.5-flash',
     instruction="You are a helpful AI assistant designed to provide accurate and useful information.",
-    tools=[toolset],
+    tools=client.load_toolset(),
 )
 
 app = App(root_agent=root_agent, name="my_agent")

docs/en/getting-started/quickstart/python/adk/requirements.txt

@@ -1,2 +1,3 @@
-google-adk[toolbox]==1.23.0
+google-adk==1.21.0
+toolbox-core==0.5.4
 pytest==9.0.2

docs/en/getting-started/quickstart/shared/configure_toolbox.md

@@ -13,7 +13,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.25.0/$OS/toolbox
     ```
     <!-- {x-release-please-end} -->
 
@@ -33,89 +33,78 @@ In this section, we will download Toolbox, configure our tools in a
     {{< /notice >}}
 
     ```yaml
-    kind: sources
+    sources:
-    name: my-pg-source
+      my-pg-source:
-    type: postgres
+        kind: postgres
-    host: 127.0.0.1
+        host: 127.0.0.1
-    port: 5432
+        port: 5432
-    database: toolbox_db
+        database: toolbox_db
-    user: toolbox_user
+        user: ${USER_NAME}
-    password: my-password
+        password: ${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
     tools:
-      - search-hotels-by-name
+      search-hotels-by-name:
-      - search-hotels-by-location
+        kind: postgres-sql
-      - book-hotel
+        source: my-pg-source
-      - update-hotel
+        description: Search for hotels based on name.
-      - cancel-hotel
+        parameters:
+          - name: name
+            type: string
+            description: The name of the hotel.
+        statement: SELECT * FROM hotels WHERE name ILIKE '%' || $1 || '%';
+      search-hotels-by-location:
+        kind: postgres-sql
+        source: my-pg-source
+        description: Search for hotels based on location.
+        parameters:
+          - name: location
+            type: string
+            description: The location of the hotel.
+        statement: SELECT * FROM hotels WHERE location ILIKE '%' || $1 || '%';
+      book-hotel:
+        kind: postgres-sql
+        source: my-pg-source
+        description: >-
+           Book a hotel by its ID. If the hotel is successfully booked, returns a NULL, raises an error if not.
+        parameters:
+          - name: hotel_id
+            type: string
+            description: The ID of the hotel to book.
+        statement: UPDATE hotels SET booked = B'1' WHERE id = $1;
+      update-hotel:
+        kind: postgres-sql
+        source: my-pg-source
+        description: >-
+          Update a hotel's check-in and check-out dates by its ID. Returns a message
+          indicating  whether the hotel was successfully updated or not.
+        parameters:
+          - name: hotel_id
+            type: string
+            description: The ID of the hotel to update.
+          - name: checkin_date
+            type: string
+            description: The new check-in date of the hotel.
+          - name: checkout_date
+            type: string
+            description: The new check-out date of the hotel.
+        statement: >-
+          UPDATE hotels SET checkin_date = CAST($2 as date), checkout_date = CAST($3
+          as date) WHERE id = $1;
+      cancel-hotel:
+        kind: postgres-sql
+        source: my-pg-source
+        description: Cancel a hotel by its ID.
+        parameters:
+          - name: hotel_id
+            type: string
+            description: The ID of the hotel to cancel.
+        statement: UPDATE hotels SET booked = B'0' WHERE id = $1;
+   toolsets:
+      my-toolset:
+        - search-hotels-by-name
+        - search-hotels-by-location
+        - book-hotel
+        - update-hotel
+        - cancel-hotel
     ```
 
     For more info on tools, check out the `Resources` section of the docs.

docs/en/how-to/connect-ide/looker_mcp.md

@@ -100,19 +100,19 @@ After you install Looker in the MCP Store, resources and tools from the server a
 
 {{< tabpane persist=header >}}
 {{< tab header="linux/amd64" lang="bash" >}}
-curl -O https://storage.googleapis.com/genai-toolbox/v0.26.0/linux/amd64/toolbox
+curl -O https://storage.googleapis.com/genai-toolbox/v0.25.0/linux/amd64/toolbox
 {{< /tab >}}
 
 {{< tab header="darwin/arm64" lang="bash" >}}
-curl -O https://storage.googleapis.com/genai-toolbox/v0.26.0/darwin/arm64/toolbox
+curl -O https://storage.googleapis.com/genai-toolbox/v0.25.0/darwin/arm64/toolbox
 {{< /tab >}}
 
 {{< tab header="darwin/amd64" lang="bash" >}}
-curl -O https://storage.googleapis.com/genai-toolbox/v0.26.0/darwin/amd64/toolbox
+curl -O https://storage.googleapis.com/genai-toolbox/v0.25.0/darwin/amd64/toolbox
 {{< /tab >}}
 
 {{< tab header="windows/amd64" lang="bash" >}}
-curl -O https://storage.googleapis.com/genai-toolbox/v0.26.0/windows/amd64/toolbox.exe
+curl -O https://storage.googleapis.com/genai-toolbox/v0.25.0/windows/amd64/toolbox.exe
 {{< /tab >}}
 {{< /tabpane >}}
     <!-- {x-release-please-end} -->

docs/en/how-to/connect-ide/mssql_mcp.md

@@ -45,19 +45,19 @@ instance:
    <!-- {x-release-please-start-version} -->
    {{< tabpane persist=header >}}
 {{< tab header="linux/amd64" lang="bash" >}}
-curl -O https://storage.googleapis.com/genai-toolbox/v0.26.0/linux/amd64/toolbox
+curl -O https://storage.googleapis.com/genai-toolbox/v0.25.0/linux/amd64/toolbox
 {{< /tab >}}
 
 {{< tab header="darwin/arm64" lang="bash" >}}
-curl -O https://storage.googleapis.com/genai-toolbox/v0.26.0/darwin/arm64/toolbox
+curl -O https://storage.googleapis.com/genai-toolbox/v0.25.0/darwin/arm64/toolbox
 {{< /tab >}}
 
 {{< tab header="darwin/amd64" lang="bash" >}}
-curl -O https://storage.googleapis.com/genai-toolbox/v0.26.0/darwin/amd64/toolbox
+curl -O https://storage.googleapis.com/genai-toolbox/v0.25.0/darwin/amd64/toolbox
 {{< /tab >}}
 
 {{< tab header="windows/amd64" lang="bash" >}}
-curl -O https://storage.googleapis.com/genai-toolbox/v0.26.0/windows/amd64/toolbox.exe
+curl -O https://storage.googleapis.com/genai-toolbox/v0.25.0/windows/amd64/toolbox.exe
 {{< /tab >}}
 {{< /tabpane >}}
     <!-- {x-release-please-end} -->

docs/en/how-to/connect-ide/mysql_mcp.md

@@ -43,19 +43,19 @@ expose your developer assistant tools to a MySQL instance:
    <!-- {x-release-please-start-version} -->
    {{< tabpane persist=header >}}
 {{< tab header="linux/amd64" lang="bash" >}}
-curl -O https://storage.googleapis.com/genai-toolbox/v0.26.0/linux/amd64/toolbox
+curl -O https://storage.googleapis.com/genai-toolbox/v0.25.0/linux/amd64/toolbox
 {{< /tab >}}
 
 {{< tab header="darwin/arm64" lang="bash" >}}
-curl -O https://storage.googleapis.com/genai-toolbox/v0.26.0/darwin/arm64/toolbox
+curl -O https://storage.googleapis.com/genai-toolbox/v0.25.0/darwin/arm64/toolbox
 {{< /tab >}}
 
 {{< tab header="darwin/amd64" lang="bash" >}}
-curl -O https://storage.googleapis.com/genai-toolbox/v0.26.0/darwin/amd64/toolbox
+curl -O https://storage.googleapis.com/genai-toolbox/v0.25.0/darwin/amd64/toolbox
 {{< /tab >}}
 
 {{< tab header="windows/amd64" lang="bash" >}}
-curl -O https://storage.googleapis.com/genai-toolbox/v0.26.0/windows/amd64/toolbox.exe
+curl -O https://storage.googleapis.com/genai-toolbox/v0.25.0/windows/amd64/toolbox.exe
 {{< /tab >}}
 {{< /tabpane >}}
     <!-- {x-release-please-end} -->

docs/en/how-to/connect-ide/neo4j_mcp.md

@@ -44,19 +44,19 @@ expose your developer assistant tools to a Neo4j instance:
    <!-- {x-release-please-start-version} -->
    {{< tabpane persist=header >}}
 {{< tab header="linux/amd64" lang="bash" >}}
-curl -O https://storage.googleapis.com/genai-toolbox/v0.26.0/linux/amd64/toolbox
+curl -O https://storage.googleapis.com/genai-toolbox/v0.25.0/linux/amd64/toolbox
 {{< /tab >}}
 
 {{< tab header="darwin/arm64" lang="bash" >}}
-curl -O https://storage.googleapis.com/genai-toolbox/v0.26.0/darwin/arm64/toolbox
+curl -O https://storage.googleapis.com/genai-toolbox/v0.25.0/darwin/arm64/toolbox
 {{< /tab >}}
 
 {{< tab header="darwin/amd64" lang="bash" >}}
-curl -O https://storage.googleapis.com/genai-toolbox/v0.26.0/darwin/amd64/toolbox
+curl -O https://storage.googleapis.com/genai-toolbox/v0.25.0/darwin/amd64/toolbox
 {{< /tab >}}
 
 {{< tab header="windows/amd64" lang="bash" >}}
-curl -O https://storage.googleapis.com/genai-toolbox/v0.26.0/windows/amd64/toolbox.exe
+curl -O https://storage.googleapis.com/genai-toolbox/v0.25.0/windows/amd64/toolbox.exe
 {{< /tab >}}
 {{< /tabpane >}}
     <!-- {x-release-please-end} -->

docs/en/how-to/connect-ide/postgres_mcp.md

@@ -56,19 +56,19 @@ Omni](https://cloud.google.com/alloydb/omni/current/docs/overview).
    <!-- {x-release-please-start-version} -->
    {{< tabpane persist=header >}}
 {{< tab header="linux/amd64" lang="bash" >}}
-curl -O https://storage.googleapis.com/genai-toolbox/v0.26.0/linux/amd64/toolbox
+curl -O https://storage.googleapis.com/genai-toolbox/v0.25.0/linux/amd64/toolbox
 {{< /tab >}}
 
 {{< tab header="darwin/arm64" lang="bash" >}}
-curl -O https://storage.googleapis.com/genai-toolbox/v0.26.0/darwin/arm64/toolbox
+curl -O https://storage.googleapis.com/genai-toolbox/v0.25.0/darwin/arm64/toolbox
 {{< /tab >}}
 
 {{< tab header="darwin/amd64" lang="bash" >}}
-curl -O https://storage.googleapis.com/genai-toolbox/v0.26.0/darwin/amd64/toolbox
+curl -O https://storage.googleapis.com/genai-toolbox/v0.25.0/darwin/amd64/toolbox
 {{< /tab >}}
 
 {{< tab header="windows/amd64" lang="bash" >}}
-curl -O https://storage.googleapis.com/genai-toolbox/v0.26.0/windows/amd64/toolbox.exe
+curl -O https://storage.googleapis.com/genai-toolbox/v0.25.0/windows/amd64/toolbox.exe
 {{< /tab >}}
 {{< /tabpane >}}
     <!-- {x-release-please-end} -->

docs/en/how-to/connect-ide/sqlite_mcp.md

@@ -43,19 +43,19 @@ to expose your developer assistant tools to a SQLite instance:
    <!-- {x-release-please-start-version} -->
    {{< tabpane persist=header >}}
 {{< tab header="linux/amd64" lang="bash" >}}
-curl -O https://storage.googleapis.com/genai-toolbox/v0.26.0/linux/amd64/toolbox
+curl -O https://storage.googleapis.com/genai-toolbox/v0.25.0/linux/amd64/toolbox
 {{< /tab >}}
 
 {{< tab header="darwin/arm64" lang="bash" >}}
-curl -O https://storage.googleapis.com/genai-toolbox/v0.26.0/darwin/arm64/toolbox
+curl -O https://storage.googleapis.com/genai-toolbox/v0.25.0/darwin/arm64/toolbox
 {{< /tab >}}
 
 {{< tab header="darwin/amd64" lang="bash" >}}
-curl -O https://storage.googleapis.com/genai-toolbox/v0.26.0/darwin/amd64/toolbox
+curl -O https://storage.googleapis.com/genai-toolbox/v0.25.0/darwin/amd64/toolbox
 {{< /tab >}}
 
 {{< tab header="windows/amd64" lang="bash" >}}
-curl -O https://storage.googleapis.com/genai-toolbox/v0.26.0/windows/amd64/toolbox.exe
+curl -O https://storage.googleapis.com/genai-toolbox/v0.25.0/windows/amd64/toolbox.exe
 {{< /tab >}}
 {{< /tabpane >}}
     <!-- {x-release-please-end} -->

docs/en/how-to/deploy_adk_agent.md

@@ -46,10 +46,10 @@ with the necessary configuration for deployment to Vertex AI Agent Engine.
     process will generate deployment configuration files (like a `Makefile` and
     `Dockerfile`) in your project directory.
 
-4.  Add `google-adk[toolbox]` as a dependency to the new project:
+4.  Add `toolbox-core` as a dependency to the new project:
 
     ```bash
-    uv add google-adk[toolbox]
+    uv add toolbox-core
     ```
 
 ## Step 3: Configure Google Cloud Authentication
@@ -95,23 +95,22 @@ authentication token.
     ```python
     from google.adk import Agent
     from google.adk.apps import App
-    from google.adk.tools.toolbox_toolset import ToolboxToolset
+    from toolbox_core import ToolboxSyncClient, auth_methods
-    from toolbox_adk import CredentialStrategy
 
     # TODO(developer): Replace with your Toolbox Cloud Run Service URL
     TOOLBOX_URL = "https://your-toolbox-service-xyz.a.run.app"
 
-    # Initialize the toolset with Workload Identity (generates ID token for the URL)
+    # Initialize the client with the Cloud Run URL and Auth headers
-    toolset = ToolboxToolset(
+    client = ToolboxSyncClient(
-        server_url=TOOLBOX_URL,
+        TOOLBOX_URL, 
-        credentials=CredentialStrategy.workload_identity(target_audience=TOOLBOX_URL)
+        client_headers={"Authorization": auth_methods.get_google_id_token(TOOLBOX_URL)}
     )
 
     root_agent = Agent(
         name='root_agent',
         model='gemini-2.5-flash',
         instruction="You are a helpful AI assistant designed to provide accurate and useful information.",
-        tools=[toolset],
+        tools=client.load_toolset(),
     )
 
     app = App(root_agent=root_agent, name="my_agent")

docs/en/how-to/invoke_tool.md

@@ -1,74 +0,0 @@
----
-title: "Invoke Tools via CLI"
-type: docs
-weight: 10
-description: >
-  Learn how to invoke your tools directly from the command line using the `invoke` command.
----
-
-The `invoke` command allows you to invoke tools defined in your configuration directly from the CLI. This is useful for:
-
-- **Ephemeral Invocation:** Executing a tool without spinning up a full MCP server/client.
-- **Debugging:** Isolating tool execution logic and testing with various parameter combinations.
-
-{{< notice tip >}}
-**Keep configurations minimal:** The `invoke` command initializes *all* resources (sources, tools, etc.) defined in your configuration files during execution. To ensure fast response times, consider using a minimal configuration file containing only the tools you need for the specific invocation.
-{{< notice tip >}}
-
-## Prerequisites
-
-- You have the `toolbox` binary installed or built.
-- You have a valid tool configuration file (e.g., `tools.yaml`).
-
-## Basic Usage
-
-The basic syntax for the command is:
-
-```bash
-toolbox [--tools-file <path> | --prebuilt <name>] invoke <tool-name> [params]
-```
-
-- `<tool-name>`: The name of the tool you want to call. This must match the name defined in your `tools.yaml`.
-- `[params]`: (Optional) A JSON string representing the arguments for the tool.
-
-## Examples
-
-### 1. Calling a Tool without Parameters
-
-If your tool takes no parameters, simply provide the tool name:
-
-```bash
-toolbox  --tools-file tools.yaml invoke my-simple-tool
-```
-
-### 2. Calling a Tool with Parameters
-
-For tools that require arguments, pass them as a JSON string. Ensure you escape quotes correctly for your shell.
-
-**Example: A tool that takes parameters**
-
-Assuming a tool named `mytool` taking `a` and `b`:
-
-```bash
-toolbox --tools-file tools.yaml invoke mytool '{"a": 10, "b": 20}' 
-```
-
-**Example: A tool that queries a database**
-
-```bash
-toolbox  --tools-file tools.yaml invoke db-query '{"sql": "SELECT * FROM users LIMIT 5"}'
-```
-
-### 3. Using Prebuilt Configurations
-
-You can also use the `--prebuilt` flag to load prebuilt toolsets.
-
-```bash
-toolbox --prebuilt cloudsql-postgres invoke cloudsql-postgres-list-instances
-```
-
-## Troubleshooting
-
-- **Tool not found:** Ensure the `<tool-name>` matches exactly what is in your YAML file and that the file is correctly loaded via `--tools-file`.
-- **Invalid parameters:** Double-check your JSON syntax. The error message will usually indicate if the JSON parsing failed or if the parameters didn't match the tool's schema.
-- **Auth errors:** The `invoke` command currently does not support flows requiring client-side authorization (like OAuth flow initiation via the CLI). It works best for tools using service-side authentication (e.g., Application Default Credentials).

docs/en/reference/cli.md

@@ -16,7 +16,7 @@ description: >
 |              | `--log-level`              | Specify the minimum level logged. Allowed: 'DEBUG', 'INFO', 'WARN', 'ERROR'.                                                                                                     | `info`      |
 |              | `--logging-format`         | Specify logging format to use. Allowed: 'standard' or 'JSON'.                                                                                                                    | `standard`  |
 | `-p`         | `--port`                   | Port the server will listen on.                                                                                                                                                  | `5000`      |
-|              | `--prebuilt`               | Use one or more prebuilt tool configuration by source type. See [Prebuilt Tools Reference](prebuilt-tools.md) for allowed values.                                                          |             |
+|              | `--prebuilt`               | Use a prebuilt tool configuration by source type. See [Prebuilt Tools Reference](prebuilt-tools.md) for allowed values.                                                          |             |
 |              | `--stdio`                  | Listens via MCP STDIO instead of acting as a remote HTTP server.                                                                                                                 |             |
 |              | `--telemetry-gcp`          | Enable exporting directly to Google Cloud Monitoring.                                                                                                                            |             |
 |              | `--telemetry-otlp`         | Enable exporting using OpenTelemetry Protocol (OTLP) to the specified endpoint (e.g. 'http://127.0.0.1:4318')                                                                    |             |
@@ -27,24 +27,9 @@ description: >
 |              | `--ui`                     | Launches the Toolbox UI web server.                                                                                                                                              |             |
 |              | `--allowed-origins`        | Specifies a list of origins permitted to access this server for CORs access.                                                                                                     | `*`         |
 |              | `--allowed-hosts`          | Specifies a list of hosts permitted to access this server to prevent DNS rebinding attacks.                                                                                      | `*`         |
-|              | `--user-agent-metadata`    | Appends additional metadata to the User-Agent.                                                                                                                                   |             |
+|              | `--user-agent-extra`       | Appends additional metadata to the User-Agent.                                                                                                                                   |             |
 | `-v`         | `--version`                | version for toolbox                                                                                                                                                              |             |
 
-## Sub Commands
-
-### `invoke`
-
-Executes a tool directly with the provided parameters. This is useful for testing tool configurations and parameters without needing a full client setup.
-
-**Syntax:**
-
-```bash
-toolbox invoke <tool-name> [params]
-```
-
-- `<tool-name>`: The name of the tool to execute (as defined in your configuration).
-- `[params]`: (Optional) A JSON string containing the parameters for the tool.
-
 ## Examples
 
 ### Transport Configuration
@@ -66,11 +51,6 @@ toolbox invoke <tool-name> [params]
 
 # Server with prebuilt + custom tools configurations
 ./toolbox --tools-file tools.yaml --prebuilt alloydb-postgres
-
-# Server with multiple prebuilt tools configurations
-./toolbox --prebuilt alloydb-postgres,alloydb-postgres-admin
-# OR
-./toolbox --prebuilt alloydb-postgres --prebuilt alloydb-postgres-admin
 ```
 
 ### Tool Configuration Sources
@@ -91,7 +71,7 @@ The CLI supports multiple mutually exclusive ways to specify tool configurations
 
 **Prebuilt Configurations:**
 
-- `--prebuilt`: Use one or more predefined configurations for specific database types (e.g.,
+- `--prebuilt`: Use predefined configurations for specific database types (e.g.,
   'bigquery', 'postgres', 'spanner'). See [Prebuilt Tools
   Reference](prebuilt-tools.md) for allowed values.
 

docs/en/reference/prebuilt-tools.md

@@ -16,9 +16,6 @@ details on how to connect your AI tools (IDEs) to databases via Toolbox and MCP.
 {{< notice tip >}}
 You can now use `--prebuilt` along `--tools-file`, `--tools-files`, or
 `--tools-folder` to combine prebuilt configs with custom tools.
-
-You can also combine multiple prebuilt configs.
-
 See [Usage Examples](../reference/cli.md#examples).
 {{< /notice >}}
 
@@ -100,43 +97,6 @@ See [Usage Examples](../reference/cli.md#examples).
         (timeseries metrics) for queries running in an AlloyDB instance using a
         PromQL query.
 
-## AlloyDB Omni
-
-*   `--prebuilt` value: `alloydb-omni`
-*   **Environment Variables:**
-    *   `ALLOYDB_OMNI_HOST`: (Optional) The hostname or IP address (Default: localhost).
-    *   `ALLOYDB_OMNI_PORT`: (Optional) The port number (Default: 5432).
-    *   `ALLOYDB_OMNI_DATABASE`: The name of the database to connect to.
-    *   `ALLOYDB_OMNI_USER`: The database username.
-    *   `ALLOYDB_OMNI_PASSWORD`: (Optional) The password for the database user.
-    *   `ALLOYDB_OMNI_QUERY_PARAMS`: (Optional) Connection query parameters.
-*   **Tools:**
-    *   `execute_sql`: Executes a SQL query.
-    *   `list_tables`: Lists tables in the database.
-    *   `list_autovacuum_configurations`: Lists autovacuum configurations in the
-        database.
-    *   `list_columnar_configurations`: List AlloyDB Omni columnar-related configurations.
-    *   `list_columnar_recommended_columns`: Lists columns that AlloyDB Omni recommends adding to the columnar engine.
-    *   `list_memory_configurations`: Lists memory-related configurations in the
-        database.
-    *   `list_top_bloated_tables`: List top bloated tables in the database.
-    *   `list_replication_slots`: Lists replication slots in the database.
-    *   `list_invalid_indexes`: Lists invalid indexes in the database.
-    *   `get_query_plan`: Generate the execution plan of a statement.
-    *   `list_views`: Lists views in the database from pg_views with a default
-        limit of 50 rows. Returns schemaname, viewname and the ownername.
-    *   `list_schemas`: Lists schemas in the database.
-    *   `database_overview`: Fetches the current state of the PostgreSQL server.
-    *   `list_triggers`: Lists triggers in the database.
-    *   `list_indexes`: List available user indexes in a PostgreSQL database.
-    *   `list_sequences`: List sequences in a PostgreSQL database.
-    *   `list_publication_tables`: List publication tables in a PostgreSQL database.
-    *   `list_tablespaces`: Lists tablespaces in the database.
-    *   `list_pg_settings`: List configuration parameters for the PostgreSQL server.
-    *   `list_database_stats`: Lists the key performance and activity statistics for
-        each database in the AlloyDB instance.
-    *   `list_roles`: Lists all the user-created roles in PostgreSQL database.
-
 ## BigQuery
 
 *   `--prebuilt` value: `bigquery`

docs/en/resources/authServices/_index.md

@@ -28,19 +28,17 @@ The following configurations are placed at the top level of a `tools.yaml` file.
 {{< notice tip >}}
 If you are accessing Toolbox with multiple applications, each
  application should register their own Client ID even if they use the same
- "type" of auth provider.
+ "kind" of auth provider.
 {{< /notice >}}
 
 ```yaml
-kind: authServices
+authServices:
-name: my_auth_app_1
+  my_auth_app_1:
-type: google
+    kind: google
-clientId: ${YOUR_CLIENT_ID_1}
+    clientId: ${YOUR_CLIENT_ID_1}
----
+  my_auth_app_2:
-kind: authServices
+    kind: google
-name: my_auth_app_2
+    clientId: ${YOUR_CLIENT_ID_2}
-type: google
-clientId: ${YOUR_CLIENT_ID_2}
 ```
 
 {{< notice tip >}}

docs/en/resources/authServices/google.md

@@ -40,10 +40,10 @@ id-token][provided-claims] can be used for the parameter.
 ## Example
 
 ```yaml
-kind: authServices
+authServices:
-name: my-google-auth
+  my-google-auth:
-type: google
+    kind: google
-clientId: ${YOUR_GOOGLE_CLIENT_ID}
+    clientId: ${YOUR_GOOGLE_CLIENT_ID}
 ```
 
 {{< notice tip >}}
@@ -55,5 +55,5 @@ instead of hardcoding your secrets into the configuration file.
 
 | **field** | **type** | **required** | **description**                                                  |
 |-----------|:--------:|:------------:|------------------------------------------------------------------|
-| type      |  string  |     true     | Must be "google".                                                |
+| kind      |  string  |     true     | Must be "google".                                                |
 | clientId  |  string  |     true     | Client ID of your application from registering your application. |

docs/en/resources/embeddingModels/_index.md

@@ -3,14 +3,13 @@ title: "EmbeddingModels"
 type: docs
 weight: 2
 description: >
-  EmbeddingModels represent services that transform text into vector embeddings
+  EmbeddingModels represent services that transform text into vector embeddings for semantic search.
-  for semantic search.
 ---
 
 EmbeddingModels represent services that generate vector representations of text
-data. In the MCP Toolbox, these models enable **Semantic Queries**, allowing
+data. In the MCP Toolbox, these models enable **Semantic Queries**,
-[Tools](../tools/) to automatically convert human-readable text into numerical
+allowing [Tools](../tools/) to automatically convert human-readable text into
-vectors before using them in a query.
+numerical vectors before using them in a query.
 
 This is primarily used in two scenarios:
 
@@ -20,33 +19,14 @@ This is primarily used in two scenarios:
 - **Semantic Search**: Converting a natural language query into a vector to
   perform similarity searches.
 
-## Hidden Parameter Duplication (valueFromParam)
-
-When building tools for vector ingestion, you often need the same input string
-twice:
-
-1. To store the original text in a TEXT column.
-1. To generate the vector embedding for a VECTOR column.
-
-Requesting an Agent (LLM) to output the exact same string twice is inefficient
-and error-prone. The `valueFromParam` field solves this by allowing a parameter
-to inherit its value from another parameter in the same tool.
-
-### Key Behaviors
-
-1. Hidden from Manifest: Parameters with valueFromParam set are excluded from
-   the tool definition sent to the Agent. The Agent does not know this parameter
-   exists.
-1. Auto-Filled: When the tool is executed, the Toolbox automatically copies the
-   value from the referenced parameter before processing embeddings.
-
 ## Example
 
 The following configuration defines an embedding model and applies it to
 specific tool parameters.
 
-{{< notice tip >}} Use environment variable replacement with the format
+{{< notice tip >}}
-${ENV_NAME} instead of hardcoding your API keys into the configuration file.
+Use environment variable replacement with the format ${ENV_NAME}
+instead of hardcoding your API keys into the configuration file.
 {{< /notice >}}
 
 ### Step 1 - Define an Embedding Model
@@ -54,53 +34,51 @@ ${ENV_NAME} instead of hardcoding your API keys into the configuration file.
 Define an embedding model in the `embeddingModels` section:
 
 ```yaml
-kind: embeddingModels
+embeddingModels:
-name: gemini-model # Name of the embedding model
+  gemini-model: # Name of the embedding model
-type: gemini
+    kind: gemini
-model: gemini-embedding-001
+    model: gemini-embedding-001
-apiKey: ${GOOGLE_API_KEY}
+    apiKey: ${GOOGLE_API_KEY}
-dimension: 768
+    dimension: 768
+
 ```
 
 ### Step 2 - Embed Tool Parameters
 
 Use the defined embedding model, embed your query parameters using the
-`embeddedBy` field. Only string-typed parameters can be embedded:
+`embeddedBy` field. Only string-typed
+parameters can be embedded:
 
 ```yaml
-# Vector ingestion tool
+tools:
-kind: tools
+  # Vector ingestion tool
-name: insert_embedding
+  insert_embedding:
-type: postgres-sql
+    kind: postgres-sql
-source: my-pg-instance
+    source: my-pg-instance
-statement: |
+    statement: |
-  INSERT INTO documents (content, embedding) 
+      INSERT INTO documents (content, embedding) 
-  VALUES ($1, $2);
+      VALUES ($1, $2);
-parameters:
+    parameters:
-  - name: content
+      - name: content
-    type: string
+        type: string
-    description: The raw text content to be stored in the database.
+      - name: vector_string
-  - name: vector_string
+        type: string
-    type: string
+        description: The text to be vectorized and stored.
-    # This parameter is hidden from the LLM.
+        embeddedBy: gemini-model # refers to the name of a defined embedding model
-    # It automatically copies the value from 'content' and embeds it.
+
-    valueFromParam: content
+  # Semantic search tool
-    embeddedBy: gemini-model
+  search_embedding:
----
+    kind: postgres-sql
-# Semantic search tool
+    source: my-pg-instance
-kind: tools
+    statement: |
-name: search_embedding
+      SELECT id, content, embedding <-> $1 AS distance 
-type: postgres-sql
+      FROM documents
-source: my-pg-instance
+      ORDER BY distance LIMIT 1
-statement: |
+    parameters:
-  SELECT id, content, embedding <-> $1 AS distance 
+      - name: semantic_search_string
-  FROM documents
+        type: string
-  ORDER BY distance LIMIT 1
+        description: The search query that will be converted to a vector.
-parameters:
+        embeddedBy: gemini-model # refers to the name of a defined embedding model
-  - name: semantic_search_string
-    type: string
-    description: The search query that will be converted to a vector.
-    embeddedBy: gemini-model # refers to the name of a defined embedding model
 ```
 
 ## Kinds of Embedding Models

docs/en/resources/embeddingModels/gemini.md

@@ -50,12 +50,12 @@ information.
 ## Example
 
 ```yaml
-kind: embeddingModels
+embeddingModels:
-name: gemini-model
+  gemini-model:
-type: gemini
+    kind: gemini
-model: gemini-embedding-001
+    model: gemini-embedding-001
-apiKey: ${GOOGLE_API_KEY}
+    apiKey: ${GOOGLE_API_KEY}
-dimension: 768
+    dimension: 768
 ```
 
 {{< notice tip >}}
@@ -67,7 +67,7 @@ instead of hardcoding your secrets into the configuration file.
 
 | **field** | **type** | **required** | **description**                                              |
 |-----------|:--------:|:------------:|--------------------------------------------------------------|
-| type      |  string  |     true     | Must be `gemini`.                                            |
+| kind      |  string  |     true     | Must be `gemini`.                                            |
 | model     |  string  |     true     | The Gemini model ID to use (e.g., `gemini-embedding-001`).   |
 | apiKey    |  string  |    false     | Your API Key from Google AI Studio.                          |
 | dimension | integer  |    false     | The number of dimensions in the output vector (e.g., `768`). |

docs/en/resources/prompts/_index.md

@@ -16,14 +16,14 @@ can be sent to a Large Language Model (LLM). The Toolbox server implements the
 specification, allowing clients to discover and retrieve these prompts.
 
 ```yaml
-kind: prompts
+prompts:
-name: code_review
+  code_review:
-description: "Asks the LLM to analyze code quality and suggest improvements."
+    description: "Asks the LLM to analyze code quality and suggest improvements."
-messages:
+    messages:
-  - content: "Please review the following code for quality, correctness, and potential improvements: \n\n{{.code}}"
+      - content: "Please review the following code for quality, correctness, and potential improvements: \n\n{{.code}}"
-arguments:
+    arguments:
-  - name: "code"
+      - name: "code"
-    description: "The code to review"
+        description: "The code to review"
 ```
 
 ## Prompt Schema
@@ -31,7 +31,7 @@ arguments:
 | **field**   | **type**                       | **required** | **description**                                                          |
 |-------------|--------------------------------|--------------|--------------------------------------------------------------------------|
 | description | string                         | No           | A brief explanation of what the prompt does.                             |
-| type        | string                         | No           | The type of prompt. Defaults to `"custom"`.                              |
+| kind        | string                         | No           | The kind of prompt. Defaults to `"custom"`.                              |
 | messages    | [][Message](#message-schema)   | Yes          | A list of one or more message objects that make up the prompt's content. |
 | arguments   | [][Argument](#argument-schema) | No           | A list of arguments that can be interpolated into the prompt's content.  |
 

docs/en/resources/prompts/custom/_index.md

@@ -17,14 +17,14 @@ Here is an example of a simple prompt that takes a single argument, code, and
 asks an LLM to review it.
 
 ```yaml
-kind: prompts
+prompts:
-name: code_review
+  code_review:
-description: "Asks the LLM to analyze code quality and suggest improvements."
+    description: "Asks the LLM to analyze code quality and suggest improvements."
-messages:
+    messages:
-  - content: "Please review the following code for quality, correctness, and potential improvements: \n\n{{.code}}"
+      - content: "Please review the following code for quality, correctness, and potential improvements: \n\n{{.code}}"
-arguments:
+    arguments:
-  - name: "code"
+      - name: "code"
-    description: "The code to review"
+        description: "The code to review"
 ```
 
 ### Multi-message prompt
@@ -33,19 +33,19 @@ You can define prompts with multiple messages to set up more complex
 conversational contexts, like a role-playing scenario.
 
 ```yaml
-kind: prompts
+prompts:
-name: roleplay_scenario
+  roleplay_scenario:
-description: "Sets up a roleplaying scenario with initial messages."
+    description: "Sets up a roleplaying scenario with initial messages."
-arguments:
+    arguments:
-  - name: "character"
+      - name: "character"
-    description: "The character the AI should embody."
+        description: "The character the AI should embody."
-  - name: "situation"
+      - name: "situation"
-    description: "The initial situation for the roleplay."
+        description: "The initial situation for the roleplay."
-messages:
+    messages:
-  - role: "user"
+      - role: "user"
-    content: "Let's roleplay. You are {{.character}}. The situation is: {{.situation}}"
+        content: "Let's roleplay. You are {{.character}}. The situation is: {{.situation}}"
-  - role: "assistant"
+      - role: "assistant"
-    content: "Okay, I understand. I am ready. What happens next?"
+        content: "Okay, I understand. I am ready. What happens next?"
 ```
 
 ## Reference
@@ -54,7 +54,7 @@ messages:
 
 | **field**   | **type**                       | **required** | **description**                                                          |
 |-------------|--------------------------------|--------------|--------------------------------------------------------------------------|
-| type        | string                         | No           | The type of prompt. Must be `"custom"`.                                  |
+| kind        | string                         | No           | The kind of prompt. Must be `"custom"`.                                  |
 | description | string                         | No           | A brief explanation of what the prompt does.                             |
 | messages    | [][Message](#message-schema)   | Yes          | A list of one or more message objects that make up the prompt's content. |
 | arguments   | [][Argument](#argument-schema) | No           | A list of arguments that can be interpolated into the prompt's content.  |

docs/en/resources/sources/_index.md

@@ -17,15 +17,15 @@ instead of hardcoding your secrets into the configuration file.
 {{< /notice >}}
 
 ```yaml
-kind: sources
+sources:
-name: my-cloud-sql-source
+    my-cloud-sql-source:
-type: cloud-sql-postgres
+        kind: cloud-sql-postgres
-project: my-project-id
+        project: my-project-id
-region: us-central1
+        region: us-central1
-instance: my-instance-name
+        instance: my-instance-name
-database: my_db
+        database: my_db
-user: ${USER_NAME}
+        user: ${USER_NAME}
-password: ${PASSWORD}
+        password: ${PASSWORD}
 ```
 
 In implementation, each source is a different connection pool or client that used

docs/en/resources/sources/alloydb-admin.md

@@ -25,20 +25,19 @@ Authentication can be handled in two ways:
 ## Example
 
 ```yaml
-kind: sources
+sources:
-name: my-alloydb-admin
+    my-alloydb-admin:
-type: alloydb-admin
+        kind: alloy-admin
----
+
-kind: sources
+    my-oauth-alloydb-admin:
-name: my-oauth-alloydb-admin
+        kind: alloydb-admin
-type: alloydb-admin
+        useClientOAuth: true
-useClientOAuth: true
 ```
 
 ## Reference
 
 | **field**      | **type** | **required** | **description**                                                                                                                                |
 | -------------- | :------: | :----------: | ---------------------------------------------------------------------------------------------------------------------------------------------- |
-| type           |  string  |     true     | Must be "alloydb-admin".                                                                                                                       |
+| kind           |  string  |     true     | Must be "alloydb-admin".                                                                                                                       |
 | defaultProject |  string  |     false    | The Google Cloud project ID to use for AlloyDB infrastructure tools.                                                                           |
 | useClientOAuth |  boolean |     false    | If true, the source will use client-side OAuth for authorization. Otherwise, it will use Application Default Credentials. Defaults to `false`. |

docs/en/resources/sources/alloydb-pg.md

@@ -176,17 +176,17 @@ To connect using IAM authentication:
 ## Example
 
 ```yaml
-kind: sources
+sources:
-name: my-alloydb-pg-source
+    my-alloydb-pg-source:
-type: alloydb-postgres
+        kind: alloydb-postgres
-project: my-project-id
+        project: my-project-id
-region: us-central1
+        region: us-central1
-cluster: my-cluster
+        cluster: my-cluster
-instance: my-instance
+        instance: my-instance
-database: my_db
+        database: my_db
-user: ${USER_NAME}
+        user: ${USER_NAME}
-password: ${PASSWORD}
+        password: ${PASSWORD}
-# ipType: "public"
+        # ipType: "public"
 ```
 
 {{< notice tip >}}
@@ -198,7 +198,7 @@ instead of hardcoding your secrets into the configuration file.
 
 | **field** | **type** | **required** | **description**                                                                                                          |
 |-----------|:--------:|:------------:|--------------------------------------------------------------------------------------------------------------------------|
-| type      |  string  |     true     | Must be "alloydb-postgres".                                                                                              |
+| kind      |  string  |     true     | Must be "alloydb-postgres".                                                                                              |
 | project   |  string  |     true     | Id of the GCP project that the cluster was created in (e.g. "my-project-id").                                            |
 | region    |  string  |     true     | Name of the GCP region that the cluster was created in (e.g. "us-central1").                                             |
 | cluster   |  string  |     true     | Name of the AlloyDB cluster (e.g. "my-cluster").                                                                         |

docs/en/resources/sources/bigquery.md

@@ -121,47 +121,47 @@ identity used has been granted the correct IAM permissions.
 Initialize a BigQuery source that uses ADC:
 
 ```yaml
-kind: sources
+sources:
-name: my-bigquery-source
+  my-bigquery-source:
-type: "bigquery"
+    kind: "bigquery"
-project: "my-project-id"
+    project: "my-project-id"
-# location: "US" # Optional: Specifies the location for query jobs.
+    # location: "US" # Optional: Specifies the location for query jobs.
-# writeMode: "allowed" # One of: allowed, blocked, protected. Defaults to "allowed".
+    # writeMode: "allowed" # One of: allowed, blocked, protected. Defaults to "allowed".
-# allowedDatasets: # Optional: Restricts tool access to a specific list of datasets.
+    # allowedDatasets: # Optional: Restricts tool access to a specific list of datasets.
-#   - "my_dataset_1"
+    #   - "my_dataset_1"
-#   - "other_project.my_dataset_2"
+    #   - "other_project.my_dataset_2"
-# impersonateServiceAccount: "service-account@project-id.iam.gserviceaccount.com" # Optional: Service account to impersonate
+    # impersonateServiceAccount: "service-account@project-id.iam.gserviceaccount.com" # Optional: Service account to impersonate
-# scopes: # Optional: List of OAuth scopes to request.
+    # scopes: # Optional: List of OAuth scopes to request.
-#   - "https://www.googleapis.com/auth/bigquery"
+    #   - "https://www.googleapis.com/auth/bigquery"
-#   - "https://www.googleapis.com/auth/drive.readonly"
+    #   - "https://www.googleapis.com/auth/drive.readonly"
-# maxQueryResultRows: 50 # Optional: Limits the number of rows returned by queries. Defaults to 50.
+    # maxQueryResultRows: 50 # Optional: Limits the number of rows returned by queries. Defaults to 50.
 ```
 
 Initialize a BigQuery source that uses the client's access token:
 
 ```yaml
-kind: sources
+sources:
-name: my-bigquery-client-auth-source
+  my-bigquery-client-auth-source:
-type: "bigquery"
+    kind: "bigquery"
-project: "my-project-id"
+    project: "my-project-id"
-useClientOAuth: true
+    useClientOAuth: true
-# location: "US" # Optional: Specifies the location for query jobs.
+    # location: "US" # Optional: Specifies the location for query jobs.
-# writeMode: "allowed" # One of: allowed, blocked, protected. Defaults to "allowed".
+    # writeMode: "allowed" # One of: allowed, blocked, protected. Defaults to "allowed".
-# allowedDatasets: # Optional: Restricts tool access to a specific list of datasets.
+    # allowedDatasets: # Optional: Restricts tool access to a specific list of datasets.
-#   - "my_dataset_1"
+    #   - "my_dataset_1"
-#   - "other_project.my_dataset_2"
+    #   - "other_project.my_dataset_2"
-# impersonateServiceAccount: "service-account@project-id.iam.gserviceaccount.com" # Optional: Service account to impersonate
+    # impersonateServiceAccount: "service-account@project-id.iam.gserviceaccount.com" # Optional: Service account to impersonate
-# scopes: # Optional: List of OAuth scopes to request.
+    # scopes: # Optional: List of OAuth scopes to request.
-#   - "https://www.googleapis.com/auth/bigquery"
+    #   - "https://www.googleapis.com/auth/bigquery"
-#   - "https://www.googleapis.com/auth/drive.readonly"
+    #   - "https://www.googleapis.com/auth/drive.readonly"
-# maxQueryResultRows: 50 # Optional: Limits the number of rows returned by queries. Defaults to 50.
+    # maxQueryResultRows: 50 # Optional: Limits the number of rows returned by queries. Defaults to 50.
 ```
 
 ## Reference
 
 | **field**                 | **type** | **required** | **description**                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     |
 |---------------------------|:--------:|:------------:|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| type                      |  string  |     true     | Must be "bigquery".                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 |
+| kind                      |  string  |     true     | Must be "bigquery".                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 |
 | project                   |  string  |     true     | Id of the Google Cloud project to use for billing and as the default project for BigQuery resources.                                                                                                                                                                                                                                                                                                                                                                                                                |
 | location                  |  string  |    false     | Specifies the location (e.g., 'us', 'asia-northeast1') in which to run the query job. This location must match the location of any tables referenced in the query. Defaults to the table's location or 'US' if the location cannot be determined. [Learn More](https://cloud.google.com/bigquery/docs/locations)                                                                                                                                                                                                    |
 | writeMode                 |  string  |    false     | Controls the write behavior for tools. `allowed` (default): All queries are permitted. `blocked`: Only `SELECT` statements are allowed for the `bigquery-execute-sql` tool. `protected`: Enables session-based execution where all tools associated with this source instance share the same [BigQuery session](https://cloud.google.com/bigquery/docs/sessions-intro). This allows for stateful operations using temporary tables (e.g., `CREATE TEMP TABLE`). For `bigquery-execute-sql`, `SELECT` statements can be used on all tables, but write operations are restricted to the session's temporary dataset. For tools like `bigquery-sql`, `bigquery-forecast`, and `bigquery-analyze-contribution`, the `writeMode` restrictions do not apply, but they will operate within the shared session. **Note:** The `protected` mode cannot be used with `useClientOAuth: true`. It is also not recommended for multi-user server environments, as all users would share the same session. A session is terminated automatically after 24 hours of inactivity or after 7 days, whichever comes first. A new session is created on the next request, and any temporary data from the previous session will be lost. |

docs/en/resources/sources/bigtable.md

@@ -59,17 +59,17 @@ applying IAM permissions and roles to an identity.
 ## Example
 
 ```yaml
-kind: sources
+sources:
-name: my-bigtable-source
+  my-bigtable-source:
-type: "bigtable"
+    kind: "bigtable"
-project: "my-project-id"
+    project: "my-project-id"
-instance: "test-instance"
+    instance: "test-instance"
 ```
 
 ## Reference
 
 | **field** | **type** | **required** | **description**                                                               |
 |-----------|:--------:|:------------:|-------------------------------------------------------------------------------|
-| type      |  string  |     true     | Must be "bigtable".                                                           |
+| kind      |  string  |     true     | Must be "bigtable".                                                           |
 | project   |  string  |     true     | Id of the GCP project that the cluster was created in (e.g. "my-project-id"). |
 | instance  |  string  |     true     | Name of the Bigtable instance.                                                |

docs/en/resources/sources/cassandra.md

@@ -23,19 +23,19 @@ distributed architectures, and a flexible approach to schema definition.
 ## Example
 
 ```yaml
-kind: sources
+sources:
-name: my-cassandra-source
+    my-cassandra-source:
-type: cassandra
+        kind: cassandra
-hosts:
+        hosts:
-    - 127.0.0.1
+            - 127.0.0.1
-keyspace: my_keyspace
+        keyspace: my_keyspace
-protoVersion: 4
+        protoVersion: 4
-username: ${USER_NAME}
+        username: ${USER_NAME}
-password: ${PASSWORD}
+        password: ${PASSWORD}
-caPath: /path/to/ca.crt # Optional: path to CA certificate
+        caPath: /path/to/ca.crt # Optional: path to CA certificate
-certPath: /path/to/client.crt # Optional: path to client certificate
+        certPath: /path/to/client.crt # Optional: path to client certificate
-keyPath: /path/to/client.key # Optional: path to client key
+        keyPath: /path/to/client.key # Optional: path to client key
-enableHostVerification: true # Optional: enable host verification
+        enableHostVerification: true # Optional: enable host verification
 ```
 
 {{< notice tip >}}
@@ -47,7 +47,7 @@ instead of hardcoding your secrets into the configuration file.
 
 | **field**              | **type** | **required** | **description**                                                                                                                                    |
 |------------------------|:--------:|:------------:|----------------------------------------------------------------------------------------------------------------------------------------------------|
-| type                   |  string  |     true     | Must be "cassandra".                                                                                                                               |
+| kind                   |  string  |     true     | Must be "cassandra".                                                                                                                               |
 | hosts                  | string[] |     true     | List of IP addresses to connect to (e.g., ["192.168.1.1:9042", "192.168.1.2:9042","192.168.1.3:9042"]). The default port is 9042 if not specified. |
 | keyspace               |  string  |     true     | Name of the Cassandra keyspace to connect to (e.g., "my_keyspace").                                                                                |
 | protoVersion           | integer  |    false     | Protocol version for the Cassandra connection (e.g., 4).                                                                                           |

docs/en/resources/sources/clickhouse.md

@@ -46,31 +46,31 @@ ClickHouse supports multiple protocols:
 ### Secure Connection Example
 
 ```yaml
-kind: sources
+sources:
-name: secure-clickhouse-source
+    secure-clickhouse-source:
-type: clickhouse
+        kind: clickhouse
-host: clickhouse.example.com
+        host: clickhouse.example.com
-port: "8443"
+        port: "8443"
-database: analytics
+        database: analytics
-user: ${CLICKHOUSE_USER}
+        user: ${CLICKHOUSE_USER}
-password: ${CLICKHOUSE_PASSWORD}
+        password: ${CLICKHOUSE_PASSWORD}
-protocol: https
+        protocol: https
-secure: true
+        secure: true
 ```
 
 ### HTTP Protocol Example
 
 ```yaml
-kind: sources
+sources:
-name: http-clickhouse-source
+    http-clickhouse-source:
-type: clickhouse
+        kind: clickhouse
-host: localhost
+        host: localhost
-port: "8123"
+        port: "8123"
-database: logs
+        database: logs
-user: ${CLICKHOUSE_USER}
+        user: ${CLICKHOUSE_USER}
-password: ${CLICKHOUSE_PASSWORD}
+        password: ${CLICKHOUSE_PASSWORD}
-protocol: http
+        protocol: http
-secure: false
+        secure: false
 ```
 
 {{< notice tip >}}
@@ -82,7 +82,7 @@ instead of hardcoding your secrets into the configuration file.
 
 | **field** | **type** | **required** | **description**                                                                     |
 |-----------|:--------:|:------------:|-------------------------------------------------------------------------------------|
-| type      |  string  |     true     | Must be "clickhouse".                                                               |
+| kind      |  string  |     true     | Must be "clickhouse".                                                               |
 | host      |  string  |     true     | IP address or hostname to connect to (e.g. "127.0.0.1" or "clickhouse.example.com") |
 | port      |  string  |     true     | Port to connect to (e.g. "8443" for HTTPS, "8123" for HTTP)                         |
 | database  |  string  |     true     | Name of the ClickHouse database to connect to (e.g. "my_database").                 |

docs/en/resources/sources/cloud-gda.md

@@ -20,22 +20,21 @@ Authentication can be handled in two ways:
 ## Example
 
 ```yaml
-kind: sources
+sources:
-name: my-gda-source
+  my-gda-source:
-type: cloud-gemini-data-analytics
+    kind: cloud-gemini-data-analytics
-projectId: my-project-id
+    projectId: my-project-id
----
+
-kind: sources
+  my-oauth-gda-source:
-name: my-oauth-gda-source
+    kind: cloud-gemini-data-analytics
-type: cloud-gemini-data-analytics
+    projectId: my-project-id
-projectId: my-project-id
+    useClientOAuth: true
-useClientOAuth: true
 ```
 
 ## Reference
 
 | **field**      | **type** | **required** | **description**                                                                                                                                                              |
 | -------------- | :------: | :----------: | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| type           |  string  |     true     | Must be "cloud-gemini-data-analytics".                                                                                                                                       |
+| kind           |  string  |     true     | Must be "cloud-gemini-data-analytics".                                                                                                                                       |
 | projectId      |  string  |     true     | The Google Cloud Project ID where the API is enabled.                                                                                                                        |
 | useClientOAuth | boolean  |    false     | If true, the source uses the token provided by the caller (forwarded to the API). Otherwise, it uses server-side Application Default Credentials (ADC). Defaults to `false`. |

docs/en/resources/sources/cloud-healthcare.md

@@ -123,41 +123,41 @@ identity used has been granted the correct IAM permissions.
 Initialize a Cloud Healthcare API source that uses ADC:
 
 ```yaml
-kind: sources
+sources:
-name: my-healthcare-source
+  my-healthcare-source:
-type: "cloud-healthcare"
+    kind: "cloud-healthcare"
-project: "my-project-id"
+    project: "my-project-id"
-region: "us-central1"
+    region: "us-central1"
-dataset: "my-healthcare-dataset-id"
+    dataset: "my-healthcare-dataset-id"
-# allowedFhirStores: # Optional: Restricts tool access to a specific list of FHIR store IDs.
+    # allowedFhirStores: # Optional: Restricts tool access to a specific list of FHIR store IDs.
-#   - "my_fhir_store_1"
+    #   - "my_fhir_store_1"
-# allowedDicomStores: # Optional: Restricts tool access to a specific list of DICOM store IDs.
+    # allowedDicomStores: # Optional: Restricts tool access to a specific list of DICOM store IDs.
-#   - "my_dicom_store_1"
+    #   - "my_dicom_store_1"
-#   - "my_dicom_store_2"
+    #   - "my_dicom_store_2"
 ```
 
 Initialize a Cloud Healthcare API source that uses the client's access token:
 
 ```yaml
-kind: sources
+sources:
-name: my-healthcare-client-auth-source
+  my-healthcare-client-auth-source:
-type: "cloud-healthcare"
+    kind: "cloud-healthcare"
-project: "my-project-id"
+    project: "my-project-id"
-region: "us-central1"
+    region: "us-central1"
-dataset: "my-healthcare-dataset-id"
+    dataset: "my-healthcare-dataset-id"
-useClientOAuth: true
+    useClientOAuth: true
-# allowedFhirStores: # Optional: Restricts tool access to a specific list of FHIR store IDs.
+    # allowedFhirStores: # Optional: Restricts tool access to a specific list of FHIR store IDs.
-#   - "my_fhir_store_1"
+    #   - "my_fhir_store_1"
-# allowedDicomStores: # Optional: Restricts tool access to a specific list of DICOM store IDs.
+    # allowedDicomStores: # Optional: Restricts tool access to a specific list of DICOM store IDs.
-#   - "my_dicom_store_1"
+    #   - "my_dicom_store_1"
-#   - "my_dicom_store_2"
+    #   - "my_dicom_store_2"
 ```
 
 ## Reference
 
 | **field**          | **type** | **required** | **description**                                                                                                                                                                                                                                                              |
 |--------------------|:--------:|:------------:|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| type               |  string  |     true     | Must be "cloud-healthcare".                                                                                                                                                                                                                                                  |
+| kind               |  string  |     true     | Must be "cloud-healthcare".                                                                                                                                                                                                                                                  |
 | project            |  string  |     true     | ID of the GCP project that the dataset lives in.                                                                                                                                                                                                                             |
 | region             |  string  |     true     | Specifies the region (e.g., 'us', 'asia-northeast1') of the healthcare dataset. [Learn More](https://cloud.google.com/healthcare-api/docs/regions)                                                                                                                           |
 | dataset            |  string  |     true     | ID of the healthcare dataset.                                                                                                                                                                                                                                                |

docs/en/resources/sources/cloud-logging-admin.md

@@ -1,71 +0,0 @@
----
-title: "Cloud Logging Admin"
-type: docs
-weight: 1
-description: >
-  The Cloud Logging Admin source enables tools to interact with the Cloud Logging API, allowing for the retrieval of log names, monitored resource types, and the querying of log data.
----
-
-## About
-
-The Cloud Logging Admin source provides a client to interact with the [Google
-Cloud Logging API](https://cloud.google.com/logging/docs). This allows tools to list log names, monitored resource types, and query log entries.
-
-Authentication can be handled in two ways:
-
-1.  **Application Default Credentials (ADC):** By default, the source uses ADC
-    to authenticate with the API.
-2.  **Client-side OAuth:** If `useClientOAuth` is set to `true`, the source will
-    expect an OAuth 2.0 access token to be provided by the client (e.g., a web
-    browser) for each request.
-
-## Available Tools
-
-- [`cloud-logging-admin-list-log-names`](../tools/cloudloggingadmin/cloud-logging-admin-list-log-names.md)
-  Lists the log names in the project.
-
-- [`cloud-logging-admin-list-resource-types`](../tools/cloudloggingadmin/cloud-logging-admin-list-resource-types.md)
-  Lists the monitored resource types.
-
-- [`cloud-logging-admin-query-logs`](../tools/cloudloggingadmin/cloud-logging-admin-query-logs.md)
-  Queries log entries.
-
-## Example
-
-Initialize a Cloud Logging Admin source that uses ADC:
-
-```yaml
-kind: sources
-name: my-cloud-logging
-type: cloud-logging-admin
-project: my-project-id
-```
-
-Initialize a Cloud Logging Admin source that uses client-side OAuth:
-
-```yaml
-kind: sources
-name: my-oauth-cloud-logging
-type: cloud-logging-admin
-project: my-project-id
-useClientOAuth: true
-```
-
-Initialize a Cloud Logging Admin source that uses service account impersonation:
-
-```yaml
-kind: sources
-name: my-impersonated-cloud-logging
-type: cloud-logging-admin
-project: my-project-id
-impersonateServiceAccount: "my-service-account@my-project.iam.gserviceaccount.com"
-```
-
-## Reference
-
-| **field**                   | **type** | **required** | **description**                                                                                                                                                                                 |
-|-----------------------------|:--------:|:------------:|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| type                        |  string  |     true     | Must be "cloud-logging-admin".                                                                                                                                                                  |
-| project                     |  string  |     true     | ID of the GCP project.                                                                                                                                                                          |
-| useClientOAuth              | boolean  |    false     | If true, the source will use client-side OAuth for authorization. Otherwise, it will use Application Default Credentials. Defaults to `false`. Cannot be used with `impersonateServiceAccount`. |
-| impersonateServiceAccount   |  string  |    false     | The service account to impersonate for API calls. Cannot be used with `useClientOAuth`.                                                                                                         |

docs/en/resources/sources/cloud-monitoring.md

@@ -25,19 +25,18 @@ Authentication can be handled in two ways:
 ## Example
 
 ```yaml
-kind: sources
+sources:
-name: my-cloud-monitoring
+    my-cloud-monitoring:
-type: cloud-monitoring
+        kind: cloud-monitoring
----
+
-kind: sources
+    my-oauth-cloud-monitoring:
-name: my-oauth-cloud-monitoring
+        kind: cloud-monitoring
-type: cloud-monitoring
+        useClientOAuth: true
-useClientOAuth: true
 ```
 
 ## Reference
 
 | **field**      | **type** | **required** | **description**                                                                                                                                |
 |----------------|:--------:|:------------:|------------------------------------------------------------------------------------------------------------------------------------------------|
-| type           |  string  |     true     | Must be "cloud-monitoring".                                                                                                                    |
+| kind           |  string  |     true     | Must be "cloud-monitoring".                                                                                                                    |
 | useClientOAuth | boolean  |    false     | If true, the source will use client-side OAuth for authorization. Otherwise, it will use Application Default Credentials. Defaults to `false`. |

docs/en/resources/sources/cloud-sql-admin.md

@@ -24,20 +24,19 @@ Authentication can be handled in two ways:
 ## Example
 
 ```yaml
-kind: sources
+sources:
-name: my-cloud-sql-admin
+    my-cloud-sql-admin:
-type: cloud-sql-admin
+        kind: cloud-sql-admin
----
+
-kind: sources
+    my-oauth-cloud-sql-admin:
-name: my-oauth-cloud-sql-admin
+        kind: cloud-sql-admin
-type: cloud-sql-admin
+        useClientOAuth: true
-useClientOAuth: true
 ```
 
 ## Reference
 
 | **field**      | **type** | **required** | **description**                                                                                                                                |
 | -------------- | :------: | :----------: | ---------------------------------------------------------------------------------------------------------------------------------------------- |
-| type           |  string  |     true     | Must be "cloud-sql-admin".                                                                                                                     |
+| kind           |  string  |     true     | Must be "cloud-sql-admin".                                                                                                                     |
 | defaultProject |  string  |     false    | The Google Cloud project ID to use for Cloud SQL infrastructure tools.                                                                         |
 | useClientOAuth |  boolean |     false    | If true, the source will use client-side OAuth for authorization. Otherwise, it will use Application Default Credentials. Defaults to `false`. |

docs/en/resources/sources/cloud-sql-mssql.md

@@ -87,16 +87,16 @@ Currently, this source only uses standard authentication. You will need to
 ## Example
 
 ```yaml
-kind: sources
+sources:
-name: my-cloud-sql-mssql-instance
+    my-cloud-sql-mssql-instance:
-type: cloud-sql-mssql
+     kind: cloud-sql-mssql
-project: my-project
+     project: my-project
-region: my-region
+     region: my-region
-instance: my-instance
+     instance: my-instance
-database: my_db
+     database: my_db
-user: ${USER_NAME}
+     user: ${USER_NAME}
-password: ${PASSWORD}
+     password: ${PASSWORD}
-# ipType: private
+     # ipType: private
 ```
 
 {{< notice tip >}}
@@ -108,7 +108,7 @@ instead of hardcoding your secrets into the configuration file.
 
 | **field** | **type** | **required** | **description**                                                                                      |
 |-----------|:--------:|:------------:|------------------------------------------------------------------------------------------------------|
-| type      |  string  |     true     | Must be "cloud-sql-mssql".                                                                           |
+| kind      |  string  |     true     | Must be "cloud-sql-mssql".                                                                           |
 | project   |  string  |     true     | Id of the GCP project that the cluster was created in (e.g. "my-project-id").                        |
 | region    |  string  |     true     | Name of the GCP region that the cluster was created in (e.g. "us-central1").                         |
 | instance  |  string  |     true     | Name of the Cloud SQL instance within the cluster (e.g. "my-instance").                              |

docs/en/resources/sources/cloud-sql-mysql.md

@@ -128,16 +128,16 @@ To connect using IAM authentication:
 ## Example
 
 ```yaml
-kind: sources
+sources:
-name: my-cloud-sql-mysql-source
+    my-cloud-sql-mysql-source:
-type: cloud-sql-mysql
+        kind: cloud-sql-mysql
-project: my-project-id
+        project: my-project-id
-region: us-central1
+        region: us-central1
-instance: my-instance
+        instance: my-instance
-database: my_db
+        database: my_db
-user: ${USER_NAME}
+        user: ${USER_NAME}
-password: ${PASSWORD}
+        password: ${PASSWORD}
-# ipType: "private"
+        # ipType: "private"
 ```
 
 {{< notice tip >}}
@@ -149,7 +149,7 @@ instead of hardcoding your secrets into the configuration file.
 
 | **field** | **type** | **required** | **description**                                                                                      |
 |-----------|:--------:|:------------:|------------------------------------------------------------------------------------------------------|
-| type      |  string  |     true     | Must be "cloud-sql-mysql".                                                                           |
+| kind      |  string  |     true     | Must be "cloud-sql-mysql".                                                                           |
 | project   |  string  |     true     | Id of the GCP project that the cluster was created in (e.g. "my-project-id").                        |
 | region    |  string  |     true     | Name of the GCP region that the cluster was created in (e.g. "us-central1").                         |
 | instance  |  string  |     true     | Name of the Cloud SQL instance within the cluster (e.g. "my-instance").                              |

docs/en/resources/sources/cloud-sql-pg.md

@@ -178,16 +178,16 @@ To connect using IAM authentication:
 ## Example
 
 ```yaml
-kind: sources
+sources:
-name: my-cloud-sql-pg-source
+    my-cloud-sql-pg-source:
-type: cloud-sql-postgres
+        kind: cloud-sql-postgres
-project: my-project-id
+        project: my-project-id
-region: us-central1
+        region: us-central1
-instance: my-instance
+        instance: my-instance
-database: my_db
+        database: my_db
-user: ${USER_NAME}
+        user: ${USER_NAME}
-password: ${PASSWORD}
+        password: ${PASSWORD}
-# ipType: "private"
+        # ipType: "private"
 ```
 
 {{< notice tip >}}
@@ -199,7 +199,7 @@ instead of hardcoding your secrets into the configuration file.
 
 | **field** | **type** | **required** | **description**                                                                                                          |
 |-----------|:--------:|:------------:|--------------------------------------------------------------------------------------------------------------------------|
-| type      |  string  |     true     | Must be "cloud-sql-postgres".                                                                                            |
+| kind      |  string  |     true     | Must be "cloud-sql-postgres".                                                                                            |
 | project   |  string  |     true     | Id of the GCP project that the cluster was created in (e.g. "my-project-id").                                            |
 | region    |  string  |     true     | Name of the GCP region that the cluster was created in (e.g. "us-central1").                                             |
 | instance  |  string  |     true     | Name of the Cloud SQL instance within the cluster (e.g. "my-instance").                                                  |

docs/en/resources/sources/couchbase.md

@@ -19,14 +19,14 @@ allowing tools to execute SQL queries against it.
 ## Example
 
 ```yaml
-kind: sources
+sources:
-name: my-couchbase-instance
+    my-couchbase-instance:
-type: couchbase
+        kind: couchbase
-connectionString: couchbase://localhost
+        connectionString: couchbase://localhost
-bucket: travel-sample
+        bucket: travel-sample
-scope: inventory
+        scope: inventory
-username: Administrator
+        username: Administrator
-password: password
+        password: password
 ```
 
 {{< notice note >}}
@@ -38,7 +38,7 @@ Connections](https://docs.couchbase.com/java-sdk/current/howtos/managing-connect
 
 | **field**            | **type** | **required** | **description**                                                                                                                                                                                                                                                                                                                                                                          |
 |----------------------|:--------:|:------------:|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| type                 |  string  |     true     | Must be "couchbase".                                                                                                                                                                                                                                                                                                                                                                     |
+| kind                 |  string  |     true     | Must be "couchbase".                                                                                                                                                                                                                                                                                                                                                                     |
 | connectionString     |  string  |     true     | Connection string for the Couchbase cluster.                                                                                                                                                                                                                                                                                                                                             |
 | bucket               |  string  |     true     | Name of the bucket to connect to.                                                                                                                                                                                                                                                                                                                                                        |
 | scope                |  string  |     true     | Name of the scope within the bucket.                                                                                                                                                                                                                                                                                                                                                     |

docs/en/resources/sources/dataplex.md

@@ -23,10 +23,10 @@ applying artificial intelligence and machine learning.
 ## Example
 
 ```yaml
-kind: sources
+sources:
-name: my-dataplex-source
+  my-dataplex-source:
-type: "dataplex"
+    kind: "dataplex"
-project: "my-project-id"
+    project: "my-project-id"
 ```
 
 ## Sample System Prompt
@@ -355,5 +355,5 @@ This abbreviated syntax works for the qualified predicates except for `label` in
 
 | **field** | **type** | **required** | **description**                                                                  |
 |-----------|:--------:|:------------:|----------------------------------------------------------------------------------|
-| type      |  string  |     true     | Must be "dataplex".                                                              |
+| kind      |  string  |     true     | Must be "dataplex".                                                              |
 | project   |  string  |     true     | ID of the GCP project used for quota and billing purposes (e.g. "my-project-id").|

docs/en/resources/sources/dgraph.md

@@ -7,17 +7,6 @@ description: >
 
 ---
 
-{{< notice note >}}
-**⚠️ Best Effort Maintenance**
-
-This integration is maintained on a best-effort basis by the project
-team/community. While we strive to address issues and provide workarounds when
-resources are available, there are no guaranteed response times or code fixes.
-
-The automated integration tests for this module are currently non-functional or
-failing.
-{{< /notice >}}
-
 ## About
 
 [Dgraph][dgraph-docs] is an open-source graph database. It is designed for
@@ -51,14 +40,14 @@ and user credentials for that namespace.
 ## Example
 
 ```yaml
-kind: sources
+sources:
-name: my-dgraph-source
+    my-dgraph-source:
-type: dgraph
+        kind: dgraph
-dgraphUrl: https://xxxx.cloud.dgraph.io
+        dgraphUrl: https://xxxx.cloud.dgraph.io
-user: ${USER_NAME}
+        user: ${USER_NAME}
-password: ${PASSWORD}
+        password: ${PASSWORD}
-apiKey: ${API_KEY}
+        apiKey: ${API_KEY}
-namespace : 0
+        namespace : 0
 ```
 
 {{< notice tip >}}
@@ -70,7 +59,7 @@ instead of hardcoding your secrets into the configuration file.
 
 | **Field**   | **Type** | **Required** | **Description**                                                                                  |
 |-------------|:--------:|:------------:|--------------------------------------------------------------------------------------------------|
-| type        |  string  |     true     | Must be "dgraph".                                                                                |
+| kind        |  string  |     true     | Must be "dgraph".                                                                                |
 | dgraphUrl   |  string  |     true     | Connection URI (e.g. "<https://xxx.cloud.dgraph.io>", "<https://localhost:8080>").               |
 | user        |  string  |     false    | Name of the Dgraph user to connect as (e.g., "groot").                                           |
 | password    |  string  |     false    | Password of the Dgraph user (e.g., "password").                                                  |

docs/en/resources/sources/elasticsearch.md

@@ -59,18 +59,18 @@ applying permissions to an API key.
 ## Example
 
 ```yaml
-kind: sources
+sources:
-name: my-elasticsearch-source
+  my-elasticsearch-source:
-type: "elasticsearch"
+    kind: "elasticsearch"
-addresses:
+    addresses:
-  - "http://localhost:9200"
+      - "http://localhost:9200"
-apikey: "my-api-key"
+    apikey: "my-api-key"
 ```
 
 ## Reference
 
 | **field** | **type** | **required** | **description**                            |
 |-----------|:--------:|:------------:|--------------------------------------------|
-| type      |  string  |     true     | Must be "elasticsearch".                   |
+| kind      |  string  |     true     | Must be "elasticsearch".                   |
 | addresses | []string |     true     | List of Elasticsearch hosts to connect to. |
 | apikey    |  string  |     true     | The API key to use for authentication.     |

docs/en/resources/sources/firebird.md

@@ -36,14 +36,14 @@ user][fb-users] to login to the database with.
 ## Example
 
 ```yaml
-kind: sources
+sources:
-name: my_firebird_db
+    my_firebird_db:
-type: firebird
+        kind: firebird
-host: "localhost"
+        host: "localhost"
-port: 3050
+        port: 3050
-database: "/path/to/your/database.fdb"
+        database: "/path/to/your/database.fdb"
-user: ${FIREBIRD_USER}
+        user: ${FIREBIRD_USER}
-password: ${FIREBIRD_PASS}
+        password: ${FIREBIRD_PASS}
 ```
 
 {{< notice tip >}}
@@ -55,7 +55,7 @@ instead of hardcoding your secrets into the configuration file.
 
 | **field** | **type** | **required** | **description**                                                              |
 |-----------|:--------:|:------------:|------------------------------------------------------------------------------|
-| type      |  string  |     true     | Must be "firebird".                                                          |
+| kind      |  string  |     true     | Must be "firebird".                                                          |
 | host      |  string  |     true     | IP address to connect to (e.g. "127.0.0.1")                                  |
 | port      |  string  |     true     | Port to connect to (e.g. "3050")                                             |
 | database  |  string  |     true     | Path to the Firebird database file (e.g. "/var/lib/firebird/data/test.fdb"). |

docs/en/resources/sources/firestore.md

@@ -61,17 +61,17 @@ database named `(default)` will be used.
 ## Example
 
 ```yaml
-kind: sources
+sources:
-name: my-firestore-source
+  my-firestore-source:
-type: "firestore"
+    kind: "firestore"
-project: "my-project-id"
+    project: "my-project-id"
-# database: "my-database"  # Optional, defaults to "(default)"
+    # database: "my-database"  # Optional, defaults to "(default)"
 ```
 
 ## Reference
 
 | **field** | **type** | **required** | **description**                                                                                          |
 |-----------|:--------:|:------------:|----------------------------------------------------------------------------------------------------------|
-| type      |  string  |     true     | Must be "firestore".                                                                                     |
+| kind      |  string  |     true     | Must be "firestore".                                                                                     |
 | project   |  string  |     true     | Id of the GCP project that contains the Firestore database (e.g. "my-project-id").                       |
 | database  |  string  |     false    | Name of the Firestore database to connect to. Defaults to "(default)" if not specified.                  |

docs/en/resources/sources/http.md

@@ -21,18 +21,18 @@ and other HTTP-accessible resources.
 ## Example
 
 ```yaml
-kind: sources
+sources:
-name: my-http-source
+  my-http-source:
-type: http
+    kind: http
-baseUrl: https://api.example.com/data
+    baseUrl: https://api.example.com/data
-timeout: 10s # default to 30s
+    timeout: 10s # default to 30s
-headers:
+    headers:
-  Authorization: Bearer ${API_KEY}
+      Authorization: Bearer ${API_KEY}
-  Content-Type: application/json
+      Content-Type: application/json
-queryParams:
+    queryParams:
-  param1: value1
+      param1: value1
-  param2: value2
+      param2: value2
-# disableSslVerification: false
+    # disableSslVerification: false
 ```
 
 {{< notice tip >}}
@@ -44,7 +44,7 @@ instead of hardcoding your secrets into the configuration file.
 
 | **field**              |     **type**      | **required** | **description**                                                                                                                    |
 |------------------------|:-----------------:|:------------:|------------------------------------------------------------------------------------------------------------------------------------|
-| type                   |      string       |     true     | Must be "http".                                                                                                                    |
+| kind                   |      string       |     true     | Must be "http".                                                                                                                    |
 | baseUrl                |      string       |     true     | The base URL for the HTTP requests (e.g., `https://api.example.com`).                                                              |
 | timeout                |      string       |    false     | The timeout for HTTP requests (e.g., "5s", "1m", refer to [ParseDuration][parse-duration-doc] for more examples). Defaults to 30s. |
 | headers                | map[string]string |    false     | Default headers to include in the HTTP requests.                                                                                   |

docs/en/resources/sources/looker.md

@@ -56,16 +56,16 @@ To initialize the application default credential run `gcloud auth login
 ## Example
 
 ```yaml
-kind: sources
+sources:
-name: my-looker-source
+    my-looker-source:
-type: looker
+        kind: looker
-base_url: http://looker.example.com
+        base_url: http://looker.example.com
-client_id: ${LOOKER_CLIENT_ID}
+        client_id: ${LOOKER_CLIENT_ID}
-client_secret: ${LOOKER_CLIENT_SECRET}
+        client_secret: ${LOOKER_CLIENT_SECRET}
-project: ${LOOKER_PROJECT}
+        project: ${LOOKER_PROJECT}
-location: ${LOOKER_LOCATION}
+        location: ${LOOKER_LOCATION}
-verify_ssl: true
+        verify_ssl: true
-timeout: 600s
+        timeout: 600s
 ```
 
 The Looker base url will look like "https://looker.example.com", don't include
@@ -93,7 +93,7 @@ instead of hardcoding your secrets into the configuration file.
 
 | **field**            | **type** | **required** | **description**                                                                                                                                     |
 |----------------------|:--------:|:------------:|-----------------------------------------------------------------------------------------------------------------------------------------------------|
-| type                 |  string  |     true     | Must be "looker".                                                                                                                                   |
+| kind                 |  string  |     true     | Must be "looker".                                                                                                                                   |
 | base_url             |  string  |     true     | The URL of your Looker server with no trailing /.                                                                                                   |
 | client_id            |  string  |    false     | The client id assigned by Looker.                                                                                                                   |
 | client_secret        |  string  |    false     | The client secret assigned by Looker.                                                                                                               |

docs/en/resources/sources/mariadb.md

@@ -45,18 +45,18 @@ MariaDB user][mariadb-users] to log in to the database.
 ## Example
 
 ```yaml
-kind: sources
+sources:
-name: my_mariadb_db
+    my_mariadb_db:
-type: mysql
+        kind: mysql
-host: 127.0.0.1
+        host: 127.0.0.1
-port: 3306
+        port: 3306
-database: my_db
+        database: my_db
-user: ${MARIADB_USER}
+        user: ${MARIADB_USER}
-password: ${MARIADB_PASS}
+        password: ${MARIADB_PASS}
-# Optional TLS and other driver parameters. For example, enable preferred TLS:
+        # Optional TLS and other driver parameters. For example, enable preferred TLS:
-# queryParams:
+        # queryParams:
-#     tls: preferred
+        #     tls: preferred
-queryTimeout: 30s # Optional: query timeout duration
+        queryTimeout: 30s # Optional: query timeout duration
 ```
 
 {{< notice tip >}}
@@ -68,7 +68,7 @@ Use environment variables instead of committing credentials to source files.
 
 | **field**    | **type** | **required** | **description**                                                                                 |
 | ------------ | :------: | :----------: | ----------------------------------------------------------------------------------------------- |
-| type         |  string  |     true     | Must be `mysql`.                                                                                |
+| kind         |  string  |     true     | Must be `mysql`.                                                                                |
 | host         |  string  |     true     | IP address to connect to (e.g. "127.0.0.1").                                                    |
 | port         |  string  |     true     | Port to connect to (e.g. "3307").                                                               |
 | database     |  string  |     true     | Name of the MariaDB database to connect to (e.g. "my_db").                                        |

docs/en/resources/sources/mindsdb.md

@@ -125,15 +125,15 @@ can omit the password field.
 ## Example
 
 ```yaml
-kind: sources
+sources:
-name: my-mindsdb-source
+    my-mindsdb-source:
-type: mindsdb
+        kind: mindsdb
-host: 127.0.0.1
+        host: 127.0.0.1
-port: 3306
+        port: 3306
-database: my_db
+        database: my_db
-user: ${USER_NAME}
+        user: ${USER_NAME}
-password: ${PASSWORD} # Optional: omit if MindsDB is configured without authentication
+        password: ${PASSWORD} # Optional: omit if MindsDB is configured without authentication
-queryTimeout: 30s # Optional: query timeout duration
+        queryTimeout: 30s # Optional: query timeout duration
 ```
 
 ### Working Configuration Example
@@ -141,13 +141,13 @@ queryTimeout: 30s # Optional: query timeout duration
 Here's a working configuration that has been tested:
 
 ```yaml
-kind: sources
+sources:
-name: my-pg-source
+  my-pg-source:
-type: mindsdb
+    kind: mindsdb
-host: 127.0.0.1
+    host: 127.0.0.1
-port: 47335
+    port: 47335
-database: files
+    database: files
-user: mindsdb
+    user: mindsdb
 ```
 
 {{< notice tip >}}
@@ -176,7 +176,7 @@ With MindsDB integration, you can:
 
 | **field**    | **type** | **required** | **description**                                                                                              |
 |--------------|:--------:|:------------:|--------------------------------------------------------------------------------------------------------------|
-| type         |  string  |     true     | Must be "mindsdb".                                                                                           |
+| kind         |  string  |     true     | Must be "mindsdb".                                                                                           |
 | host         |  string  |     true     | IP address to connect to (e.g. "127.0.0.1").                                                                 |
 | port         |  string  |     true     | Port to connect to (e.g. "3306").                                                                            |
 | database     |  string  |     true     | Name of the MindsDB database to connect to (e.g. "my_db").                                                   |

docs/en/resources/sources/mongodb.md

@@ -17,10 +17,10 @@ flexible, JSON-like documents, making it easy to develop and scale applications.
 ## Example
 
 ```yaml
-kind: sources
+sources:
-name: my-mongodb
+    my-mongodb:
-type: mongodb
+        kind: mongodb
-uri: "mongodb+srv://username:password@host.mongodb.net"       
+        uri: "mongodb+srv://username:password@host.mongodb.net"       
 
 ```
 
@@ -28,5 +28,5 @@ uri: "mongodb+srv://username:password@host.mongodb.net"
 
 | **field** | **type** | **required** | **description**                                                   |
 |-----------|:--------:|:------------:|-------------------------------------------------------------------|
-| type      |  string  |     true     | Must be "mongodb".                                                |
+| kind      |  string  |     true     | Must be "mongodb".                                                |
 | uri       |  string  |     true     | connection string to connect to MongoDB                           |

docs/en/resources/sources/mssql.md

@@ -39,15 +39,15 @@ SQL Server user][mssql-users] to login to the database with.
 ## Example
 
 ```yaml
-kind: sources
+sources:
-name: my-mssql-source
+    my-mssql-source:
-type: mssql
+        kind: mssql
-host: 127.0.0.1
+        host: 127.0.0.1
-port: 1433
+        port: 1433
-database: my_db
+        database: my_db
-user: ${USER_NAME}
+        user: ${USER_NAME}
-password: ${PASSWORD}
+        password: ${PASSWORD}
-# encrypt: strict
+        # encrypt: strict
 ```
 
 {{< notice tip >}}
@@ -59,7 +59,7 @@ instead of hardcoding your secrets into the configuration file.
 
 | **field** | **type** | **required** | **description**                                                                                                                                                                                                                                                          |
 |-----------|:--------:|:------------:|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| type      |  string  |     true     | Must be "mssql".                                                                                                                                                                                                                                                         |
+| kind      |  string  |     true     | Must be "mssql".                                                                                                                                                                                                                                                         |
 | host      |  string  |     true     | IP address to connect to (e.g. "127.0.0.1").                                                                                                                                                                                                                             |
 | port      |  string  |     true     | Port to connect to (e.g. "1433").                                                                                                                                                                                                                                        |
 | database  |  string  |     true     | Name of the SQL Server database to connect to (e.g. "my_db").                                                                                                                                                                                                            |

docs/en/resources/sources/mysql.md

@@ -49,18 +49,18 @@ MySQL user][mysql-users] to login to the database with.
 ## Example
 
 ```yaml
-kind: sources
+sources:
-name: my-mysql-source
+    my-mysql-source:
-type: mysql
+        kind: mysql
-host: 127.0.0.1
+        host: 127.0.0.1
-port: 3306
+        port: 3306
-database: my_db
+        database: my_db
-user: ${USER_NAME}
+        user: ${USER_NAME}
-password: ${PASSWORD}
+        password: ${PASSWORD}
-# Optional TLS and other driver parameters. For example, enable preferred TLS:
+        # Optional TLS and other driver parameters. For example, enable preferred TLS:
-# queryParams:
+        # queryParams:
-#     tls: preferred
+        #     tls: preferred
-queryTimeout: 30s # Optional: query timeout duration
+        queryTimeout: 30s # Optional: query timeout duration
 ```
 
 {{< notice tip >}}
@@ -72,7 +72,7 @@ instead of hardcoding your secrets into the configuration file.
 
 | **field**    | **type** | **required** | **description**                                                                                 |
 | ------------ | :------: | :----------: | ----------------------------------------------------------------------------------------------- |
-| type         |  string  |     true     | Must be "mysql".                                                                                |
+| kind         |  string  |     true     | Must be "mysql".                                                                                |
 | host         |  string  |     true     | IP address to connect to (e.g. "127.0.0.1").                                                    |
 | port         |  string  |     true     | Port to connect to (e.g. "3306").                                                               |
 | database     |  string  |     true     | Name of the MySQL database to connect to (e.g. "my_db").                                        |

docs/en/resources/sources/neo4j.md

@@ -33,13 +33,13 @@ user if available.
 ## Example
 
 ```yaml
-kind: sources
+sources:
-name: my-neo4j-source
+    my-neo4j-source:
-type: neo4j
+        kind: neo4j
-uri: neo4j+s://xxxx.databases.neo4j.io:7687
+        uri: neo4j+s://xxxx.databases.neo4j.io:7687
-user: ${USER_NAME}
+        user: ${USER_NAME}
-password: ${PASSWORD}
+        password: ${PASSWORD}
-database: "neo4j"
+        database: "neo4j"
 ```
 
 {{< notice tip >}}
@@ -51,7 +51,7 @@ instead of hardcoding your secrets into the configuration file.
 
 | **field** | **type** | **required** | **description**                                                      |
 |-----------|:--------:|:------------:|----------------------------------------------------------------------|
-| type      |  string  |     true     | Must be "neo4j".                                                     |
+| kind      |  string  |     true     | Must be "neo4j".                                                     |
 | uri       |  string  |     true     | Connect URI ("bolt://localhost", "neo4j+s://xxx.databases.neo4j.io") |
 | user      |  string  |     true     | Name of the Neo4j user to connect as (e.g. "neo4j").                 |
 | password  |  string  |     true     | Password of the Neo4j user (e.g. "my-password").                     |

docs/en/resources/sources/oceanbase.md

@@ -33,15 +33,15 @@ with SSL).
 ## Example
 
 ```yaml
-kind: sources
+sources:
-name: my-oceanbase-source
+    my-oceanbase-source:
-type: oceanbase
+        kind: oceanbase
-host: 127.0.0.1
+        host: 127.0.0.1
-port: 2881
+        port: 2881
-database: my_db
+        database: my_db
-user: ${USER_NAME}
+        user: ${USER_NAME}
-password: ${PASSWORD}
+        password: ${PASSWORD}
-queryTimeout: 30s # Optional: query timeout duration
+        queryTimeout: 30s # Optional: query timeout duration
 ```
 
 {{< notice tip >}}
@@ -53,7 +53,7 @@ instead of hardcoding your secrets into the configuration file.
 
 | **field**    | **type** | **required** | **description**                                                                                 |
 | ------------ | :------: | :----------: |-------------------------------------------------------------------------------------------------|
-| type         |  string  |     true     | Must be "oceanbase".                                                                            |
+| kind         |  string  |     true     | Must be "oceanbase".                                                                            |
 | host         |  string  |     true     | IP address to connect to (e.g. "127.0.0.1").                                                    |
 | port         |  string  |     true     | Port to connect to (e.g. "2881").                                                               |
 | database     |  string  |     true     | Name of the OceanBase database to connect to (e.g. "my_db").                                    |

docs/en/resources/sources/oracle.md

@@ -90,27 +90,27 @@ using a TNS (Transparent Network Substrate) alias.
 This example demonstrates the four connection methods you could choose from:
 
 ```yaml
-kind: sources
+sources:
-name: my-oracle-source
+    my-oracle-source:
-type: oracle
+        kind: oracle
         
-# --- Choose one connection method ---
+        # --- Choose one connection method ---
-# 1. Host, Port, and Service Name
+        # 1. Host, Port, and Service Name
-host: 127.0.0.1
+        host: 127.0.0.1
-port: 1521
+        port: 1521
-serviceName: XEPDB1
+        serviceName: XEPDB1
 
-# 2. Direct Connection String
+        # 2. Direct Connection String
-connectionString: "127.0.0.1:1521/XEPDB1"
+        connectionString: "127.0.0.1:1521/XEPDB1"
 
-# 3. TNS Alias (requires tnsnames.ora)
+        # 3. TNS Alias (requires tnsnames.ora)
-tnsAlias: "MY_DB_ALIAS"
+        tnsAlias: "MY_DB_ALIAS"
-tnsAdmin: "/opt/oracle/network/admin" # Optional: overrides TNS_ADMIN env var
+        tnsAdmin: "/opt/oracle/network/admin" # Optional: overrides TNS_ADMIN env var
 
-user: ${USER_NAME}
+        user: ${USER_NAME}
-password: ${PASSWORD}
+        password: ${PASSWORD}
 
-# Optional: Set to true to use the OCI-based driver for advanced features (Requires Oracle Instant Client)
+        # Optional: Set to true to use the OCI-based driver for advanced features (Requires Oracle Instant Client)
 ```
 
 ### Using an Oracle Wallet
@@ -122,15 +122,15 @@ Oracle Wallet allows you to store credentails used for database connection. Depe
 The `go-ora` driver uses the `walletLocation` field to connect to a database secured with an Oracle Wallet without standard username and password.
 
 ```yaml
-kind: sources
+sources:
-name: pure-go-wallet
+    pure-go-wallet:
-type: oracle
+        kind: oracle
-connectionString: "127.0.0.1:1521/XEPDB1"
+        connectionString: "127.0.0.1:1521/XEPDB1"
-user: ${USER_NAME}
+        user: ${USER_NAME}
-password: ${PASSWORD}
+        password: ${PASSWORD}
-# The TNS Alias is often required to connect to a service registered in tnsnames.ora
+        # The TNS Alias is often required to connect to a service registered in tnsnames.ora
-tnsAlias: "SECURE_DB_ALIAS"
+        tnsAlias: "SECURE_DB_ALIAS"
-walletLocation: "/path/to/my/wallet/directory"
+        walletLocation: "/path/to/my/wallet/directory"
 ```
 
 #### OCI-Based Driver (`useOCI: true`) - Oracle Wallet
@@ -138,15 +138,15 @@ walletLocation: "/path/to/my/wallet/directory"
 For the OCI-based driver, wallet authentication is triggered by setting tnsAdmin to the wallet directory and connecting via a tnsAlias. 
 
 ```yaml
-kind: sources
+sources:
-name: oci-wallet
+    oci-wallet:
-type: oracle
+        kind: oracle
-connectionString: "127.0.0.1:1521/XEPDB1"
+        connectionString: "127.0.0.1:1521/XEPDB1"
-user: ${USER_NAME}
+        user: ${USER_NAME}
-password: ${PASSWORD}
+        password: ${PASSWORD}
-tnsAlias: "WALLET_DB_ALIAS"
+        tnsAlias: "WALLET_DB_ALIAS"
-tnsAdmin: "/opt/oracle/wallet" # Directory containing tnsnames.ora, sqlnet.ora, and wallet files
+        tnsAdmin: "/opt/oracle/wallet" # Directory containing tnsnames.ora, sqlnet.ora, and wallet files
-useOCI: true
+        useOCI: true
 ```
 
 {{< notice tip >}}
@@ -158,7 +158,7 @@ instead of hardcoding your secrets into the configuration file.
 
 | **field**        | **type** | **required** | **description**                                                                                                                                                                         |
 |------------------|:--------:|:------------:|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| type             |  string  |     true     | Must be "oracle".                                                                                                                                                                       |
+| kind             |  string  |     true     | Must be "oracle".                                                                                                                                                                       |
 | user             |  string  |     true     | Name of the Oracle user to connect as (e.g. "my-oracle-user").                                                                                                                          |
 | password         |  string  |     true     | Password of the Oracle user (e.g. "my-password").                                                                                                                                       |
 | host             |  string  |    false     | IP address or hostname to connect to (e.g. "127.0.0.1"). Required if not using `connectionString` or `tnsAlias`.                                                                        |

docs/en/resources/sources/postgres.md

@@ -107,14 +107,14 @@ PostgreSQL user][pg-users] to login to the database with.
 ## Example
 
 ```yaml
-kind: sources
+sources:
-name: my-pg-source
+    my-pg-source:
-type: postgres
+        kind: postgres
-host: 127.0.0.1
+        host: 127.0.0.1
-port: 5432
+        port: 5432
-database: my_db
+        database: my_db
-user: ${USER_NAME}
+        user: ${USER_NAME}
-password: ${PASSWORD}
+        password: ${PASSWORD}
 ```
 
 {{< notice tip >}}
@@ -126,7 +126,7 @@ instead of hardcoding your secrets into the configuration file.
 
 |  **field**  |      **type**      | **required** | **description**                                                        |
 |-------------|:------------------:|:------------:|------------------------------------------------------------------------|
-| type        |       string       |     true     | Must be "postgres".                                                    |
+| kind        |       string       |     true     | Must be "postgres".                                                    |
 | host        |       string       |     true     | IP address to connect to (e.g. "127.0.0.1")                            |
 | port        |       string       |     true     | Port to connect to (e.g. "5432")                                       |
 | database    |       string       |     true     | Name of the Postgres database to connect to (e.g. "my_db").            |

docs/en/resources/sources/redis.md

@@ -34,16 +34,16 @@ connections must authenticate in order to connect.
 Specify your AUTH string in the password field:
 
 ```yaml
-kind: sources
+sources:
-name: my-redis-instance
+    my-redis-instance:
-type: redis
+     kind: redis
-address:
+     address:
-  - 127.0.0.1:6379
+       - 127.0.0.1:6379
-username: ${MY_USER_NAME}
+     username: ${MY_USER_NAME}
-password: ${MY_AUTH_STRING} # Omit this field if you don't have a password.
+     password: ${MY_AUTH_STRING} # Omit this field if you don't have a password.
-# database: 0
+     # database: 0
-# clusterEnabled: false
+     # clusterEnabled: false
-# useGCPIAM: false
+     # useGCPIAM: false
 ```
 
 {{< notice tip >}}
@@ -59,14 +59,14 @@ string.
 Here is an example tools.yaml config with [AUTH][auth] enabled:
 
 ```yaml
-kind: sources
+sources:
-name: my-redis-cluster-instance
+    my-redis-cluster-instance:
-type: memorystore-redis
+     kind: memorystore-redis
-address:
+     address:
-  - 127.0.0.1:6379
+       - 127.0.0.1:6379
-password: ${MY_AUTH_STRING}
+     password: ${MY_AUTH_STRING}
-# useGCPIAM: false
+     # useGCPIAM: false
-# clusterEnabled: false
+     # clusterEnabled: false
 ```
 
 Memorystore Redis Cluster supports IAM authentication instead. Grant your
@@ -76,13 +76,13 @@ Here is an example tools.yaml config for Memorystore Redis Cluster instances
 using IAM authentication:
 
 ```yaml
-kind: sources
+sources:
-name: my-redis-cluster-instance
+    my-redis-cluster-instance:
-type: memorystore-redis
+     kind: memorystore-redis
-address:
+     address:
-  - 127.0.0.1:6379
+       - 127.0.0.1:6379
-useGCPIAM: true
+     useGCPIAM: true
-clusterEnabled: true
+     clusterEnabled: true
 ```
 
 [iam]: https://cloud.google.com/memorystore/docs/cluster/about-iam-auth
@@ -91,7 +91,7 @@ clusterEnabled: true
 
 | **field**      | **type** | **required** | **description**                                                                                                                 |
 |----------------|:--------:|:------------:|---------------------------------------------------------------------------------------------------------------------------------|
-| type           |  string  |     true     | Must be "memorystore-redis".                                                                                                    |
+| kind           |  string  |     true     | Must be "memorystore-redis".                                                                                                    |
 | address        |  string  |     true     | Primary endpoint for the Memorystore Redis instance to connect to.                                                              |
 | username       |  string  |    false     | If you are using a non-default user, specify the user name here. If you are using Memorystore for Redis, leave this field blank |
 | password       |  string  |    false     | If you have [Redis AUTH][auth] enabled, specify the AUTH string here                                                            |

docs/en/resources/sources/serverless-spark.md

@@ -49,17 +49,17 @@ set up your ADC.
 ## Example
 
 ```yaml
-kind: sources
+sources:
-name: my-serverless-spark-source
+  my-serverless-spark-source:
-type: serverless-spark
+    kind: serverless-spark
-project: my-project-id
+    project: my-project-id
-location: us-central1
+    location: us-central1
 ```
 
 ## Reference
 
 | **field** | **type** | **required** | **description**                                                   |
 | --------- | :------: | :----------: | ----------------------------------------------------------------- |
-| type      |  string  |     true     | Must be "serverless-spark".                                       |
+| kind      |  string  |     true     | Must be "serverless-spark".                                       |
 | project   |  string  |     true     | ID of the GCP project with Serverless for Apache Spark resources. |
 | location  |  string  |     true     | Location containing Serverless for Apache Spark resources.        |

docs/en/resources/sources/singlestore.md

@@ -39,15 +39,15 @@ database user][singlestore-user] to login to the database with.
 ## Example
 
 ```yaml
-kind: sources
+sources:
-name: my-singlestore-source
+    my-singlestore-source:
-type: singlestore
+        kind: singlestore
-host: 127.0.0.1
+        host: 127.0.0.1
-port: 3306
+        port: 3306
-database: my_db
+        database: my_db
-user: ${USER_NAME}
+        user: ${USER_NAME}
-password: ${PASSWORD}
+        password: ${PASSWORD}
-queryTimeout: 30s # Optional: query timeout duration
+        queryTimeout: 30s # Optional: query timeout duration
 ```
 
 {{< notice tip >}}
@@ -59,7 +59,7 @@ instead of hardcoding your secrets into the configuration file.
 
 | **field**    | **type** | **required** | **description**                                                                                 |
 |--------------|:--------:|:------------:|-------------------------------------------------------------------------------------------------|
-| type         |  string  |     true     | Must be "singlestore".                                                                          |
+| kind         |  string  |     true     | Must be "singlestore".                                                                          |
 | host         |  string  |     true     | IP address to connect to (e.g. "127.0.0.1").                                                    |
 | port         |  string  |     true     | Port to connect to (e.g. "3306").                                                               |
 | database     |  string  |     true     | Name of the SingleStore database to connect to (e.g. "my_db").                                  |