chore: add samples for multi agent blog

2026-01-11 16:38:15 -05:00 · 2025-08-25 16:07:43 -07:00
106 changed files with 1160 additions and 4979 deletions
--- a/.ci/integration.cloudbuild.yaml
+++ b/.ci/integration.cloudbuild.yaml
@@ -152,25 +152,25 @@ steps:
          bigquery \
          bigquery

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

  - id: "postgres"
    name: golang:1
@@ -575,28 +575,6 @@ steps:
          firebird \
          firebirdsql firebirdexecutesql

-  - id: "clickhouse"
-    name : golang:1
-    waitFor: ["compile-test-binary"]
-    entrypoint: /bin/bash
-    env:
-      - "GOPATH=/gopath"
-      - "CLICKHOUSE_DATABASE=$_CLICKHOUSE_DATABASE"
-      - "CLICKHOUSE_PORT=$_CLICKHOUSE_PORT"
-      - "CLICKHOUSE_PROTOCOL=$_CLICKHOUSE_PROTOCOL"
-      - "SERVICE_ACCOUNT_EMAIL=$SERVICE_ACCOUNT_EMAIL"
-    secretEnv: ["CLICKHOUSE_HOST", "CLICKHOUSE_USER", "CLIENT_ID"]
-    volumes:
-      - name: "go"
-        path: "/gopath"
-    args:
-      - -c
-      - |
-        .ci/test_with_coverage.sh \
-          "ClickHouse" \
-          clickhouse \
-          clickhouse
-
  - id: "trino"
    name: golang:1
    waitFor: ["compile-test-binary"]
@@ -682,10 +660,6 @@ availableSecrets:
      env: TIDB_USER
    - versionName: projects/$PROJECT_ID/secrets/tidb_pass/versions/latest
      env: TIDB_PASS
-    - versionName: projects/$PROJECT_ID/secrets/clickhouse_host/versions/latest
-      env: CLICKHOUSE_HOST
-    - versionName: projects/$PROJECT_ID/secrets/clickhouse_user/versions/latest
-      env: CLICKHOUSE_USER
    - versionName: projects/$PROJECT_ID/secrets/firebird_user/versions/latest
      env: FIREBIRD_USER
    - versionName: projects/$PROJECT_ID/secrets/firebird_pass/versions/latest
@@ -733,9 +707,6 @@ substitutions:
  _LOOKER_VERIFY_SSL: "true"
  _TIDB_HOST: 127.0.0.1
  _TIDB_PORT: "4000"
-  _CLICKHOUSE_DATABASE: "default"
-  _CLICKHOUSE_PORT: "8123"
-  _CLICKHOUSE_PROTOCOL: "http"
  _FIREBIRD_HOST: 127.0.0.1
  _FIREBIRD_PORT: "3050"
  _TRINO_HOST: 127.0.0.1
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,36 +1,5 @@
 # Changelog

-## [0.13.0](https://github.com/googleapis/genai-toolbox/compare/v0.12.0...v0.13.0) (2025-08-27)
-
-### ⚠ BREAKING CHANGES
-
-* **prebuilt/alloydb:** Add bearer token support for alloydb-wait-for-operation ([#1183](https://github.com/googleapis/genai-toolbox/issues/1183))
-
-
-### Features
-
-* Add capability to set default for environment variable in config ([#1248](https://github.com/googleapis/genai-toolbox/issues/1248)) ([5bcd52e](https://github.com/googleapis/genai-toolbox/commit/5bcd52e7dcd0773ded723585f4abe29d044e1540))
-* **firebird:** Add Firebird SQL 2.5+ source and tool ([#1011](https://github.com/googleapis/genai-toolbox/issues/1011)) ([4f6b806](https://github.com/googleapis/genai-toolbox/commit/4f6b806de947efc4e12bdb50dff7781aedb7b966))
-* **oceanbase:** Add Oceanbase source and tool  ([#895](https://github.com/googleapis/genai-toolbox/issues/895)) ([6fc4982](https://github.com/googleapis/genai-toolbox/commit/6fc49826d43f46c84028e752ebebddf3d94b3d13))
-* **server/mcp:** Support `ping` mechanism ([#1178](https://github.com/googleapis/genai-toolbox/issues/1178)) ([5dcc66c](https://github.com/googleapis/genai-toolbox/commit/5dcc66c84fa72c75ec50a9ac5198018212ec2979))
-* **server:** Fail-fast on environment variable substitution ([#1177](https://github.com/googleapis/genai-toolbox/issues/1177)) ([212aaba](https://github.com/googleapis/genai-toolbox/commit/212aaba74c8b431de8a5f7b9822a0af4afcaaa0e))
-* **server:** Implement Tool call auth error propagation ([#1235](https://github.com/googleapis/genai-toolbox/issues/1235)) ([b94a021](https://github.com/googleapis/genai-toolbox/commit/b94a021ca11c6637cf8038449483b5e75f2012b3))
-* **sources/bigquery:** Add support for user-credential passthrough  ([#1067](https://github.com/googleapis/genai-toolbox/issues/1067)) ([650e2e2](https://github.com/googleapis/genai-toolbox/commit/650e2e26f51bff75ce66343f64944d0a89a58b69))
-* **tool/looker:** Add support for `description` field in looker tool ([#1199](https://github.com/googleapis/genai-toolbox/issues/1199)) ([97f0dd2](https://github.com/googleapis/genai-toolbox/commit/97f0dd2acf26caf28ecad65abea8779c196a27f1))
-* **tools/bigquery-ask-data-insights:** Add bigquery `ask-data-insights` tool ([#932](https://github.com/googleapis/genai-toolbox/issues/932)) ([7651357](https://github.com/googleapis/genai-toolbox/commit/7651357d424a2b6656d8b6818cebc5c8a86ed053))
-* **tools/bigquery-forecast:** Add bigqueryforecast tool ([#1148](https://github.com/googleapis/genai-toolbox/issues/1148)) ([2ad0ccf](https://github.com/googleapis/genai-toolbox/commit/2ad0ccf83df542340087742468d6762f81eedee6))
-* **tools/firestore-add-documents:** Add firestore-add-documents tool ([#1107](https://github.com/googleapis/genai-toolbox/issues/1107)) ([ee4a70a](https://github.com/googleapis/genai-toolbox/commit/ee4a70a0e82b346b07b5b4c60dfa060da2273f50))
-* **tools/firestore-update-document:** Add firestore-update-document tool ([#1191](https://github.com/googleapis/genai-toolbox/issues/1191)) ([0010123](https://github.com/googleapis/genai-toolbox/commit/00101232a39c70288aac5715649c184858d351e3))
-* **tools/looker:** Control over whether hidden objects are surfaced ([#1222](https://github.com/googleapis/genai-toolbox/issues/1222)) ([bc91559](https://github.com/googleapis/genai-toolbox/commit/bc91559cc4e5b20385b84cc562b624fabf7e47a8))
-* **trino:** Add Trino source and tools ([#948](https://github.com/googleapis/genai-toolbox/issues/948)) ([7dd123b](https://github.com/googleapis/genai-toolbox/commit/7dd123b3d76b8eb2b74b5d960959c1f90684b37e))
-
-
-### Bug Fixes
-
-* **tools/looker:** Lookergetdashboards uses proper Authorized helper func ([#1255](https://github.com/googleapis/genai-toolbox/issues/1255)) ([00866bc](https://github.com/googleapis/genai-toolbox/commit/00866bc7fc33115c547213e60316ae889735fdbb))
-* **tools/mongodb-find-one:** ProjectPayload unmarshaling ([#1167](https://github.com/googleapis/genai-toolbox/issues/1167)) ([8ea6a98](https://github.com/googleapis/genai-toolbox/commit/8ea6a98bd9096ba97722e5f807366887e864004f))
-* **tools/mysql:** Fix encoded text for mysql ([#1161](https://github.com/googleapis/genai-toolbox/issues/1161)) ([a37cfa8](https://github.com/googleapis/genai-toolbox/commit/a37cfa841d151b9995d4fab73cfc5e4d30d2cc57)), closes [#840](https://github.com/googleapis/genai-toolbox/issues/840)
-
 ## [0.12.0](https://github.com/googleapis/genai-toolbox/compare/v0.11.0...v0.12.0) (2025-08-14)


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

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

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

 ```sh
-go install github.com/googleapis/genai-toolbox@v0.13.0
+go install github.com/googleapis/genai-toolbox@v0.12.0
 ```
 <!-- {x-release-please-end} -->

--- a/cmd/root.go
+++ b/cmd/root.go
@@ -43,7 +43,6 @@ import (

 	// Import tool packages for side effect of registration
 	_ "github.com/googleapis/genai-toolbox/internal/tools/alloydbainl"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/bigquery/bigqueryconversationalanalytics"
 	_ "github.com/googleapis/genai-toolbox/internal/tools/bigquery/bigqueryexecutesql"
 	_ "github.com/googleapis/genai-toolbox/internal/tools/bigquery/bigqueryforecast"
 	_ "github.com/googleapis/genai-toolbox/internal/tools/bigquery/bigquerygetdatasetinfo"
@@ -52,8 +51,6 @@ import (
 	_ "github.com/googleapis/genai-toolbox/internal/tools/bigquery/bigquerylisttableids"
 	_ "github.com/googleapis/genai-toolbox/internal/tools/bigquery/bigquerysql"
 	_ "github.com/googleapis/genai-toolbox/internal/tools/bigtable"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/clickhouse/clickhouseexecutesql"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/clickhouse/clickhousesql"
 	_ "github.com/googleapis/genai-toolbox/internal/tools/couchbase"
 	_ "github.com/googleapis/genai-toolbox/internal/tools/dataplex/dataplexlookupentry"
 	_ "github.com/googleapis/genai-toolbox/internal/tools/dataplex/dataplexsearchaspecttypes"
@@ -122,7 +119,6 @@ import (
 	_ "github.com/googleapis/genai-toolbox/internal/sources/alloydbpg"
 	_ "github.com/googleapis/genai-toolbox/internal/sources/bigquery"
 	_ "github.com/googleapis/genai-toolbox/internal/sources/bigtable"
-	_ "github.com/googleapis/genai-toolbox/internal/sources/clickhouse"
 	_ "github.com/googleapis/genai-toolbox/internal/sources/cloudsqlmssql"
 	_ "github.com/googleapis/genai-toolbox/internal/sources/cloudsqlmysql"
 	_ "github.com/googleapis/genai-toolbox/internal/sources/cloudsqlpg"
@@ -268,9 +264,8 @@ type ToolsFile struct {
 }

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

 	var err error
 	output := re.ReplaceAllStringFunc(input, func(match string) string {
@@ -281,9 +276,6 @@ func parseEnv(input string) (string, error) {
 		if value, found := os.LookupEnv(variableName); found {
 			return value
 		}
-		if parts[2] != "" {
-			return parts[3]
-		}
 		err = fmt.Errorf("environment variable not found: %q", variableName)
 		return ""
 	})
@@ -837,7 +829,7 @@ func run(cmd *Command) error {
 		}
 		cmd.logger.InfoContext(ctx, "Server ready to serve!")
 		if cmd.cfg.UI {
-			cmd.logger.InfoContext(ctx, fmt.Sprintf("Toolbox UI is up and running at: http://%s:%d/ui", cmd.cfg.Address, cmd.cfg.Port))
+			cmd.logger.InfoContext(ctx, fmt.Sprintf("Toolbox UI is up and running at: http://localhost:%d/ui", cmd.cfg.Port))
 		}

 		go func() {
--- a/cmd/root_test.go
+++ b/cmd/root_test.go
@@ -206,72 +206,6 @@ func TestServerConfigFlags(t *testing.T) {
 	}
 }

-func TestParseEnv(t *testing.T) {
-	tcs := []struct {
-		desc      string
-		env       map[string]string
-		in        string
-		want      string
-		err       bool
-		errString string
-	}{
-		{
-			desc:      "without default without env",
-			in:        "${FOO}",
-			want:      "",
-			err:       true,
-			errString: `environment variable not found: "FOO"`,
-		},
-		{
-			desc: "without default with env",
-			env: map[string]string{
-				"FOO": "bar",
-			},
-			in:   "${FOO}",
-			want: "bar",
-		},
-		{
-			desc: "with empty default",
-			in:   "${FOO:}",
-			want: "",
-		},
-		{
-			desc: "with default",
-			in:   "${FOO:bar}",
-			want: "bar",
-		},
-		{
-			desc: "with default with env",
-			env: map[string]string{
-				"FOO": "hello",
-			},
-			in:   "${FOO:bar}",
-			want: "hello",
-		},
-	}
-	for _, tc := range tcs {
-		t.Run(tc.desc, func(t *testing.T) {
-			if tc.env != nil {
-				for k, v := range tc.env {
-					t.Setenv(k, v)
-				}
-			}
-			got, err := parseEnv(tc.in)
-			if tc.err {
-				if err == nil {
-					t.Fatalf("expected error not found")
-				}
-				if tc.errString != err.Error() {
-					t.Fatalf("incorrect error string: got %s, want %s", err, tc.errString)
-				}
-			}
-			if tc.want != got {
-				t.Fatalf("unexpected want: got %s, want %s", got, tc.want)
-			}
-		})
-	}
-}
-
 func TestToolFileFlag(t *testing.T) {
 	tcs := []struct {
 		desc string
@@ -1232,7 +1166,6 @@ func TestPrebuiltTools(t *testing.T) {
 	alloydb_admin_config, _ := prebuiltconfigs.Get("alloydb-postgres-admin")
 	alloydb_config, _ := prebuiltconfigs.Get("alloydb-postgres")
 	bigquery_config, _ := prebuiltconfigs.Get("bigquery")
-	clickhouse_config, _ := prebuiltconfigs.Get("clickhouse")
 	cloudsqlpg_config, _ := prebuiltconfigs.Get("cloud-sql-postgres")
 	cloudsqlmysql_config, _ := prebuiltconfigs.Get("cloud-sql-mysql")
 	cloudsqlmssql_config, _ := prebuiltconfigs.Get("cloud-sql-mssql")
@@ -1265,13 +1198,6 @@ func TestPrebuiltTools(t *testing.T) {
 	t.Setenv("ALLOYDB_POSTGRES_USER", "your_alloydb_user")
 	t.Setenv("ALLOYDB_POSTGRES_PASSWORD", "your_alloydb_password")

-	t.Setenv("CLICKHOUSE_PROTOCOL", "your_clickhouse_protocol")
-	t.Setenv("CLICKHOUSE_DATABASE", "your_clickhouse_database")
-	t.Setenv("CLICKHOUSE_PASSWORD", "your_clickhouse_password")
-	t.Setenv("CLICKHOUSE_USER", "your_clickhouse_user")
-	t.Setenv("CLICKHOUSE_HOST", "your_clickhosue_host")
-	t.Setenv("CLICKHOUSE_PORT", "8123")
-
 	t.Setenv("CLOUD_SQL_POSTGRES_PROJECT", "your_pg_project")
 	t.Setenv("CLOUD_SQL_POSTGRES_INSTANCE", "your_pg_instance")
 	t.Setenv("CLOUD_SQL_POSTGRES_DATABASE", "your_pg_db")
@@ -1353,17 +1279,7 @@ func TestPrebuiltTools(t *testing.T) {
 			wantToolset: server.ToolsetConfigs{
 				"bigquery-database-tools": tools.ToolsetConfig{
 					Name:      "bigquery-database-tools",
-					ToolNames: []string{"ask_data_insights", "execute_sql", "forecast", "get_dataset_info", "get_table_info", "list_dataset_ids", "list_table_ids"},
-				},
-			},
-		},
-		{
-			name: "clickhouse prebuilt tools",
-			in:   clickhouse_config,
-			wantToolset: server.ToolsetConfigs{
-				"clickhouse-database-tools": tools.ToolsetConfig{
-					Name:      "clickhouse-database-tools",
-					ToolNames: []string{"execute_sql"},
+					ToolNames: []string{"execute_sql", "forecast", "get_dataset_info", "get_table_info", "list_dataset_ids", "list_table_ids"},
 				},
 			},
 		},
--- a/cmd/version.txt
+++ b/cmd/version.txt
@@ -1 +1 @@
-0.13.0
+0.12.0
--- a/docs/en/getting-started/colab_quickstart.ipynb
+++ b/docs/en/getting-started/colab_quickstart.ipynb
@@ -234,7 +234,7 @@
      },
      "outputs": [],
      "source": [
-        "version = \"0.13.0\" # x-release-please-version\n",
+        "version = \"0.12.0\" # x-release-please-version\n",
        "! curl -O https://storage.googleapis.com/genai-toolbox/v{version}/linux/amd64/toolbox\n",
        "\n",
        "# Make the binary executable\n",
--- a/docs/en/getting-started/configure.md
+++ b/docs/en/getting-started/configure.md
@@ -22,11 +22,6 @@ etc., you could use environment variables instead with the format `${ENV_NAME}`.
  user: ${USER_NAME}
  password: ${PASSWORD}
 ```
-A default value can be specified like `${ENV_NAME:default}`.
-
-```yaml
-  port: ${DB_PORT:3306}
-```

 ### Sources

--- a/docs/en/getting-started/introduction/_index.md
+++ b/docs/en/getting-started/introduction/_index.md
@@ -86,7 +86,7 @@ To install Toolbox as a binary:

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

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

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

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

 {{% /tab %}}
--- a/docs/en/getting-started/local_quickstart_go.md
+++ b/docs/en/getting-started/local_quickstart_go.md
@@ -522,7 +522,6 @@ import (
 	"context"
 	"encoding/json"
 	"log"
-	"fmt

 	"github.com/googleapis/mcp-toolbox-sdk-go/core"
 	openai "github.com/openai/openai-go"
@@ -652,7 +651,7 @@ func main() {

 		params.Messages = append(params.Messages, openai.AssistantMessage(query))

-		fmt.println("\n", completion.Choices[0].Message.Content)
+		println("\n", completion.Choices[0].Message.Content)

 	}

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

--- a/docs/en/how-to/connect-ide/firestore_mcp.md
+++ b/docs/en/how-to/connect-ide/firestore_mcp.md
@@ -62,19 +62,19 @@ to expose your developer assistant tools to a Firestore instance:
   <!-- {x-release-please-start-version} -->
   {{< tabpane persist=header >}}
 {{< tab header="linux/amd64" lang="bash" >}}
-curl -O https://storage.googleapis.com/genai-toolbox/v0.13.0/linux/amd64/toolbox
+curl -O https://storage.googleapis.com/genai-toolbox/v0.12.0/linux/amd64/toolbox
 {{< /tab >}}

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

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

 {{< tab header="windows/amd64" lang="bash" >}}
-curl -O https://storage.googleapis.com/genai-toolbox/v0.13.0/windows/amd64/toolbox
+curl -O https://storage.googleapis.com/genai-toolbox/v0.12.0/windows/amd64/toolbox
 {{< /tab >}}
 {{< /tabpane >}}
    <!-- {x-release-please-end} -->
--- a/docs/en/how-to/connect-ide/looker_mcp.md
+++ b/docs/en/how-to/connect-ide/looker_mcp.md
@@ -48,19 +48,19 @@ to expose your developer assistant tools to a Looker instance:
   <!-- {x-release-please-start-version} -->
 {{< tabpane persist=header >}}
 {{< tab header="linux/amd64" lang="bash" >}}
-curl -O https://storage.googleapis.com/genai-toolbox/v0.13.0/linux/amd64/toolbox
+curl -O https://storage.googleapis.com/genai-toolbox/v0.12.0/linux/amd64/toolbox
 {{< /tab >}}

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

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

 {{< tab header="windows/amd64" lang="bash" >}}
-curl -O https://storage.googleapis.com/genai-toolbox/v0.13.0/windows/amd64/toolbox.exe
+curl -O https://storage.googleapis.com/genai-toolbox/v0.12.0/windows/amd64/toolbox.exe
 {{< /tab >}}
 {{< /tabpane >}}
    <!-- {x-release-please-end} -->
--- a/docs/en/how-to/connect-ide/mssql_mcp.md
+++ b/docs/en/how-to/connect-ide/mssql_mcp.md
@@ -37,19 +37,19 @@ description: "Connect your IDE to SQL Server using Toolbox."
   <!-- {x-release-please-start-version} -->
   {{< tabpane persist=header >}}
 {{< tab header="linux/amd64" lang="bash" >}}
-curl -O https://storage.googleapis.com/genai-toolbox/v0.13.0/linux/amd64/toolbox
+curl -O https://storage.googleapis.com/genai-toolbox/v0.12.0/linux/amd64/toolbox
 {{< /tab >}}

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

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

 {{< tab header="windows/amd64" lang="bash" >}}
-curl -O https://storage.googleapis.com/genai-toolbox/v0.13.0/windows/amd64/toolbox.exe
+curl -O https://storage.googleapis.com/genai-toolbox/v0.12.0/windows/amd64/toolbox.exe
 {{< /tab >}}
 {{< /tabpane >}}
    <!-- {x-release-please-end} -->
--- a/docs/en/how-to/connect-ide/mysql_mcp.md
+++ b/docs/en/how-to/connect-ide/mysql_mcp.md
@@ -37,19 +37,19 @@ description: "Connect your IDE to MySQL using Toolbox."
   <!-- {x-release-please-start-version} -->
   {{< tabpane persist=header >}}
 {{< tab header="linux/amd64" lang="bash" >}}
-curl -O https://storage.googleapis.com/genai-toolbox/v0.13.0/linux/amd64/toolbox
+curl -O https://storage.googleapis.com/genai-toolbox/v0.12.0/linux/amd64/toolbox
 {{< /tab >}}

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

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

 {{< tab header="windows/amd64" lang="bash" >}}
-curl -O https://storage.googleapis.com/genai-toolbox/v0.13.0/windows/amd64/toolbox.exe
+curl -O https://storage.googleapis.com/genai-toolbox/v0.12.0/windows/amd64/toolbox.exe
 {{< /tab >}}
 {{< /tabpane >}}
    <!-- {x-release-please-end} -->
--- a/docs/en/how-to/connect-ide/postgres_mcp.md
+++ b/docs/en/how-to/connect-ide/postgres_mcp.md
@@ -17,8 +17,6 @@ to expose your developer assistant tools to a Postgres instance:
 * [Cline][cline]  (VS Code extension)
 * [Claude desktop][claudedesktop]
 * [Claude code][claudecode]
-* [Gemini CLI][geminicli]
-* [Gemini Code Assist][geminicodeassist]

 [toolbox]: https://github.com/googleapis/genai-toolbox
 [cursor]: #configure-your-mcp-client
@@ -27,8 +25,6 @@ to expose your developer assistant tools to a Postgres instance:
 [cline]: #configure-your-mcp-client
 [claudedesktop]: #configure-your-mcp-client
 [claudecode]: #configure-your-mcp-client
-[geminicli]: #configure-your-mcp-client
-[geminicodeassist]: #configure-your-mcp-client

 {{< notice tip >}}
 This guide can be used with [AlloyDB
@@ -56,19 +52,19 @@ Omni](https://cloud.google.com/alloydb/omni/current/docs/overview).
   <!-- {x-release-please-start-version} -->
   {{< tabpane persist=header >}}
 {{< tab header="linux/amd64" lang="bash" >}}
-curl -O https://storage.googleapis.com/genai-toolbox/v0.13.0/linux/amd64/toolbox
+curl -O https://storage.googleapis.com/genai-toolbox/v0.12.0/linux/amd64/toolbox
 {{< /tab >}}

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

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

 {{< tab header="windows/amd64" lang="bash" >}}
-curl -O https://storage.googleapis.com/genai-toolbox/v0.13.0/windows/amd64/toolbox.exe
+curl -O https://storage.googleapis.com/genai-toolbox/v0.12.0/windows/amd64/toolbox.exe
 {{< /tab >}}
 {{< /tabpane >}}
    <!-- {x-release-please-end} -->
@@ -263,57 +259,6 @@ curl -O https://storage.googleapis.com/genai-toolbox/v0.13.0/windows/amd64/toolb
    ```

 {{% /tab %}}
-
-{{% tab header="Gemini CLI" lang="en" %}}
-
-1.  Install the [Gemini CLI](https://github.com/google-gemini/gemini-cli?tab=readme-ov-file#quickstart).
-1.  In your working directory, create a folder named `.gemini`. Within it, create a `settings.json` file.
-1.  Add the following configuration, replace the environment variables with your values, and then save:
-
-    ```json
-    {
-      "mcpServers": {
-        "postgres": {
-          "command": "./PATH/TO/toolbox",
-          "args": ["--prebuilt","postgres","--stdio"],
-          "env": {
-            "POSTGRES_HOST": "",
-            "POSTGRES_PORT": "",
-            "POSTGRES_DATABASE": "",
-            "POSTGRES_USER": "",
-            "POSTGRES_PASSWORD": ""
-          }
-        }
-      }
-    }
-    ```
-{{% /tab %}}
-
-{{% tab header="Gemini Code Assist" lang="en" %}}
-
-1.  Install the [Gemini Code Assist](https://marketplace.visualstudio.com/items?itemName=Google.geminicodeassist) extension in Visual Studio Code.
-1.  Enable Agent Mode in Gemini Code Assist chat.
-1.  In your working directory, create a folder named `.gemini`. Within it, create a `settings.json` file.
-1.  Add the following configuration, replace the environment variables with your values, and then save:
-
-    ```json
-    {
-      "mcpServers": {
-        "postgres": {
-          "command": "./PATH/TO/toolbox",
-          "args": ["--prebuilt","postgres","--stdio"],
-          "env": {
-            "POSTGRES_HOST": "",
-            "POSTGRES_PORT": "",
-            "POSTGRES_DATABASE": "",
-            "POSTGRES_USER": "",
-            "POSTGRES_PASSWORD": ""
-          }
-        }
-      }
-    }
-    ```
-{{% /tab %}}
 {{< /tabpane >}}

 ## Use Tools
--- a/docs/en/reference/prebuilt-tools.md
+++ b/docs/en/reference/prebuilt-tools.md
@@ -53,11 +53,8 @@ See guides, [Connect from your IDE](../how-to/connect-ide/_index.md), for detail
    *   **BigQuery User** (`roles/bigquery.user`) to execute queries and view metadata.
    *   **BigQuery Metadata Viewer** (`roles/bigquery.metadataViewer`) to view all datasets.
    *   **BigQuery Data Editor** (`roles/bigquery.dataEditor`) to create or modify datasets and tables.
-    *   **Gemini for Google Cloud** (`roles/cloudaicompanion.user`) to use the conversational analytics API.
 *   **Tools:**
-    *   `ask_data_insights`: Use this tool to perform data analysis, get insights, or answer complex questions about the contents of specific BigQuery tables. For more information on required roles, API setup, and IAM configuration, see the setup and authentication section of the [Conversational Analytics API documentation](https://cloud.google.com/gemini/docs/conversational-analytics-api/overview).
    *   `execute_sql`: Executes a SQL statement.
-    *   `forecast`: Use this tool to forecast time series data.
    *   `get_dataset_info`: Gets dataset metadata.
    *   `get_table_info`: Gets table metadata.
    *   `list_dataset_ids`: Lists datasets.
--- a/docs/en/resources/sources/bigquery.md
+++ b/docs/en/resources/sources/bigquery.md
@@ -65,40 +65,23 @@ Connect your IDE to BigQuery using Toolbox.

 BigQuery uses [Identity and Access Management (IAM)][iam-overview] to control
 user and group access to BigQuery resources like projects, datasets, and tables.
+Toolbox will use your [Application Default Credentials (ADC)][adc] to authorize
+and authenticate when interacting with [BigQuery][bigquery-docs].

-### Authentication via Application Default Credentials (ADC)
-
-By **default**, Toolbox will use your [Application Default Credentials (ADC)][adc] to authorize and authenticate when interacting with [BigQuery][bigquery-docs].
-
-When using this method, you need to ensure the IAM identity associated with your
-ADC (such as a service account) has the correct permissions for the queries you
-intend to run. Common roles include `roles/bigquery.user` (which includes
-permissions to run jobs and read data) or `roles/bigbigquery.dataViewer`.
-Follow this [guide][set-adc] to set up your ADC.
-
-### Authentication via User's OAuth Access Token
-
-If the `useClientOAuth` parameter is set to `true`, Toolbox will instead use the
-OAuth access token for authentication. This token is parsed from the
-`Authorization` header passed in with the tool invocation request. This method
-allows Toolbox to make queries to [BigQuery][bigquery-docs] on behalf of the
-client or the end-user.
-
-When using this on-behalf-of authentication, you must ensure that the
-identity used has been granted the correct IAM permissions. Currently,
-this option is only supported by the following BigQuery tools:
-
- [`bigquery-sql`](../tools/bigquery/bigquery-sql.md)  
-  Run SQL queries directly against BigQuery datasets.
+In addition to [setting the ADC for your server][set-adc], you need to ensure
+the IAM identity has been given the correct IAM permissions for the queries
+you intend to run. Common roles include `roles/bigquery.user` (which includes
+permissions to run jobs and read data) or `roles/bigquery.dataViewer`. See
+[Introduction to BigQuery IAM][grant-permissions] for more information on
+applying IAM permissions and roles to an identity.

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

 ## Example

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

-Initialize a BigQuery source that uses the client's access token:
-
-```yaml
-sources:
-  my-bigquery-client-auth-source:
-    kind: "bigquery"
-    project: "my-project-id"
-    useClientOAuth: true
-```
-
 ## Reference

-| **field**      | **type** | **required** | **description**                                                                                                                                                                                                                         |
-|----------------|:--------:|:------------:|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| kind           |  string  |     true     | Must be "bigquery".                                                                                                                                                                                                                     |
-| project        |  string  |     true     | Id of the GCP project that the cluster was created in (e.g. "my-project-id").                                                                                                                                                           |
-| location       |  string  |    false     | Specifies the location (e.g., 'us', 'asia-northeast1') in which to run the query job. This location must match the location of any tables referenced in the query. The default behavior is for it to be executed in the US multi-region |
-| useClientOAuth |   bool   |    false     | If true, forwards the client's OAuth access token from the "Authorization" header to downstream queries.                                                                                                                                |
+| **field** | **type** | **required** | **description**                                                               |
+|-----------|:--------:|:------------:|-------------------------------------------------------------------------------|
+| kind      |  string  |     true     | Must be "bigquery".                                                           |
+| project   |  string  |     true     | Id of the GCP project that the cluster was created in (e.g. "my-project-id"). |
+| location  |  string  |    false     | Specifies the location (e.g., 'us', 'asia-northeast1') in which to run the query job. This location must match the location of any tables referenced in the query. The default behavior is for it to be executed in the US multi-region |
--- a/docs/en/resources/sources/clickhouse.md
+++ b/docs/en/resources/sources/clickhouse.md
@@ -1,91 +0,0 @@
---
-title: "ClickHouse"
-type: docs
-weight: 1
-description: >
-  ClickHouse is an open-source, OLTP database.
-
---
-
-## About
-
-[ClickHouse][clickhouse-docs] is a fast, open-source, column-oriented database 
-
-[clickhouse-docs]: https://clickhouse.com/docs
-
-## Available Tools
-
- [`clickhouse-execute-sql`](../tools/clickhouse/clickhouse-execute-sql.md)  
-  Execute parameterized SQL queries in ClickHouse with query logging.
-
- [`clickhouse-sql`](../tools/clickhouse/clickhouse-sql.md)  
-  Execute SQL queries as prepared statements in ClickHouse.
-
-
-## Requirements
-
-### Database User
-
-This source uses standard ClickHouse authentication. You will need to [create a
-ClickHouse user][clickhouse-users] (or with [ClickHouse Cloud][clickhouse-cloud]) to connect to the database with. The user
-should have appropriate permissions for the operations you plan to perform.
-
-[clickhouse-cloud]: https://clickhouse.com/docs/getting-started/quick-start/cloud#connect-with-your-app
-[clickhouse-users]: https://clickhouse.com/docs/en/sql-reference/statements/create/user
-
-### Network Access
-
-ClickHouse supports multiple protocols:
-
- **HTTPS protocol** (default port 8443) - Secure HTTP access (default)
- **HTTP protocol** (default port 8123) - Good for web-based access
-
-## Example
-
-### Secure Connection Example
-
-```yaml
-sources:
-    secure-clickhouse-source:
-        kind: clickhouse
-        host: clickhouse.example.com
-        port: "8443"
-        database: analytics
-        user: ${CLICKHOUSE_USER}
-        password: ${CLICKHOUSE_PASSWORD}
-        protocol: https
-        secure: true
-```
-
-### HTTP Protocol Example
-
-```yaml
-sources:
-    http-clickhouse-source:
-        kind: clickhouse
-        host: localhost
-        port: "8123"
-        database: logs
-        user: ${CLICKHOUSE_USER}
-        password: ${CLICKHOUSE_PASSWORD}
-        protocol: http
-        secure: false
-```
-
-{{< notice tip >}}
-Use environment variable replacement with the format ${ENV_NAME}
-instead of hardcoding your secrets into the configuration file.
-{{< /notice >}}
-
-## Reference
-
-| **field**   | **type** | **required** | **description**                                                                    |
-|-------------|:--------:|:------------:|------------------------------------------------------------------------------------|
-| kind        |  string  |     true     | Must be "clickhouse".                                                              |
-| host        |  string  |     true     | IP address or hostname to connect to (e.g. "127.0.0.1" or "clickhouse.example.com") |
-| port        |  string  |     true     | Port to connect to (e.g. "8443" for HTTPS, "8123" for HTTP)                     |
-| database    |  string  |     true     | Name of the ClickHouse database to connect to (e.g. "my_database").              |
-| user        |  string  |     true     | Name of the ClickHouse user to connect as (e.g. "analytics_user").               |
-| password    |  string  |    false     | Password of the ClickHouse user (e.g. "my-password").                             |
-| protocol    |  string  |    false     | Connection protocol: "https" (default) or "http".                      |
-| secure      |  boolean |    false     | Whether to use a secure connection (TLS). Default: false.                         |
--- a/docs/en/resources/sources/looker.md
+++ b/docs/en/resources/sources/looker.md
@@ -56,14 +56,11 @@ instead of hardcoding your secrets into the configuration file.

 ## Reference

-| **field**            | **type** | **required** | **description**                                                                           |
-| -------------------- | :------: | :----------: | ----------------------------------------------------------------------------------------- |
-| kind                 |  string  |     true     | Must be "looker".                                                                         |
-| base_url             |  string  |     true     | The URL of your Looker server with no trailing /).                                        |
-| client_id            |  string  |     true     | The client id assigned by Looker.                                                         |
-| client_secret        |  string  |     true     | The client secret assigned by Looker.                                                     |
-| verify_ssl           |  string  |     true     | Whether to check the ssl certificate of the server.                                       |
-| timeout              |  string  |    false     | Maximum time to wait for query execution (e.g. "30s", "2m"). By default, 120s is applied. |
-| show_hidden_models   |  string  |    false     | Show or hide hidden models. (default: true)                                               |
-| show_hidden_explores |  string  |    false     | Show or hide hidden explores. (default: true)                                             |
-| show_hidden_fields   |  string  |    false     | Show or hide hidden fields. (default: true)                                               |
+| **field**     | **type** | **required** | **description**                                                                           |
+| ------------- | :------: | :----------: | ----------------------------------------------------------------------------------------- |
+| kind          |  string  |     true     | Must be "looker".                                                                         |
+| base_url      |  string  |     true     | The URL of your Looker server with no trailing /).                                        |
+| client_id     |  string  |     true     | The client id assigned by Looker.                                                         |
+| client_secret |  string  |     true     | The client secret assigned by Looker.                                                     |
+| verify_ssl    |  string  |     true     | Whether to check the ssl certificate of the server.                                       |
+| timeout       |  string  |    false     | Maximum time to wait for query execution (e.g. "30s", "2m"). By default, 120s is applied. |
--- a/docs/en/resources/sources/mongodb.md
+++ b/docs/en/resources/sources/mongodb.md
@@ -21,7 +21,6 @@ sources:
    my-mongodb:
        kind: mongodb
        uri: "mongodb+srv://username:password@host.mongodb.net"       
-
 ```

 ## Reference
@@ -30,3 +29,4 @@ sources:
 |-----------|:--------:|:------------:|-------------------------------------------------------------------|
 | kind      |  string  |     true     | Must be "mongodb".                                                |
 | uri       |  string  |     true     | connection string to connect to MongoDB                           |
+| database  |  string  |     true     | Name of the mongodb database to connect to (e.g. "sample_mflix"). |
--- a/docs/en/resources/tools/bigquery/bigquery-conversational-analytics.md
+++ b/docs/en/resources/tools/bigquery/bigquery-conversational-analytics.md
@@ -1,54 +0,0 @@
---
-title: "bigquery-conversational-analytics"
-type: docs
-weight: 1
-description: > 
-  A "bigquery-conversational-analytics" tool allows conversational interaction with a BigQuery source.
-aliases:
- /resources/tools/bigquery-conversational-analytics
---
-
-## About
-
-A `bigquery-conversational-analytics` tool allows you to ask questions about your data in natural language. 
-
-This function takes a user's question (which can include conversational history for context) 
-and references to specific BigQuery tables, and sends them to a stateless conversational API.
-
-The API uses a GenAI agent to understand the question, generate and execute SQL queries 
-and Python code, and formulate an answer. This function returns a detailed, sequential 
-log of this entire process, which includes any generated SQL or Python code, the data 
-retrieved, and the final text answer.
-
-**Note**: This tool requires additional setup in your project. Please refer to the 
-official [Conversational Analytics API documentation](https://cloud.google.com/gemini/docs/conversational-analytics-api/overview)
-for instructions.
-
-It's compatible with the following sources:
-
- [bigquery](../sources/bigquery.md)
-
-The tool takes the following input parameters:
-
-*   `user_query_with_context`: The user's question, potentially including conversation history and system instructions for context.
-*   `table_references`: A JSON string of a list of BigQuery tables to use as context. Each object in the list must contain `projectId`, `datasetId`, and `tableId`. Example: `'[{"projectId": "my-gcp-project", "datasetId": "my_dataset", "tableId": "my_table"}]'`
-
-## Example
-
-```yaml
-tools:
-  ask_data_insights:
-    kind: bigquery-conversational-analytics
-    source: my-bigquery-source
-    description: |
-      Use this tool to perform data analysis, get insights, or answer complex 
-      questions about the contents of specific BigQuery tables.
-```
-
-## Reference
-| **field**   |                  **type**                  | **required** | **description**                                                                                  |
-|-------------|:------------------------------------------:|:------------:|--------------------------------------------------------------------------------------------------|
-| kind        |                   string                   |     true     | Must be "bigquery-conversational-analytics".                                                     |
-| source      |                   string                   |     true     | Name of the source for chat.                                                    |
-| description |                   string                   |     true     | Description of the tool 
-that is passed to the LLM.                                               |
--- a/docs/en/resources/tools/clickhouse/_index.md
+++ b/docs/en/resources/tools/clickhouse/_index.md
@@ -1,7 +0,0 @@
---
-title: "ClickHouse"
-type: docs
-weight: 1
-description: >
-  Tools for interacting with ClickHouse databases and tables.
---
--- a/docs/en/resources/tools/clickhouse/clickhouse-execute-sql.md
+++ b/docs/en/resources/tools/clickhouse/clickhouse-execute-sql.md
@@ -1,46 +0,0 @@
---
-title: "clickhouse-execute-sql"
-type: docs
-weight: 1
-description: >
-  A "clickhouse-execute-sql" tool executes a SQL statement against a ClickHouse
-  database.
-aliases:
- /resources/tools/clickhouse-execute-sql
---
-
-## About
-
-A `clickhouse-execute-sql` tool executes a SQL statement against a ClickHouse
-database. It's compatible with the [clickhouse](../../sources/clickhouse.md) source.
-
-`clickhouse-execute-sql` takes one input parameter `sql` and runs the SQL
-statement against the specified `source`. This tool includes query logging
-capabilities for monitoring and debugging purposes.
-
-> **Note:** This tool is intended for developer assistant workflows with
-> human-in-the-loop and shouldn't be used for production agents.
-
-## Example
-
-```yaml
-tools:
-  execute_sql_tool:
-    kind: clickhouse-execute-sql
-    source: my-clickhouse-instance
-    description: Use this tool to execute SQL statements against ClickHouse.
-```
-
-## Parameters
-
-| **parameter** | **type** | **required** | **description**                                    |
-|---------------|:--------:|:------------:|----------------------------------------------------|
-| sql           |  string  |     true     | The SQL statement to execute against the database |
-
-## Reference
-
-| **field**   | **type** | **required** | **description**                                         |
-|-------------|:--------:|:------------:|---------------------------------------------------------|
-| kind        |  string  |     true     | Must be "clickhouse-execute-sql".                      |
-| source      |  string  |     true     | Name of the ClickHouse source to execute SQL against.  |
-| description |  string  |     true     | Description of the tool that is passed to the LLM.     |
--- a/docs/en/resources/tools/clickhouse/clickhouse-sql.md
+++ b/docs/en/resources/tools/clickhouse/clickhouse-sql.md
@@ -1,81 +0,0 @@
---
-title: "clickhouse-sql"
-type: docs
-weight: 2
-description: >
-  A "clickhouse-sql" tool executes SQL queries as prepared statements in ClickHouse.
-aliases:
- /resources/tools/clickhouse-sql
---
-
-## About
-
-A `clickhouse-sql` tool executes SQL queries as prepared statements against a 
-ClickHouse database. It's compatible with the [clickhouse](../../sources/clickhouse.md) source.
-
-This tool supports both template parameters (for SQL statement customization) 
-and regular parameters (for prepared statement values), providing flexible 
-query execution capabilities.
-
-## Example
-
-```yaml
-tools:
-  my_analytics_query:
-    kind: clickhouse-sql
-    source: my-clickhouse-instance
-    description: Get user analytics for a specific date range
-    statement: |
-      SELECT 
-        user_id,
-        count(*) as event_count,
-        max(timestamp) as last_event
-      FROM events 
-      WHERE date >= ? AND date <= ?
-      GROUP BY user_id
-      ORDER BY event_count DESC
-      LIMIT ?
-    parameters:
-      - name: start_date
-        description: Start date for the query (YYYY-MM-DD format)
-      - name: end_date  
-        description: End date for the query (YYYY-MM-DD format)
-      - name: limit
-        description: Maximum number of results to return
-```
-
-## Template Parameters Example
-
-```yaml
-tools:
-  flexible_table_query:
-    kind: clickhouse-sql
-    source: my-clickhouse-instance
-    description: Query any table with flexible columns
-    statement: |
-      SELECT {{columns}}
-      FROM {{table_name}}
-      WHERE created_date >= ?
-      LIMIT ?
-    templateParameters:
-      - name: columns
-        description: Comma-separated list of columns to select
-      - name: table_name
-        description: Name of the table to query
-    parameters:
-      - name: start_date
-        description: Start date filter
-      - name: limit
-        description: Maximum number of results
-```
-
-## Reference
-
-| **field**          | **type**           | **required** | **description**                                           |
-|--------------------|:------------------:|:------------:|-----------------------------------------------------------|
-| kind               | string             | true         | Must be "clickhouse-sql".                                |
-| source             | string             | true         | Name of the ClickHouse source to execute SQL against.    |
-| description        | string             | true         | Description of the tool that is passed to the LLM.       |
-| statement          | string             | true         | The SQL statement template to execute.                    |
-| parameters         | array of Parameter | false        | Parameters for prepared statement values.                 |
-| templateParameters | array of Parameter | false        | Parameters for SQL statement template customization.     |
--- a/docs/en/resources/tools/looker/looker-get-dimensions.md
+++ b/docs/en/resources/tools/looker/looker-get-dimensions.md
@@ -35,20 +35,6 @@ tools:
          explore_name looked up from get_explores.
 ```

-The response is a json array with the following elements:
-
-```json
-{
-  "name": "field name",
-  "description": "field description",
-  "type": "field type",
-  "label": "field label",
-  "label_short": "field short label",
-  "tags": ["tags", ...],
-  "synonyms": ["synonyms", ...]
-}
-```
-
 ## Reference

 | **field**   |                  **type**                  | **required** | **description**                                                                                  |
--- a/docs/en/resources/tools/looker/looker-get-filters.md
+++ b/docs/en/resources/tools/looker/looker-get-filters.md
@@ -35,21 +35,6 @@ tools:
          explore_name looked up from get_explores.
 ```

-The response is a json array with the following elements:
-
-```json
-{
-  "name": "field name",
-  "description": "field description",
-  "type": "field type",
-  "label": "field label",
-  "label_short": "field short label",
-  "tags": ["tags", ...],
-  "synonyms": ["synonyms", ...]
-}
-```
-
-
 ## Reference

 | **field**   |                  **type**                  | **required** | **description**                                                                                  |
--- a/docs/en/resources/tools/looker/looker-get-measures.md
+++ b/docs/en/resources/tools/looker/looker-get-measures.md
@@ -35,21 +35,6 @@ tools:
          explore_name looked up from get_explores.
 ```

-The response is a json array with the following elements:
-
-```json
-{
-  "name": "field name",
-  "description": "field description",
-  "type": "field type",
-  "label": "field label",
-  "label_short": "field short label",
-  "tags": ["tags", ...],
-  "synonyms": ["synonyms", ...]
-}
-```
-
-
 ## Reference

 | **field**   |                  **type**                  | **required** | **description**                                                                                  |
--- a/docs/en/resources/tools/looker/looker-get-parameters.md
+++ b/docs/en/resources/tools/looker/looker-get-parameters.md
@@ -35,21 +35,6 @@ tools:
          explore_name looked up from get_explores.
 ```

-The response is a json array with the following elements:
-
-```json
-{
-  "name": "field name",
-  "description": "field description",
-  "type": "field type",
-  "label": "field label",
-  "label_short": "field short label",
-  "tags": ["tags", ...],
-  "synonyms": ["synonyms", ...]
-}
-```
-
-
 ## Reference

 | **field**   |                  **type**                  | **required** | **description**                                                                                  |
--- a/docs/en/samples/bigquery/colab_quickstart_bigquery.ipynb
+++ b/docs/en/samples/bigquery/colab_quickstart_bigquery.ipynb
@@ -220,7 +220,7 @@
      },
      "outputs": [],
      "source": [
-        "version = \"0.13.0\" # x-release-please-version\n",
+        "version = \"0.12.0\" # x-release-please-version\n",
        "! curl -O https://storage.googleapis.com/genai-toolbox/v{version}/linux/amd64/toolbox\n",
        "\n",
        "# Make the binary executable\n",
--- a/docs/en/samples/bigquery/local_quickstart.md
+++ b/docs/en/samples/bigquery/local_quickstart.md
@@ -179,7 +179,7 @@ to use BigQuery, and then run the Toolbox server.
    <!-- {x-release-please-start-version} -->
    ```bash
    export OS="linux/amd64" # one of linux/amd64, darwin/arm64, darwin/amd64, or windows/amd64
-    curl -O https://storage.googleapis.com/genai-toolbox/v0.13.0/$OS/toolbox
+    curl -O https://storage.googleapis.com/genai-toolbox/v0.12.0/$OS/toolbox
    ```
    <!-- {x-release-please-end} -->

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

--- a/docs/en/samples/looker/looker_gemini.md
+++ b/docs/en/samples/looker/looker_gemini.md
@@ -34,7 +34,7 @@ In this section, we will download Toolbox and run the Toolbox server.
    <!-- {x-release-please-start-version} -->
    ```bash
    export OS="linux/amd64" # one of linux/amd64, darwin/arm64, darwin/amd64, or windows/amd64
-    curl -O https://storage.googleapis.com/genai-toolbox/v0.13.0/$OS/toolbox
+    curl -O https://storage.googleapis.com/genai-toolbox/v0.12.0/$OS/toolbox
    ```
    <!-- {x-release-please-end} -->

--- a/go.mod
+++ b/go.mod
@@ -1,6 +1,6 @@
 module github.com/googleapis/genai-toolbox

-go 1.24.0
+go 1.24

 toolchain go1.25.0

@@ -8,18 +8,17 @@ require (
 	cloud.google.com/go/alloydbconn v1.15.5
 	cloud.google.com/go/bigquery v1.69.0
 	cloud.google.com/go/bigtable v1.38.0
-	cloud.google.com/go/cloudsqlconn v1.18.1
+	cloud.google.com/go/cloudsqlconn v1.18.0
 	cloud.google.com/go/dataplex v1.26.0
 	cloud.google.com/go/firestore v1.18.0
 	cloud.google.com/go/spanner v1.84.1
-	github.com/ClickHouse/clickhouse-go/v2 v2.36.0
 	github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.53.0
 	github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.29.0
 	github.com/cenkalti/backoff/v5 v5.0.3
-	github.com/couchbase/gocb/v2 v2.11.0
+	github.com/couchbase/gocb/v2 v2.10.1
 	github.com/couchbase/tools-common/http v1.0.9
 	github.com/fsnotify/fsnotify v1.9.0
-	github.com/go-chi/chi/v5 v5.2.3
+	github.com/go-chi/chi/v5 v5.2.2
 	github.com/go-chi/httplog/v2 v2.1.1
 	github.com/go-chi/render v1.0.3
 	github.com/go-goquery/goquery v1.0.1
@@ -31,7 +30,7 @@ require (
 	github.com/jackc/pgx/v5 v5.7.5
 	github.com/json-iterator/go v1.1.12
 	github.com/looker-open-source/sdk-codegen/go v0.25.10
-	github.com/microsoft/go-mssqldb v1.9.3
+	github.com/microsoft/go-mssqldb v1.9.2
 	github.com/nakagami/firebirdsql v0.9.15
 	github.com/neo4j/neo4j-go-driver/v5 v5.28.2
 	github.com/redis/go-redis/v9 v9.12.1
@@ -50,22 +49,14 @@ require (
 	go.opentelemetry.io/otel/trace v1.37.0
 	golang.org/x/oauth2 v0.30.0
 	google.golang.org/api v0.248.0
-	google.golang.org/genproto v0.0.0-20250826171959-ef028d996bc1
+	google.golang.org/genproto v0.0.0-20250818200422-3122310a409c
 	modernc.org/sqlite v1.38.2
 )

 require (
-	github.com/ClickHouse/ch-go v0.66.0 // indirect
-	github.com/andybalholm/brotli v1.2.0 // indirect
 	github.com/andybalholm/cascadia v1.3.3 // indirect
-	github.com/go-faster/city v1.0.1 // indirect
-	github.com/go-faster/errors v0.7.1 // indirect
-	github.com/paulmach/orb v0.11.1 // indirect
-	github.com/segmentio/asm v1.2.0 // indirect
-	github.com/shopspring/decimal v1.4.0 // indirect
 	golang.org/x/exp v0.0.0-20250620022241-b7579e27df2b // indirect
 	gonum.org/v1/gonum v0.16.0 // indirect
-	gopkg.in/yaml.v3 v3.0.1 // indirect
 )

 require (
@@ -88,7 +79,7 @@ require (
 	github.com/apache/arrow/go/v15 v15.0.2 // indirect
 	github.com/cespare/xxhash/v2 v2.3.0 // indirect
 	github.com/cncf/xds/go v0.0.0-20250501225837-2ac532fd4443 // indirect
-	github.com/couchbase/gocbcore/v10 v10.8.0 // indirect
+	github.com/couchbase/gocbcore/v10 v10.7.1 // indirect
 	github.com/couchbase/gocbcoreps v0.1.3 // indirect
 	github.com/couchbase/goprotostellar v1.0.2 // indirect
 	github.com/couchbase/tools-common/errors v1.0.0 // indirect
@@ -141,6 +132,7 @@ require (
 	github.com/pierrec/lz4/v4 v4.1.22 // indirect
 	github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 // indirect
 	github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
+	github.com/shopspring/decimal v1.2.0 // indirect
 	github.com/spf13/pflag v1.0.6 // indirect
 	github.com/spiffe/go-spiffe/v2 v2.5.0 // indirect
 	github.com/xdg-go/pbkdf2 v1.0.0 // indirect
@@ -153,7 +145,7 @@ require (
 	go.opencensus.io v0.24.0 // indirect
 	go.opentelemetry.io/auto/sdk v1.1.0 // indirect
 	go.opentelemetry.io/contrib/detectors/gcp v1.36.0 // indirect
-	go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.62.0 // indirect
+	go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.61.0 // indirect
 	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.62.0 // indirect
 	go.opentelemetry.io/contrib/propagators/aws v1.37.0 // indirect
 	go.opentelemetry.io/contrib/propagators/b3 v1.37.0 // indirect
@@ -172,10 +164,10 @@ require (
 	golang.org/x/time v0.12.0 // indirect
 	golang.org/x/tools v0.35.0 // indirect
 	golang.org/x/xerrors v0.0.0-20240903120638-7835f813f4da // indirect
-	google.golang.org/genproto/googleapis/api v0.0.0-20250818200422-3122310a409c // indirect
+	google.golang.org/genproto/googleapis/api v0.0.0-20250811230008-5f3141c8851a // indirect
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20250818200422-3122310a409c // indirect
 	google.golang.org/grpc v1.74.2 // indirect
-	google.golang.org/protobuf v1.36.8 // indirect
+	google.golang.org/protobuf v1.36.7 // indirect
 	gopkg.in/ini.v1 v1.67.0 // indirect
 	modernc.org/libc v1.66.3 // indirect
 	modernc.org/mathutil v1.7.1 // indirect
--- a/go.sum
+++ b/go.sum
@@ -167,8 +167,8 @@ cloud.google.com/go/cloudbuild v1.9.0/go.mod h1:qK1d7s4QlO0VwfYn5YuClDGg2hfmLZEb
 cloud.google.com/go/clouddms v1.3.0/go.mod h1:oK6XsCDdW4Ib3jCCBugx+gVjevp2TMXFtgxvPSee3OM=
 cloud.google.com/go/clouddms v1.4.0/go.mod h1:Eh7sUGCC+aKry14O1NRljhjyrr0NFC0G2cjwX0cByRk=
 cloud.google.com/go/clouddms v1.5.0/go.mod h1:QSxQnhikCLUw13iAbffF2CZxAER3xDGNHjsTAkQJcQA=
-cloud.google.com/go/cloudsqlconn v1.18.1 h1:IIvs7QJ8eqKUUHSon13Joie9oH7/i7MJwNzBLG+FrhM=
-cloud.google.com/go/cloudsqlconn v1.18.1/go.mod h1:58bxZZ17Mz5D83ddMT8x6w56yKpcmVXyaOwGWkzGcMw=
+cloud.google.com/go/cloudsqlconn v1.18.0 h1:mP6TY/7I+nrnIh6vmbWCRJPxpFBZSL6AZhW6HaYC/OI=
+cloud.google.com/go/cloudsqlconn v1.18.0/go.mod h1:58bxZZ17Mz5D83ddMT8x6w56yKpcmVXyaOwGWkzGcMw=
 cloud.google.com/go/cloudtasks v1.5.0/go.mod h1:fD92REy1x5woxkKEkLdvavGnPJGEn8Uic9nWuLzqCpY=
 cloud.google.com/go/cloudtasks v1.6.0/go.mod h1:C6Io+sxuke9/KNRkbQpihnW93SWDU3uXt92nu85HkYI=
 cloud.google.com/go/cloudtasks v1.7.0/go.mod h1:ImsfdYWwlWNJbdgPIIGJWC+gemEGTBK/SunNQQNCAb4=
@@ -632,8 +632,8 @@ cloud.google.com/go/workflows v1.7.0/go.mod h1:JhSrZuVZWuiDfKEFxU0/F1PQjmpnpcoIS
 cloud.google.com/go/workflows v1.8.0/go.mod h1:ysGhmEajwZxGn1OhGOGKsTXc5PyxOc0vfKf5Af+to4M=
 cloud.google.com/go/workflows v1.9.0/go.mod h1:ZGkj1aFIOd9c8Gerkjjq7OW7I5+l6cSvT3ujaO/WwSA=
 cloud.google.com/go/workflows v1.10.0/go.mod h1:fZ8LmRmZQWacon9UCX1r/g/DfAXx5VcPALq2CxzdePw=
-dario.cat/mergo v1.0.1 h1:Ra4+bf83h2ztPIQYNP99R6m+Y7KfnARDfID+a+vLl4s=
-dario.cat/mergo v1.0.1/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk=
+dario.cat/mergo v1.0.0 h1:AGCNq9Evsj31mOgNPcLyXc+4PNABt905YmuqPYYpBWk=
+dario.cat/mergo v1.0.0/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk=
 dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
 filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA=
 filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4=
@@ -655,10 +655,6 @@ github.com/AzureAD/microsoft-authentication-library-for-go v1.4.2 h1:oygO0locgZJ
 github.com/AzureAD/microsoft-authentication-library-for-go v1.4.2/go.mod h1:wP83P5OoQ5p6ip3ScPr0BAq0BvuPAvacpEuSzyouqAI=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
-github.com/ClickHouse/ch-go v0.66.0 h1:hLslxxAVb2PHpbHr4n0d6aP8CEIpUYGMVT1Yj/Q5Img=
-github.com/ClickHouse/ch-go v0.66.0/go.mod h1:noiHWyLMJAZ5wYuq3R/K0TcRhrNA8h7o1AqHX0klEhM=
-github.com/ClickHouse/clickhouse-go/v2 v2.36.0 h1:FJ03h8VdmBUhvR9nQEu5jRLdfG0c/HSxUjiNdOxRQww=
-github.com/ClickHouse/clickhouse-go/v2 v2.36.0/go.mod h1:aijX64fKD1hAWu/zqWEmiGk7wRE8ZnpN0M3UvjsZG3I=
 github.com/GoogleCloudPlatform/grpc-gcp-go/grpcgcp v1.5.3 h1:2afWGsMzkIcN8Qm4mgPJKZWyroE5QBszMiDMYEBrnfw=
 github.com/GoogleCloudPlatform/grpc-gcp-go/grpcgcp v1.5.3/go.mod h1:dppbR7CwXD4pgtV9t3wD1812RaLDcBjtblcDF5f1vI0=
 github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.27.0 h1:ErKg/3iS1AKcTkf3yixlZ54f9U1rljCkQyEXWUnIUxc=
@@ -688,8 +684,6 @@ github.com/ajstarks/deck/generate v0.0.0-20210309230005-c3f852c02e19/go.mod h1:T
 github.com/ajstarks/svgo v0.0.0-20180226025133-644b8db467af/go.mod h1:K08gAheRH3/J6wwsYMMT4xOr94bZjxIelGM0+d/wbFw=
 github.com/ajstarks/svgo v0.0.0-20211024235047-1546f124cd8b/go.mod h1:1KcenG0jGWcpt8ov532z81sp/kMMUG485J2InIOyADM=
 github.com/andybalholm/brotli v1.0.4/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig=
-github.com/andybalholm/brotli v1.2.0 h1:ukwgCxwYrmACq68yiUqwIWnGY0cTPox/M94sVwToPjQ=
-github.com/andybalholm/brotli v1.2.0/go.mod h1:rzTDkvFWvIrjDXZHkuS16NPggd91W3kUSvPlQ1pLaKY=
 github.com/andybalholm/cascadia v1.3.3 h1:AG2YHrzJIm4BZ19iwJ/DAua6Btl3IwJX+VI4kktS1LM=
 github.com/andybalholm/cascadia v1.3.3/go.mod h1:xNd9bqTn98Ln4DwST8/nG+H0yuB8Hmgu1YHNnWw0GeA=
 github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=
@@ -776,10 +770,10 @@ github.com/cncf/xds/go v0.0.0-20250501225837-2ac532fd4443 h1:aQ3y1lwWyqYPiWZThqv
 github.com/cncf/xds/go v0.0.0-20250501225837-2ac532fd4443/go.mod h1:W+zGtBO5Y1IgJhy4+A9GOqVhqLpfZi+vwmdNXUehLA8=
 github.com/containerd/continuity v0.4.3 h1:6HVkalIp+2u1ZLH1J/pYX2oBVXlJZvh1X1A7bEZ9Su8=
 github.com/containerd/continuity v0.4.3/go.mod h1:F6PTNCKepoxEaXLQp3wDAjygEnImnZ/7o4JzpodfroQ=
-github.com/couchbase/gocb/v2 v2.11.0 h1:OVB+KlVeXlKVtziKx/LWZT7DClLsoQHQFrI4wan5Ijc=
-github.com/couchbase/gocb/v2 v2.11.0/go.mod h1:Y+lODSgyVzDSaf0Sy8sIzIa0RTAw3vlZUsjY6+FUq9Y=
-github.com/couchbase/gocbcore/v10 v10.8.0 h1:zDcJyYqOirFyC8T/aVvNL4N9oj6GI4qtaBuTGGWCDb4=
-github.com/couchbase/gocbcore/v10 v10.8.0/go.mod h1:OWKfU9R5Nm5V3QZBtfdZl5qCfgxtxTqOgXiNr4pn9/c=
+github.com/couchbase/gocb/v2 v2.10.1 h1:5r1jngGxw3dTZdtq6Xmjq3pdU6hOwRvynvbVIp58T64=
+github.com/couchbase/gocb/v2 v2.10.1/go.mod h1:GGEJuYjrfnPHCQLcxTcIco+Puy63PS2p8QQd8FRw66I=
+github.com/couchbase/gocbcore/v10 v10.7.1 h1:6jsNDtqyfoQ8Xg6kv99rzccc3CrHbp7FjeY+ahWXTF4=
+github.com/couchbase/gocbcore/v10 v10.7.1/go.mod h1:Q8JWVenMCEOuRgrDQKApHbzzPif38HzefGgRVe9apAI=
 github.com/couchbase/gocbcoreps v0.1.3 h1:fILaKGCjxFIeCgAUG8FGmRDSpdrRggohOMKEgO9CUpg=
 github.com/couchbase/gocbcoreps v0.1.3/go.mod h1:hBFpDNPnRno6HH5cRXExhqXYRmTsFJlFHQx7vztcXPk=
 github.com/couchbase/goprotostellar v1.0.2 h1:yoPbAL9sCtcyZ5e/DcU5PRMOEFaJrF9awXYu3VPfGls=
@@ -802,8 +796,8 @@ github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/r
 github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc=
 github.com/docker/cli v26.1.4+incompatible h1:I8PHdc0MtxEADqYJZvhBrW9bo8gawKwwenxRM7/rLu8=
 github.com/docker/cli v26.1.4+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=
-github.com/docker/docker v28.2.2+incompatible h1:CjwRSksz8Yo4+RmQ339Dp/D2tGO5JxwYeqtMOEe0LDw=
-github.com/docker/docker v28.2.2+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
+github.com/docker/docker v27.1.1+incompatible h1:hO/M4MtV36kzKldqnA37IWhebRA+LnqqcqDja6kVaKY=
+github.com/docker/docker v27.1.1+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
 github.com/docker/go-connections v0.5.0 h1:USnMq7hx7gwdVZq1L49hLXaFtUdTADjXGp+uj1Br63c=
 github.com/docker/go-connections v0.5.0/go.mod h1:ov60Kzw0kKElRwhNs9UlUHAE/F9Fe6GLaXnqyDdmEXc=
 github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4=
@@ -846,16 +840,12 @@ github.com/fsnotify/fsnotify v1.9.0/go.mod h1:8jBTzvmWwFyi3Pb8djgCCO5IBqzKJ/Jwo8
 github.com/gabriel-vasile/mimetype v1.4.8 h1:FfZ3gj38NjllZIeJAmMhr+qKL8Wu+nOoI3GqacKw1NM=
 github.com/gabriel-vasile/mimetype v1.4.8/go.mod h1:ByKUIKGjh1ODkGM1asKUbQZOLGrPjydw3hYPU2YU9t8=
 github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
-github.com/go-chi/chi/v5 v5.2.3 h1:WQIt9uxdsAbgIYgid+BpYc+liqQZGMHRaUwp0JUcvdE=
-github.com/go-chi/chi/v5 v5.2.3/go.mod h1:L2yAIGWB3H+phAw1NxKwWM+7eUH/lU8pOMm5hHcoops=
+github.com/go-chi/chi/v5 v5.2.2 h1:CMwsvRVTbXVytCk1Wd72Zy1LAsAh9GxMmSNWLHCG618=
+github.com/go-chi/chi/v5 v5.2.2/go.mod h1:L2yAIGWB3H+phAw1NxKwWM+7eUH/lU8pOMm5hHcoops=
 github.com/go-chi/httplog/v2 v2.1.1 h1:ojojiu4PIaoeJ/qAO4GWUxJqvYUTobeo7zmuHQJAxRk=
 github.com/go-chi/httplog/v2 v2.1.1/go.mod h1:/XXdxicJsp4BA5fapgIC3VuTD+z0Z/VzukoB3VDc1YE=
 github.com/go-chi/render v1.0.3 h1:AsXqd2a1/INaIfUSKq3G5uA8weYx20FOsM7uSoCyyt4=
 github.com/go-chi/render v1.0.3/go.mod h1:/gr3hVkmYR0YlEy3LxCuVRFzEu9Ruok+gFqbIofjao0=
-github.com/go-faster/city v1.0.1 h1:4WAxSZ3V2Ws4QRDrscLEDcibJY8uf41H6AhXDrNDcGw=
-github.com/go-faster/city v1.0.1/go.mod h1:jKcUJId49qdW3L1qKHH/3wPeUstCVpVSXTM6vO3VcTw=
-github.com/go-faster/errors v0.7.1 h1:MkJTnDoEdi9pDabt1dpWf7AA8/BaSYZqibYyhZ20AYg=
-github.com/go-faster/errors v0.7.1/go.mod h1:5ySTjWFiphBs07IKuiL69nxdfd5+fzh1u7FPGZP2quo=
 github.com/go-fonts/dejavu v0.1.0/go.mod h1:4Wt4I4OU2Nq9asgDCteaAaWZOV24E+0/Pwo0gppep4g=
 github.com/go-fonts/latin-modern v0.2.0/go.mod h1:rQVLdDMK+mK1xscDwsqM5J8U2jrRa3T0ecnM9pNujks=
 github.com/go-fonts/liberation v0.1.1/go.mod h1:K6qoJYypsmfVjWg8KOVDQhLc8UDgIK2HYqyqAO9z7GY=
@@ -943,7 +933,6 @@ github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiu
 github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
 github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek=
 github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps=
-github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/golang/snappy v0.0.3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/golang/snappy v1.0.0 h1:Oy607GVXHs7RtbggtPBnr2RmDArIsAefDwvrdWvRhGs=
@@ -1099,7 +1088,6 @@ github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51/go.mod h1:C
 github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
 github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
 github.com/klauspost/asmfmt v1.3.2/go.mod h1:AG8TuvYojzulgDAMCnYn50l/5QV3Bs/tp6j0HLHbNSE=
-github.com/klauspost/compress v1.13.6/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk=
 github.com/klauspost/compress v1.15.9/go.mod h1:PhcZ0MbTNciWF3rruxRgKxI5NkcHHrHUDtV4Yw2GlzU=
 github.com/klauspost/compress v1.18.0 h1:c/Cqfb0r+Yi+JtIEq73FWXVkRonBlf0CRNYc8Zttxdo=
 github.com/klauspost/compress v1.18.0/go.mod h1:2Pp+KzxcywXVXMr50+X0Q/Lsb43OQHYWRCY2AiWywWQ=
@@ -1131,8 +1119,8 @@ github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/
 github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
 github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
 github.com/mattn/go-sqlite3 v1.14.14/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU=
-github.com/microsoft/go-mssqldb v1.9.3 h1:hy4p+LDC8LIGvI3JATnLVmBOLMJbmn5X400mr5j0lPs=
-github.com/microsoft/go-mssqldb v1.9.3/go.mod h1:GBbW9ASTiDC+mpgWDGKdm3FnFLTUsLYN3iFL90lQ+PA=
+github.com/microsoft/go-mssqldb v1.9.2 h1:nY8TmFMQOHpm2qVWo6y4I2mAmVdZqlGiMGAYt64Ibbs=
+github.com/microsoft/go-mssqldb v1.9.2/go.mod h1:GBbW9ASTiDC+mpgWDGKdm3FnFLTUsLYN3iFL90lQ+PA=
 github.com/minio/asm2plan9s v0.0.0-20200509001527-cdd76441f9d8/go.mod h1:mC1jAcsrzbxHt8iiaC+zU4b1ylILSosueou12R++wfY=
 github.com/minio/c2goasm v0.0.0-20190812172519-36a3d3bbc4f3/go.mod h1:RagcQ7I8IeTMnF8JTXieKnO4Z6JCsikNEzj0DwauVzE=
 github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY=
@@ -1146,7 +1134,6 @@ github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
 github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M=
 github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
-github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe/go.mod h1:wL8QJuTMNUDYhXwkmfOly8iTdp5TEcJFWZD2D7SIkUc=
 github.com/montanaflynn/stats v0.7.1 h1:etflOAAHORrCC44V+aR6Ftzort912ZU+YLiSTuV8eaE=
 github.com/montanaflynn/stats v0.7.1/go.mod h1:etXPPgVO6n31NxCd9KQUMvCM+ve0ruNzt6R8Bnaayow=
 github.com/nakagami/chacha20 v0.1.0 h1:2fbf5KeVUw7oRpAe6/A7DqvBJLYYu0ka5WstFbnkEVo=
@@ -1161,16 +1148,13 @@ github.com/onsi/gomega v1.36.2 h1:koNYke6TVk6ZmnyHrCXba/T/MoLBXFjeC1PtvYgw0A8=
 github.com/onsi/gomega v1.36.2/go.mod h1:DdwyADRjrc825LhMEkD76cHR5+pUnjhUN8GlHlRPHzY=
 github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U=
 github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM=
-github.com/opencontainers/image-spec v1.1.1 h1:y0fUlFfIZhPF1W537XOLg0/fcx6zcHCJwooC2xJA040=
-github.com/opencontainers/image-spec v1.1.1/go.mod h1:qpqAh3Dmcf36wStyyWU+kCeDgrGnAve2nCC8+7h8Q0M=
+github.com/opencontainers/image-spec v1.1.0 h1:8SG7/vwALn54lVB/0yZ/MMwhFrPYtpEHQb2IpWsCzug=
+github.com/opencontainers/image-spec v1.1.0/go.mod h1:W4s4sFTMaBeK1BQLXbG4AdM2szdn85PY75RI83NrTrM=
 github.com/opencontainers/runc v1.1.13 h1:98S2srgG9vw0zWcDpFMn5TRrh8kLxa/5OFUstuUhmRs=
 github.com/opencontainers/runc v1.1.13/go.mod h1:R016aXacfp/gwQBYw2FDGa9m+n6atbLWrYY8hNMT/sA=
 github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o=
 github.com/ory/dockertest/v3 v3.11.0 h1:OiHcxKAvSDUwsEVh2BjxQQc/5EHz9n0va9awCtNGuyA=
 github.com/ory/dockertest/v3 v3.11.0/go.mod h1:VIPxS1gwT9NpPOrfD3rACs8Y9Z7yhzO4SB194iUDnUI=
-github.com/paulmach/orb v0.11.1 h1:3koVegMC4X/WeiXYz9iswopaTwMem53NzTJuTF20JzU=
-github.com/paulmach/orb v0.11.1/go.mod h1:5mULz1xQfs3bmQm63QEJA6lNGujuRafwA5S/EnuLaLU=
-github.com/paulmach/protoscan v0.2.1/go.mod h1:SpcSwydNLrxUGSDvXvO0P7g7AuhJ7lcKfDlhJCDw2gY=
 github.com/phpdave11/gofpdf v1.4.2/go.mod h1:zpO6xFn9yxo3YLyMvW8HcKWVdbNqgIfOOp2dXMnm1mY=
 github.com/phpdave11/gofpdi v1.0.12/go.mod h1:vBmVV0Do6hSBHC8uKUQ71JGW+ZGQq74llk/7bXwjDoI=
 github.com/phpdave11/gofpdi v1.0.13/go.mod h1:vBmVV0Do6hSBHC8uKUQ71JGW+ZGQq74llk/7bXwjDoI=
@@ -1209,10 +1193,8 @@ github.com/rogpeppe/go-internal v1.13.1/go.mod h1:uMEvuHeurkdAXX61udpOXGD/AzZDWN
 github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
 github.com/ruudk/golang-pdf417 v0.0.0-20181029194003-1af4ab5afa58/go.mod h1:6lfFZQK844Gfx8o5WFuvpxWRwnSoipWe/p622j1v06w=
 github.com/ruudk/golang-pdf417 v0.0.0-20201230142125-a7e3863a1245/go.mod h1:pQAZKsJ8yyVxGRWYNEm9oFB8ieLgKFnamEyDmSA0BRk=
-github.com/segmentio/asm v1.2.0 h1:9BQrFxC+YOHJlTlHGkTrFWf59nbL3XnCoFLTwDCI7ys=
-github.com/segmentio/asm v1.2.0/go.mod h1:BqMnlJP91P8d+4ibuonYZw9mfnzI9HfxselHZr5aAcs=
-github.com/shopspring/decimal v1.4.0 h1:bxl37RwXBklmTi0C79JfXCEBD1cqqHt0bbgBAGFp81k=
-github.com/shopspring/decimal v1.4.0/go.mod h1:gawqmDU56v4yIKSwfBSFip1HdCCXN8/+DMd9qYNcwME=
+github.com/shopspring/decimal v1.2.0 h1:abSATXmQEYyShuxI4/vyW3tV1MrKAJzCZ/0zLUXYbsQ=
+github.com/shopspring/decimal v1.2.0/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o=
 github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
 github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
 github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
@@ -1246,17 +1228,14 @@ github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOf
 github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
 github.com/thlib/go-timezone-local v0.0.7 h1:fX8zd3aJydqLlTs/TrROrIIdztzsdFV23OzOQx31jII=
 github.com/thlib/go-timezone-local v0.0.7/go.mod h1:/Tnicc6m/lsJE0irFMA0LfIwTBo4QP7A8IfyIv4zZKI=
-github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk=
 github.com/trinodb/trino-go-client v0.328.0 h1:X6hrGGysA3nvyVcz8kJbBS98srLNTNsnNYwRkMC1atA=
 github.com/trinodb/trino-go-client v0.328.0/go.mod h1:e/nck9W6hy+9bbyZEpXKFlNsufn3lQGpUgDL1d5f1FI=
 github.com/valkey-io/valkey-go v1.0.64 h1:3u4+b6D6zs9JQs254TLy4LqitCMHHr9XorP9GGk7XY4=
 github.com/valkey-io/valkey-go v1.0.64/go.mod h1:bHmwjIEOrGq/ubOJfh5uMRs7Xj6mV3mQ/ZXUbmqpjqY=
 github.com/xdg-go/pbkdf2 v1.0.0 h1:Su7DPu48wXMwC3bs7MCNG+z4FhcyEuz5dlvchbq0B0c=
 github.com/xdg-go/pbkdf2 v1.0.0/go.mod h1:jrpuAogTd400dnrH08LKmI/xc1MbPOebTwRqcT5RDeI=
-github.com/xdg-go/scram v1.1.1/go.mod h1:RaEWvsqvNKKvBPvcKeFjrG2cJqOkHTiyTpzz23ni57g=
 github.com/xdg-go/scram v1.1.2 h1:FHX5I5B4i4hKRVRBCFRxq1iQRej7WO3hhBuJf+UUySY=
 github.com/xdg-go/scram v1.1.2/go.mod h1:RT/sEzTbU5y00aCK8UOx6R7YryM0iF1N2MOmC3kKLN4=
-github.com/xdg-go/stringprep v1.0.3/go.mod h1:W3f5j4i+9rC0kuIEJL0ky1VpHXQU3ocBgklLGvcBnW8=
 github.com/xdg-go/stringprep v1.0.4 h1:XLI/Ng3O1Atzq0oBs3TWm+5ZVgkq2aqdlvP9JtoZ6c8=
 github.com/xdg-go/stringprep v1.0.4/go.mod h1:mPGuuIYwz7CmR2bT9j4GbQqutWS1zV24gijq1dTyGkM=
 github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb h1:zGWFAtiMcyryUHoUjUJX0/lt1H2+i2Ka2n+D3DImSNo=
@@ -1265,9 +1244,6 @@ github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 h1:EzJWgHo
 github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod h1:GwrjFmJcFw6At/Gs6z4yjiIwzuJ1/+UwLxMQDVQXShQ=
 github.com/xeipuuv/gojsonschema v1.2.0 h1:LhYJRs+L4fBtjZUfuSZIKGeVu0QRy8e5Xi7D17UxZ74=
 github.com/xeipuuv/gojsonschema v1.2.0/go.mod h1:anYRn/JVcOK2ZgGU+IjEV4nwlhoK5sQluxsYJ78Id3Y=
-github.com/xyproto/randomstring v1.0.5 h1:YtlWPoRdgMu3NZtP45drfy1GKoojuR7hmRcnhZqKjWU=
-github.com/xyproto/randomstring v1.0.5/go.mod h1:rgmS5DeNXLivK7YprL0pY+lTuhNQW3iGxZ18UQApw/E=
-github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d/go.mod h1:rHwXgn7JulP+udvsHwJoVG1YGAP6VLg4y9I5dyZdqmA=
 github.com/youmark/pkcs8 v0.0.0-20240726163527-a2c0da244d78 h1:ilQV1hzziu+LLM3zUTJ0trRztfwgjqKnBWNtSRkbmwM=
 github.com/youmark/pkcs8 v0.0.0-20240726163527-a2c0da244d78/go.mod h1:aL8wCCfTfSfmXjznFBSZNN13rSJjlIOI1fUNAtF7rmI=
 github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
@@ -1285,7 +1261,6 @@ github.com/zeebo/xxh3 v1.0.2 h1:xZmwmqxHZA8AI603jOQ0tMqmBr9lPeFwGg6d+xy9DC0=
 github.com/zeebo/xxh3 v1.0.2/go.mod h1:5NWz9Sef7zIDm2JHfFlcQvNekmcEl9ekUZQQKCYaDcA=
 gitlab.com/nyarla/go-crypt v0.0.0-20160106005555-d9a5dc2b789b h1:7gd+rd8P3bqcn/96gOZa3F5dpJr/vEiDQYlNb/y2uNs=
 gitlab.com/nyarla/go-crypt v0.0.0-20160106005555-d9a5dc2b789b/go.mod h1:T3BPAOm2cqquPa0MKWeNkmOM5RQsRhkrwMWonFMN7fE=
-go.mongodb.org/mongo-driver v1.11.4/go.mod h1:PTSz5yu21bkT/wXpkS7WR5f0ddqw5quethTUn9WM+2g=
 go.mongodb.org/mongo-driver v1.17.4 h1:jUorfmVzljjr0FLzYQsGP8cgN/qzzxlY9Vh0C9KFXVw=
 go.mongodb.org/mongo-driver v1.17.4/go.mod h1:Hy04i7O2kC4RS06ZrhPRqj/u4DTYkFDAAccj+rVKqgQ=
 go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
@@ -1301,8 +1276,8 @@ go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJyS
 go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A=
 go.opentelemetry.io/contrib/detectors/gcp v1.36.0 h1:F7q2tNlCaHY9nMKHR6XH9/qkp8FktLnIcy6jJNyOCQw=
 go.opentelemetry.io/contrib/detectors/gcp v1.36.0/go.mod h1:IbBN8uAIIx734PTonTPxAxnjc2pQTxWNkwfstZ+6H2k=
-go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.62.0 h1:rbRJ8BBoVMsQShESYZ0FkvcITu8X8QNwJogcLUmDNNw=
-go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.62.0/go.mod h1:ru6KHrNtNHxM4nD/vd6QrLVWgKhxPYgblq4VAtNawTQ=
+go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.61.0 h1:q4XOmH/0opmeuJtPsbFNivyl7bCt7yRBbeEm2sC/XtQ=
+go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.61.0/go.mod h1:snMWehoOh2wsEwnvvwtDyFCxVeDAODenXHtn5vzrKjo=
 go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.62.0 h1:Hf9xI/XLML9ElpiHVDNwvqI0hIFlzV8dgIr35kV1kRU=
 go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.62.0/go.mod h1:NfchwuyNoMcZ5MLHwPrODwUF1HWCXWrL31s8gSAdIKY=
 go.opentelemetry.io/contrib/propagators/autoprop v0.62.0 h1:1+EHlhAe/tukctfePZRrDruB9vn7MdwyC+rf36nUSPM=
@@ -1355,7 +1330,6 @@ golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPh
 golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4=
 golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
-golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
 golang.org/x/crypto v0.6.0/go.mod h1:OFC/31mSvZgRz0V1QTNCzfAI1aIRzbiufJtkMIlEp58=
 golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliYc=
 golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU=
@@ -1465,7 +1439,6 @@ golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96b
 golang.org/x/net v0.0.0-20210503060351-7fd8e65b6420/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
 golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
 golang.org/x/net v0.0.0-20220325170049-de3da57026de/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
@@ -1963,10 +1936,10 @@ google.golang.org/genproto v0.0.0-20230323212658-478b75c54725/go.mod h1:UUQDJDOl
 google.golang.org/genproto v0.0.0-20230330154414-c0448cd141ea/go.mod h1:UUQDJDOlWu4KYeJZffbWgBkS1YFobzKbLVfK69pe0Ak=
 google.golang.org/genproto v0.0.0-20230331144136-dcfb400f0633/go.mod h1:UUQDJDOlWu4KYeJZffbWgBkS1YFobzKbLVfK69pe0Ak=
 google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1/go.mod h1:nKE/iIaLqn2bQwXBg8f1g2Ylh6r5MN5CmZvuzZCgsCU=
-google.golang.org/genproto v0.0.0-20250826171959-ef028d996bc1 h1:Nm5SEGIguOIBDXs5rhfz2aKwEVWlgwC58UcmEnLDc8Y=
-google.golang.org/genproto v0.0.0-20250826171959-ef028d996bc1/go.mod h1:Jz9LrroM7Mcm+a0QrLh4UpZ1B/WhjIbqwEcUf4y08nQ=
-google.golang.org/genproto/googleapis/api v0.0.0-20250818200422-3122310a409c h1:AtEkQdl5b6zsybXcbz00j1LwNodDuH6hVifIaNqk7NQ=
-google.golang.org/genproto/googleapis/api v0.0.0-20250818200422-3122310a409c/go.mod h1:ea2MjsO70ssTfCjiwHgI0ZFqcw45Ksuk2ckf9G468GA=
+google.golang.org/genproto v0.0.0-20250818200422-3122310a409c h1:ZERoum3uuqL0PRSc6SXielu26FN96T4BUGaaW0oL+c8=
+google.golang.org/genproto v0.0.0-20250818200422-3122310a409c/go.mod h1:Q8kep885BJnK3Jt6QZXIFeLHSzoAQtlI1CCloQigiyU=
+google.golang.org/genproto/googleapis/api v0.0.0-20250811230008-5f3141c8851a h1:DMCgtIAIQGZqJXMVzJF4MV8BlWoJh2ZuFiRdAleyr58=
+google.golang.org/genproto/googleapis/api v0.0.0-20250811230008-5f3141c8851a/go.mod h1:y2yVLIE/CSMCPXaHnSKXxu1spLPnglFLegmgdY23uuE=
 google.golang.org/genproto/googleapis/rpc v0.0.0-20250818200422-3122310a409c h1:qXWI/sQtv5UKboZ/zUk7h+mrf/lXORyI+n9DKDAusdg=
 google.golang.org/genproto/googleapis/rpc v0.0.0-20250818200422-3122310a409c/go.mod h1:gw1tLEfykwDz2ET4a12jcXt4couGAm7IwsVaTy0Sflo=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
@@ -2030,11 +2003,10 @@ google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqw
 google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
 google.golang.org/protobuf v1.29.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
 google.golang.org/protobuf v1.30.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
-google.golang.org/protobuf v1.36.8 h1:xHScyCOEuuwZEc6UtSOvPbAT4zRh0xcNRYekJwfqyMc=
-google.golang.org/protobuf v1.36.8/go.mod h1:fuxRtAxBytpl4zzqUh6/eyUujkJdNiuEkXntxiD/uRU=
+google.golang.org/protobuf v1.36.7 h1:IgrO7UwFQGJdRNXH/sQux4R1Dj1WAKcLElzeeRaXV2A=
+google.golang.org/protobuf v1.36.7/go.mod h1:jduwjTPXsFjZGTmRluh+L6NjiWu7pchiJ2/5YcXBHnY=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
 gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
 gopkg.in/ini.v1 v1.61.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
--- a/internal/prebuiltconfigs/prebuiltconfigs_test.go
+++ b/internal/prebuiltconfigs/prebuiltconfigs_test.go
@@ -24,7 +24,6 @@ var expectedToolSources = []string{
 	"alloydb-postgres-admin",
 	"alloydb-postgres",
 	"bigquery",
-	"clickhouse",
 	"cloud-sql-mssql",
 	"cloud-sql-mysql",
 	"cloud-sql-postgres",
@@ -86,7 +85,6 @@ func TestGetPrebuiltTool(t *testing.T) {
 	alloydb_admin_config, _ := Get("alloydb-postgres-admin")
 	alloydb_config, _ := Get("alloydb-postgres")
 	bigquery_config, _ := Get("bigquery")
-	clickhouse_config, _ := Get("clickhouse")
 	cloudsqlpg_config, _ := Get("cloud-sql-postgres")
 	cloudsqlmysql_config, _ := Get("cloud-sql-mysql")
 	cloudsqlmssql_config, _ := Get("cloud-sql-mssql")
@@ -107,9 +105,6 @@ func TestGetPrebuiltTool(t *testing.T) {
 	if len(bigquery_config) <= 0 {
 		t.Fatalf("unexpected error: could not fetch bigquery prebuilt tools yaml")
 	}
-	if len(clickhouse_config) <= 0 {
-		t.Fatalf("unexpected error: could not fetch clickhouse prebuilt tools yaml")
-	}
 	if len(cloudsqlpg_config) <= 0 {
 		t.Fatalf("unexpected error: could not fetch cloud sql pg prebuilt tools yaml")
 	}
--- a/internal/prebuiltconfigs/tools/bigquery.yaml
+++ b/internal/prebuiltconfigs/tools/bigquery.yaml
@@ -4,14 +4,6 @@ sources:
    project: ${BIGQUERY_PROJECT}

 tools:
-  ask_data_insights:
-    kind: bigquery-conversational-analytics
-    source: bigquery-source
-    description: |
-      Use this tool to perform data analysis, get insights,
-      or answer complex questions about the contents of specific
-      BigQuery tables.
-
  execute_sql:
    kind: bigquery-execute-sql
    source: bigquery-source
@@ -44,7 +36,6 @@ tools:

 toolsets:
  bigquery-database-tools:
-    - ask_data_insights
    - execute_sql
    - forecast
    - get_dataset_info
--- a/internal/prebuiltconfigs/tools/clickhouse.yaml
+++ b/internal/prebuiltconfigs/tools/clickhouse.yaml
@@ -1,19 +0,0 @@
-sources:
-  clickhouse-source:
-    kind: clickhouse
-    host: ${CLICKHOUSE_HOST}
-    port: ${CLICKHOUSE_PORT}
-    user: ${CLICKHOUSE_USER}
-    password: ${CLICKHOUSE_PASSWORD}
-    database: ${CLICKHOUSE_DATABASE}
-    protocol: ${CLICKHOUSE_PROTOCOL}
-
-tools:
-  execute_sql:
-    kind: clickhouse-execute-sql
-    source: clickhouse-source
-    description: Use this tool to execute SQL.
-
-toolsets:
-  clickhouse-database-tools:
-    - execute_sql
--- a/internal/prebuiltconfigs/tools/looker.yaml
+++ b/internal/prebuiltconfigs/tools/looker.yaml
@@ -4,11 +4,8 @@ sources:
        base_url: ${LOOKER_BASE_URL}
        client_id: ${LOOKER_CLIENT_ID}
        client_secret: ${LOOKER_CLIENT_SECRET}
-        verify_ssl: ${LOOKER_VERIFY_SSL:true}
+        verify_ssl: ${LOOKER_VERIFY_SSL}
        timeout: 600s
-        show_hidden_models: ${LOOKER_SHOW_HIDDEN_MODELS:true}
-        show_hidden_explores: ${LOOKER_SHOW_HIDDEN_EXPLORES:true}
-        show_hidden_fields: ${LOOKER_SHOW_HIDDEN_FIELDS:true}

 tools:
    get_models:
@@ -91,8 +88,7 @@ tools:
          Filters are provided as a map of {"field.id": "condition",
          "field.id2": "condition2", ...}. Do not put the field.id in
          quotes. Filter expressions can be found at
-          https://cloud.google.com/looker/docs/filter-expressions. There
-          is one mistake in that, however, Use `not null` instead of `-NULL`.
+          https://cloud.google.com/looker/docs/filter-expressions.

          Sorts can be specified like [ "field.id desc 0" ].

@@ -219,7 +215,6 @@ tools:

          ### Pie / Donut

-          *   Pie charts must have exactly one dimension and one numerical measure.
          *   `type`: Must be `looker_pie`.
          *   `value_labels`: Where to display values (`'legend'`, `'labels'`).
          *   `label_type`: The format of data labels (`'labPer'`, `'labVal'`, `'lab'`, `'val'`, `'per'`).
--- a/internal/server/api.go
+++ b/internal/server/api.go
@@ -16,10 +16,8 @@ package server

 import (
 	"encoding/json"
-	"errors"
 	"fmt"
 	"net/http"
-	"strings"

 	"github.com/go-chi/chi/v5"
 	"github.com/go-chi/chi/v5/middleware"
@@ -167,20 +165,6 @@ func toolInvokeHandler(s *Server, w http.ResponseWriter, r *http.Request) {
 		return
 	}

-	// Extract OAuth access token from the "Authorization" header (currently for
-	// BigQuery end-user credentials usage only)
-	accessToken := tools.AccessToken(r.Header.Get("Authorization"))
-
-	// Check if this specific tool requires the standard authorization header
-	if tool.RequiresClientAuthorization() {
-		if accessToken == "" {
-			err = fmt.Errorf("tool requires client authorization but access token is missing from the request header")
-			s.logger.DebugContext(ctx, err.Error())
-			_ = render.Render(w, r, newErrResponse(err, http.StatusUnauthorized))
-			return
-		}
-	}
-
 	// Tool authentication
 	// claimsFromAuth maps the name of the authservice to the claims retrieved from it.
 	claimsFromAuth := make(map[string]map[string]any)
@@ -226,12 +210,6 @@ func toolInvokeHandler(s *Server, w http.ResponseWriter, r *http.Request) {

 	params, err := tool.ParseParams(data, claimsFromAuth)
 	if err != nil {
-		// If auth error, return 401
-		if errors.Is(err, tools.ErrUnauthorized) {
-			s.logger.DebugContext(ctx, fmt.Sprintf("error parsing authenticated parameters from ID token: %s", err))
-			_ = render.Render(w, r, newErrResponse(err, http.StatusUnauthorized))
-			return
-		}
 		err = fmt.Errorf("provided parameters were invalid: %w", err)
 		s.logger.DebugContext(ctx, err.Error())
 		_ = render.Render(w, r, newErrResponse(err, http.StatusBadRequest))
@@ -239,34 +217,12 @@ func toolInvokeHandler(s *Server, w http.ResponseWriter, r *http.Request) {
 	}
 	s.logger.DebugContext(ctx, fmt.Sprintf("invocation params: %s", params))

+	// Extract OAuth access token from the "Authorization" header (currently for
+	// BigQuery end-user credentials usage only)
+	accessToken := tools.AccessToken(r.Header.Get("Authorization"))
+
 	res, err := tool.Invoke(ctx, params, accessToken)
-
-	// Determine what error to return to the users.
 	if err != nil {
-		errStr := err.Error()
-		var statusCode int
-
-		// Upstream API auth error propagation
-		switch {
-		case strings.Contains(errStr, "Error 401"):
-			statusCode = http.StatusUnauthorized
-		case strings.Contains(errStr, "Error 403"):
-			statusCode = http.StatusForbidden
-		}
-
-		if statusCode == http.StatusUnauthorized || statusCode == http.StatusForbidden {
-			if tool.RequiresClientAuthorization() {
-				// Propagate the original 401/403 error.
-				s.logger.DebugContext(ctx, fmt.Sprintf("error invoking tool. Client credentials lack authorization to the source: %v", err))
-				_ = render.Render(w, r, newErrResponse(err, statusCode))
-				return
-			}
-			// ADC lacking permission or credentials configuration error.
-			internalErr := fmt.Errorf("unexpected auth error occured during Tool invocation: %w", err)
-			s.logger.ErrorContext(ctx, internalErr.Error())
-			_ = render.Render(w, r, newErrResponse(internalErr, http.StatusInternalServerError))
-			return
-		}
 		err = fmt.Errorf("error while invoking tool: %w", err)
 		s.logger.DebugContext(ctx, err.Error())
 		_ = render.Render(w, r, newErrResponse(err, http.StatusBadRequest))
--- a/internal/server/api_test.go
+++ b/internal/server/api_test.go
@@ -212,7 +212,7 @@ func TestToolGetEndpoint(t *testing.T) {
 }

 func TestToolInvokeEndpoint(t *testing.T) {
-	mockTools := []MockTool{tool1, tool2, tool4, tool5}
+	mockTools := []MockTool{tool1, tool2}
 	toolsMap, toolsets := setUpResources(t, mockTools)
 	r, shutdown := setUpServer(t, "api", toolsMap, toolsets)
 	defer shutdown()
@@ -247,20 +247,6 @@ func TestToolInvokeEndpoint(t *testing.T) {
 			want:        "",
 			isErr:       true,
 		},
-		{
-			name:        "tool4",
-			toolName:    tool4.Name,
-			requestBody: bytes.NewBuffer([]byte(`{}`)),
-			want:        "",
-			isErr:       true,
-		},
-		{
-			name:        "tool5",
-			toolName:    tool5.Name,
-			requestBody: bytes.NewBuffer([]byte(`{}`)),
-			want:        "",
-			isErr:       true,
-		},
 	}

 	for _, tc := range testCases {
--- a/internal/server/common_test.go
+++ b/internal/server/common_test.go
@@ -36,12 +36,10 @@ var _ tools.Tool = &MockTool{}

 // MockTool is used to mock tools in tests
 type MockTool struct {
-	Name                         string
-	Description                  string
-	Params                       []tools.Parameter
-	manifest                     tools.Manifest
-	unauthorized                 bool
-	requiresClientAuthrorization bool
+	Name        string
+	Description string
+	Params      []tools.Parameter
+	manifest    tools.Manifest
 }

 func (t MockTool) Invoke(context.Context, tools.ParamValues, tools.AccessToken) (any, error) {
@@ -61,15 +59,12 @@ func (t MockTool) Manifest() tools.Manifest {
 	}
 	return tools.Manifest{Description: t.Description, Parameters: pMs}
 }
-
 func (t MockTool) Authorized(verifiedAuthServices []string) bool {
-	// defaulted to true
-	return !t.unauthorized
+	return true
 }

 func (t MockTool) RequiresClientAuthorization() bool {
-	// defaulted to false
-	return t.requiresClientAuthrorization
+	return false
 }

 func (t MockTool) McpManifest() tools.McpManifest {
@@ -116,18 +111,6 @@ var tool3 = MockTool{
 	},
 }

-var tool4 = MockTool{
-	Name:         "unauthorized_tool",
-	Params:       []tools.Parameter{},
-	unauthorized: true,
-}
-
-var tool5 = MockTool{
-	Name:                         "require_client_auth_tool",
-	Params:                       []tools.Parameter{},
-	requiresClientAuthrorization: true,
-}
-
 // setUpResources setups resources to test against
 func setUpResources(t *testing.T, mockTools []MockTool) (map[string]tools.Tool, map[string]tools.Toolset) {
 	toolsMap := make(map[string]tools.Tool)
--- a/internal/server/config.go
+++ b/internal/server/config.go
@@ -218,11 +218,6 @@ func (c *ToolConfigs) UnmarshalYAML(ctx context.Context, unmarshal func(interfac
 			return fmt.Errorf("unable to unmarshal %q: %w", name, err)
 		}

-		// `authRequired` and `useClientOAuth` cannot be specified together
-		if v["authRequired"] != nil && v["useClientOAuth"] == true {
-			return fmt.Errorf("`authRequired` and `useClientOAuth` are mutually exclusive. Choose only one authentication method")
-		}
-
 		// Make `authRequired` an empty list instead of nil for Tool manifest
 		if v["authRequired"] == nil {
 			v["authRequired"] = []string{}
--- a/internal/server/mcp.go
+++ b/internal/server/mcp.go
@@ -19,11 +19,9 @@ import (
 	"bytes"
 	"context"
 	"encoding/json"
-	"errors"
 	"fmt"
 	"io"
 	"net/http"
-	"strings"
 	"sync"
 	"time"

@@ -144,7 +142,7 @@ func (s *stdioSession) readInputStream(ctx context.Context) error {
 			}
 			return err
 		}
-		v, res, err := processMcpMessage(ctx, []byte(line), s.server, s.protocol, "", nil)
+		v, res, err := processMcpMessage(ctx, []byte(line), s.server, s.protocol, "", "")
 		if err != nil {
 			// errors during the processing of message will generate a valid MCP Error response.
 			// server can continue to run.
@@ -332,8 +330,6 @@ func methodNotAllowed(s *Server, w http.ResponseWriter, r *http.Request) {

 // httpHandler handles all mcp messages.
 func httpHandler(s *Server, w http.ResponseWriter, r *http.Request) {
-	w.Header().Set("Content-Type", "application/json")
-
 	ctx, span := s.instrumentation.Tracer.Start(r.Context(), "toolbox/server/mcp")
 	r = r.WithContext(ctx)
 	ctx = util.WithLogger(r.Context(), s.logger)
@@ -406,11 +402,9 @@ func httpHandler(s *Server, w http.ResponseWriter, r *http.Request) {
 		return
 	}

-	v, res, err := processMcpMessage(ctx, body, s, protocolVersion, toolsetName, r.Header)
-	if err != nil {
-		s.logger.DebugContext(ctx, fmt.Errorf("error processing message: %w", err).Error())
-	}
+	accessToken := tools.AccessToken(r.Header.Get("Authorization"))

+	v, res, err := processMcpMessage(ctx, body, s, protocolVersion, toolsetName, accessToken)
 	// notifications will return empty string
 	if res == nil {
 		// Notifications do not expect a response
@@ -418,6 +412,9 @@ func httpHandler(s *Server, w http.ResponseWriter, r *http.Request) {
 		w.WriteHeader(http.StatusAccepted)
 		return
 	}
+	if err != nil {
+		s.logger.DebugContext(ctx, err.Error())
+	}

 	// for v20250326, add the `Mcp-Session-Id` header
 	if v == v20250326.PROTOCOL_VERSION {
@@ -437,29 +434,13 @@ func httpHandler(s *Server, w http.ResponseWriter, r *http.Request) {
 			s.logger.DebugContext(ctx, "unable to add to event queue")
 		}
 	}
-	if rpcResponse, ok := res.(jsonrpc.JSONRPCError); ok {
-		code := rpcResponse.Error.Code
-		switch code {
-		case jsonrpc.INTERNAL_ERROR:
-			w.WriteHeader(http.StatusInternalServerError)
-		case jsonrpc.INVALID_REQUEST:
-			errStr := err.Error()
-			if errors.Is(err, tools.ErrUnauthorized) {
-				w.WriteHeader(http.StatusUnauthorized)
-			} else if strings.Contains(errStr, "Error 401") {
-				w.WriteHeader(http.StatusUnauthorized)
-			} else if strings.Contains(errStr, "Error 403") {
-				w.WriteHeader(http.StatusForbidden)
-			}
-		}
-	}

 	// send HTTP response
 	render.JSON(w, r, res)
 }

 // processMcpMessage process the messages received from clients
-func processMcpMessage(ctx context.Context, body []byte, s *Server, protocolVersion string, toolsetName string, header http.Header) (string, any, error) {
+func processMcpMessage(ctx context.Context, body []byte, s *Server, protocolVersion string, toolsetName string, accessToken tools.AccessToken) (string, any, error) {
 	logger, err := util.LoggerFromContext(ctx)
 	if err != nil {
 		return "", jsonrpc.NewError("", jsonrpc.INTERNAL_ERROR, err.Error(), nil), err
@@ -514,7 +495,7 @@ func processMcpMessage(ctx context.Context, body []byte, s *Server, protocolVers
 			err = fmt.Errorf("toolset does not exist")
 			return "", jsonrpc.NewError(baseMessage.Id, jsonrpc.INVALID_REQUEST, err.Error(), nil), err
 		}
-		res, err := mcp.ProcessMethod(ctx, protocolVersion, baseMessage.Id, baseMessage.Method, toolset, s.ResourceMgr.GetToolsMap(), s.ResourceMgr.GetAuthServiceMap(), body, header)
+		res, err := mcp.ProcessMethod(ctx, protocolVersion, baseMessage.Id, baseMessage.Method, toolset, s.ResourceMgr.GetToolsMap(), body, accessToken)
 		return "", res, err
 	}
 }
--- a/internal/server/mcp/jsonrpc/jsonrpc_test.go
+++ b/internal/server/mcp/jsonrpc/jsonrpc_test.go
@@ -1,39 +0,0 @@
-// Copyright 2025 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package jsonrpc
-
-import (
-	"reflect"
-	"testing"
-)
-
-func TestNewError(t *testing.T) {
-	var id interface{} = "foo"
-	code := 111
-	message := "foo bar"
-	want := JSONRPCError{
-		Jsonrpc: "2.0",
-		Id:      "foo",
-		Error: Error{
-			Code:    111,
-			Message: "foo bar",
-		},
-	}
-
-	got := NewError(id, code, message, nil)
-	if !reflect.DeepEqual(want, got) {
-		t.Fatalf("unexpected error: got %+v, want %+v", got, want)
-	}
-}
--- a/internal/server/mcp/mcp.go
+++ b/internal/server/mcp/mcp.go
@@ -18,10 +18,8 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
-	"net/http"
 	"slices"

-	"github.com/googleapis/genai-toolbox/internal/auth"
 	"github.com/googleapis/genai-toolbox/internal/server/mcp/jsonrpc"
 	mcputil "github.com/googleapis/genai-toolbox/internal/server/mcp/util"
 	v20241105 "github.com/googleapis/genai-toolbox/internal/server/mcp/v20241105"
@@ -95,14 +93,14 @@ func NotificationHandler(ctx context.Context, body []byte) error {

 // ProcessMethod returns a response for the request.
 // This is the Operation phase of the lifecycle for MCP client-server connections.
-func ProcessMethod(ctx context.Context, mcpVersion string, id jsonrpc.RequestId, method string, toolset tools.Toolset, tools map[string]tools.Tool, authServices map[string]auth.AuthService, body []byte, header http.Header) (any, error) {
+func ProcessMethod(ctx context.Context, mcpVersion string, id jsonrpc.RequestId, method string, toolset tools.Toolset, tools map[string]tools.Tool, body []byte, accessToken tools.AccessToken) (any, error) {
 	switch mcpVersion {
 	case v20250618.PROTOCOL_VERSION:
-		return v20250618.ProcessMethod(ctx, id, method, toolset, tools, authServices, body, header)
+		return v20250618.ProcessMethod(ctx, id, method, toolset, tools, body, accessToken)
 	case v20250326.PROTOCOL_VERSION:
-		return v20250326.ProcessMethod(ctx, id, method, toolset, tools, authServices, body, header)
+		return v20250326.ProcessMethod(ctx, id, method, toolset, tools, body, accessToken)
 	default:
-		return v20241105.ProcessMethod(ctx, id, method, toolset, tools, authServices, body, header)
+		return v20241105.ProcessMethod(ctx, id, method, toolset, tools, body, accessToken)
 	}
 }

--- a/internal/server/mcp/util/lifecycle.go
+++ b/internal/server/mcp/util/lifecycle.go
@@ -14,9 +14,7 @@

 package util

-import (
-	"github.com/googleapis/genai-toolbox/internal/server/mcp/jsonrpc"
-)
+import "github.com/googleapis/genai-toolbox/internal/server/mcp/jsonrpc"

 const (
 	// SERVER_NAME is the server name used in Implementation.
--- a/internal/server/mcp/v20241105/method.go
+++ b/internal/server/mcp/v20241105/method.go
@@ -18,26 +18,22 @@ import (
 	"bytes"
 	"context"
 	"encoding/json"
-	"errors"
 	"fmt"
-	"net/http"
-	"strings"

-	"github.com/googleapis/genai-toolbox/internal/auth"
 	"github.com/googleapis/genai-toolbox/internal/server/mcp/jsonrpc"
 	"github.com/googleapis/genai-toolbox/internal/tools"
 	"github.com/googleapis/genai-toolbox/internal/util"
 )

 // ProcessMethod returns a response for the request.
-func ProcessMethod(ctx context.Context, id jsonrpc.RequestId, method string, toolset tools.Toolset, tools map[string]tools.Tool, authServices map[string]auth.AuthService, body []byte, header http.Header) (any, error) {
+func ProcessMethod(ctx context.Context, id jsonrpc.RequestId, method string, toolset tools.Toolset, tools map[string]tools.Tool, body []byte, accessToken tools.AccessToken) (any, error) {
 	switch method {
 	case PING:
 		return pingHandler(id)
 	case TOOLS_LIST:
 		return toolsListHandler(id, toolset, body)
 	case TOOLS_CALL:
-		return toolsCallHandler(ctx, id, tools, authServices, body, header)
+		return toolsCallHandler(ctx, id, tools, body, accessToken)
 	default:
 		err := fmt.Errorf("invalid method %s", method)
 		return jsonrpc.NewError(id, jsonrpc.METHOD_NOT_FOUND, err.Error(), nil), err
@@ -71,7 +67,7 @@ func toolsListHandler(id jsonrpc.RequestId, toolset tools.Toolset, body []byte)
 }

 // toolsCallHandler generate a response for tools call.
-func toolsCallHandler(ctx context.Context, id jsonrpc.RequestId, toolsMap map[string]tools.Tool, authServices map[string]auth.AuthService, body []byte, header http.Header) (any, error) {
+func toolsCallHandler(ctx context.Context, id jsonrpc.RequestId, tools map[string]tools.Tool, body []byte, accessToken tools.AccessToken) (any, error) {
 	// retrieve logger from context
 	logger, err := util.LoggerFromContext(ctx)
 	if err != nil {
@@ -87,22 +83,12 @@ func toolsCallHandler(ctx context.Context, id jsonrpc.RequestId, toolsMap map[st
 	toolName := req.Params.Name
 	toolArgument := req.Params.Arguments
 	logger.DebugContext(ctx, fmt.Sprintf("tool name: %s", toolName))
-	tool, ok := toolsMap[toolName]
+	tool, ok := tools[toolName]
 	if !ok {
 		err = fmt.Errorf("invalid tool name: tool with name %q does not exist", toolName)
 		return jsonrpc.NewError(id, jsonrpc.INVALID_PARAMS, err.Error(), nil), err
 	}

-	// Get access token
-	accessToken := tools.AccessToken(header.Get("Authorization"))
-
-	// Check if this specific tool requires the standard authorization header
-	if tool.RequiresClientAuthorization() {
-		if accessToken == "" {
-			return jsonrpc.NewError(id, jsonrpc.INVALID_REQUEST, "missing access token in the 'Authorization' header", nil), tools.ErrUnauthorized
-		}
-	}
-
 	// marshal arguments and decode it using decodeJSON instead to prevent loss between floats/int.
 	aMarshal, err := json.Marshal(toolArgument)
 	if err != nil {
@@ -116,42 +102,10 @@ func toolsCallHandler(ctx context.Context, id jsonrpc.RequestId, toolsMap map[st
 		return jsonrpc.NewError(id, jsonrpc.INTERNAL_ERROR, err.Error(), nil), err
 	}

-	// Tool authentication
 	// claimsFromAuth maps the name of the authservice to the claims retrieved from it.
+	// Since MCP doesn't support auth, an empty map will be use every time.
 	claimsFromAuth := make(map[string]map[string]any)

-	// if using stdio, header will be nil and auth will not be supported
-	if header != nil {
-		for _, aS := range authServices {
-			claims, err := aS.GetClaimsFromHeader(ctx, header)
-			if err != nil {
-				logger.DebugContext(ctx, err.Error())
-				continue
-			}
-			if claims == nil {
-				// authService not present in header
-				continue
-			}
-			claimsFromAuth[aS.GetName()] = claims
-		}
-	}
-
-	// Tool authorization check
-	verifiedAuthServices := make([]string, len(claimsFromAuth))
-	i := 0
-	for k := range claimsFromAuth {
-		verifiedAuthServices[i] = k
-		i++
-	}
-
-	// Check if any of the specified auth services is verified
-	isAuthorized := tool.Authorized(verifiedAuthServices)
-	if !isAuthorized {
-		err = fmt.Errorf("unauthorized Tool call: Please make sure your specify correct auth headers: %w", tools.ErrUnauthorized)
-		return jsonrpc.NewError(id, jsonrpc.INVALID_REQUEST, err.Error(), nil), err
-	}
-	logger.DebugContext(ctx, "tool invocation authorized")
-
 	params, err := tool.ParseParams(data, claimsFromAuth)
 	if err != nil {
 		err = fmt.Errorf("provided parameters were invalid: %w", err)
@@ -159,24 +113,14 @@ func toolsCallHandler(ctx context.Context, id jsonrpc.RequestId, toolsMap map[st
 	}
 	logger.DebugContext(ctx, fmt.Sprintf("invocation params: %s", params))

+	if !tool.Authorized([]string{}) {
+		err = fmt.Errorf("unauthorized Tool call: `authRequired` is set for the target Tool")
+		return jsonrpc.NewError(id, jsonrpc.INVALID_REQUEST, err.Error(), nil), err
+	}
+
 	// run tool invocation and generate response.
 	results, err := tool.Invoke(ctx, params, accessToken)
 	if err != nil {
-		errStr := err.Error()
-		// Missing authService tokens.
-		if errors.Is(err, tools.ErrUnauthorized) {
-			return jsonrpc.NewError(id, jsonrpc.INVALID_REQUEST, err.Error(), nil), err
-		}
-		// Upstream auth error
-		if strings.Contains(errStr, "Error 401") || strings.Contains(errStr, "Error 403") {
-			if tool.RequiresClientAuthorization() {
-				// Error with client credentials should pass down to the client
-				return jsonrpc.NewError(id, jsonrpc.INVALID_REQUEST, err.Error(), nil), err
-			}
-			// Auth error with ADC should raise internal 500 error
-			return jsonrpc.NewError(id, jsonrpc.INTERNAL_ERROR, err.Error(), nil), err
-		}
-
 		text := TextContent{
 			Type: "text",
 			Text: err.Error(),
--- a/internal/server/mcp/v20250326/method.go
+++ b/internal/server/mcp/v20250326/method.go
@@ -18,26 +18,22 @@ import (
 	"bytes"
 	"context"
 	"encoding/json"
-	"errors"
 	"fmt"
-	"net/http"
-	"strings"

-	"github.com/googleapis/genai-toolbox/internal/auth"
 	"github.com/googleapis/genai-toolbox/internal/server/mcp/jsonrpc"
 	"github.com/googleapis/genai-toolbox/internal/tools"
 	"github.com/googleapis/genai-toolbox/internal/util"
 )

 // ProcessMethod returns a response for the request.
-func ProcessMethod(ctx context.Context, id jsonrpc.RequestId, method string, toolset tools.Toolset, tools map[string]tools.Tool, authServices map[string]auth.AuthService, body []byte, header http.Header) (any, error) {
+func ProcessMethod(ctx context.Context, id jsonrpc.RequestId, method string, toolset tools.Toolset, tools map[string]tools.Tool, body []byte, accessToken tools.AccessToken) (any, error) {
 	switch method {
 	case PING:
 		return pingHandler(id)
 	case TOOLS_LIST:
 		return toolsListHandler(id, toolset, body)
 	case TOOLS_CALL:
-		return toolsCallHandler(ctx, id, tools, authServices, body, header)
+		return toolsCallHandler(ctx, id, tools, body, accessToken)
 	default:
 		err := fmt.Errorf("invalid method %s", method)
 		return jsonrpc.NewError(id, jsonrpc.METHOD_NOT_FOUND, err.Error(), nil), err
@@ -71,7 +67,7 @@ func toolsListHandler(id jsonrpc.RequestId, toolset tools.Toolset, body []byte)
 }

 // toolsCallHandler generate a response for tools call.
-func toolsCallHandler(ctx context.Context, id jsonrpc.RequestId, toolsMap map[string]tools.Tool, authServices map[string]auth.AuthService, body []byte, header http.Header) (any, error) {
+func toolsCallHandler(ctx context.Context, id jsonrpc.RequestId, tools map[string]tools.Tool, body []byte, accessToken tools.AccessToken) (any, error) {
 	// retrieve logger from context
 	logger, err := util.LoggerFromContext(ctx)
 	if err != nil {
@@ -87,22 +83,12 @@ func toolsCallHandler(ctx context.Context, id jsonrpc.RequestId, toolsMap map[st
 	toolName := req.Params.Name
 	toolArgument := req.Params.Arguments
 	logger.DebugContext(ctx, fmt.Sprintf("tool name: %s", toolName))
-	tool, ok := toolsMap[toolName]
+	tool, ok := tools[toolName]
 	if !ok {
 		err = fmt.Errorf("invalid tool name: tool with name %q does not exist", toolName)
 		return jsonrpc.NewError(id, jsonrpc.INVALID_PARAMS, err.Error(), nil), err
 	}

-	// Get access token
-	accessToken := tools.AccessToken(header.Get("Authorization"))
-
-	// Check if this specific tool requires the standard authorization header
-	if tool.RequiresClientAuthorization() {
-		if accessToken == "" {
-			return jsonrpc.NewError(id, jsonrpc.INVALID_REQUEST, "missing access token in the 'Authorization' header", nil), tools.ErrUnauthorized
-		}
-	}
-
 	// marshal arguments and decode it using decodeJSON instead to prevent loss between floats/int.
 	aMarshal, err := json.Marshal(toolArgument)
 	if err != nil {
@@ -116,42 +102,10 @@ func toolsCallHandler(ctx context.Context, id jsonrpc.RequestId, toolsMap map[st
 		return jsonrpc.NewError(id, jsonrpc.INTERNAL_ERROR, err.Error(), nil), err
 	}

-	// Tool authentication
 	// claimsFromAuth maps the name of the authservice to the claims retrieved from it.
+	// Since MCP doesn't support auth, an empty map will be use every time.
 	claimsFromAuth := make(map[string]map[string]any)

-	// if using stdio, header will be nil and auth will not be supported
-	if header != nil {
-		for _, aS := range authServices {
-			claims, err := aS.GetClaimsFromHeader(ctx, header)
-			if err != nil {
-				logger.DebugContext(ctx, err.Error())
-				continue
-			}
-			if claims == nil {
-				// authService not present in header
-				continue
-			}
-			claimsFromAuth[aS.GetName()] = claims
-		}
-	}
-
-	// Tool authorization check
-	verifiedAuthServices := make([]string, len(claimsFromAuth))
-	i := 0
-	for k := range claimsFromAuth {
-		verifiedAuthServices[i] = k
-		i++
-	}
-
-	// Check if any of the specified auth services is verified
-	isAuthorized := tool.Authorized(verifiedAuthServices)
-	if !isAuthorized {
-		err = fmt.Errorf("unauthorized Tool call: Please make sure your specify correct auth headers: %w", tools.ErrUnauthorized)
-		return jsonrpc.NewError(id, jsonrpc.INVALID_REQUEST, err.Error(), nil), err
-	}
-	logger.DebugContext(ctx, "tool invocation authorized")
-
 	params, err := tool.ParseParams(data, claimsFromAuth)
 	if err != nil {
 		err = fmt.Errorf("provided parameters were invalid: %w", err)
@@ -159,23 +113,14 @@ func toolsCallHandler(ctx context.Context, id jsonrpc.RequestId, toolsMap map[st
 	}
 	logger.DebugContext(ctx, fmt.Sprintf("invocation params: %s", params))

+	if !tool.Authorized([]string{}) {
+		err = fmt.Errorf("unauthorized Tool call: `authRequired` is set for the target Tool")
+		return jsonrpc.NewError(id, jsonrpc.INVALID_REQUEST, err.Error(), nil), err
+	}
+
 	// run tool invocation and generate response.
 	results, err := tool.Invoke(ctx, params, accessToken)
 	if err != nil {
-		errStr := err.Error()
-		// Missing authService tokens.
-		if errors.Is(err, tools.ErrUnauthorized) {
-			return jsonrpc.NewError(id, jsonrpc.INVALID_REQUEST, err.Error(), nil), err
-		}
-		// Upstream auth error
-		if strings.Contains(errStr, "Error 401") || strings.Contains(errStr, "Error 403") {
-			if tool.RequiresClientAuthorization() {
-				// Error with client credentials should pass down to the client
-				return jsonrpc.NewError(id, jsonrpc.INVALID_REQUEST, err.Error(), nil), err
-			}
-			// Auth error with ADC should raise internal 500 error
-			return jsonrpc.NewError(id, jsonrpc.INTERNAL_ERROR, err.Error(), nil), err
-		}
 		text := TextContent{
 			Type: "text",
 			Text: err.Error(),
--- a/internal/server/mcp/v20250618/method.go
+++ b/internal/server/mcp/v20250618/method.go
@@ -18,26 +18,22 @@ import (
 	"bytes"
 	"context"
 	"encoding/json"
-	"errors"
 	"fmt"
-	"net/http"
-	"strings"

-	"github.com/googleapis/genai-toolbox/internal/auth"
 	"github.com/googleapis/genai-toolbox/internal/server/mcp/jsonrpc"
 	"github.com/googleapis/genai-toolbox/internal/tools"
 	"github.com/googleapis/genai-toolbox/internal/util"
 )

 // ProcessMethod returns a response for the request.
-func ProcessMethod(ctx context.Context, id jsonrpc.RequestId, method string, toolset tools.Toolset, tools map[string]tools.Tool, authServices map[string]auth.AuthService, body []byte, header http.Header) (any, error) {
+func ProcessMethod(ctx context.Context, id jsonrpc.RequestId, method string, toolset tools.Toolset, tools map[string]tools.Tool, body []byte, accessToken tools.AccessToken) (any, error) {
 	switch method {
 	case PING:
 		return pingHandler(id)
 	case TOOLS_LIST:
 		return toolsListHandler(id, toolset, body)
 	case TOOLS_CALL:
-		return toolsCallHandler(ctx, id, tools, authServices, body, header)
+		return toolsCallHandler(ctx, id, tools, body, accessToken)
 	default:
 		err := fmt.Errorf("invalid method %s", method)
 		return jsonrpc.NewError(id, jsonrpc.METHOD_NOT_FOUND, err.Error(), nil), err
@@ -71,7 +67,7 @@ func toolsListHandler(id jsonrpc.RequestId, toolset tools.Toolset, body []byte)
 }

 // toolsCallHandler generate a response for tools call.
-func toolsCallHandler(ctx context.Context, id jsonrpc.RequestId, toolsMap map[string]tools.Tool, authServices map[string]auth.AuthService, body []byte, header http.Header) (any, error) {
+func toolsCallHandler(ctx context.Context, id jsonrpc.RequestId, tools map[string]tools.Tool, body []byte, accessToken tools.AccessToken) (any, error) {
 	// retrieve logger from context
 	logger, err := util.LoggerFromContext(ctx)
 	if err != nil {
@@ -87,22 +83,12 @@ func toolsCallHandler(ctx context.Context, id jsonrpc.RequestId, toolsMap map[st
 	toolName := req.Params.Name
 	toolArgument := req.Params.Arguments
 	logger.DebugContext(ctx, fmt.Sprintf("tool name: %s", toolName))
-	tool, ok := toolsMap[toolName]
+	tool, ok := tools[toolName]
 	if !ok {
 		err = fmt.Errorf("invalid tool name: tool with name %q does not exist", toolName)
 		return jsonrpc.NewError(id, jsonrpc.INVALID_PARAMS, err.Error(), nil), err
 	}

-	// Get access token
-	accessToken := tools.AccessToken(header.Get("Authorization"))
-
-	// Check if this specific tool requires the standard authorization header
-	if tool.RequiresClientAuthorization() {
-		if accessToken == "" {
-			return jsonrpc.NewError(id, jsonrpc.INVALID_REQUEST, "missing access token in the 'Authorization' header", nil), tools.ErrUnauthorized
-		}
-	}
-
 	// marshal arguments and decode it using decodeJSON instead to prevent loss between floats/int.
 	aMarshal, err := json.Marshal(toolArgument)
 	if err != nil {
@@ -116,42 +102,10 @@ func toolsCallHandler(ctx context.Context, id jsonrpc.RequestId, toolsMap map[st
 		return jsonrpc.NewError(id, jsonrpc.INTERNAL_ERROR, err.Error(), nil), err
 	}

-	// Tool authentication
 	// claimsFromAuth maps the name of the authservice to the claims retrieved from it.
+	// Since MCP doesn't support auth, an empty map will be use every time.
 	claimsFromAuth := make(map[string]map[string]any)

-	// if using stdio, header will be nil and auth will not be supported
-	if header != nil {
-		for _, aS := range authServices {
-			claims, err := aS.GetClaimsFromHeader(ctx, header)
-			if err != nil {
-				logger.DebugContext(ctx, err.Error())
-				continue
-			}
-			if claims == nil {
-				// authService not present in header
-				continue
-			}
-			claimsFromAuth[aS.GetName()] = claims
-		}
-	}
-
-	// Tool authorization check
-	verifiedAuthServices := make([]string, len(claimsFromAuth))
-	i := 0
-	for k := range claimsFromAuth {
-		verifiedAuthServices[i] = k
-		i++
-	}
-
-	// Check if any of the specified auth services is verified
-	isAuthorized := tool.Authorized(verifiedAuthServices)
-	if !isAuthorized {
-		err = fmt.Errorf("unauthorized Tool call: Please make sure your specify correct auth headers: %w", tools.ErrUnauthorized)
-		return jsonrpc.NewError(id, jsonrpc.INVALID_REQUEST, err.Error(), nil), err
-	}
-	logger.DebugContext(ctx, "tool invocation authorized")
-
 	params, err := tool.ParseParams(data, claimsFromAuth)
 	if err != nil {
 		err = fmt.Errorf("provided parameters were invalid: %w", err)
@@ -159,23 +113,14 @@ func toolsCallHandler(ctx context.Context, id jsonrpc.RequestId, toolsMap map[st
 	}
 	logger.DebugContext(ctx, fmt.Sprintf("invocation params: %s", params))

+	if !tool.Authorized([]string{}) {
+		err = fmt.Errorf("unauthorized Tool call: `authRequired` is set for the target Tool")
+		return jsonrpc.NewError(id, jsonrpc.INVALID_REQUEST, err.Error(), nil), err
+	}
+
 	// run tool invocation and generate response.
 	results, err := tool.Invoke(ctx, params, accessToken)
 	if err != nil {
-		errStr := err.Error()
-		// Missing authService tokens.
-		if errors.Is(err, tools.ErrUnauthorized) {
-			return jsonrpc.NewError(id, jsonrpc.INVALID_REQUEST, err.Error(), nil), err
-		}
-		// Upstream auth error
-		if strings.Contains(errStr, "Error 401") || strings.Contains(errStr, "Error 403") {
-			if tool.RequiresClientAuthorization() {
-				// Error with client credentials should pass down to the client
-				return jsonrpc.NewError(id, jsonrpc.INVALID_REQUEST, err.Error(), nil), err
-			}
-			// Auth error with ADC should raise internal 500 error
-			return jsonrpc.NewError(id, jsonrpc.INTERNAL_ERROR, err.Error(), nil), err
-		}
 		text := TextContent{
 			Type: "text",
 			Text: err.Error(),
--- a/internal/server/mcp_test.go
+++ b/internal/server/mcp_test.go
@@ -39,7 +39,7 @@ const protocolVersion20250326 = "2025-03-26"
 const protocolVersion20250618 = "2025-06-18"
 const serverName = "Toolbox"

-var basicInputSchema = map[string]any{
+var tool1InputSchema = map[string]any{
 	"type":       "object",
 	"properties": map[string]any{},
 	"required":   []any{},
@@ -67,7 +67,7 @@ var tool3InputSchema = map[string]any{
 }

 func TestMcpEndpointWithoutInitialized(t *testing.T) {
-	mockTools := []MockTool{tool1, tool2, tool3, tool4, tool5}
+	mockTools := []MockTool{tool1, tool2, tool3}
 	toolsMap, toolsets := setUpResources(t, mockTools)
 	r, shutdown := setUpServer(t, "mcp", toolsMap, toolsets)
 	defer shutdown()
@@ -116,7 +116,7 @@ func TestMcpEndpointWithoutInitialized(t *testing.T) {
 					"tools": []any{
 						map[string]any{
 							"name":        "no_params",
-							"inputSchema": basicInputSchema,
+							"inputSchema": tool1InputSchema,
 						},
 						map[string]any{
 							"name":        "some_params",
@@ -127,14 +127,6 @@ func TestMcpEndpointWithoutInitialized(t *testing.T) {
 							"description": "some description",
 							"inputSchema": tool3InputSchema,
 						},
-						map[string]any{
-							"name":        "unauthorized_tool",
-							"inputSchema": basicInputSchema,
-						},
-						map[string]any{
-							"name":        "require_client_auth_tool",
-							"inputSchema": basicInputSchema,
-						},
 					},
 				},
 			},
@@ -177,76 +169,6 @@ func TestMcpEndpointWithoutInitialized(t *testing.T) {
 				},
 			},
 		},
-		{
-			name: "call tool1 unauthorized tool",
-			url:  "/",
-			body: jsonrpc.JSONRPCRequest{
-				Jsonrpc: jsonrpcVersion,
-				Id:      "tools-call-tool1",
-				Request: jsonrpc.Request{
-					Method: "tools/call",
-				},
-				Params: map[string]any{
-					"name": "no_params",
-				},
-			},
-			want: map[string]any{
-				"jsonrpc": "2.0",
-				"id":      "tools-call-tool1",
-				"result": map[string]any{
-					"content": []any{
-						map[string]any{
-							"type": "text",
-							"text": `"no_params"`,
-						},
-					},
-				},
-			},
-		},
-		{
-			name: "call tool4 unauthorized tool",
-			url:  "/",
-			body: jsonrpc.JSONRPCRequest{
-				Jsonrpc: jsonrpcVersion,
-				Id:      "tools-call-tool4",
-				Request: jsonrpc.Request{
-					Method: "tools/call",
-				},
-				Params: map[string]any{
-					"name": "unauthorized_tool",
-				},
-			},
-			want: map[string]any{
-				"jsonrpc": "2.0",
-				"id":      "tools-call-tool4",
-				"error": map[string]any{
-					"code":    -32600.0,
-					"message": "unauthorized Tool call: Please make sure your specify correct auth headers: unauthorized",
-				},
-			},
-		},
-		{
-			name: "call tool5 unauthorized tool",
-			url:  "/",
-			body: jsonrpc.JSONRPCRequest{
-				Jsonrpc: jsonrpcVersion,
-				Id:      "tools-call-tool5",
-				Request: jsonrpc.Request{
-					Method: "tools/call",
-				},
-				Params: map[string]any{
-					"name": "require_client_auth_tool",
-				},
-			},
-			want: map[string]any{
-				"jsonrpc": "2.0",
-				"id":      "tools-call-tool5",
-				"error": map[string]any{
-					"code":    -32600.0,
-					"message": "missing access token in the 'Authorization' header",
-				},
-			},
-		},
 	}
 	for _, tc := range testCases {
 		t.Run(tc.name, func(t *testing.T) {
@@ -336,7 +258,7 @@ func runInitializeLifecycle(t *testing.T, ts *httptest.Server, protocolVersion s
 }

 func TestMcpEndpoint(t *testing.T) {
-	mockTools := []MockTool{tool1, tool2, tool3, tool4, tool5}
+	mockTools := []MockTool{tool1, tool2, tool3}
 	toolsMap, toolsets := setUpResources(t, mockTools)
 	r, shutdown := setUpServer(t, "mcp", toolsMap, toolsets)
 	defer shutdown()
@@ -412,12 +334,11 @@ func TestMcpEndpoint(t *testing.T) {
 			}

 			testCases := []struct {
-				name           string
-				url            string
-				isErr          bool
-				body           any
-				wantStatusCode int
-				want           map[string]any
+				name  string
+				url   string
+				isErr bool
+				body  any
+				want  map[string]any
 			}{
 				{
 					name: "basic notification",
@@ -428,7 +349,6 @@ func TestMcpEndpoint(t *testing.T) {
 							Method: "notification",
 						},
 					},
-					wantStatusCode: http.StatusAccepted,
 				},
 				{
 					name: "ping",
@@ -440,7 +360,6 @@ func TestMcpEndpoint(t *testing.T) {
 							Method: "ping",
 						},
 					},
-					wantStatusCode: http.StatusOK,
 					want: map[string]any{
 						"jsonrpc": "2.0",
 						"id":      "ping-test-123",
@@ -457,7 +376,6 @@ func TestMcpEndpoint(t *testing.T) {
 							Method: "tools/list",
 						},
 					},
-					wantStatusCode: http.StatusOK,
 					want: map[string]any{
 						"jsonrpc": "2.0",
 						"id":      "tools-list",
@@ -465,7 +383,7 @@ func TestMcpEndpoint(t *testing.T) {
 							"tools": []any{
 								map[string]any{
 									"name":        "no_params",
-									"inputSchema": basicInputSchema,
+									"inputSchema": tool1InputSchema,
 								},
 								map[string]any{
 									"name":        "some_params",
@@ -476,14 +394,6 @@ func TestMcpEndpoint(t *testing.T) {
 									"description": "some description",
 									"inputSchema": tool3InputSchema,
 								},
-								map[string]any{
-									"name":        "unauthorized_tool",
-									"inputSchema": basicInputSchema,
-								},
-								map[string]any{
-									"name":        "require_client_auth_tool",
-									"inputSchema": basicInputSchema,
-								},
 							},
 						},
 					},
@@ -498,7 +408,6 @@ func TestMcpEndpoint(t *testing.T) {
 							Method: "tools/list",
 						},
 					},
-					wantStatusCode: http.StatusOK,
 					want: map[string]any{
 						"jsonrpc": "2.0",
 						"id":      "tools-list-tool1",
@@ -506,7 +415,7 @@ func TestMcpEndpoint(t *testing.T) {
 							"tools": []any{
 								map[string]any{
 									"name":        "no_params",
-									"inputSchema": basicInputSchema,
+									"inputSchema": tool1InputSchema,
 								},
 							},
 						},
@@ -523,7 +432,6 @@ func TestMcpEndpoint(t *testing.T) {
 							Method: "tools/list",
 						},
 					},
-					wantStatusCode: http.StatusOK,
 					want: map[string]any{
 						"jsonrpc": "2.0",
 						"id":      "tools-list-invalid-toolset",
@@ -542,7 +450,6 @@ func TestMcpEndpoint(t *testing.T) {
 						Id:      "missing-method",
 						Request: jsonrpc.Request{},
 					},
-					wantStatusCode: http.StatusOK,
 					want: map[string]any{
 						"jsonrpc": "2.0",
 						"id":      "missing-method",
@@ -563,7 +470,6 @@ func TestMcpEndpoint(t *testing.T) {
 							Method: "foo",
 						},
 					},
-					wantStatusCode: http.StatusOK,
 					want: map[string]any{
 						"jsonrpc": "2.0",
 						"id":      "invalid-method",
@@ -584,7 +490,6 @@ func TestMcpEndpoint(t *testing.T) {
 							Method: "foo",
 						},
 					},
-					wantStatusCode: http.StatusOK,
 					want: map[string]any{
 						"jsonrpc": "2.0",
 						"id":      "invalid-jsonrpc-version",
@@ -614,7 +519,6 @@ func TestMcpEndpoint(t *testing.T) {
 							},
 						},
 					},
-					wantStatusCode: http.StatusOK,
 					want: map[string]any{
 						"jsonrpc": "2.0",
 						"error": map[string]any{
@@ -623,79 +527,6 @@ func TestMcpEndpoint(t *testing.T) {
 						},
 					},
 				},
-				{
-					name: "call tool1 unauthorized tool",
-					url:  "/",
-					body: jsonrpc.JSONRPCRequest{
-						Jsonrpc: jsonrpcVersion,
-						Id:      "tools-call-tool1",
-						Request: jsonrpc.Request{
-							Method: "tools/call",
-						},
-						Params: map[string]any{
-							"name": "no_params",
-						},
-					},
-					wantStatusCode: http.StatusOK,
-					want: map[string]any{
-						"jsonrpc": "2.0",
-						"id":      "tools-call-tool1",
-						"result": map[string]any{
-							"content": []any{
-								map[string]any{
-									"type": "text",
-									"text": `"no_params"`,
-								},
-							},
-						},
-					},
-				},
-				{
-					name: "call tool4 unauthorized tool",
-					url:  "/",
-					body: jsonrpc.JSONRPCRequest{
-						Jsonrpc: jsonrpcVersion,
-						Id:      "tools-call-tool4",
-						Request: jsonrpc.Request{
-							Method: "tools/call",
-						},
-						Params: map[string]any{
-							"name": "unauthorized_tool",
-						},
-					},
-					wantStatusCode: http.StatusUnauthorized,
-					want: map[string]any{
-						"jsonrpc": "2.0",
-						"id":      "tools-call-tool4",
-						"error": map[string]any{
-							"code":    -32600.0,
-							"message": "unauthorized Tool call: Please make sure your specify correct auth headers: unauthorized",
-						},
-					},
-				},
-				{
-					name: "call tool5 unauthorized tool",
-					url:  "/",
-					body: jsonrpc.JSONRPCRequest{
-						Jsonrpc: jsonrpcVersion,
-						Id:      "tools-call-tool5",
-						Request: jsonrpc.Request{
-							Method: "tools/call",
-						},
-						Params: map[string]any{
-							"name": "require_client_auth_tool",
-						},
-					},
-					wantStatusCode: http.StatusUnauthorized,
-					want: map[string]any{
-						"jsonrpc": "2.0",
-						"id":      "tools-call-tool5",
-						"error": map[string]any{
-							"code":    -32600.0,
-							"message": "missing access token in the 'Authorization' header",
-						},
-					},
-				},
 			}
 			for _, tc := range testCases {
 				t.Run(tc.name, func(t *testing.T) {
@@ -709,15 +540,10 @@ func TestMcpEndpoint(t *testing.T) {
 					}

 					resp, body, err := runRequest(ts, http.MethodPost, tc.url, bytes.NewBuffer(reqMarshal), header)
-
 					if err != nil {
 						t.Fatalf("unexpected error during request: %s", err)
 					}

-					if resp.StatusCode != tc.wantStatusCode {
-						t.Errorf("StatusCode mismatch: got %d, want %d", resp.StatusCode, tc.wantStatusCode)
-					}
-
 					// Notifications don't expect a response.
 					if tc.want != nil {
 						if contentType := resp.Header.Get("Content-type"); contentType != "application/json" {
--- a/internal/sources/bigquery/bigquery.go
+++ b/internal/sources/bigquery/bigquery.go
@@ -21,10 +21,8 @@ import (
 	bigqueryapi "cloud.google.com/go/bigquery"
 	"github.com/goccy/go-yaml"
 	"github.com/googleapis/genai-toolbox/internal/sources"
-	"github.com/googleapis/genai-toolbox/internal/tools"
 	"github.com/googleapis/genai-toolbox/internal/util"
 	"go.opentelemetry.io/otel/trace"
-	"golang.org/x/oauth2"
 	"golang.org/x/oauth2/google"
 	bigqueryrestapi "google.golang.org/api/bigquery/v2"
 	"google.golang.org/api/option"
@@ -35,8 +33,6 @@ const SourceKind string = "bigquery"
 // validate interface
 var _ sources.SourceConfig = Config{}

-type BigqueryClientCreator func(tokenString tools.AccessToken) (*bigqueryapi.Client, *bigqueryrestapi.Service, error)
-
 func init() {
 	if !sources.Register(SourceKind, newConfig) {
 		panic(fmt.Sprintf("source kind %q already registered", SourceKind))
@@ -66,19 +62,17 @@ func (r Config) SourceConfigKind() string {

 func (r Config) Initialize(ctx context.Context, tracer trace.Tracer) (sources.Source, error) {
 	// Initializes a BigQuery Google SQL source
-	client, restService, tokenSource, clientCreator, err := initBigQueryConnection(ctx, tracer, r.Name, r.Project, r.Location)
+	client, restService, err := initBigQueryConnection(ctx, tracer, r.Name, r.Project, r.Location)
 	if err != nil {
 		return nil, err
 	}

 	s := &Source{
-		Name:               r.Name,
-		Kind:               SourceKind,
-		Client:             client,
-		RestService:        restService,
-		TokenSource:        tokenSource,
-		MaxQueryResultRows: 50,
-		ClientCreator:      clientCreator,
+		Name:        r.Name,
+		Kind:        SourceKind,
+		Client:      client,
+		RestService: restService,
+		Location:    r.Location,
 	}
 	return s, nil

@@ -88,13 +82,11 @@ var _ sources.Source = &Source{}

 type Source struct {
 	// BigQuery Google SQL struct with client
-	Name               string `yaml:"name"`
-	Kind               string `yaml:"kind"`
-	Client             *bigqueryapi.Client
-	RestService        *bigqueryrestapi.Service
-	TokenSource        oauth2.TokenSource
-	MaxQueryResultRows int
-	ClientCreator      BigqueryClientCreator
+	Name        string `yaml:"name"`
+	Kind        string `yaml:"kind"`
+	Client      *bigqueryapi.Client
+	RestService *bigqueryrestapi.Service
+	Location    string `yaml:"location"`
 }

 func (s *Source) SourceKind() string {
@@ -110,96 +102,38 @@ func (s *Source) BigQueryRestService() *bigqueryrestapi.Service {
 	return s.RestService
 }

-func (s *Source) BigQueryTokenSource() oauth2.TokenSource {
-	return s.TokenSource
-}
-
-func (s *Source) GetMaxQueryResultRows() int {
-	return s.MaxQueryResultRows
-}
-
-func (s *Source) BigQueryClientCreator() BigqueryClientCreator {
-	return s.ClientCreator
-}
-
 func initBigQueryConnection(
 	ctx context.Context,
 	tracer trace.Tracer,
 	name string,
 	project string,
 	location string,
-) (*bigqueryapi.Client, *bigqueryrestapi.Service, oauth2.TokenSource, BigqueryClientCreator, error) {
+) (*bigqueryapi.Client, *bigqueryrestapi.Service, error) {
 	ctx, span := sources.InitConnectionSpan(ctx, tracer, SourceKind, name)
 	defer span.End()

 	cred, err := google.FindDefaultCredentials(ctx, bigqueryapi.Scope)
 	if err != nil {
-		return nil, nil, nil, nil, fmt.Errorf("failed to find default Google Cloud credentials with scope %q: %w", bigqueryapi.Scope, err)
+		return nil, nil, fmt.Errorf("failed to find default Google Cloud credentials with scope %q: %w", bigqueryapi.Scope, err)
 	}

 	userAgent, err := util.UserAgentFromContext(ctx)
 	if err != nil {
-		return nil, nil, nil, nil, err
+		return nil, nil, err
 	}

 	// Initialize the high-level BigQuery client
 	client, err := bigqueryapi.NewClient(ctx, project, option.WithUserAgent(userAgent), option.WithCredentials(cred))
-	if err != nil {
-		return nil, nil, nil, nil, fmt.Errorf("failed to create BigQuery client for project %q: %w", project, err)
-	}
-	client.Location = location
-
-	// Initialize the low-level BigQuery REST service using the same credentials
-	restService, err := bigqueryrestapi.NewService(ctx, option.WithUserAgent(userAgent), option.WithCredentials(cred))
-	if err != nil {
-		return nil, nil, nil, nil, fmt.Errorf("failed to create BigQuery v2 service: %w", err)
-	}
-
-	clientCreator := newBigQueryClientCreator(ctx, project, location, userAgent)
-	return client, restService, cred.TokenSource, clientCreator, nil
-}
-
-// initBigQueryConnectionWithOAuthToken initialize a BigQuery client with an
-// OAuth access token.
-func initBigQueryConnectionWithOAuthToken(
-	ctx context.Context,
-	project string,
-	location string,
-	userAgent string,
-	tokenString tools.AccessToken,
-) (*bigqueryapi.Client, *bigqueryrestapi.Service, error) {
-	// Construct token source
-	token := &oauth2.Token{
-		AccessToken: string(tokenString),
-	}
-	ts := oauth2.StaticTokenSource(token)
-
-	// Initialize the BigQuery client with tokenSource
-	client, err := bigqueryapi.NewClient(ctx, project, option.WithUserAgent(userAgent), option.WithTokenSource(ts))
 	if err != nil {
 		return nil, nil, fmt.Errorf("failed to create BigQuery client for project %q: %w", project, err)
 	}
 	client.Location = location

 	// Initialize the low-level BigQuery REST service using the same credentials
-	restService, err := bigqueryrestapi.NewService(ctx, option.WithUserAgent(userAgent), option.WithTokenSource(ts))
+	restService, err := bigqueryrestapi.NewService(ctx, option.WithUserAgent(userAgent), option.WithCredentials(cred))
 	if err != nil {
 		return nil, nil, fmt.Errorf("failed to create BigQuery v2 service: %w", err)
 	}

 	return client, restService, nil
 }
-
-// newBigQueryClientCreator sets the project parameters for the init helper
-// function. The returned function takes in an OAuth access token and uses it to
-// create a BQ client.
-func newBigQueryClientCreator(
-	ctx context.Context,
-	project string,
-	location string,
-	userAgent string,
-) func(tools.AccessToken) (*bigqueryapi.Client, *bigqueryrestapi.Service, error) {
-	return func(tokenString tools.AccessToken) (*bigqueryapi.Client, *bigqueryrestapi.Service, error) {
-		return initBigQueryConnectionWithOAuthToken(ctx, project, location, userAgent, tokenString)
-	}
-}
--- a/internal/sources/clickhouse/clickhouse.go
+++ b/internal/sources/clickhouse/clickhouse.go
@@ -1,145 +0,0 @@
-// Copyright 2025 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package clickhouse
-
-import (
-	"context"
-	"database/sql"
-	"fmt"
-	"net/url"
-	"time"
-
-	_ "github.com/ClickHouse/clickhouse-go/v2"
-	"github.com/goccy/go-yaml"
-	"github.com/googleapis/genai-toolbox/internal/sources"
-	"go.opentelemetry.io/otel/trace"
-)
-
-const SourceKind string = "clickhouse"
-
-// validate interface
-var _ sources.SourceConfig = Config{}
-
-func init() {
-	if !sources.Register(SourceKind, newConfig) {
-		panic(fmt.Sprintf("source kind %q already registered", SourceKind))
-	}
-}
-
-func newConfig(ctx context.Context, name string, decoder *yaml.Decoder) (sources.SourceConfig, error) {
-	actual := Config{Name: name}
-	if err := decoder.DecodeContext(ctx, &actual); err != nil {
-		return nil, err
-	}
-	return actual, nil
-}
-
-type Config struct {
-	Name     string `yaml:"name" validate:"required"`
-	Kind     string `yaml:"kind" validate:"required"`
-	Host     string `yaml:"host" validate:"required"`
-	Port     string `yaml:"port" validate:"required"`
-	Database string `yaml:"database" validate:"required"`
-	User     string `yaml:"user" validate:"required"`
-	Password string `yaml:"password"`
-	Protocol string `yaml:"protocol"`
-	Secure   bool   `yaml:"secure"`
-}
-
-func (r Config) SourceConfigKind() string {
-	return SourceKind
-}
-
-func (r Config) Initialize(ctx context.Context, tracer trace.Tracer) (sources.Source, error) {
-	pool, err := initClickHouseConnectionPool(ctx, tracer, r.Name, r.Host, r.Port, r.User, r.Password, r.Database, r.Protocol, r.Secure)
-	if err != nil {
-		return nil, fmt.Errorf("unable to create pool: %w", err)
-	}
-
-	err = pool.PingContext(ctx)
-	if err != nil {
-		return nil, fmt.Errorf("unable to connect successfully: %w", err)
-	}
-
-	s := &Source{
-		Name: r.Name,
-		Kind: SourceKind,
-		Pool: pool,
-	}
-	return s, nil
-}
-
-var _ sources.Source = &Source{}
-
-type Source struct {
-	Name string `yaml:"name"`
-	Kind string `yaml:"kind"`
-	Pool *sql.DB
-}
-
-func (s *Source) SourceKind() string {
-	return SourceKind
-}
-
-func (s *Source) ClickHousePool() *sql.DB {
-	return s.Pool
-}
-
-func validateConfig(protocol string) error {
-	validProtocols := map[string]bool{"http": true, "https": true}
-
-	if protocol != "" && !validProtocols[protocol] {
-		return fmt.Errorf("invalid protocol: %s, must be one of: http, https", protocol)
-	}
-	return nil
-}
-
-func initClickHouseConnectionPool(ctx context.Context, tracer trace.Tracer, name, host, port, user, pass, dbname, protocol string, secure bool) (*sql.DB, error) {
-	//nolint:all // Reassigned ctx
-	ctx, span := sources.InitConnectionSpan(ctx, tracer, SourceKind, name)
-	defer span.End()
-
-	if protocol == "" {
-		protocol = "https"
-	}
-
-	if err := validateConfig(protocol); err != nil {
-		return nil, err
-	}
-
-	encodedUser := url.QueryEscape(user)
-	encodedPass := url.QueryEscape(pass)
-
-	var dsn string
-	scheme := protocol
-	if protocol == "http" && secure {
-		scheme = "https"
-	}
-	dsn = fmt.Sprintf("%s://%s:%s@%s:%s/%s", scheme, encodedUser, encodedPass, host, port, dbname)
-	if scheme == "https" {
-		dsn += "?secure=true&skip_verify=false"
-	}
-
-	pool, err := sql.Open("clickhouse", dsn)
-	if err != nil {
-		return nil, fmt.Errorf("sql.Open: %w", err)
-	}
-
-	pool.SetMaxOpenConns(25)
-	pool.SetMaxIdleConns(5)
-	pool.SetConnMaxLifetime(5 * time.Minute)
-
-	return pool, nil
-}
--- a/internal/sources/clickhouse/clickhouse_test.go
+++ b/internal/sources/clickhouse/clickhouse_test.go
@@ -1,348 +0,0 @@
-// Copyright 2025 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package clickhouse
-
-import (
-	"context"
-	"strings"
-	"testing"
-
-	"github.com/goccy/go-yaml"
-	"github.com/google/go-cmp/cmp"
-	"github.com/googleapis/genai-toolbox/internal/testutils"
-	"go.opentelemetry.io/otel"
-)
-
-func TestConfigSourceConfigKind(t *testing.T) {
-	config := Config{}
-	if config.SourceConfigKind() != SourceKind {
-		t.Errorf("Expected %s, got %s", SourceKind, config.SourceConfigKind())
-	}
-}
-
-func TestNewConfig(t *testing.T) {
-	tests := []struct {
-		name     string
-		yaml     string
-		expected Config
-	}{
-		{
-			name: "all fields specified",
-			yaml: `
-				name: test-clickhouse
-				kind: clickhouse
-				host: localhost
-				port: "8443"
-				user: default
-				password: "mypass"
-				database: mydb
-				protocol: https
-				secure: true
-			`,
-			expected: Config{
-				Name:     "test-clickhouse",
-				Kind:     "clickhouse",
-				Host:     "localhost",
-				Port:     "8443",
-				User:     "default",
-				Password: "mypass",
-				Database: "mydb",
-				Protocol: "https",
-				Secure:   true,
-			},
-		},
-		{
-			name: "minimal configuration with defaults",
-			yaml: `
-				name: minimal-clickhouse
-				kind: clickhouse
-				host: 127.0.0.1
-				port: "8123"
-				user: testuser
-				database: testdb
-			`,
-			expected: Config{
-				Name:     "minimal-clickhouse",
-				Kind:     "clickhouse",
-				Host:     "127.0.0.1",
-				Port:     "8123",
-				User:     "testuser",
-				Password: "",
-				Database: "testdb",
-				Protocol: "",
-				Secure:   false,
-			},
-		},
-		{
-			name: "http protocol",
-			yaml: `
-				name: http-clickhouse
-				kind: clickhouse
-				host: clickhouse.example.com
-				port: "8123"
-				user: analytics
-				password: "securepass"
-				database: analytics_db
-				protocol: http
-				secure: false
-			`,
-			expected: Config{
-				Name:     "http-clickhouse",
-				Kind:     "clickhouse",
-				Host:     "clickhouse.example.com",
-				Port:     "8123",
-				User:     "analytics",
-				Password: "securepass",
-				Database: "analytics_db",
-				Protocol: "http",
-				Secure:   false,
-			},
-		},
-		{
-			name: "https with secure connection",
-			yaml: `
-				name: secure-clickhouse
-				kind: clickhouse
-				host: secure.clickhouse.io
-				port: "8443"
-				user: secureuser
-				password: "verysecure"
-				database: production
-				protocol: https
-				secure: true
-			`,
-			expected: Config{
-				Name:     "secure-clickhouse",
-				Kind:     "clickhouse",
-				Host:     "secure.clickhouse.io",
-				Port:     "8443",
-				User:     "secureuser",
-				Password: "verysecure",
-				Database: "production",
-				Protocol: "https",
-				Secure:   true,
-			},
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			decoder := yaml.NewDecoder(strings.NewReader(string(testutils.FormatYaml(tt.yaml))))
-			config, err := newConfig(context.Background(), tt.expected.Name, decoder)
-			if err != nil {
-				t.Fatalf("Failed to create config: %v", err)
-			}
-
-			clickhouseConfig, ok := config.(Config)
-			if !ok {
-				t.Fatalf("Expected Config type, got %T", config)
-			}
-
-			if diff := cmp.Diff(tt.expected, clickhouseConfig); diff != "" {
-				t.Errorf("Config mismatch (-want +got):\n%s", diff)
-			}
-		})
-	}
-}
-
-func TestNewConfigInvalidYAML(t *testing.T) {
-	tests := []struct {
-		name        string
-		yaml        string
-		expectError bool
-	}{
-		{
-			name: "invalid yaml syntax",
-			yaml: `
-				name: test-clickhouse
-				kind: clickhouse
-				host: [invalid
-			`,
-			expectError: true,
-		},
-		{
-			name: "missing required fields",
-			yaml: `
-				name: test-clickhouse
-				kind: clickhouse
-			`,
-			expectError: false,
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			decoder := yaml.NewDecoder(strings.NewReader(string(testutils.FormatYaml(tt.yaml))))
-			_, err := newConfig(context.Background(), "test-clickhouse", decoder)
-			if tt.expectError && err == nil {
-				t.Errorf("Expected error but got none")
-			}
-			if !tt.expectError && err != nil {
-				t.Errorf("Expected no error but got: %v", err)
-			}
-		})
-	}
-}
-
-func TestSource_SourceKind(t *testing.T) {
-	source := &Source{}
-	if source.SourceKind() != SourceKind {
-		t.Errorf("Expected %s, got %s", SourceKind, source.SourceKind())
-	}
-}
-
-func TestValidateConfig(t *testing.T) {
-	tests := []struct {
-		name        string
-		protocol    string
-		expectError bool
-	}{
-		{
-			name:        "valid https protocol",
-			protocol:    "https",
-			expectError: false,
-		},
-		{
-			name:        "valid http protocol",
-			protocol:    "http",
-			expectError: false,
-		},
-		{
-			name:        "invalid protocol",
-			protocol:    "invalid",
-			expectError: true,
-		},
-		{
-			name:        "invalid protocol - native not supported",
-			protocol:    "native",
-			expectError: true,
-		},
-		{
-			name:        "empty values use defaults",
-			protocol:    "",
-			expectError: false,
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			err := validateConfig(tt.protocol)
-			if tt.expectError && err == nil {
-				t.Errorf("Expected error but got none")
-			}
-			if !tt.expectError && err != nil {
-				t.Errorf("Expected no error but got: %v", err)
-			}
-		})
-	}
-}
-
-func TestInitClickHouseConnectionPoolDSNGeneration(t *testing.T) {
-	tracer := otel.Tracer("test")
-	ctx := context.Background()
-
-	tests := []struct {
-		name      string
-		host      string
-		port      string
-		user      string
-		pass      string
-		dbname    string
-		protocol  string
-		secure    bool
-		shouldErr bool
-	}{
-		{
-			name:      "http protocol with defaults",
-			host:      "localhost",
-			port:      "8123",
-			user:      "default",
-			pass:      "",
-			dbname:    "default",
-			protocol:  "http",
-			secure:    false,
-			shouldErr: true,
-		},
-		{
-			name:      "https protocol with secure",
-			host:      "localhost",
-			port:      "8443",
-			user:      "default",
-			pass:      "",
-			dbname:    "default",
-			protocol:  "https",
-			secure:    true,
-			shouldErr: true,
-		},
-		{
-			name:      "special characters in password",
-			host:      "localhost",
-			port:      "8443",
-			user:      "test@user",
-			pass:      "pass@word:with/special&chars",
-			dbname:    "default",
-			protocol:  "https",
-			secure:    true,
-			shouldErr: true,
-		},
-		{
-			name:      "invalid protocol should fail",
-			host:      "localhost",
-			port:      "9000",
-			user:      "default",
-			pass:      "",
-			dbname:    "default",
-			protocol:  "invalid",
-			secure:    false,
-			shouldErr: true,
-		},
-		{
-			name:      "empty protocol defaults to https",
-			host:      "localhost",
-			port:      "8443",
-			user:      "user",
-			pass:      "pass",
-			dbname:    "testdb",
-			protocol:  "",
-			secure:    true,
-			shouldErr: true,
-		},
-		{
-			name:      "http with secure flag should upgrade to https",
-			host:      "example.com",
-			port:      "8443",
-			user:      "user",
-			pass:      "pass",
-			dbname:    "db",
-			protocol:  "http",
-			secure:    true,
-			shouldErr: true,
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			pool, err := initClickHouseConnectionPool(ctx, tracer, "test", tt.host, tt.port, tt.user, tt.pass, tt.dbname, tt.protocol, tt.secure)
-
-			if !tt.shouldErr && err != nil {
-				t.Errorf("Expected no error, got: %v", err)
-			}
-
-			if pool != nil {
-				pool.Close()
-			}
-		})
-	}
-}
--- a/internal/sources/looker/looker.go
+++ b/internal/sources/looker/looker.go
@@ -39,14 +39,7 @@ func init() {
 }

 func newConfig(ctx context.Context, name string, decoder *yaml.Decoder) (sources.SourceConfig, error) {
-	actual := Config{
-		Name:               name,
-		SslVerification:    true,
-		Timeout:            "600s",
-		ShowHiddenModels:   true,
-		ShowHiddenExplores: true,
-		ShowHiddenFields:   true,
-	} // Default Ssl,timeout, ShowHidden
+	actual := Config{Name: name, SslVerification: "true", Timeout: "600s"} // Default Ssl,timeout
 	if err := decoder.DecodeContext(ctx, &actual); err != nil {
 		return nil, err
 	}
@@ -54,16 +47,13 @@ func newConfig(ctx context.Context, name string, decoder *yaml.Decoder) (sources
 }

 type Config struct {
-	Name               string `yaml:"name" validate:"required"`
-	Kind               string `yaml:"kind" validate:"required"`
-	BaseURL            string `yaml:"base_url" validate:"required"`
-	ClientId           string `yaml:"client_id" validate:"required"`
-	ClientSecret       string `yaml:"client_secret" validate:"required"`
-	SslVerification    bool   `yaml:"verify_ssl"`
-	Timeout            string `yaml:"timeout"`
-	ShowHiddenModels   bool   `yaml:"show_hidden_models"`
-	ShowHiddenExplores bool   `yaml:"show_hidden_explores"`
-	ShowHiddenFields   bool   `yaml:"show_hidden_fields"`
+	Name            string `yaml:"name" validate:"required"`
+	Kind            string `yaml:"kind" validate:"required"`
+	BaseURL         string `yaml:"base_url" validate:"required"`
+	ClientId        string `yaml:"client_id" validate:"required"`
+	ClientSecret    string `yaml:"client_secret" validate:"required"`
+	SslVerification string `yaml:"verify_ssl"`
+	Timeout         string `yaml:"timeout"`
 }

 func (r Config) SourceConfigKind() string {
@@ -87,14 +77,14 @@ func (r Config) Initialize(ctx context.Context, tracer trace.Tracer) (sources.So
 		return nil, fmt.Errorf("unable to parse Timeout string as time.Duration: %s", err)
 	}

-	if !r.SslVerification {
+	if r.SslVerification != "true" {
 		logger.WarnContext(ctx, "Insecure HTTP is enabled for Looker source %s. TLS certificate verification is skipped.\n", r.Name)
 	}
 	cfg := rtl.ApiSettings{
 		AgentTag:     userAgent,
 		BaseUrl:      r.BaseURL,
 		ApiVersion:   "4.0",
-		VerifySsl:    r.SslVerification,
+		VerifySsl:    (r.SslVerification == "true"),
 		Timeout:      int32(duration.Seconds()),
 		ClientId:     r.ClientId,
 		ClientSecret: r.ClientSecret,
@@ -108,14 +98,11 @@ func (r Config) Initialize(ctx context.Context, tracer trace.Tracer) (sources.So
 	logger.DebugContext(ctx, fmt.Sprintf("logged in as user %v %v.\n", *me.FirstName, *me.LastName))

 	s := &Source{
-		Name:               r.Name,
-		Kind:               SourceKind,
-		Timeout:            r.Timeout,
-		Client:             sdk,
-		ApiSettings:        &cfg,
-		ShowHiddenModels:   r.ShowHiddenModels,
-		ShowHiddenExplores: r.ShowHiddenExplores,
-		ShowHiddenFields:   r.ShowHiddenFields,
+		Name:        r.Name,
+		Kind:        SourceKind,
+		Timeout:     r.Timeout,
+		Client:      sdk,
+		ApiSettings: &cfg,
 	}
 	return s, nil

@@ -124,14 +111,11 @@ func (r Config) Initialize(ctx context.Context, tracer trace.Tracer) (sources.So
 var _ sources.Source = &Source{}

 type Source struct {
-	Name               string `yaml:"name"`
-	Kind               string `yaml:"kind"`
-	Timeout            string `yaml:"timeout"`
-	Client             *v4.LookerSDK
-	ApiSettings        *rtl.ApiSettings
-	ShowHiddenModels   bool `yaml:"show_hidden_models"`
-	ShowHiddenExplores bool `yaml:"show_hidden_explores"`
-	ShowHiddenFields   bool `yaml:"show_hidden_fields"`
+	Name        string `yaml:"name"`
+	Kind        string `yaml:"kind"`
+	Timeout     string `yaml:"timeout"`
+	Client      *v4.LookerSDK
+	ApiSettings *rtl.ApiSettings
 }

 func (s *Source) SourceKind() string {
--- a/internal/sources/looker/looker_test.go
+++ b/internal/sources/looker/looker_test.go
@@ -43,16 +43,13 @@ func TestParseFromYamlLooker(t *testing.T) {
 			`,
 			want: map[string]sources.SourceConfig{
 				"my-looker-instance": looker.Config{
-					Name:               "my-looker-instance",
-					Kind:               looker.SourceKind,
-					BaseURL:            "http://example.looker.com/",
-					ClientId:           "jasdl;k;tjl",
-					ClientSecret:       "sdakl;jgflkasdfkfg",
-					Timeout:            "600s",
-					SslVerification:    true,
-					ShowHiddenModels:   true,
-					ShowHiddenExplores: true,
-					ShowHiddenFields:   true,
+					Name:            "my-looker-instance",
+					Kind:            looker.SourceKind,
+					BaseURL:         "http://example.looker.com/",
+					ClientId:        "jasdl;k;tjl",
+					ClientSecret:    "sdakl;jgflkasdfkfg",
+					Timeout:         "600s",
+					SslVerification: "true",
 				},
 			},
 		},
--- a/internal/tools/bigquery/bigqueryconversationalanalytics/bigqueryconversationalanalytics.go
+++ b/internal/tools/bigquery/bigqueryconversationalanalytics/bigqueryconversationalanalytics.go
@@ -1,523 +0,0 @@
-// Copyright 2025 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package bigqueryconversationalanalytics
-
-import (
-	"bytes"
-	"context"
-	"encoding/json"
-	"fmt"
-	"io"
-	"net/http"
-	"strings"
-
-	bigqueryapi "cloud.google.com/go/bigquery"
-	yaml "github.com/goccy/go-yaml"
-	"github.com/googleapis/genai-toolbox/internal/sources"
-	bigqueryds "github.com/googleapis/genai-toolbox/internal/sources/bigquery"
-	"github.com/googleapis/genai-toolbox/internal/tools"
-	"golang.org/x/oauth2"
-)
-
-const kind string = "bigquery-conversational-analytics"
-
-const instructions = `**INSTRUCTIONS - FOLLOW THESE RULES:**
-1. **CONTENT:** Your answer should present the supporting data and then provide a conclusion based on that data.
-2. **OUTPUT FORMAT:** Your entire response MUST be in plain text format ONLY.
-3. **NO CHARTS:** You are STRICTLY FORBIDDEN from generating any charts, graphs, images, or any other form of visualization.`
-
-func init() {
-	if !tools.Register(kind, newConfig) {
-		panic(fmt.Sprintf("tool kind %q already registered", kind))
-	}
-}
-
-func newConfig(ctx context.Context, name string, decoder *yaml.Decoder) (tools.ToolConfig, error) {
-	actual := Config{Name: name}
-	if err := decoder.DecodeContext(ctx, &actual); err != nil {
-		return nil, err
-	}
-	return actual, nil
-}
-
-type compatibleSource interface {
-	BigQueryClient() *bigqueryapi.Client
-	BigQueryTokenSource() oauth2.TokenSource
-	GetMaxQueryResultRows() int
-}
-
-type BQTableReference struct {
-	ProjectID string `json:"projectId"`
-	DatasetID string `json:"datasetId"`
-	TableID   string `json:"tableId"`
-}
-
-// Structs for building the JSON payload
-type UserMessage struct {
-	Text string `json:"text"`
-}
-type Message struct {
-	UserMessage UserMessage `json:"userMessage"`
-}
-type BQDatasource struct {
-	TableReferences []BQTableReference `json:"tableReferences"`
-}
-type DatasourceReferences struct {
-	BQ BQDatasource `json:"bq"`
-}
-type ImageOptions struct {
-	NoImage map[string]any `json:"noImage"`
-}
-type ChartOptions struct {
-	Image ImageOptions `json:"image"`
-}
-type Options struct {
-	Chart ChartOptions `json:"chart"`
-}
-type InlineContext struct {
-	DatasourceReferences DatasourceReferences `json:"datasourceReferences"`
-	Options              Options              `json:"options"`
-}
-
-type CAPayload struct {
-	Project       string        `json:"project"`
-	Messages      []Message     `json:"messages"`
-	InlineContext InlineContext `json:"inlineContext"`
-}
-
-// validate compatible sources are still compatible
-var _ compatibleSource = &bigqueryds.Source{}
-
-var compatibleSources = [...]string{bigqueryds.SourceKind}
-
-type Config struct {
-	Name         string   `yaml:"name" validate:"required"`
-	Kind         string   `yaml:"kind" validate:"required"`
-	Source       string   `yaml:"source" validate:"required"`
-	Description  string   `yaml:"description" validate:"required"`
-	AuthRequired []string `yaml:"authRequired"`
-}
-
-// validate interface
-var _ tools.ToolConfig = Config{}
-
-func (cfg Config) ToolConfigKind() string {
-	return kind
-}
-
-func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error) {
-	// verify source exists
-	rawS, ok := srcs[cfg.Source]
-	if !ok {
-		return nil, fmt.Errorf("no source named %q configured", cfg.Source)
-	}
-
-	// verify the source is compatible
-	s, ok := rawS.(compatibleSource)
-	if !ok {
-		return nil, fmt.Errorf("invalid source for %q tool: source kind must be one of %q", kind, compatibleSources)
-	}
-
-	userQueryParameter := tools.NewStringParameter("user_query_with_context", "The user's question, potentially including conversation history and system instructions for context.")
-	tableRefsParameter := tools.NewStringParameter("table_references", `A JSON string of a list of BigQuery tables to use as context. Each object in the list must contain 'projectId', 'datasetId', and 'tableId'. Example: '[{"projectId": "my-gcp-project", "datasetId": "my_dataset", "tableId": "my_table"}]'`)
-
-	parameters := tools.Parameters{userQueryParameter, tableRefsParameter}
-
-	mcpManifest := tools.McpManifest{
-		Name:        cfg.Name,
-		Description: cfg.Description,
-		InputSchema: parameters.McpManifest(),
-	}
-
-	// finish tool setup
-	t := Tool{
-		Name:               cfg.Name,
-		Kind:               kind,
-		Parameters:         parameters,
-		AuthRequired:       cfg.AuthRequired,
-		Client:             s.BigQueryClient(),
-		TokenSource:        s.BigQueryTokenSource(),
-		manifest:           tools.Manifest{Description: cfg.Description, Parameters: parameters.Manifest(), AuthRequired: cfg.AuthRequired},
-		mcpManifest:        mcpManifest,
-		MaxQueryResultRows: s.GetMaxQueryResultRows(),
-	}
-	return t, nil
-}
-
-// validate interface
-var _ tools.Tool = Tool{}
-
-type Tool struct {
-	Name               string           `yaml:"name"`
-	Kind               string           `yaml:"kind"`
-	AuthRequired       []string         `yaml:"authRequired"`
-	Parameters         tools.Parameters `yaml:"parameters"`
-	Client             *bigqueryapi.Client
-	TokenSource        oauth2.TokenSource
-	manifest           tools.Manifest
-	mcpManifest        tools.McpManifest
-	MaxQueryResultRows int
-}
-
-func (t Tool) Invoke(ctx context.Context, params tools.ParamValues, accessToken tools.AccessToken) (any, error) {
-	// Get credentials for the API call
-	if t.TokenSource == nil {
-		return nil, fmt.Errorf("authentication error: found credentials but they are missing a valid token source")
-	}
-
-	token, err := t.TokenSource.Token()
-	if err != nil {
-		return nil, fmt.Errorf("failed to get token from credentials: %w", err)
-	}
-
-	// Extract parameters from the map
-	mapParams := params.AsMap()
-	userQuery, _ := mapParams["user_query_with_context"].(string)
-
-	finalQueryText := fmt.Sprintf("%s\n**User Query and Context:**\n%s", instructions, userQuery)
-
-	tableRefsJSON, _ := mapParams["table_references"].(string)
-	var tableRefs []BQTableReference
-	if tableRefsJSON != "" {
-		if err := json.Unmarshal([]byte(tableRefsJSON), &tableRefs); err != nil {
-			return nil, fmt.Errorf("failed to parse 'table_references' JSON string: %w", err)
-		}
-	}
-
-	// Construct URL, headers, and payload
-	projectID := t.Client.Project()
-	location := t.Client.Location
-	if location == "" {
-		location = "us"
-	}
-	caURL := fmt.Sprintf("https://geminidataanalytics.googleapis.com/v1alpha/projects/%s/locations/%s:chat", projectID, location)
-
-	headers := map[string]string{
-		"Authorization": fmt.Sprintf("Bearer %s", token.AccessToken),
-		"Content-Type":  "application/json",
-	}
-
-	payload := CAPayload{
-		Project:  fmt.Sprintf("projects/%s", projectID),
-		Messages: []Message{{UserMessage: UserMessage{Text: finalQueryText}}},
-		InlineContext: InlineContext{
-			DatasourceReferences: DatasourceReferences{
-				BQ: BQDatasource{TableReferences: tableRefs},
-			},
-			Options: Options{Chart: ChartOptions{Image: ImageOptions{NoImage: map[string]any{}}}},
-		},
-	}
-
-	// Call the streaming API
-	response, err := getStream(caURL, payload, headers, t.MaxQueryResultRows)
-	if err != nil {
-		return nil, fmt.Errorf("failed to get response from conversational analytics API: %w", err)
-	}
-
-	return response, nil
-}
-
-func (t Tool) ParseParams(data map[string]any, claims map[string]map[string]any) (tools.ParamValues, error) {
-	return tools.ParseParams(t.Parameters, data, claims)
-}
-
-func (t Tool) Manifest() tools.Manifest {
-	return t.manifest
-}
-
-func (t Tool) McpManifest() tools.McpManifest {
-	return t.mcpManifest
-}
-
-func (t Tool) Authorized(verifiedAuthServices []string) bool {
-	return tools.IsAuthorized(t.AuthRequired, verifiedAuthServices)
-}
-
-func (t Tool) RequiresClientAuthorization() bool {
-	return false
-}
-
-// StreamMessage represents a single message object from the streaming API response.
-type StreamMessage struct {
-	SystemMessage *SystemMessage `json:"systemMessage,omitempty"`
-	Error         *ErrorResponse `json:"error,omitempty"`
-}
-
-// SystemMessage contains different types of system-generated content.
-type SystemMessage struct {
-	Text   *TextResponse   `json:"text,omitempty"`
-	Schema *SchemaResponse `json:"schema,omitempty"`
-	Data   *DataResponse   `json:"data,omitempty"`
-}
-
-// TextResponse contains textual parts of a message.
-type TextResponse struct {
-	Parts []string `json:"parts"`
-}
-
-// SchemaResponse contains schema-related information.
-type SchemaResponse struct {
-	Query  *SchemaQuery  `json:"query,omitempty"`
-	Result *SchemaResult `json:"result,omitempty"`
-}
-
-// SchemaQuery holds the question that prompted a schema lookup.
-type SchemaQuery struct {
-	Question string `json:"question"`
-}
-
-// SchemaResult contains the datasources with their schemas.
-type SchemaResult struct {
-	Datasources []Datasource `json:"datasources"`
-}
-
-// Datasource represents a data source with its reference and schema.
-type Datasource struct {
-	BigQueryTableReference *BQTableReference `json:"bigqueryTableReference,omitempty"`
-	Schema                 *BQSchema         `json:"schema,omitempty"`
-}
-
-// BQSchema defines the structure of a BigQuery table.
-type BQSchema struct {
-	Fields []BQField `json:"fields"`
-}
-
-// BQField describes a single column in a BigQuery table.
-type BQField struct {
-	Name        string `json:"name"`
-	Type        string `json:"type"`
-	Description string `json:"description"`
-	Mode        string `json:"mode"`
-}
-
-// DataResponse contains data-related information, like queries and results.
-type DataResponse struct {
-	Query        *DataQuery  `json:"query,omitempty"`
-	GeneratedSQL string      `json:"generatedSql,omitempty"`
-	Result       *DataResult `json:"result,omitempty"`
-}
-
-// DataQuery holds information about a data retrieval query.
-type DataQuery struct {
-	Name     string `json:"name"`
-	Question string `json:"question"`
-}
-
-// DataResult contains the schema and rows of a query result.
-type DataResult struct {
-	Schema BQSchema         `json:"schema"`
-	Data   []map[string]any `json:"data"`
-}
-
-// ErrorResponse represents an error message from the API.
-type ErrorResponse struct {
-	Code    float64 `json:"code"` // JSON numbers are float64 by default
-	Message string  `json:"message"`
-}
-
-func getStream(url string, payload CAPayload, headers map[string]string, maxRows int) (string, error) {
-	payloadBytes, err := json.Marshal(payload)
-	if err != nil {
-		return "", fmt.Errorf("failed to marshal payload: %w", err)
-	}
-
-	req, err := http.NewRequest("POST", url, bytes.NewBuffer(payloadBytes))
-	if err != nil {
-		return "", fmt.Errorf("failed to create request: %w", err)
-	}
-	for k, v := range headers {
-		req.Header.Set(k, v)
-	}
-
-	client := &http.Client{}
-	resp, err := client.Do(req)
-	if err != nil {
-		return "", fmt.Errorf("failed to send request: %w", err)
-	}
-	defer resp.Body.Close()
-
-	if resp.StatusCode != http.StatusOK {
-		body, _ := io.ReadAll(resp.Body)
-		return "", fmt.Errorf("API returned non-200 status: %d %s", resp.StatusCode, string(body))
-	}
-
-	var messages []map[string]any
-	decoder := json.NewDecoder(resp.Body)
-
-	// The response is a JSON array, so we read the opening bracket.
-	if _, err := decoder.Token(); err != nil {
-		if err == io.EOF {
-			return "", nil // Empty response is valid
-		}
-		return "", fmt.Errorf("error reading start of json array: %w", err)
-	}
-
-	for decoder.More() {
-		var msg StreamMessage
-		if err := decoder.Decode(&msg); err != nil {
-			if err == io.EOF {
-				break
-			}
-			return "", fmt.Errorf("error decoding stream message: %w", err)
-		}
-
-		var newMessage map[string]any
-		if msg.SystemMessage != nil {
-			if msg.SystemMessage.Text != nil {
-				newMessage = handleTextResponse(msg.SystemMessage.Text)
-			} else if msg.SystemMessage.Schema != nil {
-				newMessage = handleSchemaResponse(msg.SystemMessage.Schema)
-			} else if msg.SystemMessage.Data != nil {
-				newMessage = handleDataResponse(msg.SystemMessage.Data, maxRows)
-			}
-		} else if msg.Error != nil {
-			newMessage = handleError(msg.Error)
-		}
-		messages = appendMessage(messages, newMessage)
-	}
-
-	var acc strings.Builder
-	for i, msg := range messages {
-		jsonBytes, err := json.MarshalIndent(msg, "", "  ")
-		if err != nil {
-			return "", fmt.Errorf("error marshalling message: %w", err)
-		}
-		acc.Write(jsonBytes)
-		if i < len(messages)-1 {
-			acc.WriteString("\n")
-		}
-	}
-
-	return acc.String(), nil
-}
-
-func formatBqTableRef(tableRef *BQTableReference) string {
-	return fmt.Sprintf("%s.%s.%s", tableRef.ProjectID, tableRef.DatasetID, tableRef.TableID)
-}
-
-func formatSchemaAsDict(data *BQSchema) map[string]any {
-	headers := []string{"Column", "Type", "Description", "Mode"}
-	if data == nil {
-		return map[string]any{"headers": headers, "rows": []any{}}
-	}
-
-	var rows [][]any
-	for _, field := range data.Fields {
-		rows = append(rows, []any{field.Name, field.Type, field.Description, field.Mode})
-	}
-	return map[string]any{"headers": headers, "rows": rows}
-}
-
-func formatDatasourceAsDict(datasource *Datasource) map[string]any {
-	var sourceName string
-	if datasource.BigQueryTableReference != nil {
-		sourceName = formatBqTableRef(datasource.BigQueryTableReference)
-	}
-
-	var schema map[string]any
-	if datasource.Schema != nil {
-		schema = formatSchemaAsDict(datasource.Schema)
-	}
-
-	return map[string]any{"source_name": sourceName, "schema": schema}
-}
-
-func handleTextResponse(resp *TextResponse) map[string]any {
-	return map[string]any{"Answer": strings.Join(resp.Parts, "")}
-}
-
-func handleSchemaResponse(resp *SchemaResponse) map[string]any {
-	if resp.Query != nil {
-		return map[string]any{"Question": resp.Query.Question}
-	}
-	if resp.Result != nil {
-		var formattedSources []map[string]any
-		for _, ds := range resp.Result.Datasources {
-			formattedSources = append(formattedSources, formatDatasourceAsDict(&ds))
-		}
-		return map[string]any{"Schema Resolved": formattedSources}
-	}
-	return nil
-}
-
-func handleDataResponse(resp *DataResponse, maxRows int) map[string]any {
-	if resp.Query != nil {
-		return map[string]any{
-			"Retrieval Query": map[string]any{
-				"Query Name": resp.Query.Name,
-				"Question":   resp.Query.Question,
-			},
-		}
-	}
-	if resp.GeneratedSQL != "" {
-		return map[string]any{"SQL Generated": resp.GeneratedSQL}
-	}
-	if resp.Result != nil {
-		var headers []string
-		for _, f := range resp.Result.Schema.Fields {
-			headers = append(headers, f.Name)
-		}
-
-		totalRows := len(resp.Result.Data)
-		var compactRows [][]any
-		numRowsToDisplay := totalRows
-		if numRowsToDisplay > maxRows {
-			numRowsToDisplay = maxRows
-		}
-
-		for _, rowVal := range resp.Result.Data[:numRowsToDisplay] {
-			var rowValues []any
-			for _, header := range headers {
-				rowValues = append(rowValues, rowVal[header])
-			}
-			compactRows = append(compactRows, rowValues)
-		}
-
-		summary := fmt.Sprintf("Showing all %d rows.", totalRows)
-		if totalRows > maxRows {
-			summary = fmt.Sprintf("Showing the first %d of %d total rows.", numRowsToDisplay, totalRows)
-		}
-
-		return map[string]any{
-			"Data Retrieved": map[string]any{
-				"headers": headers,
-				"rows":    compactRows,
-				"summary": summary,
-			},
-		}
-	}
-	return nil
-}
-
-func handleError(resp *ErrorResponse) map[string]any {
-	return map[string]any{
-		"Error": map[string]any{
-			"Code":    int(resp.Code),
-			"Message": resp.Message,
-		},
-	}
-}
-
-func appendMessage(messages []map[string]any, newMessage map[string]any) []map[string]any {
-	if newMessage == nil {
-		return messages
-	}
-	if len(messages) > 0 {
-		if _, ok := messages[len(messages)-1]["Data Retrieved"]; ok {
-			messages = messages[:len(messages)-1]
-		}
-	}
-	return append(messages, newMessage)
-}
--- a/internal/tools/bigquery/bigqueryconversationalanalytics/bigqueryconversationalanalytics_test.go
+++ b/internal/tools/bigquery/bigqueryconversationalanalytics/bigqueryconversationalanalytics_test.go
@@ -1,72 +0,0 @@
-// Copyright 2025 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//	http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package bigqueryconversationalanalytics_test
-
-import (
-	"testing"
-
-	yaml "github.com/goccy/go-yaml"
-	"github.com/google/go-cmp/cmp"
-	"github.com/googleapis/genai-toolbox/internal/server"
-	"github.com/googleapis/genai-toolbox/internal/testutils"
-	"github.com/googleapis/genai-toolbox/internal/tools/bigquery/bigqueryconversationalanalytics"
-)
-
-func TestParseFromYamlBigQueryConversationalAnalytics(t *testing.T) {
-	ctx, err := testutils.ContextWithNewLogger()
-	if err != nil {
-		t.Fatalf("unexpected error: %s", err)
-	}
-	tcs := []struct {
-		desc string
-		in   string
-		want server.ToolConfigs
-	}{
-		{
-			desc: "basic example",
-			in: `
-			tools:
-				example_tool:
-					kind: bigquery-conversational-analytics
-					source: my-instance
-					description: some description
-			`,
-			want: server.ToolConfigs{
-				"example_tool": bigqueryconversationalanalytics.Config{
-					Name:         "example_tool",
-					Kind:         "bigquery-conversational-analytics",
-					Source:       "my-instance",
-					Description:  "some description",
-					AuthRequired: []string{},
-				},
-			},
-		},
-	}
-	for _, tc := range tcs {
-		t.Run(tc.desc, func(t *testing.T) {
-			got := struct {
-				Tools server.ToolConfigs `yaml:"tools"`
-			}{}
-			// Parse contents
-			err := yaml.UnmarshalContext(ctx, testutils.FormatYaml(tc.in), &got)
-			if err != nil {
-				t.Fatalf("unable to unmarshal: %s", err)
-			}
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
-				t.Fatalf("incorrect parse: diff %v", diff)
-			}
-		})
-	}
-}
--- a/internal/tools/bigquery/bigquerysql/bigquerysql.go
+++ b/internal/tools/bigquery/bigquerysql/bigquerysql.go
@@ -23,7 +23,6 @@ import (
 	bigqueryapi "cloud.google.com/go/bigquery"
 	yaml "github.com/goccy/go-yaml"
 	"github.com/googleapis/genai-toolbox/internal/sources"
-
 	bigqueryds "github.com/googleapis/genai-toolbox/internal/sources/bigquery"
 	"github.com/googleapis/genai-toolbox/internal/tools"
 	bigqueryrestapi "google.golang.org/api/bigquery/v2"
@@ -49,7 +48,6 @@ func newConfig(ctx context.Context, name string, decoder *yaml.Decoder) (tools.T
 type compatibleSource interface {
 	BigQueryClient() *bigqueryapi.Client
 	BigQueryRestService() *bigqueryrestapi.Service
-	BigQueryClientCreator() bigqueryds.BigqueryClientCreator
 }

 // validate compatible sources are still compatible
@@ -64,7 +62,6 @@ type Config struct {
 	Description        string           `yaml:"description" validate:"required"`
 	Statement          string           `yaml:"statement" validate:"required"`
 	AuthRequired       []string         `yaml:"authRequired"`
-	UseClientOAuth     bool             `yaml:"useClientOAuth"`
 	Parameters         tools.Parameters `yaml:"parameters"`
 	TemplateParameters tools.Parameters `yaml:"templateParameters"`
 }
@@ -104,18 +101,15 @@ func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error)
 	t := Tool{
 		Name:               cfg.Name,
 		Kind:               kind,
-		AuthRequired:       cfg.AuthRequired,
-		UseClientOAuth:     cfg.UseClientOAuth,
 		Parameters:         cfg.Parameters,
 		TemplateParameters: cfg.TemplateParameters,
 		AllParams:          allParameters,
-
-		Statement:     cfg.Statement,
-		Client:        s.BigQueryClient(),
-		RestService:   s.BigQueryRestService(),
-		ClientCreator: s.BigQueryClientCreator(),
-		manifest:      tools.Manifest{Description: cfg.Description, Parameters: paramManifest, AuthRequired: cfg.AuthRequired},
-		mcpManifest:   mcpManifest,
+		Statement:          cfg.Statement,
+		AuthRequired:       cfg.AuthRequired,
+		Client:             s.BigQueryClient(),
+		RestService:        s.BigQueryRestService(),
+		manifest:           tools.Manifest{Description: cfg.Description, Parameters: paramManifest, AuthRequired: cfg.AuthRequired},
+		mcpManifest:        mcpManifest,
 	}
 	return t, nil
 }
@@ -127,17 +121,14 @@ type Tool struct {
 	Name               string           `yaml:"name"`
 	Kind               string           `yaml:"kind"`
 	AuthRequired       []string         `yaml:"authRequired"`
-	UseClientOAuth     bool             `yaml:"useClientOAuth"`
 	Parameters         tools.Parameters `yaml:"parameters"`
 	TemplateParameters tools.Parameters `yaml:"templateParameters"`
 	AllParams          tools.Parameters `yaml:"allParams"`
-
-	Statement     string
-	Client        *bigqueryapi.Client
-	RestService   *bigqueryrestapi.Service
-	ClientCreator bigqueryds.BigqueryClientCreator
-	manifest      tools.Manifest
-	mcpManifest   tools.McpManifest
+	Statement          string
+	Client             *bigqueryapi.Client
+	RestService        *bigqueryrestapi.Service
+	manifest           tools.Manifest
+	mcpManifest        tools.McpManifest
 }

 func (t Tool) Invoke(ctx context.Context, params tools.ParamValues, accessToken tools.AccessToken) (any, error) {
@@ -217,23 +208,11 @@ func (t Tool) Invoke(ctx context.Context, params tools.ParamValues, accessToken
 		lowLevelParams = append(lowLevelParams, lowLevelParam)
 	}

-	bqClient := t.Client
-	restService := t.RestService
-	var query *bigqueryapi.Query
-
-	// Initialize new client if using user OAuth token
-	if t.UseClientOAuth {
-		bqClient, restService, err = t.ClientCreator(accessToken)
-		if err != nil {
-			return nil, fmt.Errorf("error creating client from OAuth access token: %w", err)
-		}
-	}
-
-	query = bqClient.Query(newStatement)
+	query := t.Client.Query(newStatement)
 	query.Parameters = highLevelParams
 	query.Location = t.Client.Location

-	dryRunJob, err := dryRunQuery(ctx, restService, t.Client.Project(), t.Client.Location, newStatement, lowLevelParams, query.ConnectionProperties)
+	dryRunJob, err := dryRunQuery(ctx, t.RestService, t.Client.Project(), t.Client.Location, newStatement, lowLevelParams, query.ConnectionProperties)
 	if err != nil {
 		// This is a fallback check in case the switch logic was bypassed.
 		return nil, fmt.Errorf("final query validation failed: %w", err)
@@ -298,9 +277,8 @@ func (t Tool) Authorized(verifiedAuthServices []string) bool {
 }

 func (t Tool) RequiresClientAuthorization() bool {
-	return t.UseClientOAuth
+	return false
 }
-
 func BQTypeStringFromToolType(toolType string) (string, error) {
 	switch toolType {
 	case "string":
--- a/internal/tools/clickhouse/clickhouseexecutesql/clickhouseexecutesql.go
+++ b/internal/tools/clickhouse/clickhouseexecutesql/clickhouseexecutesql.go
@@ -1,191 +0,0 @@
-// Copyright 2025 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package clickhouse
-
-import (
-	"context"
-	"database/sql"
-	"fmt"
-
-	yaml "github.com/goccy/go-yaml"
-	"github.com/googleapis/genai-toolbox/internal/sources"
-	"github.com/googleapis/genai-toolbox/internal/tools"
-)
-
-type compatibleSource interface {
-	ClickHousePool() *sql.DB
-}
-
-var compatibleSources = []string{"clickhouse"}
-
-const executeSQLKind string = "clickhouse-execute-sql"
-
-func init() {
-	if !tools.Register(executeSQLKind, newExecuteSQLConfig) {
-		panic(fmt.Sprintf("tool kind %q already registered", executeSQLKind))
-	}
-}
-
-func newExecuteSQLConfig(ctx context.Context, name string, decoder *yaml.Decoder) (tools.ToolConfig, error) {
-	actual := Config{Name: name}
-	if err := decoder.DecodeContext(ctx, &actual); err != nil {
-		return nil, err
-	}
-	return actual, nil
-}
-
-type Config struct {
-	Name         string   `yaml:"name" validate:"required"`
-	Kind         string   `yaml:"kind" validate:"required"`
-	Source       string   `yaml:"source" validate:"required"`
-	Description  string   `yaml:"description" validate:"required"`
-	AuthRequired []string `yaml:"authRequired"`
-}
-
-var _ tools.ToolConfig = Config{}
-
-func (cfg Config) ToolConfigKind() string {
-	return executeSQLKind
-}
-
-func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error) {
-	rawS, ok := srcs[cfg.Source]
-	if !ok {
-		return nil, fmt.Errorf("no source named %q configured", cfg.Source)
-	}
-
-	s, ok := rawS.(compatibleSource)
-	if !ok {
-		return nil, fmt.Errorf("invalid source for %q tool: source kind must be one of %q", executeSQLKind, compatibleSources)
-	}
-
-	sqlParameter := tools.NewStringParameter("sql", "The SQL statement to execute.")
-	parameters := tools.Parameters{sqlParameter}
-
-	mcpManifest := tools.McpManifest{
-		Name:        cfg.Name,
-		Description: cfg.Description,
-		InputSchema: parameters.McpManifest(),
-	}
-
-	t := ExecuteSQLTool{
-		Name:         cfg.Name,
-		Kind:         executeSQLKind,
-		Parameters:   parameters,
-		AuthRequired: cfg.AuthRequired,
-		Pool:         s.ClickHousePool(),
-		manifest:     tools.Manifest{Description: cfg.Description, Parameters: parameters.Manifest(), AuthRequired: cfg.AuthRequired},
-		mcpManifest:  mcpManifest,
-	}
-	return t, nil
-}
-
-var _ tools.Tool = ExecuteSQLTool{}
-
-type ExecuteSQLTool struct {
-	Name         string           `yaml:"name"`
-	Kind         string           `yaml:"kind"`
-	AuthRequired []string         `yaml:"authRequired"`
-	Parameters   tools.Parameters `yaml:"parameters"`
-
-	Pool        *sql.DB
-	manifest    tools.Manifest
-	mcpManifest tools.McpManifest
-}
-
-func (t ExecuteSQLTool) Invoke(ctx context.Context, params tools.ParamValues, token tools.AccessToken) (any, error) {
-	paramsMap := params.AsMap()
-	sql, ok := paramsMap["sql"].(string)
-	if !ok {
-		return nil, fmt.Errorf("unable to cast sql parameter %s", paramsMap["sql"])
-	}
-
-	results, err := t.Pool.QueryContext(ctx, sql)
-	if err != nil {
-		return nil, fmt.Errorf("unable to execute query: %w", err)
-	}
-	defer results.Close()
-
-	cols, err := results.Columns()
-	if err != nil {
-		return nil, fmt.Errorf("unable to retrieve rows column name: %w", err)
-	}
-
-	// create an array of values for each column, which can be re-used to scan each row
-	rawValues := make([]any, len(cols))
-	values := make([]any, len(cols))
-	for i := range rawValues {
-		values[i] = &rawValues[i]
-	}
-
-	colTypes, err := results.ColumnTypes()
-	if err != nil {
-		return nil, fmt.Errorf("unable to get column types: %w", err)
-	}
-
-	var out []any
-	for results.Next() {
-		err := results.Scan(values...)
-		if err != nil {
-			return nil, fmt.Errorf("unable to parse row: %w", err)
-		}
-		vMap := make(map[string]any)
-		for i, name := range cols {
-			// ClickHouse driver may return specific types that need handling
-			switch colTypes[i].DatabaseTypeName() {
-			case "String", "FixedString":
-				if rawValues[i] != nil {
-					// Handle potential []byte to string conversion if needed
-					if b, ok := rawValues[i].([]byte); ok {
-						vMap[name] = string(b)
-					} else {
-						vMap[name] = rawValues[i]
-					}
-				} else {
-					vMap[name] = nil
-				}
-			default:
-				vMap[name] = rawValues[i]
-			}
-		}
-		out = append(out, vMap)
-	}
-
-	if err := results.Err(); err != nil {
-		return nil, fmt.Errorf("errors encountered by results.Scan: %w", err)
-	}
-
-	return out, nil
-}
-
-func (t ExecuteSQLTool) ParseParams(data map[string]any, claims map[string]map[string]any) (tools.ParamValues, error) {
-	return tools.ParseParams(t.Parameters, data, claims)
-}
-
-func (t ExecuteSQLTool) Manifest() tools.Manifest {
-	return t.manifest
-}
-
-func (t ExecuteSQLTool) McpManifest() tools.McpManifest {
-	return t.mcpManifest
-}
-
-func (t ExecuteSQLTool) Authorized(verifiedAuthServices []string) bool {
-	return tools.IsAuthorized(t.AuthRequired, verifiedAuthServices)
-}
-
-func (t ExecuteSQLTool) RequiresClientAuthorization() bool {
-	return false
-}
--- a/internal/tools/clickhouse/clickhouseexecutesql/clickhouseexecutesql_test.go
+++ b/internal/tools/clickhouse/clickhouseexecutesql/clickhouseexecutesql_test.go
@@ -1,70 +0,0 @@
-// Copyright 2025 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package clickhouse
-
-import (
-	"testing"
-
-	yaml "github.com/goccy/go-yaml"
-	"github.com/google/go-cmp/cmp"
-	"github.com/googleapis/genai-toolbox/internal/server"
-	"github.com/googleapis/genai-toolbox/internal/testutils"
-)
-
-func TestParseFromYamlClickHouseExecuteSQL(t *testing.T) {
-	ctx, err := testutils.ContextWithNewLogger()
-	if err != nil {
-		t.Fatalf("unexpected error: %s", err)
-	}
-	tcs := []struct {
-		desc string
-		in   string
-		want server.ToolConfigs
-	}{
-		{
-			desc: "basic example",
-			in: `
-			tools:
-				example_tool:
-					kind: clickhouse-execute-sql
-					source: my-instance
-					description: some description
-			`,
-			want: server.ToolConfigs{
-				"example_tool": Config{
-					Name:         "example_tool",
-					Kind:         "clickhouse-execute-sql",
-					Source:       "my-instance",
-					Description:  "some description",
-					AuthRequired: []string{},
-				},
-			},
-		},
-	}
-	for _, tc := range tcs {
-		t.Run(tc.desc, func(t *testing.T) {
-			got := struct {
-				Tools server.ToolConfigs `yaml:"tools"`
-			}{}
-			err := yaml.UnmarshalContext(ctx, testutils.FormatYaml(tc.in), &got)
-			if err != nil {
-				t.Fatalf("unable to unmarshal: %s", err)
-			}
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
-				t.Fatalf("incorrect parse: diff %v", diff)
-			}
-		})
-	}
-}
--- a/internal/tools/clickhouse/clickhousesql/clickhousesql.go
+++ b/internal/tools/clickhouse/clickhousesql/clickhousesql.go
@@ -1,207 +0,0 @@
-// Copyright 2025 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package clickhouse
-
-import (
-	"context"
-	"database/sql"
-	"fmt"
-
-	yaml "github.com/goccy/go-yaml"
-	"github.com/googleapis/genai-toolbox/internal/sources"
-	"github.com/googleapis/genai-toolbox/internal/tools"
-)
-
-type compatibleSource interface {
-	ClickHousePool() *sql.DB
-}
-
-var compatibleSources = []string{"clickhouse"}
-
-const sqlKind string = "clickhouse-sql"
-
-func init() {
-	if !tools.Register(sqlKind, newSQLConfig) {
-		panic(fmt.Sprintf("tool kind %q already registered", sqlKind))
-	}
-}
-
-func newSQLConfig(ctx context.Context, name string, decoder *yaml.Decoder) (tools.ToolConfig, error) {
-	actual := Config{Name: name}
-	if err := decoder.DecodeContext(ctx, &actual); err != nil {
-		return nil, err
-	}
-	return actual, nil
-}
-
-type Config struct {
-	Name               string           `yaml:"name" validate:"required"`
-	Kind               string           `yaml:"kind" validate:"required"`
-	Source             string           `yaml:"source" validate:"required"`
-	Description        string           `yaml:"description" validate:"required"`
-	Statement          string           `yaml:"statement" validate:"required"`
-	AuthRequired       []string         `yaml:"authRequired"`
-	Parameters         tools.Parameters `yaml:"parameters"`
-	TemplateParameters tools.Parameters `yaml:"templateParameters"`
-}
-
-var _ tools.ToolConfig = Config{}
-
-func (cfg Config) ToolConfigKind() string {
-	return sqlKind
-}
-
-func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error) {
-	rawS, ok := srcs[cfg.Source]
-	if !ok {
-		return nil, fmt.Errorf("no source named %q configured", cfg.Source)
-	}
-
-	s, ok := rawS.(compatibleSource)
-	if !ok {
-		return nil, fmt.Errorf("invalid source for %q tool: source kind must be one of %q", sqlKind, compatibleSources)
-	}
-
-	allParameters, paramManifest, paramMcpManifest, _ := tools.ProcessParameters(cfg.TemplateParameters, cfg.Parameters)
-
-	mcpManifest := tools.McpManifest{
-		Name:        cfg.Name,
-		Description: cfg.Description,
-		InputSchema: paramMcpManifest,
-	}
-
-	t := Tool{
-		Name:               cfg.Name,
-		Kind:               sqlKind,
-		Parameters:         cfg.Parameters,
-		TemplateParameters: cfg.TemplateParameters,
-		AllParams:          allParameters,
-		Statement:          cfg.Statement,
-		AuthRequired:       cfg.AuthRequired,
-		Pool:               s.ClickHousePool(),
-		manifest:           tools.Manifest{Description: cfg.Description, Parameters: paramManifest, AuthRequired: cfg.AuthRequired},
-		mcpManifest:        mcpManifest,
-	}
-	return t, nil
-}
-
-var _ tools.Tool = Tool{}
-
-type Tool struct {
-	Name               string           `yaml:"name"`
-	Kind               string           `yaml:"kind"`
-	AuthRequired       []string         `yaml:"authRequired"`
-	Parameters         tools.Parameters `yaml:"parameters"`
-	TemplateParameters tools.Parameters `yaml:"templateParameters"`
-	AllParams          tools.Parameters `yaml:"allParams"`
-
-	Pool        *sql.DB
-	Statement   string
-	manifest    tools.Manifest
-	mcpManifest tools.McpManifest
-}
-
-func (t Tool) Invoke(ctx context.Context, params tools.ParamValues, token tools.AccessToken) (any, error) {
-	paramsMap := params.AsMap()
-	newStatement, err := tools.ResolveTemplateParams(t.TemplateParameters, t.Statement, paramsMap)
-	if err != nil {
-		return nil, fmt.Errorf("unable to extract template params: %w", err)
-	}
-
-	newParams, err := tools.GetParams(t.Parameters, paramsMap)
-	if err != nil {
-		return nil, fmt.Errorf("unable to extract standard params: %w", err)
-	}
-
-	sliceParams := newParams.AsSlice()
-	results, err := t.Pool.QueryContext(ctx, newStatement, sliceParams...)
-	if err != nil {
-		return nil, fmt.Errorf("unable to execute query: %w", err)
-	}
-
-	cols, err := results.Columns()
-	if err != nil {
-		return nil, fmt.Errorf("unable to retrieve rows column name: %w", err)
-	}
-
-	rawValues := make([]any, len(cols))
-	values := make([]any, len(cols))
-	for i := range rawValues {
-		values[i] = &rawValues[i]
-	}
-
-	colTypes, err := results.ColumnTypes()
-	if err != nil {
-		return nil, fmt.Errorf("unable to get column types: %w", err)
-	}
-
-	var out []any
-	for results.Next() {
-		err := results.Scan(values...)
-		if err != nil {
-			return nil, fmt.Errorf("unable to parse row: %w", err)
-		}
-		vMap := make(map[string]any)
-		for i, name := range cols {
-			switch colTypes[i].DatabaseTypeName() {
-			case "String", "FixedString":
-				if rawValues[i] != nil {
-					// Handle potential []byte to string conversion if needed
-					if b, ok := rawValues[i].([]byte); ok {
-						vMap[name] = string(b)
-					} else {
-						vMap[name] = rawValues[i]
-					}
-				} else {
-					vMap[name] = nil
-				}
-			default:
-				vMap[name] = rawValues[i]
-			}
-		}
-		out = append(out, vMap)
-	}
-
-	err = results.Close()
-	if err != nil {
-		return nil, fmt.Errorf("unable to close rows: %w", err)
-	}
-
-	if err := results.Err(); err != nil {
-		return nil, fmt.Errorf("errors encountered by results.Scan: %w", err)
-	}
-
-	return out, nil
-}
-
-func (t Tool) ParseParams(data map[string]any, claims map[string]map[string]any) (tools.ParamValues, error) {
-	return tools.ParseParams(t.AllParams, data, claims)
-}
-
-func (t Tool) Manifest() tools.Manifest {
-	return t.manifest
-}
-
-func (t Tool) McpManifest() tools.McpManifest {
-	return t.mcpManifest
-}
-
-func (t Tool) Authorized(verifiedAuthServices []string) bool {
-	return tools.IsAuthorized(t.AuthRequired, verifiedAuthServices)
-}
-
-func (t Tool) RequiresClientAuthorization() bool {
-	return false
-}
--- a/internal/tools/clickhouse/clickhousesql/clickhousesql_test.go
+++ b/internal/tools/clickhouse/clickhousesql/clickhousesql_test.go
@@ -1,276 +0,0 @@
-// Copyright 2025 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package clickhouse
-
-import (
-	"testing"
-
-	"github.com/goccy/go-yaml"
-	"github.com/google/go-cmp/cmp"
-	"github.com/googleapis/genai-toolbox/internal/server"
-	"github.com/googleapis/genai-toolbox/internal/sources"
-	"github.com/googleapis/genai-toolbox/internal/sources/clickhouse"
-	"github.com/googleapis/genai-toolbox/internal/testutils"
-	"github.com/googleapis/genai-toolbox/internal/tools"
-)
-
-func TestConfigToolConfigKind(t *testing.T) {
-	config := Config{}
-	if config.ToolConfigKind() != sqlKind {
-		t.Errorf("Expected %s, got %s", sqlKind, config.ToolConfigKind())
-	}
-}
-
-func TestParseFromYamlClickHouseSQL(t *testing.T) {
-	ctx, err := testutils.ContextWithNewLogger()
-	if err != nil {
-		t.Fatalf("unexpected error: %s", err)
-	}
-	tcs := []struct {
-		desc string
-		in   string
-		want server.ToolConfigs
-	}{
-		{
-			desc: "basic example",
-			in: `
-			tools:
-				example_tool:
-					kind: clickhouse-sql
-					source: my-instance
-					description: some description
-					statement: SELECT 1
-			`,
-			want: server.ToolConfigs{
-				"example_tool": Config{
-					Name:         "example_tool",
-					Kind:         "clickhouse-sql",
-					Source:       "my-instance",
-					Description:  "some description",
-					Statement:    "SELECT 1",
-					AuthRequired: []string{},
-				},
-			},
-		},
-		{
-			desc: "with parameters",
-			in: `
-			tools:
-				param_tool:
-					kind: clickhouse-sql
-					source: test-source
-					description: Test ClickHouse tool
-					statement: SELECT * FROM test_table WHERE id = $1
-					parameters:
-					  - name: id
-					    type: string
-					    description: Test ID
-			`,
-			want: server.ToolConfigs{
-				"param_tool": Config{
-					Name:        "param_tool",
-					Kind:        "clickhouse-sql",
-					Source:      "test-source",
-					Description: "Test ClickHouse tool",
-					Statement:   "SELECT * FROM test_table WHERE id = $1",
-					Parameters: tools.Parameters{
-						tools.NewStringParameter("id", "Test ID"),
-					},
-					AuthRequired: []string{},
-				},
-			},
-		},
-	}
-	for _, tc := range tcs {
-		t.Run(tc.desc, func(t *testing.T) {
-			got := struct {
-				Tools server.ToolConfigs `yaml:"tools"`
-			}{}
-			err := yaml.UnmarshalContext(ctx, testutils.FormatYaml(tc.in), &got)
-			if err != nil {
-				t.Fatalf("unable to unmarshal: %s", err)
-			}
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
-				t.Fatalf("incorrect parse: diff %v", diff)
-			}
-		})
-	}
-}
-
-func TestSQLConfigInitializeValidSource(t *testing.T) {
-	config := Config{
-		Name:        "test-tool",
-		Kind:        sqlKind,
-		Source:      "test-clickhouse",
-		Description: "Test tool",
-		Statement:   "SELECT 1",
-		Parameters:  tools.Parameters{},
-	}
-
-	// Create a mock ClickHouse source
-	mockSource := &clickhouse.Source{}
-
-	sources := map[string]sources.Source{
-		"test-clickhouse": mockSource,
-	}
-
-	tool, err := config.Initialize(sources)
-	if err != nil {
-		t.Fatalf("Expected no error, got: %v", err)
-	}
-
-	clickhouseTool, ok := tool.(Tool)
-	if !ok {
-		t.Fatalf("Expected Tool type, got %T", tool)
-	}
-
-	if clickhouseTool.Name != "test-tool" {
-		t.Errorf("Expected name 'test-tool', got %s", clickhouseTool.Name)
-	}
-}
-
-func TestSQLConfigInitializeMissingSource(t *testing.T) {
-	config := Config{
-		Name:        "test-tool",
-		Kind:        sqlKind,
-		Source:      "missing-source",
-		Description: "Test tool",
-		Statement:   "SELECT 1",
-		Parameters:  tools.Parameters{},
-	}
-
-	sources := map[string]sources.Source{}
-
-	_, err := config.Initialize(sources)
-	if err == nil {
-		t.Fatal("Expected error for missing source, got nil")
-	}
-
-	expectedErr := `no source named "missing-source" configured`
-	if err.Error() != expectedErr {
-		t.Errorf("Expected error %q, got %q", expectedErr, err.Error())
-	}
-}
-
-// mockIncompatibleSource is a mock source that doesn't implement the compatibleSource interface
-type mockIncompatibleSource struct{}
-
-func (m *mockIncompatibleSource) SourceKind() string {
-	return "mock"
-}
-
-func TestSQLConfigInitializeIncompatibleSource(t *testing.T) {
-	config := Config{
-		Name:        "test-tool",
-		Kind:        sqlKind,
-		Source:      "incompatible-source",
-		Description: "Test tool",
-		Statement:   "SELECT 1",
-		Parameters:  tools.Parameters{},
-	}
-
-	mockSource := &mockIncompatibleSource{}
-
-	sources := map[string]sources.Source{
-		"incompatible-source": mockSource,
-	}
-
-	_, err := config.Initialize(sources)
-	if err == nil {
-		t.Fatal("Expected error for incompatible source, got nil")
-	}
-
-	if err.Error() == "" {
-		t.Error("Expected non-empty error message")
-	}
-}
-
-func TestToolManifest(t *testing.T) {
-	tool := Tool{
-		manifest: tools.Manifest{
-			Description: "Test description",
-			Parameters:  []tools.ParameterManifest{},
-		},
-	}
-
-	manifest := tool.Manifest()
-	if manifest.Description != "Test description" {
-		t.Errorf("Expected description 'Test description', got %s", manifest.Description)
-	}
-}
-
-func TestToolMcpManifest(t *testing.T) {
-	tool := Tool{
-		mcpManifest: tools.McpManifest{
-			Name:        "test-tool",
-			Description: "Test description",
-		},
-	}
-
-	manifest := tool.McpManifest()
-	if manifest.Name != "test-tool" {
-		t.Errorf("Expected name 'test-tool', got %s", manifest.Name)
-	}
-	if manifest.Description != "Test description" {
-		t.Errorf("Expected description 'Test description', got %s", manifest.Description)
-	}
-}
-
-func TestToolAuthorized(t *testing.T) {
-	tests := []struct {
-		name                 string
-		authRequired         []string
-		verifiedAuthServices []string
-		expectedAuthorized   bool
-	}{
-		{
-			name:                 "no auth required",
-			authRequired:         []string{},
-			verifiedAuthServices: []string{},
-			expectedAuthorized:   true,
-		},
-		{
-			name:                 "auth required and verified",
-			authRequired:         []string{"google"},
-			verifiedAuthServices: []string{"google"},
-			expectedAuthorized:   true,
-		},
-		{
-			name:                 "auth required but not verified",
-			authRequired:         []string{"google"},
-			verifiedAuthServices: []string{},
-			expectedAuthorized:   false,
-		},
-		{
-			name:                 "auth required but different service verified",
-			authRequired:         []string{"google"},
-			verifiedAuthServices: []string{"aws"},
-			expectedAuthorized:   false,
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			tool := Tool{
-				AuthRequired: tt.authRequired,
-			}
-
-			authorized := tool.Authorized(tt.verifiedAuthServices)
-			if authorized != tt.expectedAuthorized {
-				t.Errorf("Expected authorized %t, got %t", tt.expectedAuthorized, authorized)
-			}
-		})
-	}
-}
--- a/internal/tools/looker/lookercommon/lookercommon.go
+++ b/internal/tools/looker/lookercommon/lookercommon.go
@@ -16,7 +16,6 @@ package lookercommon
 import (
 	"context"
 	"fmt"
-	"strings"

 	"github.com/googleapis/genai-toolbox/internal/tools"
 	"github.com/googleapis/genai-toolbox/internal/util"
@@ -25,14 +24,14 @@ import (
 )

 const (
-	DimensionsFields = "fields(dimensions(name,type,label,label_short,description,synonyms,tags,hidden))"
-	FiltersFields    = "fields(filters(name,type,label,label_short,description,synonyms,tags,hidden))"
-	MeasuresFields   = "fields(measures(name,type,label,label_short,description,synonyms,tags,hidden))"
-	ParametersFields = "fields(parameters(name,type,label,label_short,description,synonyms,tags,hidden))"
+	DimensionsFields = "fields(dimensions(name,type,label,label_short,description))"
+	FiltersFields    = "fields(filters(name,type,label,label_short,description))"
+	MeasuresFields   = "fields(measures(name,type,label,label_short,description))"
+	ParametersFields = "fields(parameters(name,type,label,label_short,description))"
 )

 // ExtractLookerFieldProperties extracts common properties from Looker field objects.
-func ExtractLookerFieldProperties(ctx context.Context, fields *[]v4.LookmlModelExploreField, showHiddenFields bool) ([]any, error) {
+func ExtractLookerFieldProperties(ctx context.Context, fields *[]v4.LookmlModelExploreField) ([]any, error) {
 	data := make([]any, 0)

 	// Handle nil fields pointer
@@ -49,12 +48,6 @@ func ExtractLookerFieldProperties(ctx context.Context, fields *[]v4.LookmlModelE

 	for _, v := range *fields {
 		logger.DebugContext(ctx, "Got response element of %v\n", v)
-		if v.Name != nil && strings.HasSuffix(*v.Name, "_raw") {
-			continue
-		}
-		if !showHiddenFields && v.Hidden != nil && *v.Hidden {
-			continue
-		}
 		vMap := make(map[string]any)
 		if v.Name != nil {
 			vMap["name"] = *v.Name
@@ -71,12 +64,6 @@ func ExtractLookerFieldProperties(ctx context.Context, fields *[]v4.LookmlModelE
 		if v.Description != nil {
 			vMap["description"] = *v.Description
 		}
-		if v.Tags != nil {
-			vMap["tags"] = *v.Tags
-		}
-		if v.Synonyms != nil {
-			vMap["synonyms"] = *v.Synonyms
-		}
 		logger.DebugContext(ctx, "Converted to %v\n", vMap)
 		data = append(data, vMap)
 	}
--- a/internal/tools/looker/lookercommon/lookercommon_test.go
+++ b/internal/tools/looker/lookercommon/lookercommon_test.go
@@ -132,7 +132,7 @@ func TestExtractLookerFieldProperties(t *testing.T) {

 	for _, tc := range tcs {
 		t.Run(tc.desc, func(t *testing.T) {
-			got, err := lookercommon.ExtractLookerFieldProperties(ctx, &tc.fields, true)
+			got, err := lookercommon.ExtractLookerFieldProperties(ctx, &tc.fields)
 			if err != nil {
 				t.Fatalf("unexpected error: %v", err)
 			}
@@ -150,7 +150,7 @@ func TestExtractLookerFieldPropertiesWithNilFields(t *testing.T) {
 		t.Fatalf("unexpected error: %s", err)
 	}

-	got, err := lookercommon.ExtractLookerFieldProperties(ctx, nil, true)
+	got, err := lookercommon.ExtractLookerFieldProperties(ctx, nil)
 	if err != nil {
 		t.Fatalf("unexpected error: %v", err)
 	}
--- a/internal/tools/looker/lookergetdashboards/lookergetdashboards.go
+++ b/internal/tools/looker/lookergetdashboards/lookergetdashboards.go
@@ -184,7 +184,7 @@ func (t Tool) McpManifest() tools.McpManifest {
 }

 func (t Tool) Authorized(verifiedAuthServices []string) bool {
-	return tools.IsAuthorized(t.AuthRequired, verifiedAuthServices)
+	return true
 }

 func (t Tool) RequiresClientAuthorization() bool {
--- a/internal/tools/looker/lookergetdimensions/lookergetdimensions.go
+++ b/internal/tools/looker/lookergetdimensions/lookergetdimensions.go
@@ -93,8 +93,7 @@ func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error)
 			Parameters:   parameters.Manifest(),
 			AuthRequired: cfg.AuthRequired,
 		},
-		mcpManifest:      mcpManifest,
-		ShowHiddenFields: s.ShowHiddenFields,
+		mcpManifest: mcpManifest,
 	}, nil
 }

@@ -102,15 +101,14 @@ func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error)
 var _ tools.Tool = Tool{}

 type Tool struct {
-	Name             string `yaml:"name"`
-	Kind             string `yaml:"kind"`
-	Client           *v4.LookerSDK
-	ApiSettings      *rtl.ApiSettings
-	AuthRequired     []string         `yaml:"authRequired"`
-	Parameters       tools.Parameters `yaml:"parameters"`
-	manifest         tools.Manifest
-	mcpManifest      tools.McpManifest
-	ShowHiddenFields bool
+	Name         string `yaml:"name"`
+	Kind         string `yaml:"kind"`
+	Client       *v4.LookerSDK
+	ApiSettings  *rtl.ApiSettings
+	AuthRequired []string         `yaml:"authRequired"`
+	Parameters   tools.Parameters `yaml:"parameters"`
+	manifest     tools.Manifest
+	mcpManifest  tools.McpManifest
 }

 func (t Tool) Invoke(ctx context.Context, params tools.ParamValues, accessToken tools.AccessToken) (any, error) {
@@ -138,7 +136,7 @@ func (t Tool) Invoke(ctx context.Context, params tools.ParamValues, accessToken
 		return nil, fmt.Errorf("error processing get_dimensions response: %w", err)
 	}

-	data, err := lookercommon.ExtractLookerFieldProperties(ctx, resp.Fields.Dimensions, t.ShowHiddenFields)
+	data, err := lookercommon.ExtractLookerFieldProperties(ctx, resp.Fields.Dimensions)
 	if err != nil {
 		return nil, fmt.Errorf("error extracting get_dimensions response: %w", err)
 	}
--- a/internal/tools/looker/lookergetexplores/lookergetexplores.go
+++ b/internal/tools/looker/lookergetexplores/lookergetexplores.go
@@ -93,8 +93,7 @@ func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error)
 			Parameters:   parameters.Manifest(),
 			AuthRequired: cfg.AuthRequired,
 		},
-		mcpManifest:        mcpManifest,
-		ShowHiddenExplores: s.ShowHiddenExplores,
+		mcpManifest: mcpManifest,
 	}, nil
 }

@@ -102,15 +101,14 @@ func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error)
 var _ tools.Tool = Tool{}

 type Tool struct {
-	Name               string `yaml:"name"`
-	Kind               string `yaml:"kind"`
-	Client             *v4.LookerSDK
-	ApiSettings        *rtl.ApiSettings
-	AuthRequired       []string         `yaml:"authRequired"`
-	Parameters         tools.Parameters `yaml:"parameters"`
-	manifest           tools.Manifest
-	mcpManifest        tools.McpManifest
-	ShowHiddenExplores bool
+	Name         string `yaml:"name"`
+	Kind         string `yaml:"kind"`
+	Client       *v4.LookerSDK
+	ApiSettings  *rtl.ApiSettings
+	AuthRequired []string         `yaml:"authRequired"`
+	Parameters   tools.Parameters `yaml:"parameters"`
+	manifest     tools.Manifest
+	mcpManifest  tools.McpManifest
 }

 func (t Tool) Invoke(ctx context.Context, params tools.ParamValues, accessToken tools.AccessToken) (any, error) {
@@ -124,7 +122,7 @@ func (t Tool) Invoke(ctx context.Context, params tools.ParamValues, accessToken
 		return nil, fmt.Errorf("'model' must be a string, got %T", mapParams["model"])
 	}

-	resp, err := t.Client.LookmlModel(model, "explores(name,description,label,group_label,hidden)", t.ApiSettings)
+	resp, err := t.Client.LookmlModel(model, "explores(name,label,group_label)", t.ApiSettings)
 	if err != nil {
 		return nil, fmt.Errorf("error making get_explores request: %s", err)
 	}
@@ -132,9 +130,6 @@ func (t Tool) Invoke(ctx context.Context, params tools.ParamValues, accessToken
 	var data []any
 	for _, v := range *resp.Explores {
 		logger.DebugContext(ctx, "Got response element of %v\n", v)
-		if !t.ShowHiddenExplores && v.Hidden != nil && *v.Hidden {
-			continue
-		}
 		vMap := make(map[string]any)
 		if v.Name != nil {
 			vMap["name"] = *v.Name
--- a/internal/tools/looker/lookergetfilters/lookergetfilters.go
+++ b/internal/tools/looker/lookergetfilters/lookergetfilters.go
@@ -93,8 +93,7 @@ func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error)
 			Parameters:   parameters.Manifest(),
 			AuthRequired: cfg.AuthRequired,
 		},
-		mcpManifest:      mcpManifest,
-		ShowHiddenFields: s.ShowHiddenFields,
+		mcpManifest: mcpManifest,
 	}, nil
 }

@@ -102,15 +101,14 @@ func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error)
 var _ tools.Tool = Tool{}

 type Tool struct {
-	Name             string `yaml:"name"`
-	Kind             string `yaml:"kind"`
-	Client           *v4.LookerSDK
-	ApiSettings      *rtl.ApiSettings
-	AuthRequired     []string         `yaml:"authRequired"`
-	Parameters       tools.Parameters `yaml:"parameters"`
-	manifest         tools.Manifest
-	mcpManifest      tools.McpManifest
-	ShowHiddenFields bool
+	Name         string `yaml:"name"`
+	Kind         string `yaml:"kind"`
+	Client       *v4.LookerSDK
+	ApiSettings  *rtl.ApiSettings
+	AuthRequired []string         `yaml:"authRequired"`
+	Parameters   tools.Parameters `yaml:"parameters"`
+	manifest     tools.Manifest
+	mcpManifest  tools.McpManifest
 }

 func (t Tool) Invoke(ctx context.Context, params tools.ParamValues, accessToken tools.AccessToken) (any, error) {
@@ -138,7 +136,7 @@ func (t Tool) Invoke(ctx context.Context, params tools.ParamValues, accessToken
 		return nil, fmt.Errorf("error processing get_filters response: %w", err)
 	}

-	data, err := lookercommon.ExtractLookerFieldProperties(ctx, resp.Fields.Filters, t.ShowHiddenFields)
+	data, err := lookercommon.ExtractLookerFieldProperties(ctx, resp.Fields.Filters)
 	if err != nil {
 		return nil, fmt.Errorf("error extracting get_filters response: %w", err)
 	}
--- a/internal/tools/looker/lookergetmeasures/lookergetmeasures.go
+++ b/internal/tools/looker/lookergetmeasures/lookergetmeasures.go
@@ -93,8 +93,7 @@ func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error)
 			Parameters:   parameters.Manifest(),
 			AuthRequired: cfg.AuthRequired,
 		},
-		mcpManifest:      mcpManifest,
-		ShowHiddenFields: s.ShowHiddenFields,
+		mcpManifest: mcpManifest,
 	}, nil
 }

@@ -102,15 +101,14 @@ func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error)
 var _ tools.Tool = Tool{}

 type Tool struct {
-	Name             string `yaml:"name"`
-	Kind             string `yaml:"kind"`
-	Client           *v4.LookerSDK
-	ApiSettings      *rtl.ApiSettings
-	AuthRequired     []string         `yaml:"authRequired"`
-	Parameters       tools.Parameters `yaml:"parameters"`
-	manifest         tools.Manifest
-	mcpManifest      tools.McpManifest
-	ShowHiddenFields bool
+	Name         string `yaml:"name"`
+	Kind         string `yaml:"kind"`
+	Client       *v4.LookerSDK
+	ApiSettings  *rtl.ApiSettings
+	AuthRequired []string         `yaml:"authRequired"`
+	Parameters   tools.Parameters `yaml:"parameters"`
+	manifest     tools.Manifest
+	mcpManifest  tools.McpManifest
 }

 func (t Tool) Invoke(ctx context.Context, params tools.ParamValues, accessToken tools.AccessToken) (any, error) {
@@ -138,7 +136,7 @@ func (t Tool) Invoke(ctx context.Context, params tools.ParamValues, accessToken
 		return nil, fmt.Errorf("error processing get_measures response: %w", err)
 	}

-	data, err := lookercommon.ExtractLookerFieldProperties(ctx, resp.Fields.Measures, t.ShowHiddenFields)
+	data, err := lookercommon.ExtractLookerFieldProperties(ctx, resp.Fields.Measures)
 	if err != nil {
 		return nil, fmt.Errorf("error extracting get_measures response: %w", err)
 	}
--- a/internal/tools/looker/lookergetmodels/lookergetmodels.go
+++ b/internal/tools/looker/lookergetmodels/lookergetmodels.go
@@ -92,8 +92,7 @@ func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error)
 			Parameters:   parameters.Manifest(),
 			AuthRequired: cfg.AuthRequired,
 		},
-		mcpManifest:      mcpManifest,
-		ShowHiddenModels: s.ShowHiddenModels,
+		mcpManifest: mcpManifest,
 	}, nil
 }

@@ -101,15 +100,14 @@ func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error)
 var _ tools.Tool = Tool{}

 type Tool struct {
-	Name             string `yaml:"name"`
-	Kind             string `yaml:"kind"`
-	Client           *v4.LookerSDK
-	ApiSettings      *rtl.ApiSettings
-	AuthRequired     []string         `yaml:"authRequired"`
-	Parameters       tools.Parameters `yaml:"parameters"`
-	manifest         tools.Manifest
-	mcpManifest      tools.McpManifest
-	ShowHiddenModels bool
+	Name         string `yaml:"name"`
+	Kind         string `yaml:"kind"`
+	Client       *v4.LookerSDK
+	ApiSettings  *rtl.ApiSettings
+	AuthRequired []string         `yaml:"authRequired"`
+	Parameters   tools.Parameters `yaml:"parameters"`
+	manifest     tools.Manifest
+	mcpManifest  tools.McpManifest
 }

 func (t Tool) Invoke(ctx context.Context, params tools.ParamValues, accessToken tools.AccessToken) (any, error) {
@@ -119,7 +117,7 @@ func (t Tool) Invoke(ctx context.Context, params tools.ParamValues, accessToken
 	}

 	excludeEmpty := false
-	excludeHidden := !t.ShowHiddenModels
+	excludeHidden := false
 	includeInternal := true

 	req := v4.RequestAllLookmlModels{
--- a/internal/tools/looker/lookergetparameters/lookergetparameters.go
+++ b/internal/tools/looker/lookergetparameters/lookergetparameters.go
@@ -93,8 +93,7 @@ func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error)
 			Parameters:   parameters.Manifest(),
 			AuthRequired: cfg.AuthRequired,
 		},
-		mcpManifest:      mcpManifest,
-		ShowHiddenFields: s.ShowHiddenFields,
+		mcpManifest: mcpManifest,
 	}, nil
 }

@@ -102,15 +101,14 @@ func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error)
 var _ tools.Tool = Tool{}

 type Tool struct {
-	Name             string `yaml:"name"`
-	Kind             string `yaml:"kind"`
-	Client           *v4.LookerSDK
-	ApiSettings      *rtl.ApiSettings
-	AuthRequired     []string         `yaml:"authRequired"`
-	Parameters       tools.Parameters `yaml:"parameters"`
-	manifest         tools.Manifest
-	mcpManifest      tools.McpManifest
-	ShowHiddenFields bool
+	Name         string `yaml:"name"`
+	Kind         string `yaml:"kind"`
+	Client       *v4.LookerSDK
+	ApiSettings  *rtl.ApiSettings
+	AuthRequired []string         `yaml:"authRequired"`
+	Parameters   tools.Parameters `yaml:"parameters"`
+	manifest     tools.Manifest
+	mcpManifest  tools.McpManifest
 }

 func (t Tool) Invoke(ctx context.Context, params tools.ParamValues, accessToken tools.AccessToken) (any, error) {
@@ -138,7 +136,7 @@ func (t Tool) Invoke(ctx context.Context, params tools.ParamValues, accessToken
 		return nil, fmt.Errorf("error processing get_parameters response: %w", err)
 	}

-	data, err := lookercommon.ExtractLookerFieldProperties(ctx, resp.Fields.Parameters, t.ShowHiddenFields)
+	data, err := lookercommon.ExtractLookerFieldProperties(ctx, resp.Fields.Parameters)
 	if err != nil {
 		return nil, fmt.Errorf("error extracting get_parameters response: %w", err)
 	}
--- a/internal/tools/mysql/mysqlcommon/mysqlcommon.go
+++ b/internal/tools/mysql/mysqlcommon/mysqlcommon.go
@@ -1,43 +0,0 @@
-// Copyright 2025 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package mysqlcommon
-
-import (
-	"database/sql"
-	"encoding/json"
-	"reflect"
-)
-
-// ConvertToType handles casting mysql returns to the right type
-// types for mysql driver: https://github.com/go-sql-driver/mysql/blob/v1.9.3/fields.go
-// all numeric type or unknown type will be return as is.
-func ConvertToType(t *sql.ColumnType, v any) (any, error) {
-	switch t.ScanType() {
-	case reflect.TypeOf(""), reflect.TypeOf([]byte{}), reflect.TypeOf(sql.NullString{}):
-		// unmarshal JSON data before returning to prevent double marshaling
-		if t.DatabaseTypeName() == "JSON" {
-			// unmarshal JSON data before storing to prevent double marshaling
-			var unmarshaledData any
-			err := json.Unmarshal(v.([]byte), &unmarshaledData)
-			if err != nil {
-				return nil, err
-			}
-			return unmarshaledData, nil
-		}
-		return string(v.([]byte)), nil
-	default:
-		return v, nil
-	}
-}
--- a/internal/tools/mysql/mysqlexecutesql/mysqlexecutesql.go
+++ b/internal/tools/mysql/mysqlexecutesql/mysqlexecutesql.go
@@ -24,7 +24,6 @@ import (
 	"github.com/googleapis/genai-toolbox/internal/sources/cloudsqlmysql"
 	"github.com/googleapis/genai-toolbox/internal/sources/mysql"
 	"github.com/googleapis/genai-toolbox/internal/tools"
-	"github.com/googleapis/genai-toolbox/internal/tools/mysql/mysqlcommon"
 	"github.com/googleapis/genai-toolbox/internal/util"
 )

@@ -169,9 +168,13 @@ func (t Tool) Invoke(ctx context.Context, params tools.ParamValues, accessToken
 				continue
 			}

-			vMap[name], err = mysqlcommon.ConvertToType(colTypes[i], val)
-			if err != nil {
-				return nil, fmt.Errorf("errors encountered when converting values: %w", err)
+			// mysql driver return []uint8 type for "TEXT", "VARCHAR", and "NVARCHAR"
+			// we'll need to cast it back to string
+			switch colTypes[i].DatabaseTypeName() {
+			case "TEXT", "VARCHAR", "NVARCHAR":
+				vMap[name] = string(val.([]byte))
+			default:
+				vMap[name] = val
 			}
 		}
 		out = append(out, vMap)
--- a/internal/tools/mysql/mysqlsql/mysqlsql.go
+++ b/internal/tools/mysql/mysqlsql/mysqlsql.go
@@ -17,6 +17,7 @@ package mysqlsql
 import (
 	"context"
 	"database/sql"
+	"encoding/json"
 	"fmt"

 	yaml "github.com/goccy/go-yaml"
@@ -24,7 +25,6 @@ import (
 	"github.com/googleapis/genai-toolbox/internal/sources/cloudsqlmysql"
 	"github.com/googleapis/genai-toolbox/internal/sources/mysql"
 	"github.com/googleapis/genai-toolbox/internal/tools"
-	"github.com/googleapis/genai-toolbox/internal/tools/mysql/mysqlcommon"
 )

 const kind string = "mysql-sql"
@@ -178,9 +178,21 @@ func (t Tool) Invoke(ctx context.Context, params tools.ParamValues, accessToken
 				continue
 			}

-			vMap[name], err = mysqlcommon.ConvertToType(colTypes[i], val)
-			if err != nil {
-				return nil, fmt.Errorf("errors encountered when converting values: %w", err)
+			// mysql driver return []uint8 type for "TEXT", "VARCHAR", and "NVARCHAR"
+			// we'll need to cast it back to string
+			switch colTypes[i].DatabaseTypeName() {
+			case "JSON":
+				// unmarshal JSON data before storing to prevent double marshaling
+				var unmarshaledData any
+				err := json.Unmarshal(val.([]byte), &unmarshaledData)
+				if err != nil {
+					return nil, fmt.Errorf("unable to unmarshal json data %s", val)
+				}
+				vMap[name] = unmarshaledData
+			case "TEXT", "VARCHAR", "NVARCHAR":
+				vMap[name] = string(val.([]byte))
+			default:
+				vMap[name] = val
 			}
 		}
 		out = append(out, vMap)
--- a/internal/tools/parameters.go
+++ b/internal/tools/parameters.go
@@ -107,7 +107,7 @@ func parseFromAuthService(paramAuthServices []ParamAuthService, claimsMap map[st
 		}
 		return v, nil
 	}
-	return nil, fmt.Errorf("missing or invalid authentication header: %w", ErrUnauthorized)
+	return nil, fmt.Errorf("missing or invalid authentication header")
 }

 // CheckParamRequired checks if a parameter is required based on the required and default field.
--- a/internal/tools/tools.go
+++ b/internal/tools/tools.go
@@ -16,7 +16,6 @@ package tools

 import (
 	"context"
-	"errors"
 	"fmt"
 	"slices"

@@ -92,8 +91,6 @@ type McpManifest struct {
 	InputSchema McpToolsSchema `json:"inputSchema,omitempty"`
 }

-var ErrUnauthorized = errors.New("unauthorized")
-
 // Helper function that returns if a tool invocation request is authorized
 func IsAuthorized(authRequiredSources []string, verifiedAuthServices []string) bool {
 	if len(authRequiredSources) == 0 {
--- a/samples/multiagent/README.md
+++ b/samples/multiagent/README.md
@@ -0,0 +1,141 @@
+# Multi-Agent Cymbal Travel Agency
+
+> [!NOTE]
+> This demo is NOT actively maintained.
+
+## Introduction
+
+This demo showcases a simplified travel agency called Cymbal Travel Agency. Check out our medium posting for more information.
+
+Cymbal Travel Agency demonstrates how three agents can collaborate to research and book flights and hotels:
+
+* **Customer Service Agent:** This agent is the primary interface for the customer. It receives travel requests, clarifies details, and relays informations to other agents.
+* **Flight Agent:** This is a specialized agent that helps queries flight databases, list users' flight tickets and handles flight booking details.
+* **Hotel Agent:** This is a specialized agent that helps searches for hotel accommodations, list users' hotel bookings, and manages hotel reservations.
+
+![cymbal travel agency architecture](./architecture.png)
+
+## Quickstart Demo
+
+### Set up database
+
+For this demo, I used an existing dataset from the [GenAI Databases Retrieval App v0.4.0](https://github.com/GoogleCloudPlatform/genai-databases-retrieval-app/tree/v0.4.0/data). For simpler set up, please follow the [README](https://github.com/GoogleCloudPlatform/genai-databases-retrieval-app/blob/v0.4.0/README.md) instructions and sets up via [run_database_init.py](https://github.com/GoogleCloudPlatform/genai-databases-retrieval-app/blob/v0.4.0/retrieval_service/run_database_init.py).
+
+After parsing the dataset to your database, please ensure that your database consist of the following tables:
+
+* airports
+* amenities
+* flights
+* policies
+* tickets
+
+Next, we will generate some data for hotels:
+
+<details>
+<summary>SQL to create and insert hotels-related tables</summary>
+
+```
+CREATE TABLE hotels (
+  name VARCHAR(255) NOT NULL,
+  rating NUMERIC(2,1) NOT NULL,
+  price INTEGER,
+  city VARCHAR(255) NOT NULL
+);
+
+INSERT INTO hotels (name, rating, price, city) VALUES
+    ('Rocky Mountain Retreat', 4, 285, 'Estes Park'),
+    ('The Mile High Inn', 3, 210, 'Denver'),
+    ('Aspen Creek Lodge', 5, 495, 'Aspen'),
+    ('Breckenridge Vista', 4, 320, 'Breckenridge'),
+    ('Garden of the Gods Resort', 5, 450, 'Colorado Springs'),
+    ('Boulder Creek Hotel', 4, 250, 'Boulder'),
+    ('The Vail Chalet', 5, 580, 'Vail'),
+    ('Durango Junction Inn', 3, 185, 'Durango'),
+    ('Union Station Hotel', 4, 350, 'Denver'),
+    ('Telluride Mountain Suites', 5, 510, 'Telluride'),
+    ('The Winter Park Lodge', 4, 290, 'Winter Park'),
+    ('Steamboat Hot Springs', 3, 205, 'Steamboat Springs'),
+    ('The Maroon Bells Inn', 4, 380, 'Aspen'),
+    ('Crested Butte Getaway', 3, 240, 'Crested Butte'),
+    ('The Denver Skyline', 4, 305, 'Denver'),
+    ('Pikes Peak Inn', 3, 195, 'Colorado Springs'),
+    ('Silverthorne Peaks Hotel', 4, 270, 'Silverthorne'),
+    ('The Palisade Retreat', 5, 410, 'Palisade'),
+    ('Grand Lake Lodge', 3, 230, 'Grand Lake'),
+    ('Snowmass Village Resort', 5, 530, 'Snowmass Village'),
+    ('The Copper Mountain Inn', 4, 315, 'Copper Mountain'),
+    ('Keystone Lakeside Lodge', 3, 225, 'Keystone'),
+    ('Arapahoe Basin Chalet', 4, 280, 'Dillon'),
+    ('The Monarch Pass Lodge', 3, 190, 'Monarch'),
+    ('Purgatory Pines Hotel', 4, 265, 'Durango'),
+    ('The Aspen Peak Suites', 5, 520, 'Aspen'),
+    ('Vail Village Hotel', 5, 610, 'Vail'),
+    ('Steamboat River Inn', 4, 300, 'Steamboat Springs'),
+    ('Telluride Grand Resort', 5, 550, 'Telluride'),
+    ('Crested Butte Mountain Lodge', 4, 275, 'Crested Butte'),
+    ('The Central Park Grand', 5, 650, 'Manhattan'),
+    ('Brooklyn Bridge View', 4, 310, 'Brooklyn'),
+    ('The Greenwich Village Inn', 3, 205, 'Manhattan'),
+    ('Times Square Lights', 4, 380, 'Manhattan'),
+    ('The Chelsea Art House', 4, 290, 'Manhattan'),
+    ('Hotel Wall Street', 3, 230, 'Manhattan'),
+    ('Queensboro River Hotel', 3, 185, 'Queens'),
+    ('The NoMad Boutique', 5, 520, 'Manhattan'),
+    ('The Harlem Jazz', 4, 240, 'Manhattan'),
+    ('Staten Island Ferry Hotel', 3, 160, 'Staten Island'),
+    ('The Upper East Side Manor', 5, 710, 'Manhattan'),
+    ('The Broadway Performer', 4, 350, 'Manhattan'),
+    ('The Plaza Tower', 5, 800, 'Manhattan'),
+    ('Long Island City Loft', 3, 195, 'Queens'),
+    ('The Battery Park Stay', 4, 270, 'Manhattan'),
+    ('The SoHo Gallery', 5, 480, 'Manhattan'),
+    ('The Bronx Botanical', 3, 170, 'The Bronx'),
+    ('The Hudson Yards View', 4, 305, 'Manhattan'),
+    ('The West Village Hideaway', 4, 330, 'Manhattan'),
+    ('The Midtown Oasis', 5, 620, 'Manhattan');
+
+
+CREATE TABLE
+  "bookings" ( "user_id" TEXT,
+    "user_name" TEXT,
+    "user_email" TEXT,
+    "hotel_name" TEXT,
+    "hotel_city" TEXT,
+    "hotel_rating" FLOAT,
+    "hotel_total_price" FLOAT,
+    "check_in_date" TEXT,
+    "number_of_nights" INTEGER );
+```
+
+</details>
+
+### Set up Toolbox
+
+This demo utilizes [MCP Toolbox for Databases][https://github.com/googleapis/genai-toolbox]. Please follow the installation guidelines and install Toolbox locally.
+
+Update the `tools.yaml` file with your database source information. For the simplicity of this demo, we did not utilize any Auth Services, hence, user-informations are all parsed automatically in `tools` with a `default` field.
+
+Run Toolbox:
+
+```
+./toolbox
+```
+
+### Set up Cymbal Travel Agency application
+
+1. [Install python][install-python] and set up a python [virtual environment][venv].
+
+1. Install requirements:
+
+    ```bash
+    pip install -r requirements.txt
+    ```
+
+1. Run the application:
+
+    ```bash
+    python app.py
+    ```
+
+[install-python]: https://cloud.google.com/python/docs/setup#installing_python
+[venv]: https://cloud.google.com/python/docs/setup#installing_and_using_virtualenv
--- a/samples/multiagent/app.py
+++ b/samples/multiagent/app.py
@@ -0,0 +1,129 @@
+import uuid
+import os
+import asyncio
+
+from toolbox_core import auth_methods
+from toolbox_llamaindex import ToolboxClient
+
+from llama_index.core.workflow import Context
+from llama_index.core.agent.workflow import AgentWorkflow, FunctionAgent
+from llama_index.llms.google_genai import GoogleGenAI
+
+TOOLBOX_URL = "http://127.0.0.1:5000"
+
+CS_PROMPT = """
+You are a friendly and professional customer service agent for Cymbal Travel Agency, a travel booking service.
+
+Your primary responsibilities are to:
+1.  **Welcome users** and greet them warmly.
+2.  **Answer general knowledge questions** related to travel (e.g. questions about airports or specific airport such as SFO). If you are unsure of a specific information or do not have tool to access it, you should let the user know.
+3.  **Manage conversational flow** and ask clarifying questions to understand the user's intent.
+
+**Specialized Agent:**
+- **flight agent**: If a user asks a question specifically about **searching, listing and booking a flight**.
+- **hotel agent**: If a user asks a question specifically about **searching, listing and booking a hotel**.
+
+**You can call the specialized agents** to help you with certain tasks. You can do this however many times you want until you have all the informations needed.
+
+**If you already have the informamtion you need, feel free to response directly to the user instead of calling another agent. If you're unsure, please check with the other agents.**
+"""
+
+HOTEL_PROMPT = """
+You are the dedicated hotel specialist. Your expertise is dedicated exclusively to hotel and accommodation services. The customer service agent will reach out to you regarding to question around your specialties.
+
+Your primary responsibilities are to:
+1.  **Search for hotels** based on specific criteria (hotel name, city, rating, price range).
+2.  **Book or reserve hotel rooms**.
+3.  **List bookings** that are under a specific name.
+
+You **must** focus solely on hotel and accommodation-related tasks. Do not answer questions about flights, rental cars, activities, or general travel knowledge.
+
+**Your communication style should be helpful and detailed, providing rich information to help the customer service agent choose the best accommodation.**
+"""
+
+FLIGHT_PROMPT = """
+You are the dedicated flight specialist. Your expertise is dedicated exclusively to flights. The customer service agent will reach out to you regarding to questions around your specialties.
+
+Your primary responsibilities are to:
+1.  **Search for flights** based on user criteria (origin, destination, dates).
+2.  **Book or reserve flight tickets** on behalf of the user.
+3.  **Provide detailed information about flights** (e.g., flight numbers, departure/arrival times, layovers, airline, and fare rules).
+4.  **List flight tickets** that are under user's name.
+5.  **Answer questions on Cymbal Air Flight's policy**.
+
+You **must** focus solely on flight-related tasks. Do not answer questions about hotels, rental cars, activities, or general travel knowledge.
+
+**Your communication style should be efficient and informative, directly addressing the customer service agent's flight-related questions.**
+"""
+
+async def run_app():
+    # load model
+    llm = GoogleGenAI(
+        model="gemini-2.5-flash",
+        vertexai_config={"project": "project-id", "location": "us-central1"},
+    )
+
+    # Alternatively, you can also load the gemini model using google api key
+    # llm = GoogleGenAI(
+    #     model="gemini-2.5-flash",
+    #     api_key=os.getenv("GOOGLE_API_KEY"),
+    # )
+
+    # load tools from Toolbox
+    general_tools, hotel_tools, flight_tools = await get_tools()
+
+    # build agents
+    customer_service_agent = FunctionAgent(
+        name="CustomerServiceAgent",
+        description="Answer user's queries and route to the right agents for flight and hotel related queries",
+        system_prompt=CS_PROMPT,
+        llm=llm,
+        tools=general_tools,
+    )
+
+    hotel_agent = FunctionAgent(
+        name="HotelAgent",
+        description="Handles hotel and accommodation services, including searching, booking and list bookings of hotels",
+        system_prompt=HOTEL_PROMPT,
+        llm=llm,
+        tools=hotel_tools,
+    )
+
+    flight_agent = FunctionAgent(
+        name="FlightAgent",
+        description="Handles flights-related services, including searching, booking and list tickets of flights",
+        system_prompt=FLIGHT_PROMPT,
+        llm=llm,
+        tools=flight_tools,
+    )
+
+    # set up agent workflow
+    agent_workflow = AgentWorkflow(
+        agents = [customer_service_agent, hotel_agent, flight_agent],
+        root_agent=customer_service_agent.name,
+        initial_state={},
+    )
+
+    # use Context to maintain state between runs
+    ctx = Context(agent_workflow)
+
+    # start application
+    print("\nCymbal Travel Agency: What question do you have?")
+    while True:
+        user_input = input("\nUser: ")
+        resp = await agent_workflow.run(user_msg=user_input, ctx=ctx)
+        print("\nCymbal Travel Agency:", resp)
+    
+async def get_tools():
+    """
+    This function grab tools from Toolbox.
+    """
+    auth_token_provider = auth_methods.aget_google_id_token(TOOLBOX_URL)
+    client = ToolboxClient(TOOLBOX_URL, client_headers={"Authorization": auth_token_provider})
+    general_tools = await client.aload_toolset("general_tools")
+    hotel_tools = await client.aload_toolset("hotel_tools")
+    flight_tools = await client.aload_toolset("flight_tools")
+    return (general_tools, hotel_tools, flight_tools)
+    
+if __name__ == "__main__":
+    asyncio.run(run_app())
--- a/samples/multiagent/architecture.png
+++ b/samples/multiagent/architecture.png
--- a/samples/multiagent/requirements.txt
+++ b/samples/multiagent/requirements.txt
@@ -0,0 +1,92 @@
+aiohappyeyeballs==2.6.1
+aiohttp==3.12.15
+aiosignal==1.4.0
+aiosqlite==0.21.0
+annotated-types==0.7.0
+anyio==4.10.0
+attrs==25.3.0
+banks==2.2.0
+beautifulsoup4==4.13.5
+cachetools==5.5.2
+certifi==2025.8.3
+charset-normalizer==3.4.3
+click==8.2.1
+colorama==0.4.6
+dataclasses-json==0.6.7
+defusedxml==0.7.1
+Deprecated==1.2.18
+dirtyjson==1.0.8
+distro==1.9.0
+filetype==1.2.0
+frozenlist==1.7.0
+fsspec==2025.7.0
+google-auth==2.40.3
+google-genai==1.31.0
+greenlet==3.2.4
+griffe==1.12.1
+h11==0.16.0
+httpcore==1.0.9
+httpx==0.28.1
+idna==3.10
+Jinja2==3.1.6
+jiter==0.10.0
+joblib==1.5.1
+llama-cloud==0.1.35
+llama-cloud-services==0.6.54
+llama-index==0.13.3
+llama-index-cli==0.5.0
+llama-index-core==0.13.3
+llama-index-embeddings-openai==0.5.0
+llama-index-indices-managed-llama-cloud==0.9.2
+llama-index-instrumentation==0.4.0
+llama-index-llms-google-genai==0.3.0
+llama-index-llms-openai==0.5.4
+llama-index-readers-file==0.5.2
+llama-index-readers-llama-parse==0.5.0
+llama-index-workflows==1.3.0
+llama-parse==0.6.54
+MarkupSafe==3.0.2
+marshmallow==3.26.1
+multidict==6.6.4
+mypy_extensions==1.1.0
+nest-asyncio==1.6.0
+networkx==3.5
+nltk==3.9.1
+numpy==2.3.2
+openai==1.101.0
+packaging==25.0
+pandas==2.2.3
+pillow==11.3.0
+platformdirs==4.3.8
+propcache==0.3.2
+pyasn1==0.6.1
+pyasn1_modules==0.4.2
+pydantic==2.11.7
+pydantic_core==2.33.2
+pypdf==6.0.0
+python-dateutil==2.9.0.post0
+python-dotenv==1.1.1
+pytz==2025.2
+PyYAML==6.0.2
+regex==2025.7.34
+requests==2.32.5
+rsa==4.9.1
+setuptools==80.9.0
+six==1.17.0
+sniffio==1.3.1
+soupsieve==2.7
+SQLAlchemy==2.0.43
+striprtf==0.0.26
+tenacity==9.1.2
+tiktoken==0.11.0
+toolbox-core==0.5.0
+toolbox-llamaindex==0.5.0
+tqdm==4.67.1
+typing-inspect==0.9.0
+typing-inspection==0.4.1
+typing_extensions==4.15.0
+tzdata==2025.2
+urllib3==2.5.0
+websockets==15.0.1
+wrapt==1.17.3
+yarl==1.20.1
--- a/samples/multiagent/tools.yaml
+++ b/samples/multiagent/tools.yaml
@@ -0,0 +1,307 @@
+sources:
+  my-source:
+    kind: alloydb-postgres
+    project: my-project
+    region: my-region
+    cluster: my-cluster
+    instance: my-instance
+    database: my-db
+    user: my-user
+    password: my-pass 
+
+tools:
+  search_airports:
+    kind: postgres-sql
+    source: my-source
+    description: |
+      Use this tool to list all airports matching search criteria.
+      Takes at least one of country, city, name, or all and returns all matching airports.
+      The agent can decide to return the results directly to the user.
+    parameters:
+      - name: country
+        type: string
+        description: Country
+        default: ""
+      - name: city
+        type: string
+        description: City
+        default: ""
+      - name: name
+        type: string
+        description: Airport name
+        default: ""
+    statement: |
+      SELECT * FROM airports
+      WHERE (CAST($1 AS TEXT) = '' OR country ILIKE $1)
+      AND (CAST($2 AS TEXT) = '' OR city ILIKE $2)
+      AND (CAST($3 AS TEXT) = '' OR name ILIKE '%' || $3 || '%')
+      LIMIT 10
+  list_flights:
+    kind: postgres-sql
+    source: my-source
+    description: |
+      Use this tool to list flights information matching search criteria.
+      Takes an arrival airport, a departure airport, or both, filters by date and returns all matching flights.
+      If 3-letter iata code is not provided for departure_airport or arrival_airport, use `search_airports` tool to get iata code information.
+      Do NOT guess a date, ask user for date input if it is not given. Date must be in the following format: YYYY-MM-DD.
+      The agent can decide to return the results directly to the user.
+    parameters:
+      - name: departure_airport
+        type: string
+        description: Departure airport 3-letter code
+        default: ""
+      - name: arrival_airport
+        type: string
+        description: Arrival airport 3-letter code
+        default: ""
+      - name: date
+        type: string
+        description: Date of flight departure
+    statement: |
+      SELECT * FROM flights
+      WHERE (CAST($1 AS TEXT) = '' OR departure_airport ILIKE $1)
+      AND (CAST($2 AS TEXT) = '' OR arrival_airport ILIKE $2)
+      AND departure_time >= CAST($3 AS timestamp)
+      AND departure_time < CAST($3 AS timestamp) + interval '1 day'
+      LIMIT 10
+  search_flights_by_number:
+    kind: postgres-sql
+    source: my-source
+    description: |
+      Use this tool to get information for a specific flight.
+      Takes an airline code and flight number and returns info on the flight.
+      Do NOT use this tool with a flight id. Do NOT guess an airline code or flight number.
+      A airline code is a code for an airline service consisting of two-character
+      airline designator and followed by flight number, which is 1 to 4 digit number.
+      For example, if given CY 0123, the airline is "CY", and flight_number is "123".
+      Another example for this is DL 1234, the airline is "DL", and flight_number is "1234".
+      If the tool returns more than one option choose the date closest to the current date.
+    parameters:
+      - name: airline
+        type: string
+        description: Airline unique 2 letter identifier
+      - name: flight_number
+        type: string
+        description: 1 to 4 digit number
+    statement: |
+      SELECT * FROM flights
+      WHERE airline = $1
+      AND flight_number = $2
+      LIMIT 10
+  search_amenities:
+    kind: postgres-sql
+    source: my-source
+    description: |
+      Use this tool to search amenities by name or to recommended airport amenities at SFO.
+      If user provides flight info, use 'search_flights_by_number' tool
+      first to get gate info and location.
+      Only recommend amenities that are returned by this query.
+      Find amenities close to the user by matching the terminal and then comparing
+      the gate numbers. Gate number iterate by letter and number, example A1 A2 A3
+      B1 B2 B3 C1 C2 C3. Gate A3 is close to A2 and B1.
+    parameters:
+      - name: query
+        type: string
+        description: Search query
+    statement: |
+      SELECT name, description, location, terminal, category, hour
+      FROM amenities
+      WHERE (embedding <=> embedding('gemini-embedding-001', $1)::vector) < 0.5
+      ORDER BY (embedding <=> embedding('gemini-embedding-001', $1)::vector)
+      LIMIT 5
+  search_policies:
+    kind: postgres-sql
+    source: my-source
+    description: |
+      Use this tool to search for cymbal air passenger policy.
+      Policy that are listed is unchangeable.
+      You will not answer any questions outside of the policy given.
+      Policy includes information on ticket purchase and changes, baggage, check-in and boarding, special assistance, overbooking, flight delays and cancellations.
+    parameters:
+      - name: query
+        type: string
+        description: Search query
+    statement: |
+      SELECT content
+      FROM policies
+      WHERE (embedding <=> embedding('gemini-embedding-001', $1)::vector) < 0.5
+      ORDER BY (embedding <=> embedding('gemini-embedding-001', $1)::vector)
+      LIMIT 5
+  insert_ticket:
+    kind: postgres-sql
+    source: my-source
+    description: |
+      Use this tool to book a flight ticket for the user. Use the default value for user_id, user_name, and user_email.
+    parameters:
+      - name: user_id
+        type: string
+        description: User ID of the logged in user.
+        default: "8888"
+      - name: user_name
+        type: string
+        description: Name of the logged in user.
+        default: "test user"
+      - name: user_email
+        type: string
+        description: Email ID of the logged in user.
+        default: "test_user@example.com"
+      - name: airline
+        type: string
+        description: Airline unique 2 letter identifier
+      - name: flight_number
+        type: string
+        description: 1 to 4 digit number
+      - name: departure_airport
+        type: string
+        description: Departure airport 3-letter code
+      - name: departure_time
+        type: string
+        description: Flight departure datetime
+      - name: arrival_airport
+        type: string
+        description: Arrival airport 3-letter code
+      - name: arrival_time
+        type: string
+        description: Flight arrival datetime
+    statement: |
+      INSERT INTO tickets (
+        user_id,
+        user_name,
+        user_email,
+        airline,
+        flight_number,
+        departure_airport,
+        departure_time,
+        arrival_airport,
+        arrival_time
+      ) VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9);
+  list_tickets:
+    kind: postgres-sql
+    source: my-source
+    description: |
+      Use this tool to list a user's flight tickets. Use the default value for user_id.
+    parameters:
+      - name: user_id
+        type: string
+        description: User ID of the logged in user.
+        default: "8888"
+    statement: |
+      SELECT user_name, airline, flight_number, departure_airport, arrival_airport, departure_time, arrival_time FROM tickets
+      WHERE user_id = $1
+
+  list_hotels:
+    kind: postgres-sql
+    source: my-source
+    description: |
+      Use this tool to list all hotels matching search criteria.
+      Takes at least one of name, minimum rating, maximum rating, minimum price, maximum price, or city and returns all matching hotels.
+      The agent can decide to return the results directly to the user.
+    parameters:
+      - name: name
+        type: string
+        description: name of the hotel
+        default: ""
+      - name: minimum_rating
+        type: float 
+        description: minimum rating of the hotel.
+        default: 0
+      - name: maximum_rating
+        type: float 
+        description: maximum rating of the hotel.
+        default: 5
+      - name: minimum_price
+        type: float 
+        description: minimum price of the hotel.
+        default: 0
+      - name: maximum_price
+        type: float 
+        description: maximum price of the hotel.
+        default: 1000
+      - name: city
+        type: string
+        description: city of the hotel.
+        default: ""
+    statement: |
+      SELECT * FROM hotels
+      WHERE (CAST($1 AS TEXT) = '' OR name ILIKE '%' || $1)
+      AND rating >= $2 OR rating <= $3
+      AND price >= $4 OR price <= $5
+      AND (CAST($6 AS TEXT) = '' OR city ILIKE '%' || $6 || '%')
+      LIMIT 10;
+
+  book_hotel:
+    kind: postgres-sql
+    source: my-source
+    description: |
+        Use this tool to book a hotel for the user. Use the default value for user_id, user_name, and user_email.
+    parameters:
+      - name: user_id
+        type: string
+        description: User ID of the logged in user.
+        default: "8888"
+      - name: user_name
+        type: string
+        description: Name of the logged in user.
+        default: "test user"
+      - name: user_email
+        type: string
+        description: Email ID of the logged in user.
+        default: "test_user@example.com"
+      - name: hotel_name
+        type: string
+        description: name of the hotel.
+      - name: hotel_city
+        type: string
+        description: city of the hotel.
+      - name: hotel_rating
+        type: float 
+        description: rating of the hotel.
+      - name: hotel_total_price
+        type: float 
+        description: price of the hotel booking. If user book for two nights, the price will be hotel price * 2.
+      - name: check_in_date
+        type: string
+        description: hotel check in date of the user.
+      - name: nights
+        type: integer
+        description: number of nights that user is staying.
+    statement: |
+      INSERT INTO bookings (
+        user_id,
+        user_name,
+        user_email,
+        hotel_name,
+        hotel_city,
+        hotel_rating,
+        hotel_total_price,
+        check_in_date,
+        number_of_nights
+      ) VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9);
+
+  list_bookings:
+    kind: postgres-sql
+    source: my-source
+    description: Use this tool to list a user's hotel bookings. Use the default value for user_id.
+    parameters:
+      - name: user_id
+        type: string
+        description: user id of the logged in user.
+        default: "8888"
+    statement: |
+      SELECT user_name, hotel_name, hotel_city, hotel_rating, hotel_total_price, check_in_date, number_of_nights FROM bookings
+        WHERE user_id = $1;
+
+toolsets:
+  general_tools:
+    - search_airports
+    - search_amenities
+  hotel_tools:
+    - list_hotels
+    - book_hotel
+    - list_bookings
+  flight_tools:
+    - list_flights
+    - search_policies
+    - search_flights_by_number
+    - insert_ticket
+    - list_tickets
--- a/tests/alloydbpg/alloydb_pg_integration_test.go
+++ b/tests/alloydbpg/alloydb_pg_integration_test.go
@@ -165,12 +165,12 @@ func TestAlloyDBPgToolEndpoints(t *testing.T) {
 	}

 	// Get configs for tests
-	select1Want, failInvocationWant, createTableStatement, mcpSelect1Want := tests.GetPostgresWants()
+	select1Want, failInvocationWant, createTableStatement := tests.GetPostgresWants()

 	// Run tests
 	tests.RunToolGetTest(t)
 	tests.RunToolInvokeTest(t, select1Want)
-	tests.RunMCPToolCallMethod(t, failInvocationWant, mcpSelect1Want)
+	tests.RunMCPToolCallMethod(t, failInvocationWant)
 	tests.RunExecuteSqlToolInvokeTest(t, createTableStatement, select1Want)
 	tests.RunToolInvokeWithTemplateParameters(t, tableNameTemplateParam)
 }
--- a/tests/bigquery/bigquery_integration_test.go
+++ b/tests/bigquery/bigquery_integration_test.go
@@ -158,17 +158,15 @@ func TestBigQueryToolEndpoints(t *testing.T) {
 	datasetInfoWant := "\"Location\":\"US\",\"DefaultTableExpiration\":0,\"Labels\":null,\"Access\":"
 	tableInfoWant := "{\"Name\":\"\",\"Location\":\"US\",\"Description\":\"\",\"Schema\":[{\"Name\":\"id\""
 	ddlWant := `"Query executed successfully and returned no content."`
-	dataInsightsWant := `(?s)Schema Resolved.*Retrieval Query.*SQL Generated.*Answer`
 	// Partial message; the full error message is too long.
 	mcpMyFailToolWant := `{"jsonrpc":"2.0","id":"invoke-fail-tool","result":{"content":[{"type":"text","text":"final query validation failed: failed to insert dry run job: googleapi: Error 400: Syntax error: Unexpected identifier \"SELEC\" at [1:1]`
-	mcpSelect1Want := `{"jsonrpc":"2.0","id":"invoke my-auth-required-tool","result":{"content":[{"type":"text","text":"{\"f0_\":1}"}]}}`
 	createColArray := `["id INT64", "name STRING", "age INT64"]`
 	selectEmptyWant := `"The query returned 0 rows."`

 	// Run tests
 	tests.RunToolGetTest(t)
-	tests.RunToolInvokeTest(t, select1Want, tests.DisableOptionalNullParamTest(), tests.EnableClientAuthTest())
-	tests.RunMCPToolCallMethod(t, mcpMyFailToolWant, mcpSelect1Want, tests.EnableMcpClientAuthTest())
+	tests.RunToolInvokeTest(t, select1Want, tests.DisableOptionalNullParamTest())
+	tests.RunMCPToolCallMethod(t, mcpMyFailToolWant)
 	tests.RunToolInvokeWithTemplateParameters(t, tableNameTemplateParam,
 		tests.WithCreateColArray(createColArray),
 		tests.WithDdlWant(ddlWant),
@@ -184,7 +182,6 @@ func TestBigQueryToolEndpoints(t *testing.T) {
 	runBigQueryGetDatasetInfoToolInvokeTest(t, datasetName, datasetInfoWant)
 	runBigQueryListTableIdsToolInvokeTest(t, datasetName, tableName)
 	runBigQueryGetTableInfoToolInvokeTest(t, datasetName, tableName, tableInfoWant)
-	runBigQueryConversationalAnalyticsInvokeTest(t, datasetName, tableName, dataInsightsWant)
 }

 // getBigQueryParamToolInfo returns statements and param for my-tool for bigquery kind
@@ -423,19 +420,6 @@ func addBigQueryPrebuiltToolsConfig(t *testing.T, config map[string]any) map[str
 			"my-google-auth",
 		},
 	}
-	tools["my-conversational-analytics-tool"] = map[string]any{
-		"kind":        "bigquery-conversational-analytics",
-		"source":      "my-instance",
-		"description": "Tool to ask BigQuery conversational analytics",
-	}
-	tools["my-auth-conversational-analytics-tool"] = map[string]any{
-		"kind":        "bigquery-conversational-analytics",
-		"source":      "my-instance",
-		"description": "Tool to ask BigQuery conversational analytics",
-		"authRequired": []string{
-			"my-google-auth",
-		},
-	}
 	config["tools"] = tools
 	return config
 }
@@ -469,13 +453,7 @@ func addBigQuerySqlToolConfig(t *testing.T, config map[string]any, toolStatement
 			map[string]any{"name": "bool_array", "type": "array", "description": "an array of boolean values", "items": map[string]any{"name": "item", "type": "boolean", "description": "desc"}},
 		},
 	}
-	tools["my-client-auth-tool"] = map[string]any{
-		"kind":           "bigquery-sql",
-		"source":         "my-instance",
-		"description":    "Tool to test client authorization.",
-		"useClientOAuth": true,
-		"statement":      "SELECT 1",
-	}
+
 	config["tools"] = tools
 	return config
 }
@@ -1371,94 +1349,3 @@ func runBigQueryGetTableInfoToolInvokeTest(t *testing.T, datasetName, tableName,
 		})
 	}
 }
-
-func runBigQueryConversationalAnalyticsInvokeTest(t *testing.T, datasetName, tableName, dataInsightsWant string) {
-	// Get ID token
-	idToken, err := tests.GetGoogleIdToken(tests.ClientId)
-	if err != nil {
-		t.Fatalf("error getting Google ID token: %s", err)
-	}
-
-	tableRefsJSON := fmt.Sprintf(`[{"projectId":"%s","datasetId":"%s","tableId":"%s"}]`, BigqueryProject, datasetName, tableName)
-
-	invokeTcs := []struct {
-		name          string
-		api           string
-		requestHeader map[string]string
-		requestBody   io.Reader
-		want          string
-		isErr         bool
-	}{
-		{
-			name:          "invoke my-conversational-analytics-tool successfully",
-			api:           "http://127.0.0.1:5000/api/tool/my-conversational-analytics-tool/invoke",
-			requestHeader: map[string]string{},
-			requestBody: bytes.NewBuffer([]byte(fmt.Sprintf(
-				`{"user_query_with_context": "What are the names in the table?", "table_references": %q}`,
-				tableRefsJSON,
-			))),
-			want:  dataInsightsWant,
-			isErr: false,
-		},
-		{
-			name:          "invoke my-auth-conversational-analytics-tool with auth token",
-			api:           "http://127.0.0.1:5000/api/tool/my-auth-conversational-analytics-tool/invoke",
-			requestHeader: map[string]string{"my-google-auth_token": idToken},
-			requestBody: bytes.NewBuffer([]byte(fmt.Sprintf(
-				`{"user_query_with_context": "What are the names in the table?", "table_references": %q}`,
-				tableRefsJSON,
-			))),
-			want:  dataInsightsWant,
-			isErr: false,
-		},
-		{
-			name:          "invoke my-auth-conversational-analytics-tool without auth token",
-			api:           "http://127.0.0.1:5000/api/tool/my-auth-conversational-analytics-tool/invoke",
-			requestHeader: map[string]string{},
-			requestBody:   bytes.NewBuffer([]byte(`{"user_query_with_context": "What are the names in the table?"}`)),
-			isErr:         true,
-		},
-	}
-	for _, tc := range invokeTcs {
-		t.Run(tc.name, func(t *testing.T) {
-			// Send Tool invocation request
-			req, err := http.NewRequest(http.MethodPost, tc.api, tc.requestBody)
-			if err != nil {
-				t.Fatalf("unable to create request: %s", err)
-			}
-			req.Header.Add("Content-type", "application/json")
-			for k, v := range tc.requestHeader {
-				req.Header.Add(k, v)
-			}
-			resp, err := http.DefaultClient.Do(req)
-			if err != nil {
-				t.Fatalf("unable to send request: %s", err)
-			}
-			defer resp.Body.Close()
-
-			if resp.StatusCode != http.StatusOK {
-				if tc.isErr {
-					return
-				}
-				bodyBytes, _ := io.ReadAll(resp.Body)
-				t.Fatalf("response status code is not 200, got %d: %s", resp.StatusCode, string(bodyBytes))
-			}
-
-			var body map[string]interface{}
-			err = json.NewDecoder(resp.Body).Decode(&body)
-			if err != nil {
-				t.Fatalf("error parsing response body: %v", err)
-			}
-
-			got, ok := body["result"].(string)
-			if !ok {
-				t.Fatalf("unable to find result in response body")
-			}
-
-			wantPattern := regexp.MustCompile(tc.want)
-			if !wantPattern.MatchString(got) {
-				t.Fatalf("response did not match the expected pattern.\nFull response:\n%s", got)
-			}
-		})
-	}
-}
--- a/tests/bigtable/bigtable_integration_test.go
+++ b/tests/bigtable/bigtable_integration_test.go
@@ -121,7 +121,6 @@ func TestBigtableToolEndpoints(t *testing.T) {
 	select1Want := "[{\"$col1\":1}]"
 	myToolById4Want := `[{"id":4,"name":""}]`
 	mcpMyFailToolWant := `{"jsonrpc":"2.0","id":"invoke-fail-tool","result":{"content":[{"type":"text","text":"unable to prepare statement: rpc error: code = InvalidArgument desc = Syntax error: Unexpected identifier \"SELEC\" [at 1:1]"}],"isError":true}}`
-	mcpSelect1Want := `{"jsonrpc":"2.0","id":"invoke my-auth-required-tool","result":{"content":[{"type":"text","text":"{\"$col1\":1}"}]}}`
 	nameFieldArray := `["CAST(cf['name'] AS string) as name"]`
 	nameColFilter := "CAST(cf['name'] AS string)"

@@ -130,7 +129,7 @@ func TestBigtableToolEndpoints(t *testing.T) {
 	tests.RunToolInvokeTest(t, select1Want,
 		tests.WithMyToolById4Want(myToolById4Want),
 	)
-	tests.RunMCPToolCallMethod(t, mcpMyFailToolWant, mcpSelect1Want)
+	tests.RunMCPToolCallMethod(t, mcpMyFailToolWant)
 	tests.RunToolInvokeWithTemplateParameters(t, tableNameTemplateParam,
 		tests.WithNameFieldArray(nameFieldArray),
 		tests.WithNameColFilter(nameColFilter),
--- a/tests/clickhouse/clickhouse_integration_test.go
+++ b/tests/clickhouse/clickhouse_integration_test.go
--- a/tests/cloudsqlmssql/cloud_sql_mssql_integration_test.go
+++ b/tests/cloudsqlmssql/cloud_sql_mssql_integration_test.go
@@ -159,12 +159,12 @@ func TestCloudSQLMSSQLToolEndpoints(t *testing.T) {
 	}

 	// Get configs for tests
-	select1Want, mcpMyFailToolWant, createTableStatement, mcpSelect1Want := tests.GetMSSQLWants()
+	select1Want, mcpMyFailToolWant, createTableStatement := tests.GetMSSQLWants()

 	// Run tests
 	tests.RunToolGetTest(t)
 	tests.RunToolInvokeTest(t, select1Want, tests.DisableArrayTest())
-	tests.RunMCPToolCallMethod(t, mcpMyFailToolWant, mcpSelect1Want)
+	tests.RunMCPToolCallMethod(t, mcpMyFailToolWant)
 	tests.RunExecuteSqlToolInvokeTest(t, createTableStatement, select1Want)
 	tests.RunToolInvokeWithTemplateParameters(t, tableNameTemplateParam)
 }
--- a/tests/cloudsqlmysql/cloud_sql_mysql_integration_test.go
+++ b/tests/cloudsqlmysql/cloud_sql_mysql_integration_test.go
@@ -146,12 +146,12 @@ func TestCloudSQLMySQLToolEndpoints(t *testing.T) {
 	}

 	// Get configs for tests
-	select1Want, mcpMyFailToolWant, createTableStatement, mcpSelect1Want := tests.GetMySQLWants()
+	select1Want, mcpMyFailToolWant, createTableStatement := tests.GetMySQLWants()

 	// Run tests
 	tests.RunToolGetTest(t)
 	tests.RunToolInvokeTest(t, select1Want, tests.DisableArrayTest())
-	tests.RunMCPToolCallMethod(t, mcpMyFailToolWant, mcpSelect1Want)
+	tests.RunMCPToolCallMethod(t, mcpMyFailToolWant)
 	tests.RunExecuteSqlToolInvokeTest(t, createTableStatement, select1Want)
 	tests.RunToolInvokeWithTemplateParameters(t, tableNameTemplateParam)
 }
--- a/tests/cloudsqlpg/cloud_sql_pg_integration_test.go
+++ b/tests/cloudsqlpg/cloud_sql_pg_integration_test.go
@@ -150,12 +150,12 @@ func TestCloudSQLPgSimpleToolEndpoints(t *testing.T) {
 	}

 	// Get configs for tests
-	select1Want, mcpMyFailToolWant, createTableStatement, mcpSelect1Want := tests.GetPostgresWants()
+	select1Want, mcpMyFailToolWant, createTableStatement := tests.GetPostgresWants()

 	// Run tests
 	tests.RunToolGetTest(t)
 	tests.RunToolInvokeTest(t, select1Want)
-	tests.RunMCPToolCallMethod(t, mcpMyFailToolWant, mcpSelect1Want)
+	tests.RunMCPToolCallMethod(t, mcpMyFailToolWant)
 	tests.RunExecuteSqlToolInvokeTest(t, createTableStatement, select1Want)
 	tests.RunToolInvokeWithTemplateParameters(t, tableNameTemplateParam)
 }
--- a/tests/common.go
+++ b/tests/common.go
@@ -400,30 +400,27 @@ func GetMySQLTmplToolStatement() (string, string) {
 }

 // GetPostgresWants return the expected wants for postgres
-func GetPostgresWants() (string, string, string, string) {
+func GetPostgresWants() (string, string, string) {
 	select1Want := "[{\"?column?\":1}]"
 	mcpMyFailToolWant := `{"jsonrpc":"2.0","id":"invoke-fail-tool","result":{"content":[{"type":"text","text":"unable to execute query: ERROR: syntax error at or near \"SELEC\" (SQLSTATE 42601)"}],"isError":true}}`
 	createTableStatement := `"CREATE TABLE t (id SERIAL PRIMARY KEY, name TEXT)"`
-	mcpSelect1Want := `{"jsonrpc":"2.0","id":"invoke my-auth-required-tool","result":{"content":[{"type":"text","text":"{\"?column?\":1}"}]}}`
-	return select1Want, mcpMyFailToolWant, createTableStatement, mcpSelect1Want
+	return select1Want, mcpMyFailToolWant, createTableStatement
 }

 // GetMSSQLWants return the expected wants for mssql
-func GetMSSQLWants() (string, string, string, string) {
+func GetMSSQLWants() (string, string, string) {
 	select1Want := "[{\"\":1}]"
 	mcpMyFailToolWant := `{"jsonrpc":"2.0","id":"invoke-fail-tool","result":{"content":[{"type":"text","text":"unable to execute query: mssql: Could not find stored procedure 'SELEC'."}],"isError":true}}`
 	createTableStatement := `"CREATE TABLE t (id INT IDENTITY(1,1) PRIMARY KEY, name NVARCHAR(MAX))"`
-	mcpSelect1Want := `{"jsonrpc":"2.0","id":"invoke my-auth-required-tool","result":{"content":[{"type":"text","text":"{\"\":1}"}]}}`
-	return select1Want, mcpMyFailToolWant, createTableStatement, mcpSelect1Want
+	return select1Want, mcpMyFailToolWant, createTableStatement
 }

 // GetMySQLWants return the expected wants for mysql
-func GetMySQLWants() (string, string, string, string) {
+func GetMySQLWants() (string, string, string) {
 	select1Want := "[{\"1\":1}]"
 	mcpMyFailToolWant := `{"jsonrpc":"2.0","id":"invoke-fail-tool","result":{"content":[{"type":"text","text":"unable to execute query: Error 1064 (42000): You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'SELEC 1' at line 1"}],"isError":true}}`
 	createTableStatement := `"CREATE TABLE t (id SERIAL PRIMARY KEY, name TEXT)"`
-	mcpSelect1Want := `{"jsonrpc":"2.0","id":"invoke my-auth-required-tool","result":{"content":[{"type":"text","text":"{\"1\":1}"}]}}`
-	return select1Want, mcpMyFailToolWant, createTableStatement, mcpSelect1Want
+	return select1Want, mcpMyFailToolWant, createTableStatement
 }

 // SetupPostgresSQLTable creates and inserts data into a table of tool
@@ -514,15 +511,14 @@ func SetupMySQLTable(t *testing.T, ctx context.Context, pool *sql.DB, createStat
 }

 // GetRedisWants return the expected wants for redis
-func GetRedisValkeyWants() (string, string, string, string, string, string, string) {
+func GetRedisValkeyWants() (string, string, string, string, string, string) {
 	select1Want := "[\"PONG\"]"
 	mcpMyFailToolWant := `unknown command 'SELEC 1;', with args beginning with: \""}]}}`
 	invokeParamWant := "[{\"id\":\"1\",\"name\":\"Alice\"},{\"id\":\"3\",\"name\":\"Sid\"}]"
 	invokeIdNullWant := `[{"id":"4","name":""}]`
 	nullWant := `["null"]`
-	mcpSelect1Want := `{"jsonrpc":"2.0","id":"invoke my-auth-required-tool","result":{"content":[{"type":"text","text":"\"PONG\""}]}}`
 	mcpInvokeParamWant := `{"jsonrpc":"2.0","id":"my-tool","result":{"content":[{"type":"text","text":"{\"id\":\"1\",\"name\":\"Alice\"}"},{"type":"text","text":"{\"id\":\"3\",\"name\":\"Sid\"}"}]}}`
-	return select1Want, mcpMyFailToolWant, invokeParamWant, invokeIdNullWant, nullWant, mcpSelect1Want, mcpInvokeParamWant
+	return select1Want, mcpMyFailToolWant, invokeParamWant, invokeIdNullWant, nullWant, mcpInvokeParamWant
 }

 func GetRedisValkeyToolsConfig(sourceConfig map[string]any, toolKind string) map[string]any {
--- a/tests/couchbase/couchbase_integration_test.go
+++ b/tests/couchbase/couchbase_integration_test.go
@@ -138,14 +138,13 @@ func TestCouchbaseToolEndpoints(t *testing.T) {
 	// Get configs for tests
 	select1Want := "[{\"$1\":1}]"
 	mcpMyFailToolWant := `{"jsonrpc":"2.0","id":"invoke-fail-tool","result":{"content":[{"type":"text","text":"unable to execute query: parsing failure | {\"statement\":\"SELEC 1;\"`
-	mcpSelect1Want := `{"jsonrpc":"2.0","id":"invoke my-auth-required-tool","result":{"content":[{"type":"text","text":"{\"$1\":1}"}]}}`
 	tmplSelectId1Want := "[{\"age\":21,\"id\":1,\"name\":\"Alex\"}]"
 	selectAllWant := "[{\"age\":21,\"id\":1,\"name\":\"Alex\"},{\"age\":100,\"id\":2,\"name\":\"Alice\"}]"

 	// Run tests
 	tests.RunToolGetTest(t)
 	tests.RunToolInvokeTest(t, select1Want)
-	tests.RunMCPToolCallMethod(t, mcpMyFailToolWant, mcpSelect1Want)
+	tests.RunMCPToolCallMethod(t, mcpMyFailToolWant)
 	tests.RunToolInvokeWithTemplateParameters(t, collectionNameTemplateParam,
 		tests.WithTmplSelectId1Want(tmplSelectId1Want),
 		tests.WithSelectAllWant(selectAllWant),
--- a/tests/firebird/firebird_integration_test.go
+++ b/tests/firebird/firebird_integration_test.go
@@ -127,7 +127,7 @@ func TestFirebirdToolEndpoints(t *testing.T) {
 	}

 	// Get configs for tests
-	select1Want, mcpMyFailToolWant, createTableStatement, mcpSelect1Want := getFirebirdWants()
+	select1Want, failInvocationWant, createTableStatement := getFirebirdWants()
 	nullWant := `[{"id":4,"name":null}]`
 	select1Statement := `"SELECT 1 AS \"constant\" FROM RDB$DATABASE;"`
 	templateParamCreateColArray := `["id INTEGER","name VARCHAR(255)","age INTEGER"]`
@@ -137,7 +137,7 @@ func TestFirebirdToolEndpoints(t *testing.T) {
 	tests.RunToolInvokeTest(t, select1Want,
 		tests.WithNullWant(nullWant),
 		tests.DisableArrayTest())
-	tests.RunMCPToolCallMethod(t, mcpMyFailToolWant, mcpSelect1Want)
+	tests.RunMCPToolCallMethod(t, failInvocationWant)
 	tests.RunExecuteSqlToolInvokeTest(t, createTableStatement, select1Want, tests.WithSelect1Statement(select1Statement))
 	tests.RunToolInvokeWithTemplateParameters(t, tableNameTemplateParam,
 		tests.WithCreateColArray(templateParamCreateColArray))
@@ -303,12 +303,11 @@ func getFirebirdAuthToolInfo(tableName string) ([]string, string, string, []any)
 	return createStatements, insertStatement, toolStatement, params
 }

-func getFirebirdWants() (string, string, string, string) {
+func getFirebirdWants() (string, string, string) {
 	select1Want := `[{"constant":1}]`
-	mcpMyFailToolWant := `{"jsonrpc":"2.0","id":"invoke-fail-tool","result":{"content":[{"type":"text","text":"unable to execute query: Dynamic SQL Error\nSQL error code = -104\nToken unknown - line 1, column 1\nSELEC\n"}],"isError":true}}`
+	failInvocationWant := `{"jsonrpc":"2.0","id":"invoke-fail-tool","result":{"content":[{"type":"text","text":"unable to execute query: Dynamic SQL Error\nSQL error code = -104\nToken unknown - line 1, column 1\nSELEC\n"}],"isError":true}}`
 	createTableStatement := `"CREATE TABLE t (id INTEGER PRIMARY KEY, name VARCHAR(50))"`
-	mcpSelect1Want := `{"jsonrpc":"2.0","id":"invoke my-auth-required-tool","result":{"content":[{"type":"text","text":"{\"constant\":1}"}]}}`
-	return select1Want, mcpMyFailToolWant, createTableStatement, mcpSelect1Want
+	return select1Want, failInvocationWant, createTableStatement
 }

 func getFirebirdToolsConfig(sourceConfig map[string]any, toolKind, paramToolStatement, idParamToolStmt, nameParamToolStmt, arrayToolStatement, authToolStatement string) map[string]any {
--- a/tests/looker/looker_integration_test.go
+++ b/tests/looker/looker_integration_test.go
@@ -624,10 +624,10 @@ func TestLooker(t *testing.T) {
 	wantResult = "{\"group_label\":\"System Activity\",\"label\":\"Content Usage\",\"name\":\"content_usage\"}"
 	tests.RunToolInvokeParametersTest(t, "get_explores", []byte(`{"model": "system__activity"}`), wantResult)

-	wantResult = "{\"description\":\"Number of times this content has been viewed via the Looker API\",\"label\":\"Content Usage API Count\",\"label_short\":\"API Count\",\"name\":\"content_usage.api_count\",\"synonyms\":[],\"tags\":[],\"type\":\"number\"}"
+	wantResult = "{\"description\":\"Number of times this content has been viewed via the Looker API\",\"label\":\"Content Usage API Count\",\"label_short\":\"API Count\",\"name\":\"content_usage.api_count\",\"type\":\"number\"}"
 	tests.RunToolInvokeParametersTest(t, "get_dimensions", []byte(`{"model": "system__activity", "explore": "content_usage"}`), wantResult)

-	wantResult = "{\"description\":\"The total number of views via the Looker API\",\"label\":\"Content Usage API Total\",\"label_short\":\"API Total\",\"name\":\"content_usage.api_total\",\"synonyms\":[],\"tags\":[],\"type\":\"sum\"}"
+	wantResult = "{\"description\":\"The total number of views via the Looker API\",\"label\":\"Content Usage API Total\",\"label_short\":\"API Total\",\"name\":\"content_usage.api_total\",\"type\":\"sum\"}"
 	tests.RunToolInvokeParametersTest(t, "get_measures", []byte(`{"model": "system__activity", "explore": "content_usage"}`), wantResult)

 	wantResult = "[]"
--- a/tests/mongodb/mongodb_integration_test.go
+++ b/tests/mongodb/mongodb_integration_test.go
@@ -112,7 +112,7 @@ func TestMongoDBToolEndpoints(t *testing.T) {
 		tests.WithMyToolId3NameAliceWant(myToolId3NameAliceWant),
 		tests.WithMyToolById4Want(myToolById4Want),
 	)
-	tests.RunMCPToolCallMethod(t, mcpMyFailToolWant, select1Want,
+	tests.RunMCPToolCallMethod(t, mcpMyFailToolWant,
 		tests.WithMcpMyToolId3NameAliceWant(mcpMyToolId3NameAliceWant),
 	)

--- a/tests/mssql/mssql_integration_test.go
+++ b/tests/mssql/mssql_integration_test.go
@@ -132,12 +132,12 @@ func TestMSSQLToolEndpoints(t *testing.T) {
 	}

 	// Get configs for tests
-	select1Want, mcpMyFailToolWant, createTableStatement, mcpSelect1Want := tests.GetMSSQLWants()
+	select1Want, mcpMyFailToolWant, createTableStatement := tests.GetMSSQLWants()

 	// Run tests
 	tests.RunToolGetTest(t)
 	tests.RunToolInvokeTest(t, select1Want, tests.DisableArrayTest())
-	tests.RunMCPToolCallMethod(t, mcpMyFailToolWant, mcpSelect1Want)
+	tests.RunMCPToolCallMethod(t, mcpMyFailToolWant)
 	tests.RunExecuteSqlToolInvokeTest(t, createTableStatement, select1Want)
 	tests.RunToolInvokeWithTemplateParameters(t, tableNameTemplateParam)
 }
--- a/tests/mysql/mysql_integration_test.go
+++ b/tests/mysql/mysql_integration_test.go
@@ -123,12 +123,12 @@ func TestMySQLToolEndpoints(t *testing.T) {
 	}

 	// Get configs for tests
-	select1Want, mcpMyFailToolWant, createTableStatement, mcpSelect1Want := tests.GetMySQLWants()
+	select1Want, mcpMyFailToolWant, createTableStatement := tests.GetMySQLWants()

 	// Run tests
 	tests.RunToolGetTest(t)
 	tests.RunToolInvokeTest(t, select1Want, tests.DisableArrayTest())
-	tests.RunMCPToolCallMethod(t, mcpMyFailToolWant, mcpSelect1Want)
+	tests.RunMCPToolCallMethod(t, mcpMyFailToolWant)
 	tests.RunExecuteSqlToolInvokeTest(t, createTableStatement, select1Want)
 	tests.RunToolInvokeWithTemplateParameters(t, tableNameTemplateParam)
 }
--- a/tests/oceanbase/oceanbase_integration_test.go
+++ b/tests/oceanbase/oceanbase_integration_test.go
@@ -125,12 +125,12 @@ func TestOceanBaseToolEndpoints(t *testing.T) {
 	}

 	// Get configs for tests
-	select1Want, mcpMyFailToolWant, createTableStatement, mcpSelect1Want := getOceanBaseWants()
+	select1Want, mcpMyFailToolWant, createTableStatement := getOceanBaseWants()

 	// Run tests
 	tests.RunToolGetTest(t)
 	tests.RunToolInvokeTest(t, select1Want, tests.DisableArrayTest())
-	tests.RunMCPToolCallMethod(t, mcpMyFailToolWant, mcpSelect1Want)
+	tests.RunMCPToolCallMethod(t, mcpMyFailToolWant)
 	tests.RunExecuteSqlToolInvokeTest(t, createTableStatement, select1Want)
 	tests.RunToolInvokeWithTemplateParameters(t, tableNameTemplateParam)
 }
@@ -164,12 +164,11 @@ func getOceanBaseTmplToolStatement() (string, string) {
 }

 // OceanBase specific expected results
-func getOceanBaseWants() (string, string, string, string) {
+func getOceanBaseWants() (string, string, string) {
 	select1Want := "[{\"1\":1}]"
 	mcpMyFailToolWant := `{"jsonrpc":"2.0","id":"invoke-fail-tool","result":{"content":[{"type":"text","text":"unable to execute query: Error 1064 (42000): You have an error in your SQL syntax; check the manual that corresponds to your OceanBase version for the right syntax to use near 'SELEC 1;' at line 1"}],"isError":true}}`
 	createTableStatement := `"CREATE TABLE t (id INT NOT NULL AUTO_INCREMENT PRIMARY KEY, name VARCHAR(255))"`
-	mcpSelect1Want := `{"jsonrpc":"2.0","id":"invoke my-auth-required-tool","result":{"content":[{"type":"text","text":"{\"1\":1}"}]}}`
-	return select1Want, mcpMyFailToolWant, createTableStatement, mcpSelect1Want
+	return select1Want, mcpMyFailToolWant, createTableStatement
 }

 // Add OceanBase Execute SQL configuration
--- a/tests/option.go
+++ b/tests/option.go
@@ -23,7 +23,6 @@ type InvokeTestConfig struct {
 	nullWant                 string
 	supportOptionalNullParam bool
 	supportArrayParam        bool
-	supportClientAuth        bool
 }

 type InvokeTestOption func(*InvokeTestConfig)
@@ -69,21 +68,11 @@ func DisableArrayTest() InvokeTestOption {
 	}
 }

-// EnableClientAuthTest runs the client authorization tests.
-// Only enable it if your source supports the `useClientOAuth` configuration.
-// Currently, this should only be used with the BigQuery tests.
-func EnableClientAuthTest() InvokeTestOption {
-	return func(c *InvokeTestConfig) {
-		c.supportClientAuth = true
-	}
-}
-
 /* Configurations for RunMCPToolCallMethod()  */

 // MCPTestConfig represents the various configuration options for mcp tool call tests.
 type MCPTestConfig struct {
 	myToolId3NameAliceWant string
-	supportClientAuth      bool
 }

 type McpTestOption func(*MCPTestConfig)
@@ -96,15 +85,6 @@ func WithMcpMyToolId3NameAliceWant(s string) McpTestOption {
 	}
 }

-// EnableMcpClientAuthTest runs the client authorization tests.
-// Only enable it if your source supports the `useClientOAuth` configuration.
-// Currently, this should only be used with the BigQuery tests.
-func EnableMcpClientAuthTest() McpTestOption {
-	return func(c *MCPTestConfig) {
-		c.supportClientAuth = true
-	}
-}
-
 /* Configurations for RunExecuteSqlToolInvokeTest()  */

 // ExecuteSqlTestConfig represents the various configuration options for RunExecuteSqlToolInvokeTest()
--- a/tests/postgres/postgres_integration_test.go
+++ b/tests/postgres/postgres_integration_test.go
@@ -129,12 +129,12 @@ func TestPostgres(t *testing.T) {
 	}

 	// Get configs for tests
-	select1Want, mcpMyFailToolWant, createTableStatement, mcpSelect1Want := tests.GetPostgresWants()
+	select1Want, mcpMyFailToolWant, createTableStatement := tests.GetPostgresWants()

 	// Run tests
 	tests.RunToolGetTest(t)
 	tests.RunToolInvokeTest(t, select1Want)
-	tests.RunMCPToolCallMethod(t, mcpMyFailToolWant, mcpSelect1Want)
+	tests.RunMCPToolCallMethod(t, mcpMyFailToolWant)
 	tests.RunExecuteSqlToolInvokeTest(t, createTableStatement, select1Want)
 	tests.RunToolInvokeWithTemplateParameters(t, tableNameTemplateParam)
 }
--- a/tests/redis/redis_test.go
+++ b/tests/redis/redis_test.go
@@ -98,7 +98,7 @@ func TestRedisToolEndpoints(t *testing.T) {
 	}

 	// Get configs for tests
-	select1Want, mcpMyFailToolWant, invokeParamWant, invokeIdNullWant, nullWant, mcpSelect1Want, mcpInvokeParamWant := tests.GetRedisValkeyWants()
+	select1Want, mcpMyFailToolWant, invokeParamWant, invokeIdNullWant, nullWant, mcpInvokeParamWant := tests.GetRedisValkeyWants()

 	// Run tests
 	tests.RunToolGetTest(t)
@@ -107,7 +107,7 @@ func TestRedisToolEndpoints(t *testing.T) {
 		tests.WithMyToolById4Want(invokeIdNullWant),
 		tests.WithNullWant(nullWant),
 	)
-	tests.RunMCPToolCallMethod(t, mcpMyFailToolWant, mcpSelect1Want,
+	tests.RunMCPToolCallMethod(t, mcpMyFailToolWant,
 		tests.WithMcpMyToolId3NameAliceWant(mcpInvokeParamWant),
 	)
 }
--- a/Show More
+++ b/Show More
@@ -1 +1 @@
 .13.0
 .12.0